@actual-app/api 6.7.0 → 6.7.1

package/dist/app/bundle.api.js

@@ -12133,6 +12133,66 @@
             }
             /***/ 
         }),
+        /***/ "./node_modules/date-fns/esm/endOfWeek/index.js": 
+        /*!******************************************************!*\
+          !*** ./node_modules/date-fns/esm/endOfWeek/index.js ***!
+          \******************************************************/
+        /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+                /* harmony export */ "default": () => ( /* binding */endOfWeek)
+                /* harmony export */ 
+            });
+            /* harmony import */ var _lib_defaultOptions_index_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../_lib/defaultOptions/index.js */ "./node_modules/date-fns/esm/_lib/defaultOptions/index.js");
+            /* harmony import */ var _toDate_index_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../toDate/index.js */ "./node_modules/date-fns/esm/toDate/index.js");
+            /* harmony import */ var _lib_toInteger_index_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../_lib/toInteger/index.js */ "./node_modules/date-fns/esm/_lib/toInteger/index.js");
+            /* harmony import */ var _lib_requiredArgs_index_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../_lib/requiredArgs/index.js */ "./node_modules/date-fns/esm/_lib/requiredArgs/index.js");
+            /**
+             * @name endOfWeek
+             * @category Week Helpers
+             * @summary Return the end of a week for the given date.
+             *
+             * @description
+             * Return the end of a week for the given date.
+             * The result will be in the local timezone.
+             *
+             * @param {Date|Number} date - the original date
+             * @param {Object} [options] - an object with options.
+             * @param {Locale} [options.locale=defaultLocale] - the locale object. See [Locale]{@link https://date-fns.org/docs/Locale}
+             * @param {0|1|2|3|4|5|6} [options.weekStartsOn=0] - the index of the first day of the week (0 - Sunday)
+             * @returns {Date} the end of a week
+             * @throws {TypeError} 1 argument required
+             * @throws {RangeError} `options.weekStartsOn` must be between 0 and 6
+             *
+             * @example
+             * // The end of a week for 2 September 2014 11:55:00:
+             * const result = endOfWeek(new Date(2014, 8, 2, 11, 55, 0))
+             * //=> Sat Sep 06 2014 23:59:59.999
+             *
+             * @example
+             * // If the week starts on Monday, the end of the week for 2 September 2014 11:55:00:
+             * const result = endOfWeek(new Date(2014, 8, 2, 11, 55, 0), { weekStartsOn: 1 })
+             * //=> Sun Sep 07 2014 23:59:59.999
+             */
+            function endOfWeek(dirtyDate, options) {
+                var _ref, _ref2, _ref3, _options$weekStartsOn, _options$locale, _options$locale$optio, _defaultOptions$local, _defaultOptions$local2;
+                (0, _lib_requiredArgs_index_js__WEBPACK_IMPORTED_MODULE_0__["default"])(1, arguments);
+                var defaultOptions = (0, _lib_defaultOptions_index_js__WEBPACK_IMPORTED_MODULE_1__.getDefaultOptions)();
+                var weekStartsOn = (0, _lib_toInteger_index_js__WEBPACK_IMPORTED_MODULE_2__["default"])((_ref = (_ref2 = (_ref3 = (_options$weekStartsOn = options === null || options === void 0 ? void 0 : options.weekStartsOn) !== null && _options$weekStartsOn !== void 0 ? _options$weekStartsOn : options === null || options === void 0 ? void 0 : (_options$locale = options.locale) === null || _options$locale === void 0 ? void 0 : (_options$locale$optio = _options$locale.options) === null || _options$locale$optio === void 0 ? void 0 : _options$locale$optio.weekStartsOn) !== null && _ref3 !== void 0 ? _ref3 : defaultOptions.weekStartsOn) !== null && _ref2 !== void 0 ? _ref2 : (_defaultOptions$local = defaultOptions.locale) === null || _defaultOptions$local === void 0 ? void 0 : (_defaultOptions$local2 = _defaultOptions$local.options) === null || _defaultOptions$local2 === void 0 ? void 0 : _defaultOptions$local2.weekStartsOn) !== null && _ref !== void 0 ? _ref : 0);
+                // Test if weekStartsOn is between 0 and 6 _and_ is not NaN
+                if (!(weekStartsOn >= 0 && weekStartsOn <= 6)) {
+                    throw new RangeError('weekStartsOn must be between 0 and 6 inclusively');
+                }
+                var date = (0, _toDate_index_js__WEBPACK_IMPORTED_MODULE_3__["default"])(dirtyDate);
+                var day = date.getDay();
+                var diff = (day < weekStartsOn ? -7 : 0) + 6 - (day - weekStartsOn);
+                date.setDate(date.getDate() + diff);
+                date.setHours(23, 59, 59, 999);
+                return date;
+            }
+            /***/ 
+        }),
         /***/ "./node_modules/date-fns/esm/format/index.js": 
         /*!***************************************************!*\
           !*** ./node_modules/date-fns/esm/format/index.js ***!
@@ -17359,6 +17419,66 @@
             }
             /***/ 
         }),
+        /***/ "./node_modules/date-fns/esm/startOfWeek/index.js": 
+        /*!********************************************************!*\
+          !*** ./node_modules/date-fns/esm/startOfWeek/index.js ***!
+          \********************************************************/
+        /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+                /* harmony export */ "default": () => ( /* binding */startOfWeek)
+                /* harmony export */ 
+            });
+            /* harmony import */ var _toDate_index_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../toDate/index.js */ "./node_modules/date-fns/esm/toDate/index.js");
+            /* harmony import */ var _lib_toInteger_index_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../_lib/toInteger/index.js */ "./node_modules/date-fns/esm/_lib/toInteger/index.js");
+            /* harmony import */ var _lib_requiredArgs_index_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../_lib/requiredArgs/index.js */ "./node_modules/date-fns/esm/_lib/requiredArgs/index.js");
+            /* harmony import */ var _lib_defaultOptions_index_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../_lib/defaultOptions/index.js */ "./node_modules/date-fns/esm/_lib/defaultOptions/index.js");
+            /**
+             * @name startOfWeek
+             * @category Week Helpers
+             * @summary Return the start of a week for the given date.
+             *
+             * @description
+             * Return the start of a week for the given date.
+             * The result will be in the local timezone.
+             *
+             * @param {Date|Number} date - the original date
+             * @param {Object} [options] - an object with options.
+             * @param {Locale} [options.locale=defaultLocale] - the locale object. See [Locale]{@link https://date-fns.org/docs/Locale}
+             * @param {0|1|2|3|4|5|6} [options.weekStartsOn=0] - the index of the first day of the week (0 - Sunday)
+             * @returns {Date} the start of a week
+             * @throws {TypeError} 1 argument required
+             * @throws {RangeError} `options.weekStartsOn` must be between 0 and 6
+             *
+             * @example
+             * // The start of a week for 2 September 2014 11:55:00:
+             * const result = startOfWeek(new Date(2014, 8, 2, 11, 55, 0))
+             * //=> Sun Aug 31 2014 00:00:00
+             *
+             * @example
+             * // If the week starts on Monday, the start of the week for 2 September 2014 11:55:00:
+             * const result = startOfWeek(new Date(2014, 8, 2, 11, 55, 0), { weekStartsOn: 1 })
+             * //=> Mon Sep 01 2014 00:00:00
+             */
+            function startOfWeek(dirtyDate, options) {
+                var _ref, _ref2, _ref3, _options$weekStartsOn, _options$locale, _options$locale$optio, _defaultOptions$local, _defaultOptions$local2;
+                (0, _lib_requiredArgs_index_js__WEBPACK_IMPORTED_MODULE_0__["default"])(1, arguments);
+                var defaultOptions = (0, _lib_defaultOptions_index_js__WEBPACK_IMPORTED_MODULE_1__.getDefaultOptions)();
+                var weekStartsOn = (0, _lib_toInteger_index_js__WEBPACK_IMPORTED_MODULE_2__["default"])((_ref = (_ref2 = (_ref3 = (_options$weekStartsOn = options === null || options === void 0 ? void 0 : options.weekStartsOn) !== null && _options$weekStartsOn !== void 0 ? _options$weekStartsOn : options === null || options === void 0 ? void 0 : (_options$locale = options.locale) === null || _options$locale === void 0 ? void 0 : (_options$locale$optio = _options$locale.options) === null || _options$locale$optio === void 0 ? void 0 : _options$locale$optio.weekStartsOn) !== null && _ref3 !== void 0 ? _ref3 : defaultOptions.weekStartsOn) !== null && _ref2 !== void 0 ? _ref2 : (_defaultOptions$local = defaultOptions.locale) === null || _defaultOptions$local === void 0 ? void 0 : (_defaultOptions$local2 = _defaultOptions$local.options) === null || _defaultOptions$local2 === void 0 ? void 0 : _defaultOptions$local2.weekStartsOn) !== null && _ref !== void 0 ? _ref : 0);
+                // Test if weekStartsOn is between 0 and 6 _and_ is not NaN
+                if (!(weekStartsOn >= 0 && weekStartsOn <= 6)) {
+                    throw new RangeError('weekStartsOn must be between 0 and 6 inclusively');
+                }
+                var date = (0, _toDate_index_js__WEBPACK_IMPORTED_MODULE_3__["default"])(dirtyDate);
+                var day = date.getDay();
+                var diff = (day < weekStartsOn ? 7 : 0) + day - weekStartsOn;
+                date.setDate(date.getDate() - diff);
+                date.setHours(0, 0, 0, 0);
+                return date;
+            }
+            /***/ 
+        }),
         /***/ "./node_modules/date-fns/esm/subDays/index.js": 
         /*!****************************************************!*\
           !*** ./node_modules/date-fns/esm/subDays/index.js ***!
@@ -31226,124 +31346,27 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-                /* harmony export */ addAccounts: () => ( /* binding */addAccounts),
-                /* harmony export */ addGoCardlessAccounts: () => ( /* binding */addGoCardlessAccounts),
-                /* harmony export */ findOrCreateBank: () => ( /* binding */findOrCreateBank),
-                /* harmony export */ handoffPublicToken: () => ( /* binding */handoffPublicToken)
+                /* harmony export */ findOrCreateBank: () => ( /* binding */findOrCreateBank)
                 /* harmony export */ 
             });
-            /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
-            /* harmony import */ var _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../platform/server/asyncStorage */ "./packages/loot-core/src/platform/server/asyncStorage/index.electron.ts");
-            /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../shared/util */ "./packages/loot-core/src/shared/util.ts");
-            /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.ts");
-            /* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../mutators */ "./packages/loot-core/src/server/mutators.ts");
-            /* harmony import */ var _post__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../post */ "./packages/loot-core/src/server/post.ts");
-            /* harmony import */ var _server_config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../server-config */ "./packages/loot-core/src/server/server-config.ts");
-            /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./sync */ "./packages/loot-core/src/server/accounts/sync.ts");
+            /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
+            /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.ts");
             // @ts-strict-ignore
-            async function handoffPublicToken(institution, publicToken) {
-                const [[, userId], [, key]] = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__.multiGet([
-                    'user-id',
-                    'user-key'
-                ]);
-                if (institution == null || !institution.institution_id || !institution.name) {
-                    throw new Error('Invalid institution object');
-                }
-                const id = (0, uuid__WEBPACK_IMPORTED_MODULE_7__["default"])();
-                // Make sure to generate an access token first before inserting it
-                // into our local database in case it fails
-                await (0, _post__WEBPACK_IMPORTED_MODULE_4__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_5__.getServer)().PLAID_SERVER + '/handoff_public_token', {
-                    userId,
-                    key,
-                    item_id: id,
-                    public_token: publicToken
-                });
-                await (0, _mutators__WEBPACK_IMPORTED_MODULE_3__.runMutator)(() => _db__WEBPACK_IMPORTED_MODULE_2__.insertWithUUID('banks', {
-                    id,
-                    bank_id: institution.institution_id,
-                    name: institution.name
-                }));
-                return id;
-            }
             async function findOrCreateBank(institution, requisitionId) {
-                const bank = await _db__WEBPACK_IMPORTED_MODULE_2__.first('SELECT id, bank_id, name FROM banks WHERE bank_id = ?', [
+                const bank = await _db__WEBPACK_IMPORTED_MODULE_0__.first('SELECT id, bank_id, name FROM banks WHERE bank_id = ?', [
                     requisitionId
                 ]);
                 if (bank) {
                     return bank;
                 }
                 const bankData = {
-                    id: (0, uuid__WEBPACK_IMPORTED_MODULE_7__["default"])(),
+                    id: (0, uuid__WEBPACK_IMPORTED_MODULE_1__["default"])(),
                     bank_id: requisitionId,
                     name: institution.name
                 };
-                await _db__WEBPACK_IMPORTED_MODULE_2__.insertWithUUID('banks', bankData);
+                await _db__WEBPACK_IMPORTED_MODULE_0__.insertWithUUID('banks', bankData);
                 return bankData;
             }
-            async function addAccounts(bankId, accountIds, offbudgetIds = []) {
-                const [[, userId], [, userKey]] = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__.multiGet([
-                    'user-id',
-                    'user-key'
-                ]);
-                // Get all the available accounts
-                let accounts = await _sync__WEBPACK_IMPORTED_MODULE_6__.getAccounts(userId, userKey, bankId);
-                // Only add the selected accounts
-                accounts = accounts.filter((acct) => accountIds.includes(acct.account_id));
-                return Promise.all(accounts.map(async (acct) => {
-                    const id = await (0, _mutators__WEBPACK_IMPORTED_MODULE_3__.runMutator)(async () => {
-                        const id = await _db__WEBPACK_IMPORTED_MODULE_2__.insertAccount({
-                            account_id: acct.account_id,
-                            name: acct.name,
-                            official_name: acct.official_name,
-                            balance_current: (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.amountToInteger)(acct.balances.current),
-                            mask: acct.mask,
-                            bank: bankId,
-                            offbudget: offbudgetIds.includes(acct.account_id) ? 1 : 0
-                        });
-                        // Create a transfer payee
-                        await _db__WEBPACK_IMPORTED_MODULE_2__.insertPayee({
-                            name: '',
-                            transfer_acct: id
-                        });
-                        return id;
-                    });
-                    // Do an initial sync
-                    await _sync__WEBPACK_IMPORTED_MODULE_6__.syncAccount(userId, userKey, id, acct.account_id, bankId);
-                    return id;
-                }));
-            }
-            async function addGoCardlessAccounts(bankId, accountIds, offbudgetIds = []) {
-                const [[, userId], [, userKey]] = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__.multiGet([
-                    'user-id',
-                    'user-key'
-                ]);
-                // Get all the available accounts
-                let accounts = await _sync__WEBPACK_IMPORTED_MODULE_6__.getGoCardlessAccounts(userId, userKey, bankId);
-                // Only add the selected accounts
-                accounts = accounts.filter((acct) => accountIds.includes(acct.account_id));
-                return Promise.all(accounts.map(async (acct) => {
-                    const id = await (0, _mutators__WEBPACK_IMPORTED_MODULE_3__.runMutator)(async () => {
-                        const id = await _db__WEBPACK_IMPORTED_MODULE_2__.insertAccount({
-                            account_id: acct.account_id,
-                            name: acct.name,
-                            official_name: acct.official_name,
-                            balance_current: (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.amountToInteger)(acct.balances.current),
-                            mask: acct.mask,
-                            bank: bankId,
-                            offbudget: offbudgetIds.includes(acct.account_id) ? 1 : 0
-                        });
-                        // Create a transfer payee
-                        await _db__WEBPACK_IMPORTED_MODULE_2__.insertPayee({
-                            name: '',
-                            transfer_acct: id
-                        });
-                        return id;
-                    });
-                    // Do an initial sync
-                    await _sync__WEBPACK_IMPORTED_MODULE_6__.syncExternalAccount(userId, userKey, id, acct.account_id, bankId);
-                    return id;
-                }));
-            }
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/accounts/ofx2json.ts": 
@@ -31583,7 +31606,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         payee_name: trans.payee,
                         imported_payee: trans.payee,
                         notes: trans.memo || null
-                    }))
+                    })).filter((trans) => trans.date != null && trans.amount != null)
                 };
             }
             async function parseOFX(filepath, options) {
@@ -32284,7 +32307,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         update = (0, _shared_transactions__WEBPACK_IMPORTED_MODULE_3__.recalculateSplit)(update);
                     }
                 }
-                // The split index 0 is reserved for "Before split" actions.
+                // The split index 0 is reserved for "Apply to all" actions.
                 // Remove that entry from the subtransactions.
                 update.subtransactions = update.subtransactions.slice(1);
                 return update;
@@ -32595,19 +32618,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
                 /* harmony export */ addTransactions: () => ( /* binding */addTransactions),
-                /* harmony export */ fromPlaid: () => ( /* binding */fromPlaid),
-                /* harmony export */ getAccounts: () => ( /* binding */getAccounts),
                 /* harmony export */ getGoCardlessAccounts: () => ( /* binding */getGoCardlessAccounts),
-                /* harmony export */ reconcileExternalTransactions: () => ( /* binding */reconcileExternalTransactions),
                 /* harmony export */ reconcileTransactions: () => ( /* binding */reconcileTransactions),
-                /* harmony export */ syncAccount: () => ( /* binding */syncAccount),
-                /* harmony export */ syncExternalAccount: () => ( /* binding */syncExternalAccount)
+                /* harmony export */ syncAccount: () => ( /* binding */syncAccount)
                 /* harmony export */ 
             });
             /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/differenceInMilliseconds/index.js");
             /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/parseISO/index.js");
             /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/max/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/format/index.js");
             /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
             /* harmony import */ var _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../platform/server/asyncStorage */ "./packages/loot-core/src/platform/server/asyncStorage/index.electron.ts");
             /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../shared/months */ "./packages/loot-core/src/shared/months.ts");
@@ -32623,8 +32641,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _transaction_rules__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./transaction-rules */ "./packages/loot-core/src/server/accounts/transaction-rules.ts");
             /* harmony import */ var _transactions__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./transactions */ "./packages/loot-core/src/server/accounts/transactions.ts");
             // @ts-strict-ignore
-            // Plaid article about API options:
-            // https://support.plaid.com/customer/en/portal/articles/2612155-transactions-returned-per-request
             function BankSyncError(type, code) {
                 return {
                     type: 'BankSyncError',
@@ -32663,18 +32679,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     id
                 ]);
             }
-            async function getAccounts(userId, userKey, id) {
-                const res = await (0, _post__WEBPACK_IMPORTED_MODULE_6__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_7__.getServer)().PLAID_SERVER + '/accounts', {
-                    userId,
-                    key: userKey,
-                    item_id: id
-                });
-                const { accounts } = res;
-                accounts.forEach((acct) => {
-                    acct.balances.current = getAccountBalance(acct);
-                });
-                return accounts;
-            }
             async function getGoCardlessAccounts(userId, userKey, id) {
                 const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__.getItem('user-token');
                 if (!userToken)
@@ -32692,55 +32696,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
                 return accounts;
             }
-            function fromPlaid(trans) {
-                return {
-                    imported_id: trans.transaction_id,
-                    payee_name: trans.name,
-                    imported_payee: trans.name,
-                    amount: -(0, _shared_util__WEBPACK_IMPORTED_MODULE_3__.amountToInteger)(trans.amount),
-                    date: trans.date
-                };
-            }
-            async function downloadTransactions(userId, userKey, acctId, bankId, since, count) {
-                let allTransactions = [];
-                let accountBalance = null;
-                const pageSize = 100;
-                let offset = 0;
-                let numDownloaded = 0;
-                while (1) {
-                    const endDate = _shared_months__WEBPACK_IMPORTED_MODULE_1__.currentDay();
-                    const res = await (0, _post__WEBPACK_IMPORTED_MODULE_6__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_7__.getServer)().PLAID_SERVER + '/transactions', {
-                        userId,
-                        key: userKey,
-                        item_id: '' + bankId,
-                        account_id: acctId,
-                        start_date: since,
-                        end_date: endDate,
-                        count: pageSize,
-                        offset
-                    });
-                    if (res.error_code) {
-                        throw BankSyncError(res.error_type, res.error_code);
-                    }
-                    if (res.transactions.length === 0) {
-                        break;
-                    }
-                    numDownloaded += res.transactions.length;
-                    // Remove pending transactions for now - we will handle them in
-                    // the future.
-                    allTransactions = allTransactions.concat(res.transactions.filter((t) => !t.pending));
-                    accountBalance = getAccountBalance(res.accounts[0]);
-                    if (numDownloaded === res.total_transactions || count != null && allTransactions.length >= count) {
-                        break;
-                    }
-                    offset += pageSize;
-                }
-                allTransactions = count != null ? allTransactions.slice(0, count) : allTransactions;
-                return {
-                    transactions: allTransactions.map(fromPlaid),
-                    accountBalance
-                };
-            }
             async function downloadGoCardlessTransactions(userId, userKey, acctId, bankId, since) {
                 const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_0__.getItem('user-token');
                 if (!userToken)
@@ -32854,7 +32809,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     payeesToCreate
                 };
             }
-            async function normalizeExternalTransactions(transactions, acctId) {
+            async function normalizeBankSyncTransactions(transactions, acctId) {
                 const payeesToCreate = new Map();
                 const normalized = [];
                 for (const trans of transactions) {
@@ -32932,12 +32887,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 });
             }
-            async function reconcileExternalTransactions(acctId, transactions) {
+            async function reconcileTransactions(acctId, transactions, isBankSyncAccount = false) {
                 console.log('Performing transaction reconciliation');
                 const hasMatched = new Set();
                 const updated = [];
                 const added = [];
-                const { normalized, payeesToCreate } = await normalizeExternalTransactions(transactions, acctId);
+                const transactionNormalization = isBankSyncAccount ? normalizeBankSyncTransactions : normalizeTransactions;
+                const { normalized, payeesToCreate } = await transactionNormalization(transactions, acctId);
                 // The first pass runs the rules, and preps data for fuzzy matching
                 const transactionsStep1 = [];
                 for (const { payee_name, trans: originalTrans, subtransactions } of normalized) {
@@ -33039,6 +32995,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         };
                         // Update the transaction
                         const updates = {
+                            ...isBankSyncAccount ? {} : {
+                                date: trans.date
+                            },
                             imported_id: trans.imported_id || null,
                             payee: existing.payee || trans.payee || null,
                             category: existing.category || trans.category || null,
@@ -33100,167 +33059,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     updated: updated.map((trans) => trans.id)
                 };
             }
-            async function reconcileTransactions(acctId, transactions) {
-                const hasMatched = new Set();
-                const updated = [];
-                const added = [];
-                const { normalized, payeesToCreate } = await normalizeTransactions(transactions, acctId);
-                // The first pass runs the rules, and preps data for fuzzy matching
-                const transactionsStep1 = [];
-                for (const { payee_name, trans: originalTrans, subtransactions } of normalized) {
-                    // Run the rules
-                    const trans = (0, _transaction_rules__WEBPACK_IMPORTED_MODULE_11__.runRules)(originalTrans);
-                    let match = null;
-                    let fuzzyDataset = null;
-                    // First, match with an existing transaction's imported_id. This
-                    // is the highest fidelity match and should always be attempted
-                    // first.
-                    if (trans.imported_id) {
-                        match = await _db__WEBPACK_IMPORTED_MODULE_4__.first('SELECT * FROM v_transactions WHERE imported_id = ? AND account = ?', [
-                            trans.imported_id,
-                            acctId
-                        ]);
-                        if (match) {
-                            hasMatched.add(match.id);
-                        }
-                    }
-                    // If it didn't match, query data needed for fuzzy matching
-                    if (!match) {
-                        // Look 7 days ahead and 7 days back when fuzzy matching. This
-                        // needs to select all fields that need to be read from the
-                        // matched transaction. See the final pass below for the needed
-                        // fields.
-                        fuzzyDataset = await _db__WEBPACK_IMPORTED_MODULE_4__.all(`SELECT id, is_parent, date, imported_id, payee, category, notes, reconciled FROM v_transactions
-           WHERE date >= ? AND date <= ? AND amount = ? AND account = ?`, [
-                            _db__WEBPACK_IMPORTED_MODULE_4__.toDateRepr(_shared_months__WEBPACK_IMPORTED_MODULE_1__.subDays(trans.date, 7)),
-                            _db__WEBPACK_IMPORTED_MODULE_4__.toDateRepr(_shared_months__WEBPACK_IMPORTED_MODULE_1__.addDays(trans.date, 7)),
-                            trans.amount || 0,
-                            acctId
-                        ]);
-                        // Sort the matched transactions according to the distance from the original
-                        // transactions date. i.e. if the original transaction is in 21-02-2024 and
-                        // the matched transactions are: 20-02-2024, 21-02-2024, 29-02-2024 then
-                        // the resulting data-set should be: 21-02-2024, 20-02-2024, 29-02-2024.
-                        fuzzyDataset = fuzzyDataset.sort((a, b) => {
-                            const aDistance = Math.abs(date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](trans.date), date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](_db__WEBPACK_IMPORTED_MODULE_4__.fromDateRepr(a.date))));
-                            const bDistance = Math.abs(date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](trans.date), date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](_db__WEBPACK_IMPORTED_MODULE_4__.fromDateRepr(b.date))));
-                            return aDistance > bDistance ? 1 : -1;
-                        });
-                    }
-                    transactionsStep1.push({
-                        payee_name,
-                        trans,
-                        subtransactions: trans.subtransactions || subtransactions,
-                        match,
-                        fuzzyDataset
-                    });
-                }
-                // Next, do the fuzzy matching. This first pass matches based on the
-                // payee id. We do this in multiple passes so that higher fidelity
-                // matching always happens first, i.e. a transaction should match
-                // match with low fidelity if a later transaction is going to match
-                // the same one with high fidelity.
-                const transactionsStep2 = transactionsStep1.map((data) => {
-                    if (!data.match && data.fuzzyDataset) {
-                        // Try to find one where the payees match.
-                        const match = data.fuzzyDataset.find((row) => !hasMatched.has(row.id) && data.trans.payee === row.payee);
-                        if (match) {
-                            hasMatched.add(match.id);
-                            return {
-                                ...data,
-                                match
-                            };
-                        }
-                    }
-                    return data;
-                });
-                // The final fuzzy matching pass. This is the lowest fidelity
-                // matching: it just find the first transaction that hasn't been
-                // matched yet. Remember the dataset only contains transactions
-                // around the same date with the same amount.
-                const transactionsStep3 = transactionsStep2.map((data) => {
-                    if (!data.match && data.fuzzyDataset) {
-                        const match = data.fuzzyDataset.find((row) => !hasMatched.has(row.id));
-                        if (match) {
-                            hasMatched.add(match.id);
-                            return {
-                                ...data,
-                                match
-                            };
-                        }
-                    }
-                    return data;
-                });
-                // Finally, generate & commit the changes
-                for (const { trans, subtransactions, match } of transactionsStep3) {
-                    if (match) {
-                        // Skip updating already reconciled (locked) transactions
-                        if (match.reconciled) {
-                            continue;
-                        }
-                        // TODO: change the above sql query to use aql
-                        const existing = {
-                            ...match,
-                            cleared: match.cleared === 1,
-                            date: _db__WEBPACK_IMPORTED_MODULE_4__.fromDateRepr(match.date)
-                        };
-                        // Update the transaction
-                        const updates = {
-                            date: trans.date,
-                            imported_id: trans.imported_id || null,
-                            payee: existing.payee || trans.payee || null,
-                            category: existing.category || trans.category || null,
-                            imported_payee: trans.imported_payee || null,
-                            notes: existing.notes || trans.notes || null,
-                            cleared: trans.cleared != null ? trans.cleared : true
-                        };
-                        if ((0, _shared_util__WEBPACK_IMPORTED_MODULE_3__.hasFieldsChanged)(existing, updates, Object.keys(updates))) {
-                            updated.push({
-                                id: existing.id,
-                                ...updates
-                            });
-                        }
-                        if (existing.is_parent && existing.cleared !== updates.cleared) {
-                            const children = await _db__WEBPACK_IMPORTED_MODULE_4__.all('SELECT id FROM v_transactions WHERE parent_id = ?', [
-                                existing.id
-                            ]);
-                            for (const child of children) {
-                                updated.push({
-                                    id: child.id,
-                                    cleared: updates.cleared
-                                });
-                            }
-                        }
-                    }
-                    else {
-                        // Insert a new transaction
-                        const finalTransaction = {
-                            ...trans,
-                            id: (0, uuid__WEBPACK_IMPORTED_MODULE_13__["default"])(),
-                            category: trans.category || null,
-                            cleared: trans.cleared != null ? trans.cleared : true
-                        };
-                        if (subtransactions && subtransactions.length > 0) {
-                            added.push(...makeSplitTransaction(finalTransaction, subtransactions));
-                        }
-                        else {
-                            added.push(finalTransaction);
-                        }
-                    }
-                }
-                await createNewPayees(payeesToCreate, [
-                    ...added,
-                    ...updated
-                ]);
-                await (0, _transactions__WEBPACK_IMPORTED_MODULE_12__.batchUpdateTransactions)({
-                    added,
-                    updated
-                });
-                return {
-                    added: added.map((trans) => trans.id),
-                    updated: updated.map((trans) => trans.id)
-                };
-            }
             // This is similar to `reconcileTransactions` except much simpler: it
             // does not try to match any transactions. It just adds them
             async function addTransactions(acctId, transactions, { runTransfers = true, learnCategories = false } = {}) {
@@ -33303,7 +33101,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 return newTransactions;
             }
-            async function syncExternalAccount(userId, userKey, id, acctId, bankId) {
+            async function syncAccount(userId, userKey, id, acctId, bankId) {
                 // TODO: Handle the case where transactions exist in the future
                 // (that will make start date after end date)
                 const latestTransaction = await _db__WEBPACK_IMPORTED_MODULE_4__.first('SELECT * FROM v_transactions WHERE account = ? ORDER BY date DESC LIMIT 1', [
@@ -33314,13 +33112,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     const startingTransaction = await _db__WEBPACK_IMPORTED_MODULE_4__.first('SELECT date FROM v_transactions WHERE account = ? ORDER BY date ASC LIMIT 1', [
                         id
                     ]);
-                    const startingDate = _shared_months__WEBPACK_IMPORTED_MODULE_1__.parseDate(_db__WEBPACK_IMPORTED_MODULE_4__.fromDateRepr(startingTransaction.date));
+                    const startingDate = _db__WEBPACK_IMPORTED_MODULE_4__.fromDateRepr(startingTransaction.date);
+                    // assert(startingTransaction)
                     const startDate = _shared_months__WEBPACK_IMPORTED_MODULE_1__.dayFromDate(date_fns__WEBPACK_IMPORTED_MODULE_16__["default"]([
                         // Many GoCardless integrations do not support getting more than 90 days
                         // worth of data, so make that the earliest possible limit.
                         _shared_months__WEBPACK_IMPORTED_MODULE_1__.parseDate(_shared_months__WEBPACK_IMPORTED_MODULE_1__.subDays(_shared_months__WEBPACK_IMPORTED_MODULE_1__.currentDay(), 90)),
                         // Never download transactions before the starting date.
-                        startingDate
+                        _shared_months__WEBPACK_IMPORTED_MODULE_1__.parseDate(startingDate)
                     ]));
                     let download;
                     if (acctRow.account_sync_source === 'simpleFin') {
@@ -33329,6 +33128,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     else if (acctRow.account_sync_source === 'goCardless') {
                         download = await downloadGoCardlessTransactions(userId, userKey, acctId, bankId, startDate);
                     }
+                    else {
+                        throw new Error(`Unrecognized bank-sync provider: ${acctRow.account_sync_source}`);
+                    }
                     const { transactions: originalTransactions, accountBalance } = download;
                     if (originalTransactions.length === 0) {
                         return {
@@ -33341,25 +33143,25 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         account: id
                     }));
                     return (0, _mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(async () => {
-                        const result = await reconcileExternalTransactions(id, transactions);
+                        const result = await reconcileTransactions(id, transactions, true);
                         await updateAccountBalance(id, accountBalance);
                         return result;
                     });
                 }
                 else {
+                    let download;
                     // Otherwise, download transaction for the past 90 days
                     const startingDay = _shared_months__WEBPACK_IMPORTED_MODULE_1__.subDays(_shared_months__WEBPACK_IMPORTED_MODULE_1__.currentDay(), 90);
-                    let download;
                     if (acctRow.account_sync_source === 'simpleFin') {
                         download = await downloadSimpleFinTransactions(acctId, startingDay);
                     }
                     else if (acctRow.account_sync_source === 'goCardless') {
                         download = await downloadGoCardlessTransactions(userId, userKey, acctId, bankId, startingDay);
                     }
-                    const { transactions, startingBalance } = download;
-                    let balanceToUse = startingBalance;
+                    const { transactions } = download;
+                    let balanceToUse = download.startingBalance;
                     if (acctRow.account_sync_source === 'simpleFin') {
-                        const currentBalance = startingBalance;
+                        const currentBalance = download.startingBalance;
                         const previousBalance = transactions.reduce((total, trans) => {
                             return total - parseInt(trans.transactionAmount.amount.replace('.', ''));
                         }, currentBalance);
@@ -33378,86 +33180,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             cleared: true,
                             starting_balance_flag: true
                         });
-                        const result = await reconcileExternalTransactions(id, transactions);
-                        return {
-                            ...result,
-                            added: [
-                                initialId,
-                                ...result.added
-                            ]
-                        };
-                    });
-                }
-            }
-            async function syncAccount(userId, userKey, id, acctId, bankId) {
-                // TODO: Handle the case where transactions exist in the future
-                // (that will make start date after end date)
-                const latestTransaction = await _db__WEBPACK_IMPORTED_MODULE_4__.first('SELECT * FROM v_transactions WHERE account = ? ORDER BY date DESC LIMIT 1', [
-                    id
-                ]);
-                if (latestTransaction) {
-                    const startingTransaction = await _db__WEBPACK_IMPORTED_MODULE_4__.first('SELECT date FROM v_transactions WHERE account = ? ORDER BY date ASC LIMIT 1', [
-                        id
-                    ]);
-                    const startingDate = _db__WEBPACK_IMPORTED_MODULE_4__.fromDateRepr(startingTransaction.date);
-                    // assert(startingTransaction)
-                    // Get all transactions since the latest transaction, plus any 5
-                    // days before the latest transaction. This gives us a chance to
-                    // resolve any transactions that were entered manually.
-                    //
-                    // TODO: What this really should do is query the last imported_id
-                    // and since then
-                    let date = _shared_months__WEBPACK_IMPORTED_MODULE_1__.subDays(_db__WEBPACK_IMPORTED_MODULE_4__.fromDateRepr(latestTransaction.date), 31);
-                    // Never download transactions before the starting date. This was
-                    // when the account was added to the system.
-                    if (date < startingDate) {
-                        date = startingDate;
-                    }
-                    const { transactions: originalTransactions, accountBalance } = await downloadTransactions(userId, userKey, acctId, bankId, date);
-                    if (originalTransactions.length === 0) {
-                        return {
-                            added: [],
-                            updated: []
-                        };
-                    }
-                    const transactions = originalTransactions.map((trans) => ({
-                        ...trans,
-                        account: id
-                    }));
-                    return (0, _mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(async () => {
-                        const result = await reconcileTransactions(id, transactions);
-                        await updateAccountBalance(id, accountBalance);
-                        return result;
-                    });
-                }
-                else {
-                    const acctRow = await _db__WEBPACK_IMPORTED_MODULE_4__.select('accounts', id);
-                    // Otherwise, download transaction for the last few days if it's an
-                    // on-budget account, or for the past 30 days if off-budget
-                    const startingDay = _shared_months__WEBPACK_IMPORTED_MODULE_1__.subDays(_shared_months__WEBPACK_IMPORTED_MODULE_1__.currentDay(), acctRow.offbudget === 0 ? 1 : 30);
-                    const { transactions } = await downloadTransactions(userId, userKey, acctId, bankId, date_fns__WEBPACK_IMPORTED_MODULE_17__["default"](date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](startingDay), 'yyyy-MM-dd'));
-                    // We need to add a transaction that represents the starting
-                    // balance for everything to balance out. In order to get balance
-                    // before the first imported transaction, we need to get the
-                    // current balance from the accounts table and subtract all the
-                    // imported transactions.
-                    const currentBalance = acctRow.balance_current;
-                    const previousBalance = transactions.reduce((total, trans) => {
-                        return total - trans.amount;
-                    }, currentBalance);
-                    const oldestDate = transactions.length > 0 ? transactions[transactions.length - 1].date : _shared_months__WEBPACK_IMPORTED_MODULE_1__.currentDay();
-                    const payee = await (0, _payees__WEBPACK_IMPORTED_MODULE_9__.getStartingBalancePayee)();
-                    return (0, _mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(async () => {
-                        const initialId = await _db__WEBPACK_IMPORTED_MODULE_4__.insertTransaction({
-                            account: id,
-                            amount: previousBalance,
-                            category: acctRow.offbudget === 0 ? payee.category : null,
-                            payee: payee.id,
-                            date: oldestDate,
-                            cleared: true,
-                            starting_balance_flag: true
-                        });
-                        const result = await reconcileTransactions(id, transactions);
+                        const result = await reconcileTransactions(id, transactions, true);
                         return {
                             ...result,
                             added: [
@@ -36057,6 +35780,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             return typed(val(state, args[0]), args[0].type);
                         }
                     // date functions
+                    case '$day':
+                        {
+                            validateArgLength(args, 1);
+                            return castInput(state, args[0], 'date');
+                        }
                     case '$month':
                         {
                             validateArgLength(args, 1);
@@ -38589,6 +38317,83 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             function cleanupTemplate({ month }) {
                 return processCleanup(month);
             }
+            async function applyGroupCleanups(month, sourceGroups, sinkGroups, generalGroups) {
+                const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(month);
+                const warnings = [];
+                const db_month = parseInt(month.replace('-', ''));
+                let groupLength = sourceGroups.length;
+                while (groupLength > 0) {
+                    //function for each unique group
+                    const groupName = sourceGroups[0].group;
+                    const tempSourceGroups = sourceGroups.filter((c) => c.group === groupName);
+                    const sinkGroup = sinkGroups.filter((c) => c.group === groupName);
+                    const generalGroup = generalGroups.filter((c) => c.group === groupName);
+                    let total_weight = 0;
+                    if (sinkGroup.length > 0 || generalGroup.length > 0) {
+                        //only return group source funds to To Budget if there are corresponding sinking groups or underfunded included groups
+                        for (let ii = 0; ii < tempSourceGroups.length; ii++) {
+                            const balance = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `leftover-${tempSourceGroups[ii].category}`);
+                            const budgeted = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `budget-${tempSourceGroups[ii].category}`);
+                            await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.setBudget)({
+                                category: tempSourceGroups[ii].category,
+                                month,
+                                amount: budgeted - balance
+                            });
+                        }
+                        //calculate total weight for sinking funds
+                        for (let ii = 0; ii < sinkGroup.length; ii++) {
+                            total_weight += sinkGroup[ii].weight;
+                        }
+                        //fill underfunded categories within the group first
+                        for (let ii = 0; ii < generalGroup.length; ii++) {
+                            const budgetAvailable = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `to-budget`);
+                            const balance = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `leftover-${generalGroup[ii].category}`);
+                            const budgeted = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `budget-${generalGroup[ii].category}`);
+                            const to_budget = budgeted + Math.abs(balance);
+                            const categoryId = generalGroup[ii].category;
+                            let carryover = await _db__WEBPACK_IMPORTED_MODULE_1__.first(`SELECT carryover FROM zero_budgets WHERE month = ? and category = ?`, [
+                                db_month,
+                                categoryId
+                            ]);
+                            if (carryover === null) {
+                                carryover = {
+                                    carryover: 0
+                                };
+                            }
+                            if (balance < 0 && Math.abs(balance) <= budgetAvailable && !generalGroup[ii].category.is_income && carryover.carryover === 0) {
+                                await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.setBudget)({
+                                    category: generalGroup[ii].category,
+                                    month,
+                                    amount: to_budget
+                                });
+                            }
+                            else if (balance < 0 && !generalGroup[ii].category.is_income && carryover.carryover === 0 && Math.abs(balance) > budgetAvailable) {
+                                await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.setBudget)({
+                                    category: generalGroup[ii].category,
+                                    month,
+                                    amount: budgeted + budgetAvailable
+                                });
+                            }
+                        }
+                        const budgetAvailable = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `to-budget`);
+                        for (let ii = 0; ii < sinkGroup.length; ii++) {
+                            const budgeted = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `budget-${sinkGroup[ii].category}`);
+                            const to_budget = budgeted + Math.round(sinkGroup[ii].weight / total_weight * budgetAvailable);
+                            await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.setBudget)({
+                                category: sinkGroup[ii].category,
+                                month,
+                                amount: to_budget
+                            });
+                        }
+                    }
+                    else {
+                        warnings.push(groupName + ' has no matching sink categories.');
+                    }
+                    sourceGroups = sourceGroups.filter((c) => c.group !== groupName);
+                    groupLength = sourceGroups.length;
+                }
+                return warnings;
+            }
             async function processCleanup(month) {
                 let num_sources = 0;
                 let num_sinks = 0;
@@ -38601,15 +38406,52 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const category_templates = await getCategoryTemplates();
                 const categories = await _db__WEBPACK_IMPORTED_MODULE_1__.all('SELECT * FROM v_categories WHERE tombstone = 0');
                 const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(month);
+                const groupSource = [];
+                const groupSink = [];
+                const groupGeneral = [];
+                //filter out category groups
+                for (let c = 0; c < categories.length; c++) {
+                    const category = categories[c];
+                    const template = category_templates[category.id];
+                    //filter out source and sink groups for processing
+                    if (template) {
+                        if (template.filter((t) => t.type === 'source' && t.group !== null).length > 0) {
+                            groupSource.push({
+                                category: category.id,
+                                group: template.filter((t) => t.type === 'source' && t.group !== null)[0].group
+                            });
+                        }
+                        if (template.filter((t) => t.type === 'sink' && t.group !== null).length > 0) {
+                            //only supports 1 sink reference per category.  Need more?
+                            groupSink.push({
+                                category: category.id,
+                                group: template.filter((t) => t.type === 'sink' && t.group !== null)[0].group,
+                                weight: template.filter((t) => t.type === 'sink' && t.group !== null)[0].weight
+                            });
+                        }
+                        if (template.filter((t) => t.type === null && t.group !== null).length > 0) {
+                            groupGeneral.push({
+                                category: category.id,
+                                group: template[0].group
+                            });
+                        }
+                    }
+                }
+                //run category groups
+                const newWarnings = await applyGroupCleanups(month, groupSource, groupSink, groupGeneral);
+                warnings.splice(1, 0, ...newWarnings);
                 for (let c = 0; c < categories.length; c++) {
                     const category = categories[c];
                     const template = category_templates[category.id];
                     if (template) {
-                        if (template.filter((t) => t.type === 'source').length > 0) {
+                        if (template.filter((t) => t.type === 'source' && t.group === null).length > 0) {
                             const balance = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `leftover-${category.id}`);
                             const budgeted = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `budget-${category.id}`);
                             if (balance >= 0) {
-                                const spent = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `sum-amount-${category.id}`);
+                                // const spent = await getSheetValue(
+                                //   sheetName,
+                                //   `sum-amount-${category.id}`,
+                                // );
                                 await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.setBudget)({
                                     category: category.id,
                                     month,
@@ -38618,7 +38460,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.setGoal)({
                                     category: category.id,
                                     month,
-                                    goal: -spent
+                                    goal: budgeted - balance
                                 });
                                 num_sources += 1;
                             }
@@ -38639,7 +38481,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 }
                             }
                         }
-                        if (template.filter((t) => t.type === 'sink').length > 0) {
+                        if (template.filter((t) => t.type === 'sink' && t.group === null).length > 0) {
                             sinkCategory.push({
                                 cat: category,
                                 temp: template
@@ -38683,8 +38525,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 const budgetAvailable = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `to-budget`);
                 if (budgetAvailable <= 0) {
-                    warnings.push('No funds are available to reallocate.');
+                    warnings.push('Global: No funds are available to reallocate.');
                 }
+                //fill sinking categories
                 for (let c = 0; c < sinkCategory.length; c++) {
                     const budgeted = await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.getSheetValue)(sheetName, `budget-${sinkCategory[c].cat.id}`);
                     const categoryId = sinkCategory[c].cat.id;
@@ -38714,7 +38557,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     else if (warnings.length) {
                         return {
                             type: 'warning',
-                            message: 'Funds not available:',
+                            message: 'Global: Funds not available:',
                             pre: warnings.join('\n\n')
                         };
                     }
@@ -38734,6 +38577,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             pre: errors.join('\n\n')
                         };
                     }
+                    else if (warnings.length) {
+                        return {
+                            type: 'warning',
+                            message: 'Global: Funds not available:',
+                            pre: warnings.join('\n\n')
+                        };
+                    }
                     else {
                         return {
                             type: 'message',
@@ -38774,6 +38624,47 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             /***/ 
         }),
+        /***/ "./packages/loot-core/src/server/budget/goals/goalsAverage.ts": 
+        /*!********************************************************************!*\
+          !*** ./packages/loot-core/src/server/budget/goals/goalsAverage.ts ***!
+          \********************************************************************/
+        /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+                /* harmony export */ goalsAverage: () => ( /* binding */goalsAverage)
+                /* harmony export */ 
+            });
+            /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../shared/months */ "./packages/loot-core/src/shared/months.ts");
+            /* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../actions */ "./packages/loot-core/src/server/budget/actions.ts");
+            // @ts-strict-ignore
+            async function goalsAverage(template, month, category, errors, to_budget) {
+                // simple has an 'amount' param
+                let increment = 0;
+                if (template.amount) {
+                    let sum = 0;
+                    for (let i = 1; i <= template.amount; i++) {
+                        // add up other months
+                        const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(_shared_months__WEBPACK_IMPORTED_MODULE_0__.subMonths(month, i));
+                        sum += await (0, _actions__WEBPACK_IMPORTED_MODULE_1__.getSheetValue)(sheetName, `sum-amount-${category.id}`);
+                    }
+                    increment = sum / template.amount;
+                }
+                else {
+                    errors.push('Number of months to average is not valid');
+                    return {
+                        to_budget,
+                        errors
+                    };
+                }
+                to_budget += -Math.round(increment);
+                return {
+                    to_budget,
+                    errors
+                };
+            }
+            /***/ 
+        }),
         /***/ "./packages/loot-core/src/server/budget/goals/goalsBy.ts": 
         /*!***************************************************************!*\
           !*** ./packages/loot-core/src/server/budget/goals/goalsBy.ts ***!
@@ -39108,7 +38999,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../shared/util */ "./packages/loot-core/src/shared/util.ts");
             // @ts-strict-ignore
-            async function goalsSimple(template, limitCheck, errors, limit, hold, to_budget) {
+            async function goalsSimple(template, limitCheck, errors, limit, hold, to_budget, last_month_balance) {
                 // simple has 'monthly' and/or 'limit' params
                 if (template.limit != null) {
                     if (limitCheck) {
@@ -39133,7 +39024,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     increment = monthly;
                 }
                 else {
-                    increment = limit;
+                    increment = limit - last_month_balance;
                 }
                 to_budget += increment;
                 return {
@@ -39278,13 +39169,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./actions */ "./packages/loot-core/src/server/budget/actions.ts");
             /* 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__);
-            /* harmony import */ var _goals_goalsBy__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./goals/goalsBy */ "./packages/loot-core/src/server/budget/goals/goalsBy.ts");
-            /* harmony import */ var _goals_goalsPercentage__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./goals/goalsPercentage */ "./packages/loot-core/src/server/budget/goals/goalsPercentage.ts");
-            /* harmony import */ var _goals_goalsRemainder__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./goals/goalsRemainder */ "./packages/loot-core/src/server/budget/goals/goalsRemainder.ts");
-            /* harmony import */ var _goals_goalsSchedule__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./goals/goalsSchedule */ "./packages/loot-core/src/server/budget/goals/goalsSchedule.ts");
-            /* harmony import */ var _goals_goalsSimple__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./goals/goalsSimple */ "./packages/loot-core/src/server/budget/goals/goalsSimple.ts");
-            /* harmony import */ var _goals_goalsSpend__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./goals/goalsSpend */ "./packages/loot-core/src/server/budget/goals/goalsSpend.ts");
-            /* harmony import */ var _goals_goalsWeek__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./goals/goalsWeek */ "./packages/loot-core/src/server/budget/goals/goalsWeek.ts");
+            /* harmony import */ var _goals_goalsAverage__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./goals/goalsAverage */ "./packages/loot-core/src/server/budget/goals/goalsAverage.ts");
+            /* harmony import */ var _goals_goalsBy__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./goals/goalsBy */ "./packages/loot-core/src/server/budget/goals/goalsBy.ts");
+            /* harmony import */ var _goals_goalsPercentage__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./goals/goalsPercentage */ "./packages/loot-core/src/server/budget/goals/goalsPercentage.ts");
+            /* harmony import */ var _goals_goalsRemainder__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./goals/goalsRemainder */ "./packages/loot-core/src/server/budget/goals/goalsRemainder.ts");
+            /* harmony import */ var _goals_goalsSchedule__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./goals/goalsSchedule */ "./packages/loot-core/src/server/budget/goals/goalsSchedule.ts");
+            /* harmony import */ var _goals_goalsSimple__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./goals/goalsSimple */ "./packages/loot-core/src/server/budget/goals/goalsSimple.ts");
+            /* harmony import */ var _goals_goalsSpend__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./goals/goalsSpend */ "./packages/loot-core/src/server/budget/goals/goalsSpend.ts");
+            /* harmony import */ var _goals_goalsWeek__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./goals/goalsWeek */ "./packages/loot-core/src/server/budget/goals/goalsWeek.ts");
             // @ts-strict-ignore
             async function applyTemplate({ month }) {
                 await storeTemplates();
@@ -39472,7 +39364,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 priority_list = priority_list.sort(function (a, b) {
                     return a - b;
                 }).filter((item, index, curr) => curr.indexOf(item) === index);
-                const { remainder_found, remainder_priority, remainder_weight_total } = (0, _goals_goalsRemainder__WEBPACK_IMPORTED_MODULE_8__.findRemainder)(priority_list, categories, category_templates);
+                const { remainder_found, remainder_priority, remainder_weight_total } = (0, _goals_goalsRemainder__WEBPACK_IMPORTED_MODULE_9__.findRemainder)(priority_list, categories, category_templates);
                 if (remainder_found)
                     priority_list.push(remainder_priority);
                 const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(month);
@@ -39700,7 +39592,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     switch (template.type) {
                         case 'simple':
                             {
-                                const goalsReturn = await (0, _goals_goalsSimple__WEBPACK_IMPORTED_MODULE_10__.goalsSimple)(template, limitCheck, errors, limit, hold, to_budget);
+                                const goalsReturn = await (0, _goals_goalsSimple__WEBPACK_IMPORTED_MODULE_11__.goalsSimple)(template, limitCheck, errors, limit, hold, to_budget, last_month_balance);
                                 to_budget = goalsReturn.to_budget;
                                 errors = goalsReturn.errors;
                                 limit = goalsReturn.limit;
@@ -39710,7 +39602,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             }
                         case 'by':
                             {
-                                const goalsReturn = await (0, _goals_goalsBy__WEBPACK_IMPORTED_MODULE_6__.goalsBy)(template_lines, current_month, template, l, remainder, last_month_balance, to_budget, errors);
+                                const goalsReturn = await (0, _goals_goalsBy__WEBPACK_IMPORTED_MODULE_7__.goalsBy)(template_lines, current_month, template, l, remainder, last_month_balance, to_budget, errors);
                                 to_budget = goalsReturn.to_budget;
                                 errors = goalsReturn.errors;
                                 remainder = goalsReturn.remainder;
@@ -39718,7 +39610,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             }
                         case 'week':
                             {
-                                const goalsReturn = await (0, _goals_goalsWeek__WEBPACK_IMPORTED_MODULE_12__.goalsWeek)(template, limit, limitCheck, hold, current_month, to_budget, errors);
+                                const goalsReturn = await (0, _goals_goalsWeek__WEBPACK_IMPORTED_MODULE_13__.goalsWeek)(template, limit, limitCheck, hold, current_month, to_budget, errors);
                                 to_budget = goalsReturn.to_budget;
                                 errors = goalsReturn.errors;
                                 limit = goalsReturn.limit;
@@ -39728,21 +39620,21 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             }
                         case 'spend':
                             {
-                                const goalsReturn = await (0, _goals_goalsSpend__WEBPACK_IMPORTED_MODULE_11__.goalsSpend)(template, last_month_balance, current_month, to_budget, errors, category);
+                                const goalsReturn = await (0, _goals_goalsSpend__WEBPACK_IMPORTED_MODULE_12__.goalsSpend)(template, last_month_balance, current_month, to_budget, errors, category);
                                 to_budget = goalsReturn.to_budget;
                                 errors = goalsReturn.errors;
                                 break;
                             }
                         case 'percentage':
                             {
-                                const goalsReturn = await (0, _goals_goalsPercentage__WEBPACK_IMPORTED_MODULE_7__.goalsPercentage)(template, month, available_start, sheetName, to_budget, errors);
+                                const goalsReturn = await (0, _goals_goalsPercentage__WEBPACK_IMPORTED_MODULE_8__.goalsPercentage)(template, month, available_start, sheetName, to_budget, errors);
                                 to_budget = goalsReturn.to_budget;
                                 errors = goalsReturn.errors;
                                 break;
                             }
                         case 'schedule':
                             {
-                                const goalsReturn = await (0, _goals_goalsSchedule__WEBPACK_IMPORTED_MODULE_9__.goalsSchedule)(scheduleFlag, template_lines, current_month, balance, remainder, last_month_balance, to_budget, errors, category);
+                                const goalsReturn = await (0, _goals_goalsSchedule__WEBPACK_IMPORTED_MODULE_10__.goalsSchedule)(scheduleFlag, template_lines, current_month, balance, remainder, last_month_balance, to_budget, errors, category);
                                 to_budget = goalsReturn.to_budget;
                                 errors = goalsReturn.errors;
                                 remainder = goalsReturn.remainder;
@@ -39751,10 +39643,17 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             }
                         case 'remainder':
                             {
-                                const goalsReturn = await (0, _goals_goalsRemainder__WEBPACK_IMPORTED_MODULE_8__.goalsRemainder)(template, budgetAvailable, remainder_scale, to_budget);
+                                const goalsReturn = await (0, _goals_goalsRemainder__WEBPACK_IMPORTED_MODULE_9__.goalsRemainder)(template, budgetAvailable, remainder_scale, to_budget);
                                 to_budget = goalsReturn.to_budget;
                                 break;
                             }
+                        case 'average':
+                            {
+                                const goalsReturn = await (0, _goals_goalsAverage__WEBPACK_IMPORTED_MODULE_6__.goalsAverage)(template, current_month, category, errors, to_budget);
+                                to_budget = goalsReturn.to_budget;
+                                errors = goalsReturn.errors;
+                                break;
+                            }
                         case 'error':
                             return {
                                 errors
@@ -39784,16 +39683,24 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const category_templates = await getCategoryTemplates(null);
                 const errors = [];
                 const categories = await _db__WEBPACK_IMPORTED_MODULE_2__.all('SELECT * FROM v_categories WHERE tombstone = 0');
+                let all_schedule_names = await _db__WEBPACK_IMPORTED_MODULE_2__.all('SELECT name from schedules WHERE name NOT NULL AND tombstone = 0');
+                all_schedule_names = all_schedule_names.map((v) => v.name);
                 // run through each line and see if its an error
                 for (let c = 0; c < categories.length; c++) {
                     const category = categories[c];
                     const template = category_templates[category.id];
                     if (template) {
                         for (let l = 0; l < template.length; l++) {
+                            //check for basic error
                             if (template[l].type === 'error') {
-                                //return { type: 'message', message: "found a bad one",};
                                 errors.push(category.name + ': ' + template[l].line);
                             }
+                            // check schedule name error
+                            if (template[l].type === 'schedule') {
+                                if (!all_schedule_names.includes(template[l].name)) {
+                                    errors.push(category.name + ': Schedule “' + template[l].name + '” does not exist');
+                                }
+                            }
                         }
                     }
                 }
@@ -42298,14 +42205,121 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     payee
                 ]);
                 const payeeTransferAcctHashMap = new Map(payeesByTransferAcct);
+                const orphanTransferMap = new Map();
+                const orphanSubtransfer = [];
+                const orphanSubtransferTrxId = [];
+                const orphanSubtransferAcctIdByTrxIdMap = new Map();
+                const orphanSubtransferDateByTrxIdMap = new Map();
                 // Go ahead and generate ids for all of the transactions so we can
                 // reliably resolve transfers
-                for (const transaction of data.transactions) {
+                // Also identify orphan transfer transactions and subtransactions.
+                for (const transaction of data.subtransactions) {
                     entityIdMap.set(transaction.id, (0, uuid__WEBPACK_IMPORTED_MODULE_3__["default"])());
+                    if (transaction.transfer_account_id) {
+                        orphanSubtransfer.push(transaction);
+                        orphanSubtransferTrxId.push(transaction.transaction_id);
+                    }
                 }
-                for (const transaction of data.subtransactions) {
+                for (const transaction of data.transactions) {
                     entityIdMap.set(transaction.id, (0, uuid__WEBPACK_IMPORTED_MODULE_3__["default"])());
+                    if (transaction.transfer_account_id && !transaction.transfer_transaction_id) {
+                        const key = transaction.account_id + '#' + transaction.transfer_account_id;
+                        if (!orphanTransferMap.has(key)) {
+                            orphanTransferMap.set(key, [
+                                transaction
+                            ]);
+                        }
+                        else {
+                            orphanTransferMap.get(key).push(transaction);
+                        }
+                    }
+                    if (orphanSubtransferTrxId.includes(transaction.id)) {
+                        orphanSubtransferAcctIdByTrxIdMap.set(transaction.id, transaction.account_id);
+                        orphanSubtransferDateByTrxIdMap.set(transaction.id, transaction.date);
+                    }
                 }
+                // Compute link between subtransaction transfers and orphaned transaction
+                // transfers. The goal is to match each transfer subtransaction to the related
+                // transfer transaction according to the accounts, date, amount and memo.
+                const orphanSubtransferMap = orphanSubtransfer.reduce((map, subtransaction) => {
+                    const key = subtransaction.transfer_account_id + '#' + orphanSubtransferAcctIdByTrxIdMap.get(subtransaction.transaction_id);
+                    if (!map.has(key)) {
+                        map.set(key, [
+                            subtransaction
+                        ]);
+                    }
+                    else {
+                        map.get(key).push(subtransaction);
+                    }
+                    return map;
+                }, new Map());
+                // The comparator will be used to order transfer transactions and their
+                // corresponding tranfer subtransaction in two aligned list. Hopefully
+                // for every list index in the transactions list, the related subtransaction
+                // will be at the same index.
+                const orphanTransferComparator = (a, b) => {
+                    // a and b can be a YNAB5.Transaction (having a date attribute) or a
+                    // YNAB5.Subtransaction (missing that date attribute)
+                    const date_a = 'date' in a ? a.date : orphanSubtransferDateByTrxIdMap.get(a.transaction_id);
+                    const date_b = 'date' in b ? b.date : orphanSubtransferDateByTrxIdMap.get(b.transaction_id);
+                    // A transaction and the related subtransaction have inverted amounts.
+                    // To have those in the same order, the subtransaction has to be reversed
+                    // to have the same amount.
+                    const amount_a = 'date' in a ? a.amount : -a.amount;
+                    const amount_b = 'date' in b ? b.amount : -b.amount;
+                    // Transaction are ordered first by date, then by amount, and lastly by memo
+                    if (date_a > date_b)
+                        return 1;
+                    if (date_a < date_b)
+                        return -1;
+                    if (amount_a > amount_b)
+                        return 1;
+                    if (amount_a < amount_b)
+                        return -1;
+                    if (a.memo > b.memo)
+                        return 1;
+                    if (a.memo < b.memo)
+                        return -1;
+                    return 0;
+                };
+                const orphanTrxIdSubtrxIdMap = new Map();
+                orphanTransferMap.forEach((transactions, key) => {
+                    const subtransactions = orphanSubtransferMap.get(key);
+                    if (subtransactions) {
+                        transactions.sort(orphanTransferComparator);
+                        subtransactions.sort(orphanTransferComparator);
+                        // Iterate on the two sorted lists transactions and subtransactions and
+                        // find matching data to identify the related transaction ids.
+                        let transactionIdx = 0;
+                        let subtransactionIdx = 0;
+                        do {
+                            switch (orphanTransferComparator(transactions[transactionIdx], subtransactions[subtransactionIdx])) {
+                                case 0:
+                                    // The current list indexes are matching: the transaction and
+                                    // subtransaction are related (same date, amount and memo)
+                                    orphanTrxIdSubtrxIdMap.set(transactions[transactionIdx].id, entityIdMap.get(subtransactions[subtransactionIdx].id));
+                                    orphanTrxIdSubtrxIdMap.set(subtransactions[subtransactionIdx].id, entityIdMap.get(transactions[transactionIdx].id));
+                                    transactionIdx++;
+                                    subtransactionIdx++;
+                                    break;
+                                case -1:
+                                    // The current list indexes are not matching:
+                                    // The current transaction is "smaller" than the current subtransaction
+                                    // (earlier date, smaller amount, memo value sorted before)
+                                    // So we advance to the next transaction and see if it match with
+                                    // the current subtransaction
+                                    transactionIdx++;
+                                    break;
+                                case 1:
+                                    // Inverse of the previous case:
+                                    // The current subtransaction is "smaller" than the current transaction
+                                    // So we advance to the next subtransaction
+                                    subtransactionIdx++;
+                                    break;
+                            }
+                        } while (transactionIdx < transactions.length && subtransactionIdx < subtransactions.length);
+                    }
+                });
                 await Promise.all([
                     ...transactionsGrouped.keys()
                 ].map(async (accountId) => {
@@ -42329,31 +42343,38 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             reconciled: transaction.cleared === 'reconciled',
                             notes: transaction.memo || null,
                             imported_id: transaction.import_id || null,
-                            transfer_id: entityIdMap.get(transaction.transfer_transaction_id) || null,
+                            transfer_id: entityIdMap.get(transaction.transfer_transaction_id) || orphanTrxIdSubtrxIdMap.get(transaction.id) || null,
                             subtransactions: subtransactions ? subtransactions.map((subtrans) => {
-                                let payee = null;
-                                if (subtrans.transfer_account_id) {
-                                    const mappedTransferAccountId = entityIdMap.get(subtrans.transfer_account_id);
-                                    payee = payeeTransferAcctHashMap.get(mappedTransferAccountId)?.id;
-                                }
                                 return {
                                     id: entityIdMap.get(subtrans.id),
                                     amount: amountFromYnab(subtrans.amount),
                                     category: entityIdMap.get(subtrans.category_id) || null,
                                     notes: subtrans.memo,
-                                    payee
+                                    transfer_id: orphanTrxIdSubtrxIdMap.get(subtrans.id) || null,
+                                    payee: null,
+                                    imported_payee: null
                                 };
                             }) : null,
                             payee: null,
                             imported_payee: null
                         };
-                        // Handle transfer payee
-                        if (transaction.transfer_account_id) {
-                            newTransaction.payee = payees.find((p) => p.transfer_acct === entityIdMap.get(transaction.transfer_account_id)).id;
-                        }
-                        else {
-                            newTransaction.payee = entityIdMap.get(transaction.payee_id);
-                            newTransaction.imported_payee = data.payees.find((p) => !p.deleted && p.id === transaction.payee_id)?.name;
+                        // Handle transactions and subtransactions payee
+                        const transactionPayeeUpdate = (trx, newTrx) => {
+                            if (trx.transfer_account_id) {
+                                const mappedTransferAccountId = entityIdMap.get(trx.transfer_account_id);
+                                newTrx.payee = payeeTransferAcctHashMap.get(mappedTransferAccountId)?.id;
+                            }
+                            else {
+                                newTrx.payee = entityIdMap.get(trx.payee_id);
+                                newTrx.imported_payee = data.payees.find((p) => !p.deleted && p.id === trx.payee_id)?.name;
+                            }
+                        };
+                        transactionPayeeUpdate(transaction, newTransaction);
+                        if (newTransaction.subtransactions) {
+                            subtransactions.forEach((subtrans) => {
+                                const newSubtransaction = newTransaction.subtransactions.find((newSubtrans) => newSubtrans.id === entityIdMap.get(subtrans.id));
+                                transactionPayeeUpdate(subtrans, newSubtransaction);
+                            });
                         }
                         // Handle starting balances
                         if (transaction.payee_id === startingPayeeYNAB && entityIdMap.get(transaction.category_id) === incomeCatId) {
@@ -42959,21 +42980,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 return (0, _aql__WEBPACK_IMPORTED_MODULE_22__.runQuery)(query);
             };
-            handlers['bank-delete'] = async function ({ id }) {
-                const accts = await _db__WEBPACK_IMPORTED_MODULE_27__.runQuery('SELECT * FROM accounts WHERE bank = ?', [
-                    id
-                ], true);
-                await _db__WEBPACK_IMPORTED_MODULE_27__.delete_('banks', id);
-                await Promise.all(accts.map(async (acct) => {
-                    // TODO: This will not sync across devices because we are bypassing
-                    // the "recorded" functions
-                    await _db__WEBPACK_IMPORTED_MODULE_27__.runQuery('DELETE FROM transactions WHERE acct = ?', [
-                        acct.id
-                    ]);
-                    await _db__WEBPACK_IMPORTED_MODULE_27__.delete_('accounts', acct.id);
-                }));
-                return 'ok';
-            };
             handlers['account-update'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function ({ id, name }) {
                 return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
                     await _db__WEBPACK_IMPORTED_MODULE_27__.update('accounts', {
@@ -42998,34 +43004,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     numTransactions: count
                 };
             };
-            handlers['accounts-link'] = async function ({ institution, publicToken, accountId, upgradingId }) {
-                const bankId = await _accounts_link__WEBPACK_IMPORTED_MODULE_15__.handoffPublicToken(institution, publicToken);
-                const [[, userId], [, userKey]] = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.multiGet([
-                    'user-id',
-                    'user-key'
-                ]);
-                // Get all the available accounts and find the selected one
-                const accounts = await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.getGoCardlessAccounts(userId, userKey, bankId);
-                const account = accounts.find((acct) => acct.account_id === accountId);
-                await _db__WEBPACK_IMPORTED_MODULE_27__.update('accounts', {
-                    id: upgradingId,
-                    account_id: account.account_id,
-                    official_name: account.official_name,
-                    balance_current: (0, _shared_util__WEBPACK_IMPORTED_MODULE_13__.amountToInteger)(account.balances.current),
-                    balance_available: (0, _shared_util__WEBPACK_IMPORTED_MODULE_13__.amountToInteger)(account.balances.available),
-                    balance_limit: (0, _shared_util__WEBPACK_IMPORTED_MODULE_13__.amountToInteger)(account.balances.limit),
-                    mask: account.mask,
-                    bank: bankId
-                });
-                await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.syncAccount(userId, userKey, upgradingId, account.account_id, bankId);
-                _platform_server_connection__WEBPACK_IMPORTED_MODULE_6__.send('sync-event', {
-                    type: 'success',
-                    tables: [
-                        'transactions'
-                    ]
-                });
-                return 'ok';
-            };
             handlers['gocardless-accounts-link'] = async function ({ requisitionId, account, upgradingId }) {
                 let id;
                 const bank = await _accounts_link__WEBPACK_IMPORTED_MODULE_15__.findOrCreateBank(account.institution, requisitionId);
@@ -43057,7 +43035,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         transfer_acct: id
                     });
                 }
-                await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.syncExternalAccount(undefined, undefined, id, account.account_id, bank.bank_id);
+                await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.syncAccount(undefined, undefined, id, account.account_id, bank.bank_id);
                 _platform_server_connection__WEBPACK_IMPORTED_MODULE_6__.send('sync-event', {
                     type: 'success',
                     tables: [
@@ -43099,7 +43077,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         transfer_acct: id
                     });
                 }
-                await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.syncExternalAccount(undefined, undefined, id, externalAccount.account_id, bank.bank_id);
+                await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.syncAccount(undefined, undefined, id, externalAccount.account_id, bank.bank_id);
                 await _platform_server_connection__WEBPACK_IMPORTED_MODULE_6__.send('sync-event', {
                     type: 'success',
                     tables: [
@@ -43108,16 +43086,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
                 return 'ok';
             };
-            handlers['accounts-connect'] = async function ({ institution, publicToken, accountIds, offbudgetIds }) {
-                const bankId = await _accounts_link__WEBPACK_IMPORTED_MODULE_15__.handoffPublicToken(institution, publicToken);
-                const ids = await _accounts_link__WEBPACK_IMPORTED_MODULE_15__.addAccounts(bankId, accountIds, offbudgetIds);
-                return ids;
-            };
-            handlers['gocardless-accounts-connect'] = async function ({ institution, publicToken, accountIds, offbudgetIds }) {
-                const bankId = await _accounts_link__WEBPACK_IMPORTED_MODULE_15__.handoffPublicToken(institution, publicToken);
-                const ids = await _accounts_link__WEBPACK_IMPORTED_MODULE_15__.addGoCardlessAccounts(bankId, accountIds, offbudgetIds);
-                return ids;
-            };
             handlers['account-create'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function ({ name, balance, offBudget, closed }) {
                 return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
                     const id = await _db__WEBPACK_IMPORTED_MODULE_27__.insertAccount({
@@ -43145,8 +43113,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             });
             handlers['account-close'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function ({ id, transferAccountId, categoryId, forced }) {
-                // Unlink the account if it's linked. This makes sure to remove it
-                // from Plaid. (This should not be undo-able, as it mutates the
+                // Unlink the account if it's linked. This makes sure to remove it from
+                // bank-sync providers. (This should not be undo-able, as it mutates the
                 // remote server and the user will have to link the account again)
                 await handlers['account-unlink']({
                     id
@@ -43243,127 +43211,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 });
             });
             let stopPolling = false;
-            handlers['poll-web-token'] = async function ({ token }) {
-                const [[, userId], [, key]] = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.multiGet([
-                    'user-id',
-                    'user-key'
-                ]);
-                const startTime = Date.now();
-                stopPolling = false;
-                async function getData(cb) {
-                    if (stopPolling) {
-                        return;
-                    }
-                    if (Date.now() - startTime >= 1000 * 60 * 10) {
-                        cb('timeout');
-                        return;
-                    }
-                    const data = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().PLAID_SERVER + '/get-web-token-contents', {
-                        userId,
-                        key,
-                        token
-                    });
-                    if (data) {
-                        if (data.error) {
-                            cb('unknown');
-                        }
-                        else {
-                            cb(null, data);
-                        }
-                    }
-                    else {
-                        setTimeout(() => getData(cb), 3000);
-                    }
-                }
-                return new Promise((resolve) => {
-                    getData((error, data) => {
-                        if (error) {
-                            resolve({
-                                error
-                            });
-                        }
-                        else {
-                            resolve({
-                                data
-                            });
-                        }
-                    });
-                });
-            };
-            handlers['poll-web-token-stop'] = async function () {
-                stopPolling = true;
-                return 'ok';
-            };
-            handlers['accounts-sync'] = async function ({ id }) {
-                const [[, userId], [, userKey]] = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.multiGet([
-                    'user-id',
-                    'user-key'
-                ]);
-                let accounts = await _db__WEBPACK_IMPORTED_MODULE_27__.runQuery(`SELECT a.*, b.id as bankId FROM accounts a
-         LEFT JOIN banks b ON a.bank = b.id
-         WHERE a.tombstone = 0 AND a.closed = 0`, [], true);
-                if (id) {
-                    accounts = accounts.filter((acct) => acct.id === id);
-                }
-                const errors = [];
-                let newTransactions = [];
-                let matchedTransactions = [];
-                let updatedAccounts = [];
-                for (let i = 0; i < accounts.length; i++) {
-                    const acct = accounts[i];
-                    if (acct.bankId) {
-                        try {
-                            const res = await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.syncAccount(userId, userKey, acct.id, acct.account_id, acct.bankId);
-                            const { added, updated } = res;
-                            newTransactions = newTransactions.concat(added);
-                            matchedTransactions = matchedTransactions.concat(updated);
-                            if (added.length > 0 || updated.length > 0) {
-                                updatedAccounts = updatedAccounts.concat(acct.id);
-                            }
-                        }
-                        catch (err) {
-                            if (err.type === 'BankSyncError') {
-                                errors.push({
-                                    type: 'SyncError',
-                                    accountId: acct.id,
-                                    message: 'Failed syncing account “' + acct.name + '.”',
-                                    category: err.category,
-                                    code: err.code
-                                });
-                            }
-                            else if (err instanceof _errors__WEBPACK_IMPORTED_MODULE_30__.PostError && err.reason !== 'internal') {
-                                errors.push({
-                                    accountId: acct.id,
-                                    message: `Account “${acct.name}” is not linked properly. Please link it again`
-                                });
-                            }
-                            else {
-                                errors.push({
-                                    accountId: acct.id,
-                                    message: 'There was an internal error. Please get in touch https://actualbudget.org/contact for support.',
-                                    internal: err.stack
-                                });
-                                err.message = 'Failed syncing account: ' + err.message;
-                                (0, _platform_exceptions__WEBPACK_IMPORTED_MODULE_4__.captureException)(err);
-                            }
-                        }
-                    }
-                }
-                if (updatedAccounts.length > 0) {
-                    _platform_server_connection__WEBPACK_IMPORTED_MODULE_6__.send('sync-event', {
-                        type: 'success',
-                        tables: [
-                            'transactions'
-                        ]
-                    });
-                }
-                return {
-                    errors,
-                    newTransactions,
-                    matchedTransactions,
-                    updatedAccounts
-                };
-            };
             handlers['secret-set'] = async function ({ name, value }) {
                 const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('user-token');
                 if (!userToken) {
@@ -43547,7 +43394,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (acct.bankId) {
                         try {
                             console.group('Bank Sync operation');
-                            const res = await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.syncExternalAccount(userId, userKey, acct.id, acct.account_id, acct.bankId);
+                            const res = await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.syncAccount(userId, userKey, acct.id, acct.account_id, acct.bankId);
                             console.groupEnd();
                             const { added, updated } = res;
                             newTransactions = newTransactions.concat(added);
@@ -43674,27 +43521,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 return 'ok';
             });
-            handlers['make-plaid-public-token'] = async function ({ bankId }) {
-                const [[, userId], [, userKey]] = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.multiGet([
-                    'user-id',
-                    'user-key'
-                ]);
-                const data = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().PLAID_SERVER + '/make-public-token', {
-                    userId,
-                    key: userKey,
-                    item_id: '' + bankId
-                });
-                if (data.error_code) {
-                    return {
-                        error: '',
-                        code: data.error_code,
-                        type: data.error_type
-                    };
-                }
-                return {
-                    linkToken: data.link_token
-                };
-            };
             handlers['save-global-prefs'] = async function (prefs) {
                 if ('maxMonths' in prefs) {
                     await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('max-months', '' + prefs.maxMonths);
@@ -43734,7 +43560,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     autoUpdate: autoUpdate == null || autoUpdate === 'true' ? true : false,
                     documentDir: documentDir || getDefaultDocumentDir(),
                     keyId: encryptKey && JSON.parse(encryptKey).id,
-                    theme: theme === 'light' || theme === 'dark' || theme === 'auto' || theme === 'development' || theme === 'midnight' ? theme : 'light'
+                    theme: theme === 'light' || theme === 'dark' || theme === 'auto' || theme === 'development' || theme === 'midnight' ? theme : 'auto'
                 };
             };
             handlers['save-prefs'] = async function (prefsToSet) {
@@ -43980,16 +43806,22 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return {};
             };
             handlers['subscribe-sign-in'] = async function ({ password }) {
-                const res = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().SIGNUP_SERVER + '/login', {
-                    password
-                });
-                if (res.token) {
-                    await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('user-token', res.token);
-                    return {};
+                let res;
+                try {
+                    res = await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().SIGNUP_SERVER + '/login', {
+                        password
+                    });
                 }
-                return {
-                    error: 'invalid-password'
-                };
+                catch (err) {
+                    return {
+                        error: err.reason || 'network-failure'
+                    };
+                }
+                if (!res.token) {
+                    throw new Error('login: User token not set');
+                }
+                await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('user-token', res.token);
+                return {};
             };
             handlers['subscribe-sign-out'] = async function () {
                 _encryption__WEBPACK_IMPORTED_MODULE_29__.unloadAllKeys();
@@ -44071,8 +43903,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (name !== DEMO_BUDGET_ID) {
                             return {
                                 id: name,
-                                cloudFileId: prefs.cloudFileId,
-                                groupId: prefs.groupId,
+                                ...prefs.cloudFileId ? {
+                                    cloudFileId: prefs.cloudFileId
+                                } : {},
+                                ...prefs.groupId ? {
+                                    groupId: prefs.groupId
+                                } : {},
                                 name: prefs.budgetName || '(no name)'
                             };
                         }
@@ -46366,7 +46202,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         BASE_SERVER: url,
                         SYNC_SERVER: joinURL(url, '/sync'),
                         SIGNUP_SERVER: joinURL(url, '/account'),
-                        PLAID_SERVER: joinURL(url, '/plaid'),
                         GOCARDLESS_SERVER: joinURL(url, '/gocardless'),
                         SIMPLEFIN_SERVER: joinURL(url, '/simplefin')
                     };
@@ -48789,6 +48624,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             "use strict";
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+                /* harmony export */ LazyLoadFailedError: () => ( /* binding */LazyLoadFailedError),
                 /* harmony export */ getCreateKeyError: () => ( /* binding */getCreateKeyError),
                 /* harmony export */ getDownloadError: () => ( /* binding */getDownloadError),
                 /* harmony export */ getSyncError: () => ( /* binding */getSyncError),
@@ -48863,6 +48699,16 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return `We had an unknown problem opening “${id}”.`;
                 }
             }
+            class LazyLoadFailedError extends Error {
+                constructor(name) {
+                    super(`Error: failed loading lazy-loaded module ${name}`);
+                    this.type = 'app-init-failure';
+                    this.meta = {};
+                    this.meta = {
+                        name
+                    };
+                }
+            }
             /***/ 
         }),
         /***/ "./packages/loot-core/src/shared/months.ts": 
@@ -48876,13 +48722,18 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ _dayRange: () => ( /* binding */_dayRange),
                 /* harmony export */ _parse: () => ( /* binding */_parse),
                 /* harmony export */ _range: () => ( /* binding */_range),
+                /* harmony export */ _weekRange: () => ( /* binding */_weekRange),
+                /* harmony export */ _yearRange: () => ( /* binding */_yearRange),
                 /* harmony export */ addDays: () => ( /* binding */addDays),
                 /* harmony export */ addMonths: () => ( /* binding */addMonths),
                 /* harmony export */ addWeeks: () => ( /* binding */addWeeks),
+                /* harmony export */ addYears: () => ( /* binding */addYears),
                 /* harmony export */ bounds: () => ( /* binding */bounds),
                 /* harmony export */ currentDate: () => ( /* binding */currentDate),
                 /* harmony export */ currentDay: () => ( /* binding */currentDay),
                 /* harmony export */ currentMonth: () => ( /* binding */currentMonth),
+                /* harmony export */ currentWeek: () => ( /* binding */currentWeek),
+                /* harmony export */ currentYear: () => ( /* binding */currentYear),
                 /* harmony export */ dayFromDate: () => ( /* binding */dayFromDate),
                 /* harmony export */ dayRange: () => ( /* binding */dayRange),
                 /* harmony export */ dayRangeInclusive: () => ( /* binding */dayRangeInclusive),
@@ -48890,15 +48741,18 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ differenceInCalendarMonths: () => ( /* binding */differenceInCalendarMonths),
                 /* harmony export */ format: () => ( /* binding */format),
                 /* harmony export */ getDateFormatRegex: () => ( /* binding */getDateFormatRegex),
+                /* harmony export */ getDay: () => ( /* binding */getDay),
                 /* harmony export */ getDayMonthFormat: () => ( /* binding */getDayMonthFormat),
                 /* harmony export */ getDayMonthRegex: () => ( /* binding */getDayMonthRegex),
                 /* harmony export */ getMonth: () => ( /* binding */getMonth),
+                /* harmony export */ getMonthEnd: () => ( /* binding */getMonthEnd),
                 /* harmony export */ getMonthFromIndex: () => ( /* binding */getMonthFromIndex),
                 /* harmony export */ getMonthIndex: () => ( /* binding */getMonthIndex),
                 /* harmony export */ getMonthYearFormat: () => ( /* binding */getMonthYearFormat),
                 /* harmony export */ getMonthYearRegex: () => ( /* binding */getMonthYearRegex),
                 /* harmony export */ getShortYearFormat: () => ( /* binding */getShortYearFormat),
                 /* harmony export */ getShortYearRegex: () => ( /* binding */getShortYearRegex),
+                /* harmony export */ getWeekEnd: () => ( /* binding */getWeekEnd),
                 /* harmony export */ getYear: () => ( /* binding */getYear),
                 /* harmony export */ getYearEnd: () => ( /* binding */getYearEnd),
                 /* harmony export */ getYearStart: () => ( /* binding */getYearStart),
@@ -48915,23 +48769,33 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ sheetForMonth: () => ( /* binding */sheetForMonth),
                 /* harmony export */ subDays: () => ( /* binding */subDays),
                 /* harmony export */ subMonths: () => ( /* binding */subMonths),
-                /* harmony export */ yearFromDate: () => ( /* binding */yearFromDate)
+                /* harmony export */ subWeeks: () => ( /* binding */subWeeks),
+                /* harmony export */ subYears: () => ( /* binding */subYears),
+                /* harmony export */ weekFromDate: () => ( /* binding */weekFromDate),
+                /* harmony export */ weekRangeInclusive: () => ( /* binding */weekRangeInclusive),
+                /* harmony export */ yearFromDate: () => ( /* binding */yearFromDate),
+                /* harmony export */ yearRangeInclusive: () => ( /* binding */yearRangeInclusive)
                 /* harmony export */ 
             });
             /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/format/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/parse/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addMonths/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subMonths/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addWeeks/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/differenceInCalendarMonths/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/differenceInCalendarDays/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addDays/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subDays/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/isBefore/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/isAfter/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/startOfMonth/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/endOfMonth/index.js");
-            /* harmony import */ var memoize_one__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! memoize-one */ "./node_modules/memoize-one/dist/memoize-one.esm.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/startOfWeek/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/parse/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addMonths/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subMonths/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addYears/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addWeeks/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/differenceInCalendarMonths/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/differenceInCalendarDays/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subWeeks/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subYears/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addDays/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subDays/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/isBefore/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/isAfter/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/startOfMonth/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/endOfMonth/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/endOfWeek/index.js");
+            /* harmony import */ var memoize_one__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! memoize-one */ "./node_modules/memoize-one/dist/memoize-one.esm.js");
             /* harmony import */ var _client_platform__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../client/platform */ "./packages/loot-core/src/client/platform.electron.ts");
             // @ts-strict-ignore
             function _parse(value) {
@@ -49012,6 +48876,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             function monthFromDate(date) {
                 return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](_parse(date), 'yyyy-MM');
             }
+            function weekFromDate(date, firstDayOfWeekIdx) {
+                const converted = parseInt(firstDayOfWeekIdx || '0');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](_parse(date_fns__WEBPACK_IMPORTED_MODULE_2__["default"](_parse(date), {
+                    weekStartsOn: converted
+                })), 'yyyy-MM-dd');
+            }
             function dayFromDate(date) {
                 return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](_parse(date), 'yyyy-MM-dd');
             }
@@ -49023,9 +48893,28 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](new Date(), 'yyyy-MM');
                 }
             }
+            function currentWeek(firstDayOfWeekIdx) {
+                if (global.IS_TESTING || _client_platform__WEBPACK_IMPORTED_MODULE_0__.isPlaywright) {
+                    return global.currentWeek || '2017-01-01';
+                }
+                else {
+                    const converted = parseInt(firstDayOfWeekIdx || '0');
+                    return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](_parse(date_fns__WEBPACK_IMPORTED_MODULE_2__["default"](new Date(), {
+                        weekStartsOn: converted
+                    })), 'yyyy-MM-dd');
+                }
+            }
+            function currentYear() {
+                if (global.IS_TESTING || _client_platform__WEBPACK_IMPORTED_MODULE_0__.isPlaywright) {
+                    return global.currentMonth || '2017';
+                }
+                else {
+                    return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](new Date(), 'yyyy');
+                }
+            }
             function currentDate() {
                 if (global.IS_TESTING || _client_platform__WEBPACK_IMPORTED_MODULE_0__.isPlaywright) {
-                    return date_fns__WEBPACK_IMPORTED_MODULE_2__["default"](currentDay(), 'yyyy-MM-dd', new Date());
+                    return date_fns__WEBPACK_IMPORTED_MODULE_3__["default"](currentDay(), 'yyyy-MM-dd', new Date());
                 }
                 return new Date();
             }
@@ -49038,53 +48927,92 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
             }
             function nextMonth(month) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_3__["default"](_parse(month), 1), 'yyyy-MM');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_4__["default"](_parse(month), 1), 'yyyy-MM');
             }
             function prevYear(month) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_4__["default"](_parse(month), 12), 'yyyy-MM');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_5__["default"](_parse(month), 12), 'yyyy-MM');
             }
             function prevMonth(month) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_4__["default"](_parse(month), 1), 'yyyy-MM');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_5__["default"](_parse(month), 1), 'yyyy-MM');
+            }
+            function addYears(year, n) {
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_6__["default"](_parse(year), n), 'yyyy');
             }
             function addMonths(month, n) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_3__["default"](_parse(month), n), 'yyyy-MM');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_4__["default"](_parse(month), n), 'yyyy-MM');
             }
             function addWeeks(date, n) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_5__["default"](_parse(date), n), 'yyyy-MM-dd');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_7__["default"](_parse(date), n), 'yyyy-MM-dd');
             }
             function differenceInCalendarMonths(month1, month2) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_6__["default"](_parse(month1), _parse(month2));
+                return date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](_parse(month1), _parse(month2));
             }
             function differenceInCalendarDays(month1, month2) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_7__["default"](_parse(month1), _parse(month2));
+                return date_fns__WEBPACK_IMPORTED_MODULE_9__["default"](_parse(month1), _parse(month2));
             }
             function subMonths(month, n) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_4__["default"](_parse(month), n), 'yyyy-MM');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_5__["default"](_parse(month), n), 'yyyy-MM');
+            }
+            function subWeeks(date, n) {
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_10__["default"](_parse(date), n), 'yyyy-MM-dd');
+            }
+            function subYears(year, n) {
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_11__["default"](_parse(year), n), 'yyyy');
             }
             function addDays(day, n) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](_parse(day), n), 'yyyy-MM-dd');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_12__["default"](_parse(day), n), 'yyyy-MM-dd');
             }
             function subDays(day, n) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_9__["default"](_parse(day), n), 'yyyy-MM-dd');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_13__["default"](_parse(day), n), 'yyyy-MM-dd');
             }
             function isBefore(month1, month2) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_10__["default"](_parse(month1), _parse(month2));
+                return date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](_parse(month1), _parse(month2));
             }
             function isAfter(month1, month2) {
-                return date_fns__WEBPACK_IMPORTED_MODULE_11__["default"](_parse(month1), _parse(month2));
+                return date_fns__WEBPACK_IMPORTED_MODULE_15__["default"](_parse(month1), _parse(month2));
             }
             // TODO: This doesn't really fit in this module anymore, should
             // probably live elsewhere
             function bounds(month) {
                 return {
-                    start: parseInt(date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_12__["default"](_parse(month)), 'yyyyMMdd')),
-                    end: parseInt(date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_13__["default"](_parse(month)), 'yyyyMMdd'))
+                    start: parseInt(date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_16__["default"](_parse(month)), 'yyyyMMdd')),
+                    end: parseInt(date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](date_fns__WEBPACK_IMPORTED_MODULE_17__["default"](_parse(month)), 'yyyyMMdd'))
                 };
             }
+            function _yearRange(start, end, inclusive = false) {
+                const years = [];
+                let year = yearFromDate(start);
+                while (date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](_parse(year), _parse(end))) {
+                    years.push(year);
+                    year = addYears(year, 1);
+                }
+                if (inclusive) {
+                    years.push(year);
+                }
+                return years;
+            }
+            function yearRangeInclusive(start, end) {
+                return _yearRange(start, end, true);
+            }
+            function _weekRange(start, end, inclusive = false, firstDayOfWeekIdx) {
+                const weeks = [];
+                let week = weekFromDate(start, firstDayOfWeekIdx);
+                while (date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](_parse(week), _parse(end))) {
+                    weeks.push(week);
+                    week = addWeeks(week, 1);
+                }
+                if (inclusive) {
+                    weeks.push(week);
+                }
+                return weeks;
+            }
+            function weekRangeInclusive(start, end, firstDayOfWeekIdx) {
+                return _weekRange(start, end, true, firstDayOfWeekIdx);
+            }
             function _range(start, end, inclusive = false) {
                 const months = [];
                 let month = monthFromDate(start);
-                while (date_fns__WEBPACK_IMPORTED_MODULE_10__["default"](_parse(month), _parse(end))) {
+                while (date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](_parse(month), _parse(end))) {
                     months.push(month);
                     month = addMonths(month, 1);
                 }
@@ -49102,7 +49030,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             function _dayRange(start, end, inclusive = false) {
                 const days = [];
                 let day = start;
-                while (date_fns__WEBPACK_IMPORTED_MODULE_10__["default"](_parse(day), _parse(end))) {
+                while (date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](_parse(day), _parse(end))) {
                     days.push(dayFromDate(day));
                     day = addDays(day, 1);
                 }
@@ -49130,6 +49058,18 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             function getMonth(day) {
                 return day.slice(0, 7);
             }
+            function getDay(day) {
+                return Number(date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](_parse(day), 'dd'));
+            }
+            function getMonthEnd(day) {
+                return subDays(nextMonth(day.slice(0, 7)) + '-01', 1);
+            }
+            function getWeekEnd(date, firstDayOfWeekIdx) {
+                const converted = parseInt(firstDayOfWeekIdx || '0');
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](_parse(date_fns__WEBPACK_IMPORTED_MODULE_18__["default"](_parse(date), {
+                    weekStartsOn: converted
+                })), 'yyyy-MM-dd');
+            }
             function getYearStart(month) {
                 return getYear(month) + '-01';
             }
@@ -49140,33 +49080,32 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return 'budget' + month.replace('-', '');
             }
             function nameForMonth(month) {
-                // eslint-disable-next-line rulesdir/typography
-                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](_parse(month), "MMMM 'yy");
+                return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](_parse(month), 'MMMM ‘yy');
             }
             function format(month, str) {
                 return date_fns__WEBPACK_IMPORTED_MODULE_1__["default"](_parse(month), str);
             }
-            const getDateFormatRegex = (0, memoize_one__WEBPACK_IMPORTED_MODULE_14__["default"])((format) => {
+            const getDateFormatRegex = (0, memoize_one__WEBPACK_IMPORTED_MODULE_19__["default"])((format) => {
                 return new RegExp(format.replace(/d+/g, '\\d{1,2}').replace(/M+/g, '\\d{1,2}').replace(/y+/g, '\\d{4}'));
             });
-            const getDayMonthFormat = (0, memoize_one__WEBPACK_IMPORTED_MODULE_14__["default"])((format) => {
+            const getDayMonthFormat = (0, memoize_one__WEBPACK_IMPORTED_MODULE_19__["default"])((format) => {
                 return format.replace(/y+/g, '').replace(/[^\w]$/, '').replace(/^[^\w]/, '');
             });
-            const getDayMonthRegex = (0, memoize_one__WEBPACK_IMPORTED_MODULE_14__["default"])((format) => {
+            const getDayMonthRegex = (0, memoize_one__WEBPACK_IMPORTED_MODULE_19__["default"])((format) => {
                 const regex = format.replace(/y+/g, '').replace(/[^\w]$/, '').replace(/^[^\w]/, '').replace(/d+/g, '\\d{1,2}').replace(/M+/g, '\\d{1,2}');
                 return new RegExp('^' + regex + '$');
             });
-            const getMonthYearFormat = (0, memoize_one__WEBPACK_IMPORTED_MODULE_14__["default"])((format) => {
+            const getMonthYearFormat = (0, memoize_one__WEBPACK_IMPORTED_MODULE_19__["default"])((format) => {
                 return format.replace(/d+/g, '').replace(/[^\w]$/, '').replace(/^[^\w]/, '').replace(/\/\//, '/').replace(/\.\./, '.').replace(/--/, '-');
             });
-            const getMonthYearRegex = (0, memoize_one__WEBPACK_IMPORTED_MODULE_14__["default"])((format) => {
+            const getMonthYearRegex = (0, memoize_one__WEBPACK_IMPORTED_MODULE_19__["default"])((format) => {
                 const regex = format.replace(/d+/g, '').replace(/[^\w]$/, '').replace(/^[^\w]/, '').replace(/\/\//, '/').replace(/M+/g, '\\d{1,2}').replace(/y+/g, '\\d{2,4}');
                 return new RegExp('^' + regex + '$');
             });
-            const getShortYearFormat = (0, memoize_one__WEBPACK_IMPORTED_MODULE_14__["default"])((format) => {
+            const getShortYearFormat = (0, memoize_one__WEBPACK_IMPORTED_MODULE_19__["default"])((format) => {
                 return format.replace(/y+/g, 'yy');
             });
-            const getShortYearRegex = (0, memoize_one__WEBPACK_IMPORTED_MODULE_14__["default"])((format) => {
+            const getShortYearRegex = (0, memoize_one__WEBPACK_IMPORTED_MODULE_19__["default"])((format) => {
                 const regex = format.replace(/[^\w]$/, '').replace(/^[^\w]/, '').replace(/d+/g, '\\d{1,2}').replace(/M+/g, '\\d{1,2}').replace(/y+/g, '\\d{2}');
                 return new RegExp('^' + regex + '$');
             });
@@ -50013,11 +49952,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return {
                     amount: 0,
                     ...data,
+                    category: 'category' in data ? data.category : parent.category,
                     payee: 'payee' in data ? data.payee : parent.payee,
                     id: 'id' in data ? data.id : prefix + (0, uuid__WEBPACK_IMPORTED_MODULE_1__["default"])(),
                     account: parent.account,
                     date: parent.date,
                     cleared: parent.cleared != null ? parent.cleared : null,
+                    reconciled: 'reconciled' in data ? data.reconciled : parent.reconciled,
                     starting_balance_flag: parent.starting_balance_flag != null ? parent.starting_balance_flag : null,
                     is_child: true,
                     parent_id: parent.id,
@@ -50612,7 +50553,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if (amount.startsWith('(') && amount.endsWith(')')) {
                     amount = amount.replace('(', '-').replace(')', '');
                 }
-                const m = amount.match(/[.,][^.,]{1,2}$/);
+                //look for a decimal marker, then look for either 5 or 1-2 decimal places.
+                // This avoids matching against 3 places which may not actually be decimal
+                const m = amount.match(/[.,]([^.,]{5}|[^.,]{1,2})$/);
                 if (!m || m.index === undefined || m.index === 0) {
                     return safeNumber(parseFloat(extractNumbers(amount)));
                 }
@@ -55580,6 +55523,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     var peg$c0 = "source";
                     var peg$c1 = "sink";
                     var peg$c2 = " ";
+                    var peg$c3 = " source";
+                    var peg$c4 = " sink";
                     var peg$r0 = /^[0-9]/;
                     var peg$e0 = peg$literalExpectation("source", false);
                     var peg$e1 = peg$literalExpectation("sink", false);
@@ -55588,9 +55533,16 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     var peg$e4 = peg$otherExpectation("digit");
                     var peg$e5 = peg$classExpectation([["0", "9"]], false, false);
                     var peg$e6 = peg$otherExpectation("weight");
-                    var peg$f0 = function () { return { type: 'source' }; };
-                    var peg$f1 = function (weight) { return { type: 'sink', weight: +weight || 1 }; };
-                    var peg$f2 = function (weight) { return +weight; };
+                    var peg$e7 = peg$otherExpectation("Name");
+                    var peg$e8 = peg$literalExpectation(" source", false);
+                    var peg$e9 = peg$anyExpectation();
+                    var peg$e10 = peg$literalExpectation(" sink", false);
+                    var peg$f0 = function () { return { group: null, type: 'source' }; };
+                    var peg$f1 = function (weight) { return { type: 'sink', weight: +weight || 1, group: null }; };
+                    var peg$f2 = function (group) { return { group: group || null, type: 'source' }; };
+                    var peg$f3 = function (group, weight) { return { type: 'sink', weight: +weight || 1, group: group || null }; };
+                    var peg$f4 = function (group) { return { group: group, type: null }; };
+                    var peg$f5 = function (weight) { return +weight; };
                     var peg$currPos = 0;
                     var peg$savedPos = 0;
                     var peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -55716,7 +55668,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         return new peg$SyntaxError(peg$SyntaxError.buildMessage(expected, found), expected, found, location);
                     }
                     function peg$parseexpr() {
-                        var s0, s1, s2, s3;
+                        var s0, s1, s2, s3, s4, s5;
                         s0 = peg$currPos;
                         s1 = peg$parsesource();
                         if (s1 !== peg$FAILED) {
@@ -55743,6 +55695,55 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 peg$currPos = s0;
                                 s0 = peg$FAILED;
                             }
+                            if (s0 === peg$FAILED) {
+                                s0 = peg$currPos;
+                                s1 = peg$parsesourcegroup();
+                                s2 = peg$parse_();
+                                if (s2 === peg$FAILED) {
+                                    s2 = null;
+                                }
+                                s3 = peg$parsesource();
+                                if (s3 !== peg$FAILED) {
+                                    peg$savedPos = s0;
+                                    s0 = peg$f2(s1);
+                                }
+                                else {
+                                    peg$currPos = s0;
+                                    s0 = peg$FAILED;
+                                }
+                                if (s0 === peg$FAILED) {
+                                    s0 = peg$currPos;
+                                    s1 = peg$parsesinkgroup();
+                                    s2 = peg$parse_();
+                                    if (s2 === peg$FAILED) {
+                                        s2 = null;
+                                    }
+                                    s3 = peg$parsesink();
+                                    if (s3 !== peg$FAILED) {
+                                        s4 = peg$parse_();
+                                        if (s4 === peg$FAILED) {
+                                            s4 = null;
+                                        }
+                                        s5 = peg$parseweight();
+                                        if (s5 === peg$FAILED) {
+                                            s5 = null;
+                                        }
+                                        peg$savedPos = s0;
+                                        s0 = peg$f3(s1, s5);
+                                    }
+                                    else {
+                                        peg$currPos = s0;
+                                        s0 = peg$FAILED;
+                                    }
+                                    if (s0 === peg$FAILED) {
+                                        s0 = peg$currPos;
+                                        s1 = peg$parsesourcegroup();
+                                        peg$savedPos = s0;
+                                        s1 = peg$f4(s1);
+                                        s0 = s1;
+                                    }
+                                }
+                            }
                         }
                         return s0;
                     }
@@ -55861,7 +55862,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                         if (s1 !== peg$FAILED) {
                             peg$savedPos = s0;
-                            s1 = peg$f2(s1);
+                            s1 = peg$f5(s1);
                         }
                         s0 = s1;
                         peg$silentFails--;
@@ -55873,6 +55874,218 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                         return s0;
                     }
+                    function peg$parsesourcegroup() {
+                        var s0, s1, s2, s3, s4;
+                        peg$silentFails++;
+                        s0 = peg$currPos;
+                        s1 = [];
+                        s2 = peg$currPos;
+                        s3 = peg$currPos;
+                        peg$silentFails++;
+                        if (input.substr(peg$currPos, 7) === peg$c3) {
+                            s4 = peg$c3;
+                            peg$currPos += 7;
+                        }
+                        else {
+                            s4 = peg$FAILED;
+                            if (peg$silentFails === 0) {
+                                peg$fail(peg$e8);
+                            }
+                        }
+                        peg$silentFails--;
+                        if (s4 === peg$FAILED) {
+                            s3 = undefined;
+                        }
+                        else {
+                            peg$currPos = s3;
+                            s3 = peg$FAILED;
+                        }
+                        if (s3 !== peg$FAILED) {
+                            if (input.length > peg$currPos) {
+                                s4 = input.charAt(peg$currPos);
+                                peg$currPos++;
+                            }
+                            else {
+                                s4 = peg$FAILED;
+                                if (peg$silentFails === 0) {
+                                    peg$fail(peg$e9);
+                                }
+                            }
+                            if (s4 !== peg$FAILED) {
+                                s3 = [s3, s4];
+                                s2 = s3;
+                            }
+                            else {
+                                peg$currPos = s2;
+                                s2 = peg$FAILED;
+                            }
+                        }
+                        else {
+                            peg$currPos = s2;
+                            s2 = peg$FAILED;
+                        }
+                        while (s2 !== peg$FAILED) {
+                            s1.push(s2);
+                            s2 = peg$currPos;
+                            s3 = peg$currPos;
+                            peg$silentFails++;
+                            if (input.substr(peg$currPos, 7) === peg$c3) {
+                                s4 = peg$c3;
+                                peg$currPos += 7;
+                            }
+                            else {
+                                s4 = peg$FAILED;
+                                if (peg$silentFails === 0) {
+                                    peg$fail(peg$e8);
+                                }
+                            }
+                            peg$silentFails--;
+                            if (s4 === peg$FAILED) {
+                                s3 = undefined;
+                            }
+                            else {
+                                peg$currPos = s3;
+                                s3 = peg$FAILED;
+                            }
+                            if (s3 !== peg$FAILED) {
+                                if (input.length > peg$currPos) {
+                                    s4 = input.charAt(peg$currPos);
+                                    peg$currPos++;
+                                }
+                                else {
+                                    s4 = peg$FAILED;
+                                    if (peg$silentFails === 0) {
+                                        peg$fail(peg$e9);
+                                    }
+                                }
+                                if (s4 !== peg$FAILED) {
+                                    s3 = [s3, s4];
+                                    s2 = s3;
+                                }
+                                else {
+                                    peg$currPos = s2;
+                                    s2 = peg$FAILED;
+                                }
+                            }
+                            else {
+                                peg$currPos = s2;
+                                s2 = peg$FAILED;
+                            }
+                        }
+                        s0 = input.substring(s0, peg$currPos);
+                        peg$silentFails--;
+                        s1 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                            peg$fail(peg$e7);
+                        }
+                        return s0;
+                    }
+                    function peg$parsesinkgroup() {
+                        var s0, s1, s2, s3, s4;
+                        peg$silentFails++;
+                        s0 = peg$currPos;
+                        s1 = [];
+                        s2 = peg$currPos;
+                        s3 = peg$currPos;
+                        peg$silentFails++;
+                        if (input.substr(peg$currPos, 5) === peg$c4) {
+                            s4 = peg$c4;
+                            peg$currPos += 5;
+                        }
+                        else {
+                            s4 = peg$FAILED;
+                            if (peg$silentFails === 0) {
+                                peg$fail(peg$e10);
+                            }
+                        }
+                        peg$silentFails--;
+                        if (s4 === peg$FAILED) {
+                            s3 = undefined;
+                        }
+                        else {
+                            peg$currPos = s3;
+                            s3 = peg$FAILED;
+                        }
+                        if (s3 !== peg$FAILED) {
+                            if (input.length > peg$currPos) {
+                                s4 = input.charAt(peg$currPos);
+                                peg$currPos++;
+                            }
+                            else {
+                                s4 = peg$FAILED;
+                                if (peg$silentFails === 0) {
+                                    peg$fail(peg$e9);
+                                }
+                            }
+                            if (s4 !== peg$FAILED) {
+                                s3 = [s3, s4];
+                                s2 = s3;
+                            }
+                            else {
+                                peg$currPos = s2;
+                                s2 = peg$FAILED;
+                            }
+                        }
+                        else {
+                            peg$currPos = s2;
+                            s2 = peg$FAILED;
+                        }
+                        while (s2 !== peg$FAILED) {
+                            s1.push(s2);
+                            s2 = peg$currPos;
+                            s3 = peg$currPos;
+                            peg$silentFails++;
+                            if (input.substr(peg$currPos, 5) === peg$c4) {
+                                s4 = peg$c4;
+                                peg$currPos += 5;
+                            }
+                            else {
+                                s4 = peg$FAILED;
+                                if (peg$silentFails === 0) {
+                                    peg$fail(peg$e10);
+                                }
+                            }
+                            peg$silentFails--;
+                            if (s4 === peg$FAILED) {
+                                s3 = undefined;
+                            }
+                            else {
+                                peg$currPos = s3;
+                                s3 = peg$FAILED;
+                            }
+                            if (s3 !== peg$FAILED) {
+                                if (input.length > peg$currPos) {
+                                    s4 = input.charAt(peg$currPos);
+                                    peg$currPos++;
+                                }
+                                else {
+                                    s4 = peg$FAILED;
+                                    if (peg$silentFails === 0) {
+                                        peg$fail(peg$e9);
+                                    }
+                                }
+                                if (s4 !== peg$FAILED) {
+                                    s3 = [s3, s4];
+                                    s2 = s3;
+                                }
+                                else {
+                                    peg$currPos = s2;
+                                    s2 = peg$FAILED;
+                                }
+                            }
+                            else {
+                                peg$currPos = s2;
+                                s2 = peg$FAILED;
+                            }
+                        }
+                        s0 = input.substring(s0, peg$currPos);
+                        peg$silentFails--;
+                        s1 = peg$FAILED;
+                        if (peg$silentFails === 0) {
+                            peg$fail(peg$e7);
+                        }
+                        return s0;
+                    }
                     peg$result = peg$startRuleFunction();
                     if (peg$result !== peg$FAILED && peg$currPos === input.length) {
                         return peg$result;
@@ -56060,73 +56273,75 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     var peg$source = options.grammarSource;
                     var peg$startRuleFunctions = { expr: peg$parseexpr };
                     var peg$startRuleFunction = peg$parseexpr;
-                    var peg$c0 = "month";
+                    var peg$c0 = "average";
                     var peg$c1 = "months";
-                    var peg$c2 = "year";
-                    var peg$c3 = "years";
-                    var peg$c4 = "hold";
-                    var peg$c5 = "previous";
-                    var peg$c6 = "spend";
-                    var peg$c7 = "from";
-                    var peg$c8 = "week";
-                    var peg$c9 = "weeks";
-                    var peg$c10 = "by";
-                    var peg$c11 = "of";
-                    var peg$c12 = "repeat";
-                    var peg$c13 = "every";
-                    var peg$c14 = "starting";
-                    var peg$c15 = "up";
-                    var peg$c16 = "to";
-                    var peg$c17 = "schedule";
-                    var peg$c18 = "full";
-                    var peg$c19 = "-";
-                    var peg$c20 = "remainder";
-                    var peg$c21 = " ";
-                    var peg$c22 = ".";
-                    var peg$c23 = "%";
+                    var peg$c2 = "month";
+                    var peg$c3 = "year";
+                    var peg$c4 = "years";
+                    var peg$c5 = "hold";
+                    var peg$c6 = "previous";
+                    var peg$c7 = "spend";
+                    var peg$c8 = "from";
+                    var peg$c9 = "week";
+                    var peg$c10 = "weeks";
+                    var peg$c11 = "by";
+                    var peg$c12 = "of";
+                    var peg$c13 = "repeat";
+                    var peg$c14 = "every";
+                    var peg$c15 = "starting";
+                    var peg$c16 = "up";
+                    var peg$c17 = "to";
+                    var peg$c18 = "schedule";
+                    var peg$c19 = "full";
+                    var peg$c20 = "-";
+                    var peg$c21 = "remainder";
+                    var peg$c22 = " ";
+                    var peg$c23 = ".";
+                    var peg$c24 = "%";
                     var peg$r0 = /^[0-9]/;
                     var peg$r1 = /^[1-9]/;
                     var peg$r2 = /^[^\r\n\t]/;
-                    var peg$e0 = peg$otherExpectation("repeat interval");
-                    var peg$e1 = peg$literalExpectation("month", true);
-                    var peg$e2 = peg$literalExpectation("months", true);
-                    var peg$e3 = peg$literalExpectation("year", true);
-                    var peg$e4 = peg$literalExpectation("years", true);
-                    var peg$e5 = peg$literalExpectation("hold", true);
-                    var peg$e6 = peg$literalExpectation("previous", true);
-                    var peg$e7 = peg$literalExpectation("spend", true);
-                    var peg$e8 = peg$literalExpectation("from", true);
-                    var peg$e9 = peg$literalExpectation("week", true);
-                    var peg$e10 = peg$literalExpectation("weeks", true);
-                    var peg$e11 = peg$literalExpectation("by", true);
-                    var peg$e12 = peg$literalExpectation("of", true);
-                    var peg$e13 = peg$literalExpectation("repeat", true);
-                    var peg$e14 = peg$literalExpectation("every", true);
-                    var peg$e15 = peg$literalExpectation("starting", true);
-                    var peg$e16 = peg$literalExpectation("up", true);
-                    var peg$e17 = peg$literalExpectation("to", true);
-                    var peg$e18 = peg$literalExpectation("schedule", true);
-                    var peg$e19 = peg$literalExpectation("full", true);
-                    var peg$e20 = peg$literalExpectation("-", true);
-                    var peg$e21 = peg$literalExpectation("remainder", true);
-                    var peg$e22 = peg$otherExpectation("space");
-                    var peg$e23 = peg$literalExpectation(" ", false);
-                    var peg$e24 = peg$otherExpectation("digit");
-                    var peg$e25 = peg$classExpectation([["0", "9"]], false, false);
-                    var peg$e26 = peg$otherExpectation("number");
-                    var peg$e27 = peg$classExpectation([["1", "9"]], false, false);
-                    var peg$e28 = peg$otherExpectation("amount");
-                    var peg$e29 = peg$literalExpectation(".", false);
-                    var peg$e30 = peg$otherExpectation("percentage");
-                    var peg$e31 = peg$literalExpectation("%", false);
-                    var peg$e32 = peg$otherExpectation("year");
-                    var peg$e33 = peg$otherExpectation("month");
-                    var peg$e34 = peg$literalExpectation("-", false);
-                    var peg$e35 = peg$otherExpectation("day");
-                    var peg$e36 = peg$otherExpectation("currency symbol");
-                    var peg$e37 = peg$anyExpectation();
-                    var peg$e38 = peg$otherExpectation("Name");
-                    var peg$e39 = peg$classExpectation(["\r", "\n", "\t"], true, false);
+                    var peg$e0 = peg$literalExpectation("average", true);
+                    var peg$e1 = peg$literalExpectation("months", true);
+                    var peg$e2 = peg$otherExpectation("repeat interval");
+                    var peg$e3 = peg$literalExpectation("month", true);
+                    var peg$e4 = peg$literalExpectation("year", true);
+                    var peg$e5 = peg$literalExpectation("years", true);
+                    var peg$e6 = peg$literalExpectation("hold", true);
+                    var peg$e7 = peg$literalExpectation("previous", true);
+                    var peg$e8 = peg$literalExpectation("spend", true);
+                    var peg$e9 = peg$literalExpectation("from", true);
+                    var peg$e10 = peg$literalExpectation("week", true);
+                    var peg$e11 = peg$literalExpectation("weeks", true);
+                    var peg$e12 = peg$literalExpectation("by", true);
+                    var peg$e13 = peg$literalExpectation("of", true);
+                    var peg$e14 = peg$literalExpectation("repeat", true);
+                    var peg$e15 = peg$literalExpectation("every", true);
+                    var peg$e16 = peg$literalExpectation("starting", true);
+                    var peg$e17 = peg$literalExpectation("up", true);
+                    var peg$e18 = peg$literalExpectation("to", true);
+                    var peg$e19 = peg$literalExpectation("schedule", true);
+                    var peg$e20 = peg$literalExpectation("full", true);
+                    var peg$e21 = peg$literalExpectation("-", true);
+                    var peg$e22 = peg$literalExpectation("remainder", true);
+                    var peg$e23 = peg$otherExpectation("space");
+                    var peg$e24 = peg$literalExpectation(" ", false);
+                    var peg$e25 = peg$otherExpectation("digit");
+                    var peg$e26 = peg$classExpectation([["0", "9"]], false, false);
+                    var peg$e27 = peg$otherExpectation("number");
+                    var peg$e28 = peg$classExpectation([["1", "9"]], false, false);
+                    var peg$e29 = peg$otherExpectation("amount");
+                    var peg$e30 = peg$literalExpectation(".", false);
+                    var peg$e31 = peg$otherExpectation("percentage");
+                    var peg$e32 = peg$literalExpectation("%", false);
+                    var peg$e33 = peg$otherExpectation("year");
+                    var peg$e34 = peg$otherExpectation("month");
+                    var peg$e35 = peg$literalExpectation("-", false);
+                    var peg$e36 = peg$otherExpectation("day");
+                    var peg$e37 = peg$otherExpectation("currency symbol");
+                    var peg$e38 = peg$anyExpectation();
+                    var peg$e39 = peg$otherExpectation("Name");
+                    var peg$e40 = peg$classExpectation(["\r", "\n", "\t"], true, false);
                     var peg$f0 = function (priority, percentOf, category) { return { type: 'percentage', percent: +percentOf.percent, previous: percentOf.prev, category, priority: +priority }; };
                     var peg$f1 = function (priority, amount, weeks, starting, limit) { return { type: 'week', amount, weeks, starting, limit, priority: +priority }; };
                     var peg$f2 = function (priority, amount, month, from, repeat) {
@@ -56143,23 +56358,24 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     var peg$f4 = function (priority, limit) { return { type: 'simple', limit, priority: +priority }; };
                     var peg$f5 = function (priority, full, name) { return { type: 'schedule', name, priority: +priority, full }; };
                     var peg$f6 = function (priority, remainder) { return { type: 'remainder', priority: null, weight: remainder }; };
-                    var peg$f7 = function () { return { annual: false }; };
-                    var peg$f8 = function (months) { return { annual: false, repeat: +months }; };
-                    var peg$f9 = function () { return { annual: true }; };
-                    var peg$f10 = function (years) { return { annual: true, repeat: +years }; };
-                    var peg$f11 = function (amount) { return { amount: amount, hold: true }; };
-                    var peg$f12 = function (amount) { return { amount: amount, hold: false }; };
-                    var peg$f13 = function (percent) { return { percent: percent, prev: true }; };
-                    var peg$f14 = function (percent) { return { percent: percent, prev: false }; };
-                    var peg$f15 = function () { return null; };
-                    var peg$f16 = function (n) { return +n; };
-                    var peg$f17 = function (month) { return month; };
-                    var peg$f18 = function () { return true; };
-                    var peg$f19 = function (number) { return number; };
-                    var peg$f20 = function (weight) { return +weight || 1; };
-                    var peg$f21 = function (amount) { return +amount; };
-                    var peg$f22 = function (percent) { return +percent; };
-                    var peg$f23 = function (symbol) { return /\p{Sc}/u.test(symbol); };
+                    var peg$f7 = function (priority, amount) { return { type: 'average', amount: +amount, priority: +priority }; };
+                    var peg$f8 = function () { return { annual: false }; };
+                    var peg$f9 = function (months) { return { annual: false, repeat: +months }; };
+                    var peg$f10 = function () { return { annual: true }; };
+                    var peg$f11 = function (years) { return { annual: true, repeat: +years }; };
+                    var peg$f12 = function (amount) { return { amount: amount, hold: true }; };
+                    var peg$f13 = function (amount) { return { amount: amount, hold: false }; };
+                    var peg$f14 = function (percent) { return { percent: percent, prev: true }; };
+                    var peg$f15 = function (percent) { return { percent: percent, prev: false }; };
+                    var peg$f16 = function () { return null; };
+                    var peg$f17 = function (n) { return +n; };
+                    var peg$f18 = function (month) { return month; };
+                    var peg$f19 = function () { return true; };
+                    var peg$f20 = function (number) { return number; };
+                    var peg$f21 = function (weight) { return +weight || 1; };
+                    var peg$f22 = function (amount) { return +amount; };
+                    var peg$f23 = function (percent) { return +percent; };
+                    var peg$f24 = function (symbol) { return /\p{Sc}/u.test(symbol); };
                     var peg$currPos = 0;
                     var peg$savedPos = 0;
                     var peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -56573,6 +56789,69 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                                     peg$currPos = s0;
                                                     s0 = peg$FAILED;
                                                 }
+                                                if (s0 === peg$FAILED) {
+                                                    s0 = peg$currPos;
+                                                    s1 = peg$parsepriority();
+                                                    if (s1 === peg$FAILED) {
+                                                        s1 = null;
+                                                    }
+                                                    s2 = peg$parse_();
+                                                    if (s2 === peg$FAILED) {
+                                                        s2 = null;
+                                                    }
+                                                    if (input.substr(peg$currPos, 7).toLowerCase() === peg$c0) {
+                                                        s3 = input.substr(peg$currPos, 7);
+                                                        peg$currPos += 7;
+                                                    }
+                                                    else {
+                                                        s3 = peg$FAILED;
+                                                        if (peg$silentFails === 0) {
+                                                            peg$fail(peg$e0);
+                                                        }
+                                                    }
+                                                    if (s3 !== peg$FAILED) {
+                                                        s4 = peg$parse_();
+                                                        if (s4 !== peg$FAILED) {
+                                                            s5 = peg$parsepositive();
+                                                            if (s5 !== peg$FAILED) {
+                                                                s6 = peg$parse_();
+                                                                if (s6 !== peg$FAILED) {
+                                                                    if (input.substr(peg$currPos, 6).toLowerCase() === peg$c1) {
+                                                                        s7 = input.substr(peg$currPos, 6);
+                                                                        peg$currPos += 6;
+                                                                    }
+                                                                    else {
+                                                                        s7 = peg$FAILED;
+                                                                        if (peg$silentFails === 0) {
+                                                                            peg$fail(peg$e1);
+                                                                        }
+                                                                    }
+                                                                    if (s7 === peg$FAILED) {
+                                                                        s7 = null;
+                                                                    }
+                                                                    peg$savedPos = s0;
+                                                                    s0 = peg$f7(s1, s5);
+                                                                }
+                                                                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;
+                                                    }
+                                                }
                                             }
                                         }
                                     }
@@ -56585,19 +56864,19 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         var s0, s1, s2, s3;
                         peg$silentFails++;
                         s0 = peg$currPos;
-                        if (input.substr(peg$currPos, 5).toLowerCase() === peg$c0) {
+                        if (input.substr(peg$currPos, 5).toLowerCase() === peg$c2) {
                             s1 = input.substr(peg$currPos, 5);
                             peg$currPos += 5;
                         }
                         else {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e1);
+                                peg$fail(peg$e3);
                             }
                         }
                         if (s1 !== peg$FAILED) {
                             peg$savedPos = s0;
-                            s1 = peg$f7();
+                            s1 = peg$f8();
                         }
                         s0 = s1;
                         if (s0 === peg$FAILED) {
@@ -56613,12 +56892,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                     else {
                                         s3 = peg$FAILED;
                                         if (peg$silentFails === 0) {
-                                            peg$fail(peg$e2);
+                                            peg$fail(peg$e1);
                                         }
                                     }
                                     if (s3 !== peg$FAILED) {
                                         peg$savedPos = s0;
-                                        s0 = peg$f8(s1);
+                                        s0 = peg$f9(s1);
                                     }
                                     else {
                                         peg$currPos = s0;
@@ -56636,19 +56915,19 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             }
                             if (s0 === peg$FAILED) {
                                 s0 = peg$currPos;
-                                if (input.substr(peg$currPos, 4).toLowerCase() === peg$c2) {
+                                if (input.substr(peg$currPos, 4).toLowerCase() === peg$c3) {
                                     s1 = input.substr(peg$currPos, 4);
                                     peg$currPos += 4;
                                 }
                                 else {
                                     s1 = peg$FAILED;
                                     if (peg$silentFails === 0) {
-                                        peg$fail(peg$e3);
+                                        peg$fail(peg$e4);
                                     }
                                 }
                                 if (s1 !== peg$FAILED) {
                                     peg$savedPos = s0;
-                                    s1 = peg$f9();
+                                    s1 = peg$f10();
                                 }
                                 s0 = s1;
                                 if (s0 === peg$FAILED) {
@@ -56657,19 +56936,19 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                     if (s1 !== peg$FAILED) {
                                         s2 = peg$parse_();
                                         if (s2 !== peg$FAILED) {
-                                            if (input.substr(peg$currPos, 5).toLowerCase() === peg$c3) {
+                                            if (input.substr(peg$currPos, 5).toLowerCase() === peg$c4) {
                                                 s3 = input.substr(peg$currPos, 5);
                                                 peg$currPos += 5;
                                             }
                                             else {
                                                 s3 = peg$FAILED;
                                                 if (peg$silentFails === 0) {
-                                                    peg$fail(peg$e4);
+                                                    peg$fail(peg$e5);
                                                 }
                                             }
                                             if (s3 !== peg$FAILED) {
                                                 peg$savedPos = s0;
-                                                s0 = peg$f10(s1);
+                                                s0 = peg$f11(s1);
                                             }
                                             else {
                                                 peg$currPos = s0;
@@ -56692,7 +56971,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (s0 === peg$FAILED) {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e0);
+                                peg$fail(peg$e2);
                             }
                         }
                         return s0;
@@ -56712,19 +56991,19 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 if (s4 !== peg$FAILED) {
                                     s5 = peg$parse_();
                                     if (s5 !== peg$FAILED) {
-                                        if (input.substr(peg$currPos, 4).toLowerCase() === peg$c4) {
+                                        if (input.substr(peg$currPos, 4).toLowerCase() === peg$c5) {
                                             s6 = input.substr(peg$currPos, 4);
                                             peg$currPos += 4;
                                         }
                                         else {
                                             s6 = peg$FAILED;
                                             if (peg$silentFails === 0) {
-                                                peg$fail(peg$e5);
+                                                peg$fail(peg$e6);
                                             }
                                         }
                                         if (s6 !== peg$FAILED) {
                                             peg$savedPos = s0;
-                                            s0 = peg$f11(s4);
+                                            s0 = peg$f12(s4);
                                         }
                                         else {
                                             peg$currPos = s0;
@@ -56763,7 +57042,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                     s4 = peg$parseamount();
                                     if (s4 !== peg$FAILED) {
                                         peg$savedPos = s0;
-                                        s0 = peg$f12(s4);
+                                        s0 = peg$f13(s4);
                                     }
                                     else {
                                         peg$currPos = s0;
@@ -56793,21 +57072,21 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 if (s3 !== peg$FAILED) {
                                     s4 = peg$parse_();
                                     if (s4 !== peg$FAILED) {
-                                        if (input.substr(peg$currPos, 8).toLowerCase() === peg$c5) {
+                                        if (input.substr(peg$currPos, 8).toLowerCase() === peg$c6) {
                                             s5 = input.substr(peg$currPos, 8);
                                             peg$currPos += 8;
                                         }
                                         else {
                                             s5 = peg$FAILED;
                                             if (peg$silentFails === 0) {
-                                                peg$fail(peg$e6);
+                                                peg$fail(peg$e7);
                                             }
                                         }
                                         if (s5 !== peg$FAILED) {
                                             s6 = peg$parse_();
                                             if (s6 !== peg$FAILED) {
                                                 peg$savedPos = s0;
-                                                s0 = peg$f13(s1);
+                                                s0 = peg$f14(s1);
                                             }
                                             else {
                                                 peg$currPos = s0;
@@ -56849,7 +57128,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                         s4 = peg$parse_();
                                         if (s4 !== peg$FAILED) {
                                             peg$savedPos = s0;
-                                            s0 = peg$f14(s1);
+                                            s0 = peg$f15(s1);
                                         }
                                         else {
                                             peg$currPos = s0;
@@ -56879,7 +57158,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         s1 = peg$parseweek();
                         if (s1 !== peg$FAILED) {
                             peg$savedPos = s0;
-                            s1 = peg$f15();
+                            s1 = peg$f16();
                         }
                         s0 = s1;
                         if (s0 === peg$FAILED) {
@@ -56891,7 +57170,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                     s3 = peg$parseweeks();
                                     if (s3 !== peg$FAILED) {
                                         peg$savedPos = s0;
-                                        s0 = peg$f16(s1);
+                                        s0 = peg$f17(s1);
                                     }
                                     else {
                                         peg$currPos = s0;
@@ -56915,27 +57194,27 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         s0 = peg$currPos;
                         s1 = peg$parse_();
                         if (s1 !== peg$FAILED) {
-                            if (input.substr(peg$currPos, 5).toLowerCase() === peg$c6) {
+                            if (input.substr(peg$currPos, 5).toLowerCase() === peg$c7) {
                                 s2 = input.substr(peg$currPos, 5);
                                 peg$currPos += 5;
                             }
                             else {
                                 s2 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$e7);
+                                    peg$fail(peg$e8);
                                 }
                             }
                             if (s2 !== peg$FAILED) {
                                 s3 = peg$parse_();
                                 if (s3 !== peg$FAILED) {
-                                    if (input.substr(peg$currPos, 4).toLowerCase() === peg$c7) {
+                                    if (input.substr(peg$currPos, 4).toLowerCase() === peg$c8) {
                                         s4 = input.substr(peg$currPos, 4);
                                         peg$currPos += 4;
                                     }
                                     else {
                                         s4 = peg$FAILED;
                                         if (peg$silentFails === 0) {
-                                            peg$fail(peg$e8);
+                                            peg$fail(peg$e9);
                                         }
                                     }
                                     if (s4 !== peg$FAILED) {
@@ -56944,7 +57223,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                             s6 = peg$parsemonth();
                                             if (s6 !== peg$FAILED) {
                                                 peg$savedPos = s0;
-                                                s0 = peg$f17(s6);
+                                                s0 = peg$f18(s6);
                                             }
                                             else {
                                                 peg$currPos = s0;
@@ -56979,56 +57258,56 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                     function peg$parseweek() {
                         var s0;
-                        if (input.substr(peg$currPos, 4).toLowerCase() === peg$c8) {
+                        if (input.substr(peg$currPos, 4).toLowerCase() === peg$c9) {
                             s0 = input.substr(peg$currPos, 4);
                             peg$currPos += 4;
                         }
                         else {
                             s0 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e9);
+                                peg$fail(peg$e10);
                             }
                         }
                         return s0;
                     }
                     function peg$parseweeks() {
                         var s0;
-                        if (input.substr(peg$currPos, 5).toLowerCase() === peg$c9) {
+                        if (input.substr(peg$currPos, 5).toLowerCase() === peg$c10) {
                             s0 = input.substr(peg$currPos, 5);
                             peg$currPos += 5;
                         }
                         else {
                             s0 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e10);
+                                peg$fail(peg$e11);
                             }
                         }
                         return s0;
                     }
                     function peg$parseby() {
                         var s0;
-                        if (input.substr(peg$currPos, 2).toLowerCase() === peg$c10) {
+                        if (input.substr(peg$currPos, 2).toLowerCase() === peg$c11) {
                             s0 = input.substr(peg$currPos, 2);
                             peg$currPos += 2;
                         }
                         else {
                             s0 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e11);
+                                peg$fail(peg$e12);
                             }
                         }
                         return s0;
                     }
                     function peg$parseof() {
                         var s0;
-                        if (input.substr(peg$currPos, 2).toLowerCase() === peg$c11) {
+                        if (input.substr(peg$currPos, 2).toLowerCase() === peg$c12) {
                             s0 = input.substr(peg$currPos, 2);
                             peg$currPos += 2;
                         }
                         else {
                             s0 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e12);
+                                peg$fail(peg$e13);
                             }
                         }
                         return s0;
@@ -57036,27 +57315,27 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     function peg$parserepeatEvery() {
                         var s0, s1, s2, s3;
                         s0 = peg$currPos;
-                        if (input.substr(peg$currPos, 6).toLowerCase() === peg$c12) {
+                        if (input.substr(peg$currPos, 6).toLowerCase() === peg$c13) {
                             s1 = input.substr(peg$currPos, 6);
                             peg$currPos += 6;
                         }
                         else {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e13);
+                                peg$fail(peg$e14);
                             }
                         }
                         if (s1 !== peg$FAILED) {
                             s2 = peg$parse_();
                             if (s2 !== peg$FAILED) {
-                                if (input.substr(peg$currPos, 5).toLowerCase() === peg$c13) {
+                                if (input.substr(peg$currPos, 5).toLowerCase() === peg$c14) {
                                     s3 = input.substr(peg$currPos, 5);
                                     peg$currPos += 5;
                                 }
                                 else {
                                     s3 = peg$FAILED;
                                     if (peg$silentFails === 0) {
-                                        peg$fail(peg$e14);
+                                        peg$fail(peg$e15);
                                     }
                                 }
                                 if (s3 !== peg$FAILED) {
@@ -57081,14 +57360,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                     function peg$parsestarting() {
                         var s0;
-                        if (input.substr(peg$currPos, 8).toLowerCase() === peg$c14) {
+                        if (input.substr(peg$currPos, 8).toLowerCase() === peg$c15) {
                             s0 = input.substr(peg$currPos, 8);
                             peg$currPos += 8;
                         }
                         else {
                             s0 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e15);
+                                peg$fail(peg$e16);
                             }
                         }
                         return s0;
@@ -57096,27 +57375,27 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     function peg$parseupTo() {
                         var s0, s1, s2, s3;
                         s0 = peg$currPos;
-                        if (input.substr(peg$currPos, 2).toLowerCase() === peg$c15) {
+                        if (input.substr(peg$currPos, 2).toLowerCase() === peg$c16) {
                             s1 = input.substr(peg$currPos, 2);
                             peg$currPos += 2;
                         }
                         else {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e16);
+                                peg$fail(peg$e17);
                             }
                         }
                         if (s1 !== peg$FAILED) {
                             s2 = peg$parse_();
                             if (s2 !== peg$FAILED) {
-                                if (input.substr(peg$currPos, 2).toLowerCase() === peg$c16) {
+                                if (input.substr(peg$currPos, 2).toLowerCase() === peg$c17) {
                                     s3 = input.substr(peg$currPos, 2);
                                     peg$currPos += 2;
                                 }
                                 else {
                                     s3 = peg$FAILED;
                                     if (peg$silentFails === 0) {
-                                        peg$fail(peg$e17);
+                                        peg$fail(peg$e18);
                                     }
                                 }
                                 if (s3 !== peg$FAILED) {
@@ -57141,14 +57420,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                     function peg$parseschedule() {
                         var s0;
-                        if (input.substr(peg$currPos, 8).toLowerCase() === peg$c17) {
+                        if (input.substr(peg$currPos, 8).toLowerCase() === peg$c18) {
                             s0 = input.substr(peg$currPos, 8);
                             peg$currPos += 8;
                         }
                         else {
                             s0 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e18);
+                                peg$fail(peg$e19);
                             }
                         }
                         return s0;
@@ -57156,21 +57435,21 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     function peg$parsefull() {
                         var s0, s1, s2;
                         s0 = peg$currPos;
-                        if (input.substr(peg$currPos, 4).toLowerCase() === peg$c18) {
+                        if (input.substr(peg$currPos, 4).toLowerCase() === peg$c19) {
                             s1 = input.substr(peg$currPos, 4);
                             peg$currPos += 4;
                         }
                         else {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e19);
+                                peg$fail(peg$e20);
                             }
                         }
                         if (s1 !== peg$FAILED) {
                             s2 = peg$parse_();
                             if (s2 !== peg$FAILED) {
                                 peg$savedPos = s0;
-                                s0 = peg$f18();
+                                s0 = peg$f19();
                             }
                             else {
                                 peg$currPos = s0;
@@ -57186,14 +57465,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     function peg$parsepriority() {
                         var s0, s1, s2, s3;
                         s0 = peg$currPos;
-                        if (input.substr(peg$currPos, 1).toLowerCase() === peg$c19) {
+                        if (input.substr(peg$currPos, 1).toLowerCase() === peg$c20) {
                             s1 = input.charAt(peg$currPos);
                             peg$currPos++;
                         }
                         else {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e20);
+                                peg$fail(peg$e21);
                             }
                         }
                         if (s1 !== peg$FAILED) {
@@ -57202,7 +57481,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 s3 = peg$parse_();
                                 if (s3 !== peg$FAILED) {
                                     peg$savedPos = s0;
-                                    s0 = peg$f19(s2);
+                                    s0 = peg$f20(s2);
                                 }
                                 else {
                                     peg$currPos = s0;
@@ -57223,14 +57502,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     function peg$parseremainder() {
                         var s0, s1, s2, s3;
                         s0 = peg$currPos;
-                        if (input.substr(peg$currPos, 9).toLowerCase() === peg$c20) {
+                        if (input.substr(peg$currPos, 9).toLowerCase() === peg$c21) {
                             s1 = input.substr(peg$currPos, 9);
                             peg$currPos += 9;
                         }
                         else {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e21);
+                                peg$fail(peg$e22);
                             }
                         }
                         if (s1 !== peg$FAILED) {
@@ -57243,7 +57522,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 s3 = null;
                             }
                             peg$savedPos = s0;
-                            s0 = peg$f20(s3);
+                            s0 = peg$f21(s3);
                         }
                         else {
                             peg$currPos = s0;
@@ -57256,26 +57535,26 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         peg$silentFails++;
                         s0 = [];
                         if (input.charCodeAt(peg$currPos) === 32) {
-                            s1 = peg$c21;
+                            s1 = peg$c22;
                             peg$currPos++;
                         }
                         else {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e23);
+                                peg$fail(peg$e24);
                             }
                         }
                         if (s1 !== peg$FAILED) {
                             while (s1 !== peg$FAILED) {
                                 s0.push(s1);
                                 if (input.charCodeAt(peg$currPos) === 32) {
-                                    s1 = peg$c21;
+                                    s1 = peg$c22;
                                     peg$currPos++;
                                 }
                                 else {
                                     s1 = peg$FAILED;
                                     if (peg$silentFails === 0) {
-                                        peg$fail(peg$e23);
+                                        peg$fail(peg$e24);
                                     }
                                 }
                             }
@@ -57287,7 +57566,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (s0 === peg$FAILED) {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e22);
+                                peg$fail(peg$e23);
                             }
                         }
                         return s0;
@@ -57302,14 +57581,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         else {
                             s0 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e25);
+                                peg$fail(peg$e26);
                             }
                         }
                         peg$silentFails--;
                         if (s0 === peg$FAILED) {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e24);
+                                peg$fail(peg$e25);
                             }
                         }
                         return s0;
@@ -57339,7 +57618,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (s0 === peg$FAILED) {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e26);
+                                peg$fail(peg$e27);
                             }
                         }
                         return s0;
@@ -57355,7 +57634,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         else {
                             s2 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e27);
+                                peg$fail(peg$e28);
                             }
                         }
                         if (s2 !== peg$FAILED) {
@@ -57367,7 +57646,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             else {
                                 s4 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$e25);
+                                    peg$fail(peg$e26);
                                 }
                             }
                             while (s4 !== peg$FAILED) {
@@ -57379,7 +57658,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 else {
                                     s4 = peg$FAILED;
                                     if (peg$silentFails === 0) {
-                                        peg$fail(peg$e25);
+                                        peg$fail(peg$e26);
                                     }
                                 }
                             }
@@ -57426,13 +57705,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (s5 !== peg$FAILED) {
                             s6 = peg$currPos;
                             if (input.charCodeAt(peg$currPos) === 46) {
-                                s7 = peg$c22;
+                                s7 = peg$c23;
                                 peg$currPos++;
                             }
                             else {
                                 s7 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$e29);
+                                    peg$fail(peg$e30);
                                 }
                             }
                             if (s7 !== peg$FAILED) {
@@ -57478,7 +57757,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                         if (s3 !== peg$FAILED) {
                             peg$savedPos = s0;
-                            s0 = peg$f21(s3);
+                            s0 = peg$f22(s3);
                         }
                         else {
                             peg$currPos = s0;
@@ -57488,25 +57767,70 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (s0 === peg$FAILED) {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e28);
+                                peg$fail(peg$e29);
                             }
                         }
                         return s0;
                     }
                     function peg$parsepercent() {
-                        var s0, s1, s2, s3;
+                        var s0, s1, s2, s3, s4, s5, s6, s7;
                         peg$silentFails++;
                         s0 = peg$currPos;
                         s1 = peg$currPos;
-                        s2 = [];
-                        s3 = peg$parsed();
+                        s2 = peg$currPos;
+                        s3 = [];
+                        s4 = peg$parsed();
+                        if (s4 !== peg$FAILED) {
+                            while (s4 !== peg$FAILED) {
+                                s3.push(s4);
+                                s4 = peg$parsed();
+                            }
+                        }
+                        else {
+                            s3 = peg$FAILED;
+                        }
                         if (s3 !== peg$FAILED) {
-                            while (s3 !== peg$FAILED) {
-                                s2.push(s3);
-                                s3 = peg$parsed();
+                            s4 = peg$currPos;
+                            if (input.charCodeAt(peg$currPos) === 46) {
+                                s5 = peg$c23;
+                                peg$currPos++;
                             }
+                            else {
+                                s5 = peg$FAILED;
+                                if (peg$silentFails === 0) {
+                                    peg$fail(peg$e30);
+                                }
+                            }
+                            if (s5 !== peg$FAILED) {
+                                s6 = [];
+                                s7 = peg$parsed();
+                                if (s7 !== peg$FAILED) {
+                                    while (s7 !== peg$FAILED) {
+                                        s6.push(s7);
+                                        s7 = peg$parsed();
+                                    }
+                                }
+                                else {
+                                    s6 = peg$FAILED;
+                                }
+                                if (s6 === peg$FAILED) {
+                                    s6 = null;
+                                }
+                                s5 = [s5, s6];
+                                s4 = s5;
+                            }
+                            else {
+                                peg$currPos = s4;
+                                s4 = peg$FAILED;
+                            }
+                            if (s4 === peg$FAILED) {
+                                s4 = null;
+                            }
+                            s3 = [s3, s4];
+                            s2 = s3;
                         }
                         else {
+                            peg$currPos = s2;
                             s2 = peg$FAILED;
                         }
                         if (s2 !== peg$FAILED) {
@@ -57521,18 +57845,18 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 s2 = null;
                             }
                             if (input.charCodeAt(peg$currPos) === 37) {
-                                s3 = peg$c23;
+                                s3 = peg$c24;
                                 peg$currPos++;
                             }
                             else {
                                 s3 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$e31);
+                                    peg$fail(peg$e32);
                                 }
                             }
                             if (s3 !== peg$FAILED) {
                                 peg$savedPos = s0;
-                                s0 = peg$f22(s1);
+                                s0 = peg$f23(s1);
                             }
                             else {
                                 peg$currPos = s0;
@@ -57547,7 +57871,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (s0 === peg$FAILED) {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e30);
+                                peg$fail(peg$e31);
                             }
                         }
                         return s0;
@@ -57597,7 +57921,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (s0 === peg$FAILED) {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e32);
+                                peg$fail(peg$e33);
                             }
                         }
                         return s0;
@@ -57610,13 +57934,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         s2 = peg$parseyear();
                         if (s2 !== peg$FAILED) {
                             if (input.charCodeAt(peg$currPos) === 45) {
-                                s3 = peg$c19;
+                                s3 = peg$c20;
                                 peg$currPos++;
                             }
                             else {
                                 s3 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$e34);
+                                    peg$fail(peg$e35);
                                 }
                             }
                             if (s3 !== peg$FAILED) {
@@ -57656,7 +57980,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (s0 === peg$FAILED) {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e33);
+                                peg$fail(peg$e34);
                             }
                         }
                         return s0;
@@ -57692,7 +58016,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (s0 === peg$FAILED) {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e35);
+                                peg$fail(peg$e36);
                             }
                         }
                         return s0;
@@ -57704,13 +58028,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         s2 = peg$parsemonth();
                         if (s2 !== peg$FAILED) {
                             if (input.charCodeAt(peg$currPos) === 45) {
-                                s3 = peg$c19;
+                                s3 = peg$c20;
                                 peg$currPos++;
                             }
                             else {
                                 s3 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$e34);
+                                    peg$fail(peg$e35);
                                 }
                             }
                             if (s3 !== peg$FAILED) {
@@ -57752,12 +58076,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         else {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e37);
+                                peg$fail(peg$e38);
                             }
                         }
                         if (s1 !== peg$FAILED) {
                             peg$savedPos = peg$currPos;
-                            s2 = peg$f23(s1);
+                            s2 = peg$f24(s1);
                             if (s2) {
                                 s2 = undefined;
                             }
@@ -57781,7 +58105,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (s0 === peg$FAILED) {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e36);
+                                peg$fail(peg$e37);
                             }
                         }
                         return s0;
@@ -57798,7 +58122,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         else {
                             s2 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e39);
+                                peg$fail(peg$e40);
                             }
                         }
                         if (s2 !== peg$FAILED) {
@@ -57811,7 +58135,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 else {
                                     s2 = peg$FAILED;
                                     if (peg$silentFails === 0) {
-                                        peg$fail(peg$e39);
+                                        peg$fail(peg$e40);
                                     }
                                 }
                             }
@@ -57829,7 +58153,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (s0 === peg$FAILED) {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e38);
+                                peg$fail(peg$e39);
                             }
                         }
                         return s0;