@actual-app/api 6.8.1 → 6.9.0

package/dist/app/bundle.api.js

@@ -23720,17 +23720,21 @@
                 /* harmony export */ deleteRule: () => ( /* binding */deleteRule),
                 /* harmony export */ deleteTransaction: () => ( /* binding */deleteTransaction),
                 /* harmony export */ downloadBudget: () => ( /* binding */downloadBudget),
+                /* harmony export */ getAccountBalance: () => ( /* binding */getAccountBalance),
                 /* harmony export */ getAccounts: () => ( /* binding */getAccounts),
                 /* harmony export */ getBudgetMonth: () => ( /* binding */getBudgetMonth),
                 /* harmony export */ getBudgetMonths: () => ( /* binding */getBudgetMonths),
+                /* harmony export */ getBudgets: () => ( /* binding */getBudgets),
                 /* harmony export */ getCategories: () => ( /* binding */getCategories),
                 /* harmony export */ getCategoryGroups: () => ( /* binding */getCategoryGroups),
+                /* harmony export */ getCommonPayees: () => ( /* binding */getCommonPayees),
                 /* harmony export */ getPayeeRules: () => ( /* binding */getPayeeRules),
                 /* harmony export */ getPayees: () => ( /* binding */getPayees),
                 /* harmony export */ getRules: () => ( /* binding */getRules),
                 /* harmony export */ getTransactions: () => ( /* binding */getTransactions),
                 /* harmony export */ importTransactions: () => ( /* binding */importTransactions),
                 /* harmony export */ loadBudget: () => ( /* binding */loadBudget),
+                /* harmony export */ mergePayees: () => ( /* binding */mergePayees),
                 /* harmony export */ q: () => ( /* reexport safe */_app_query__WEBPACK_IMPORTED_MODULE_1__.q),
                 /* harmony export */ reopenAccount: () => ( /* binding */reopenAccount),
                 /* harmony export */ runBankSync: () => ( /* binding */runBankSync),
@@ -23983,6 +23987,20 @@
                 });
                 return _downloadBudget.apply(this, arguments);
             }
+            function getBudgets() {
+                return _getBudgets.apply(this, arguments);
+            }
+            function _getBudgets() {
+                _getBudgets = _async_to_generator(function () {
+                    return _ts_generator(this, function (_state) {
+                        return [
+                            2,
+                            send('api/get-budgets')
+                        ];
+                    });
+                });
+                return _getBudgets.apply(this, arguments);
+            }
             function sync() {
                 return _sync.apply(this, arguments);
             }
@@ -24154,6 +24172,12 @@
                     id: id
                 });
             }
+            function getAccountBalance(id, cutoff) {
+                return send('api/account-balance', {
+                    id: id,
+                    cutoff: cutoff
+                });
+            }
             function getCategoryGroups() {
                 return send('api/category-groups-get');
             }
@@ -24196,6 +24220,9 @@
                     transferCategoryId: transferCategoryId
                 });
             }
+            function getCommonPayees() {
+                return send('api/common-payees-get');
+            }
             function getPayees() {
                 return send('api/payees-get');
             }
@@ -24215,6 +24242,12 @@
                     id: id
                 });
             }
+            function mergePayees(targetId, mergeIds) {
+                return send('api/payees-merge', {
+                    targetId: targetId,
+                    mergeIds: mergeIds
+                });
+            }
             function getRules() {
                 return send('api/rules-get');
             }
@@ -24422,18 +24455,17 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _server_budget_base__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../server/budget/base */ "./packages/loot-core/src/server/budget/base.ts");
             /* harmony import */ var _server_db__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../server/db */ "./packages/loot-core/src/server/db/index.ts");
             /* harmony import */ var _server_mutators__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../server/mutators */ "./packages/loot-core/src/server/mutators.ts");
-            /* harmony import */ var _server_prefs__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../server/prefs */ "./packages/loot-core/src/server/prefs.ts");
-            /* harmony import */ var _server_sheet__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../server/sheet */ "./packages/loot-core/src/server/sheet.ts");
-            /* harmony import */ var _server_sync__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../server/sync */ "./packages/loot-core/src/server/sync/index.ts");
-            /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../shared/months */ "./packages/loot-core/src/shared/months.ts");
-            /* harmony import */ var _shared_query__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../shared/query */ "./packages/loot-core/src/shared/query.ts");
-            /* harmony import */ var _random__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./random */ "./packages/loot-core/src/mocks/random.ts");
+            /* harmony import */ var _server_sheet__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../server/sheet */ "./packages/loot-core/src/server/sheet.ts");
+            /* harmony import */ var _server_sync__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../server/sync */ "./packages/loot-core/src/server/sync/index.ts");
+            /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../shared/months */ "./packages/loot-core/src/shared/months.ts");
+            /* harmony import */ var _shared_query__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../shared/query */ "./packages/loot-core/src/shared/query.ts");
+            /* harmony import */ var _random__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./random */ "./packages/loot-core/src/mocks/random.ts");
             // @ts-strict-ignore
             function pickRandom(list) {
-                return list[Math.floor((0, _random__WEBPACK_IMPORTED_MODULE_11__.random)() * list.length) % list.length];
+                return list[Math.floor((0, _random__WEBPACK_IMPORTED_MODULE_10__.random)() * list.length) % list.length];
             }
             function number(start, end) {
-                return start + (end - start) * (0, _random__WEBPACK_IMPORTED_MODULE_11__.random)();
+                return start + (end - start) * (0, _random__WEBPACK_IMPORTED_MODULE_10__.random)();
             }
             function integer(start, end) {
                 return Math.round(number(start, end));
@@ -24479,7 +24511,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const transactions = [];
                 for (let i = 0; i < numTransactions; i++) {
                     let payee;
-                    if ((0, _random__WEBPACK_IMPORTED_MODULE_11__.random)() < 0.09) {
+                    if ((0, _random__WEBPACK_IMPORTED_MODULE_10__.random)() < 0.09) {
                         payee = incomePayee;
                     }
                     else {
@@ -24497,17 +24529,17 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         amount = integer(50000, 70000);
                     }
                     else {
-                        amount = integer(0, (0, _random__WEBPACK_IMPORTED_MODULE_11__.random)() < 0.05 ? -8000 : -700);
+                        amount = integer(0, (0, _random__WEBPACK_IMPORTED_MODULE_10__.random)() < 0.05 ? -8000 : -700);
                     }
                     const transaction = {
                         amount,
                         payee: payee.id,
                         account: account.id,
-                        date: _shared_months__WEBPACK_IMPORTED_MODULE_9__.subDays(_shared_months__WEBPACK_IMPORTED_MODULE_9__.currentDay(), Math.floor(i / 3)),
+                        date: _shared_months__WEBPACK_IMPORTED_MODULE_8__.subDays(_shared_months__WEBPACK_IMPORTED_MODULE_8__.currentDay(), Math.floor(i / 3)),
                         category: category.id
                     };
                     transactions.push(transaction);
-                    if ((0, _random__WEBPACK_IMPORTED_MODULE_11__.random)() < 0.2) {
+                    if ((0, _random__WEBPACK_IMPORTED_MODULE_10__.random)() < 0.2) {
                         const a = Math.round(transaction.amount / 3);
                         const pick = () => payee === incomePayee ? incomeGroup.categories.find((c) => c.name === 'Income').id : pickRandom(expenseCategories).id;
                         transaction.subtransactions = [
@@ -24526,12 +24558,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         ];
                     }
                 }
-                const earliestMonth = _shared_months__WEBPACK_IMPORTED_MODULE_9__.monthFromDate(transactions[transactions.length - 1].date);
-                const months = _shared_months__WEBPACK_IMPORTED_MODULE_9__.rangeInclusive(earliestMonth, _shared_months__WEBPACK_IMPORTED_MODULE_9__.currentMonth());
-                const currentDay = _shared_months__WEBPACK_IMPORTED_MODULE_9__.currentDay();
+                const earliestMonth = _shared_months__WEBPACK_IMPORTED_MODULE_8__.monthFromDate(transactions[transactions.length - 1].date);
+                const months = _shared_months__WEBPACK_IMPORTED_MODULE_8__.rangeInclusive(earliestMonth, _shared_months__WEBPACK_IMPORTED_MODULE_8__.currentMonth());
+                const currentDay = _shared_months__WEBPACK_IMPORTED_MODULE_8__.currentDay();
                 for (const month of months) {
-                    let date = _shared_months__WEBPACK_IMPORTED_MODULE_9__.addDays(month, 12);
-                    if (_shared_months__WEBPACK_IMPORTED_MODULE_9__.isBefore(date, currentDay)) {
+                    let date = _shared_months__WEBPACK_IMPORTED_MODULE_8__.addDays(month, 12);
+                    if (_shared_months__WEBPACK_IMPORTED_MODULE_8__.isBefore(date, currentDay)) {
                         transactions.push({
                             amount: -10000,
                             payee: billPayees.find((p) => p.name.toLowerCase().includes('power')).id,
@@ -24540,8 +24572,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             category: billCategories.find((c) => c.name === 'Power').id
                         });
                     }
-                    date = _shared_months__WEBPACK_IMPORTED_MODULE_9__.addDays(month, 18);
-                    if (_shared_months__WEBPACK_IMPORTED_MODULE_9__.isBefore(date, currentDay)) {
+                    date = _shared_months__WEBPACK_IMPORTED_MODULE_8__.addDays(month, 18);
+                    if (_shared_months__WEBPACK_IMPORTED_MODULE_8__.isBefore(date, currentDay)) {
                         transactions.push({
                             amount: -9000,
                             payee: billPayees.find((p) => p.name.toLowerCase().includes('water')).id,
@@ -24550,8 +24582,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             category: billCategories.find((c) => c.name === 'Water').id
                         });
                     }
-                    date = _shared_months__WEBPACK_IMPORTED_MODULE_9__.addDays(month, 2);
-                    if (_shared_months__WEBPACK_IMPORTED_MODULE_9__.isBefore(date, currentDay)) {
+                    date = _shared_months__WEBPACK_IMPORTED_MODULE_8__.addDays(month, 2);
+                    if (_shared_months__WEBPACK_IMPORTED_MODULE_8__.isBefore(date, currentDay)) {
                         transactions.push({
                             amount: -120000,
                             payee: billPayees.find((p) => p.name.toLowerCase().includes('housy')).id,
@@ -24560,8 +24592,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             category: billCategories.find((c) => c.name === 'Mortgage').id
                         });
                     }
-                    date = _shared_months__WEBPACK_IMPORTED_MODULE_9__.addDays(month, 20);
-                    if (_shared_months__WEBPACK_IMPORTED_MODULE_9__.isBefore(date, currentDay)) {
+                    date = _shared_months__WEBPACK_IMPORTED_MODULE_8__.addDays(month, 20);
+                    if (_shared_months__WEBPACK_IMPORTED_MODULE_8__.isBefore(date, currentDay)) {
                         transactions.push({
                             amount: -6000,
                             payee: billPayees.find((p) => p.name.toLowerCase().includes('internet')).id,
@@ -24570,8 +24602,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             category: billCategories.find((c) => c.name === 'Internet').id
                         });
                     }
-                    date = _shared_months__WEBPACK_IMPORTED_MODULE_9__.addDays(month, 23);
-                    if (_shared_months__WEBPACK_IMPORTED_MODULE_9__.isBefore(date, currentDay)) {
+                    date = _shared_months__WEBPACK_IMPORTED_MODULE_8__.addDays(month, 23);
+                    if (_shared_months__WEBPACK_IMPORTED_MODULE_8__.isBefore(date, currentDay)) {
                         transactions.push({
                             amount: -7500,
                             payee: billPayees.find((p) => p.name.toLowerCase().includes('t-mobile')).id,
@@ -24603,7 +24635,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const transactions = [];
                 for (let i = 0; i < numTransactions; i++) {
                     let payee;
-                    if ((0, _random__WEBPACK_IMPORTED_MODULE_11__.random)() < 0.04) {
+                    if ((0, _random__WEBPACK_IMPORTED_MODULE_10__.random)() < 0.04) {
                         payee = incomePayee;
                     }
                     else {
@@ -24621,7 +24653,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         amount,
                         payee: payee.id,
                         account: account.id,
-                        date: _shared_months__WEBPACK_IMPORTED_MODULE_9__.subDays(_shared_months__WEBPACK_IMPORTED_MODULE_9__.currentDay(), i * 2),
+                        date: _shared_months__WEBPACK_IMPORTED_MODULE_8__.subDays(_shared_months__WEBPACK_IMPORTED_MODULE_8__.currentDay(), i * 2),
                         category: category.id
                     });
                 }
@@ -24650,7 +24682,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         amount,
                         payee: payee.id,
                         account: account.id,
-                        date: _shared_months__WEBPACK_IMPORTED_MODULE_9__.subDays(_shared_months__WEBPACK_IMPORTED_MODULE_9__.currentDay(), integer(10, 360)),
+                        date: _shared_months__WEBPACK_IMPORTED_MODULE_8__.subDays(_shared_months__WEBPACK_IMPORTED_MODULE_8__.currentDay(), integer(10, 360)),
                         category: category.id
                     });
                 }
@@ -24673,7 +24705,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const transactions = [];
                 for (let i = 0; i < numTransactions; i++) {
                     let payee;
-                    if ((0, _random__WEBPACK_IMPORTED_MODULE_11__.random)() < 0.3) {
+                    if ((0, _random__WEBPACK_IMPORTED_MODULE_10__.random)() < 0.3) {
                         payee = incomePayee;
                     }
                     else {
@@ -24685,7 +24717,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         amount,
                         payee: payee.id,
                         account: account.id,
-                        date: _shared_months__WEBPACK_IMPORTED_MODULE_9__.subDays(_shared_months__WEBPACK_IMPORTED_MODULE_9__.currentDay(), i * 5),
+                        date: _shared_months__WEBPACK_IMPORTED_MODULE_8__.subDays(_shared_months__WEBPACK_IMPORTED_MODULE_8__.currentDay(), i * 5),
                         category: category.id
                     });
                 }
@@ -24712,7 +24744,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         amount: integer(-3000, -3500) * 100 * 100,
                         payee: payees.find((p) => p.name === 'Starting Balance').id,
                         account: account.id,
-                        date: _shared_months__WEBPACK_IMPORTED_MODULE_9__.subMonths(_shared_months__WEBPACK_IMPORTED_MODULE_9__.currentDay(), numTransactions) + '-02',
+                        date: _shared_months__WEBPACK_IMPORTED_MODULE_8__.subMonths(_shared_months__WEBPACK_IMPORTED_MODULE_8__.currentDay(), numTransactions) + '-02',
                         category: getStartingBalanceCat(incomeGroup.categories),
                         starting_balance_flag: true
                     }
@@ -24723,7 +24755,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         amount,
                         payee: payee.id,
                         account: account.id,
-                        date: _shared_months__WEBPACK_IMPORTED_MODULE_9__.subMonths(_shared_months__WEBPACK_IMPORTED_MODULE_9__.currentDay(), i) + '-02',
+                        date: _shared_months__WEBPACK_IMPORTED_MODULE_8__.subMonths(_shared_months__WEBPACK_IMPORTED_MODULE_8__.currentDay(), i) + '-02',
                         category: category.id,
                         starting_balance_flag: true
                     });
@@ -24742,7 +24774,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         amount: integer(3250, 3700) * 100 * 100,
                         payee: payees.find((p) => p.name === 'Starting Balance').id,
                         account: account.id,
-                        date: _shared_months__WEBPACK_IMPORTED_MODULE_9__.subMonths(_shared_months__WEBPACK_IMPORTED_MODULE_9__.currentDay(), numTransactions) + '-02',
+                        date: _shared_months__WEBPACK_IMPORTED_MODULE_8__.subMonths(_shared_months__WEBPACK_IMPORTED_MODULE_8__.currentDay(), numTransactions) + '-02',
                         category: getStartingBalanceCat(incomeGroup.categories),
                         starting_balance_flag: true
                     }
@@ -24754,7 +24786,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         amount,
                         payee: payee.id,
                         account: account.id,
-                        date: _shared_months__WEBPACK_IMPORTED_MODULE_9__.subMonths(_shared_months__WEBPACK_IMPORTED_MODULE_9__.currentDay(), i) + '-02',
+                        date: _shared_months__WEBPACK_IMPORTED_MODULE_8__.subMonths(_shared_months__WEBPACK_IMPORTED_MODULE_8__.currentDay(), i) + '-02',
                         category: category.id
                     });
                 }
@@ -24771,9 +24803,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
        WHERE a.id = ? AND a.offbudget = 0 AND t.is_child = 0 ORDER BY date ASC LIMIT 1`, [
                     primaryAccount.id
                 ])).date;
-                const start = _shared_months__WEBPACK_IMPORTED_MODULE_9__.monthFromDate(_server_db__WEBPACK_IMPORTED_MODULE_4__.fromDateRepr(earliestDate));
-                const end = _shared_months__WEBPACK_IMPORTED_MODULE_9__.currentMonth();
-                const months = _shared_months__WEBPACK_IMPORTED_MODULE_9__.rangeInclusive(start, end);
+                const start = _shared_months__WEBPACK_IMPORTED_MODULE_8__.monthFromDate(_server_db__WEBPACK_IMPORTED_MODULE_4__.fromDateRepr(earliestDate));
+                const end = _shared_months__WEBPACK_IMPORTED_MODULE_8__.currentMonth();
+                const months = _shared_months__WEBPACK_IMPORTED_MODULE_8__.rangeInclusive(start, end);
                 function category(name) {
                     for (const group of groups) {
                         const cat = group.categories.find((c) => c.name === name);
@@ -24790,14 +24822,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     });
                 }
                 function setBudgetIfSpent(month, cat) {
-                    const spent = _server_sheet__WEBPACK_IMPORTED_MODULE_7__.getCellValue(_shared_months__WEBPACK_IMPORTED_MODULE_9__.sheetForMonth(month), `sum-amount-${cat.id}`);
+                    const spent = _server_sheet__WEBPACK_IMPORTED_MODULE_6__.getCellValue(_shared_months__WEBPACK_IMPORTED_MODULE_8__.sheetForMonth(month), `sum-amount-${cat.id}`);
                     if (spent < 0) {
                         setBudget(month, cat, -spent);
                     }
                 }
-                await (0, _server_mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(() => (0, _server_sync__WEBPACK_IMPORTED_MODULE_8__.batchMessages)(async () => {
+                await (0, _server_mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(() => (0, _server_sync__WEBPACK_IMPORTED_MODULE_7__.batchMessages)(async () => {
                     for (const month of months) {
-                        if (month >= _shared_months__WEBPACK_IMPORTED_MODULE_9__.monthFromDate(_server_db__WEBPACK_IMPORTED_MODULE_4__.fromDateRepr(earliestPrimaryDate))) {
+                        if (month >= _shared_months__WEBPACK_IMPORTED_MODULE_8__.monthFromDate(_server_db__WEBPACK_IMPORTED_MODULE_4__.fromDateRepr(earliestPrimaryDate))) {
                             setBudget(month, category('Food'), 40000);
                             setBudget(month, category('Restaurants'), 30000);
                             setBudget(month, category('Entertainment'), 10000);
@@ -24827,13 +24859,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                     }
                 }));
-                await _server_sheet__WEBPACK_IMPORTED_MODULE_7__.waitOnSpreadsheet();
-                await (0, _server_mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(() => (0, _server_sync__WEBPACK_IMPORTED_MODULE_8__.batchMessages)(async () => {
+                await _server_sheet__WEBPACK_IMPORTED_MODULE_6__.waitOnSpreadsheet();
+                await (0, _server_mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(() => (0, _server_sync__WEBPACK_IMPORTED_MODULE_7__.batchMessages)(async () => {
                     let prevSaved = 0;
                     for (const month of months) {
-                        if (month >= _shared_months__WEBPACK_IMPORTED_MODULE_9__.monthFromDate(_server_db__WEBPACK_IMPORTED_MODULE_4__.fromDateRepr(earliestPrimaryDate)) && month <= _shared_months__WEBPACK_IMPORTED_MODULE_9__.currentMonth()) {
-                            const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_9__.sheetForMonth(month);
-                            const toBudget = _server_sheet__WEBPACK_IMPORTED_MODULE_7__.getCellValue(sheetName, 'to-budget');
+                        if (month >= _shared_months__WEBPACK_IMPORTED_MODULE_8__.monthFromDate(_server_db__WEBPACK_IMPORTED_MODULE_4__.fromDateRepr(earliestPrimaryDate)) && month <= _shared_months__WEBPACK_IMPORTED_MODULE_8__.currentMonth()) {
+                            const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_8__.sheetForMonth(month);
+                            const toBudget = _server_sheet__WEBPACK_IMPORTED_MODULE_6__.getCellValue(sheetName, 'to-budget');
                             const available = toBudget - prevSaved;
                             if (available - 403000 > 0) {
                                 setBudget(month, category('Savings'), available - 403000);
@@ -24846,25 +24878,25 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                     }
                 }));
-                await _server_sheet__WEBPACK_IMPORTED_MODULE_7__.waitOnSpreadsheet();
-                const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_9__.sheetForMonth(_shared_months__WEBPACK_IMPORTED_MODULE_9__.currentMonth());
-                const toBudget = _server_sheet__WEBPACK_IMPORTED_MODULE_7__.getCellValue(sheetName, 'to-budget');
+                await _server_sheet__WEBPACK_IMPORTED_MODULE_6__.waitOnSpreadsheet();
+                const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_8__.sheetForMonth(_shared_months__WEBPACK_IMPORTED_MODULE_8__.currentMonth());
+                const toBudget = _server_sheet__WEBPACK_IMPORTED_MODULE_6__.getCellValue(sheetName, 'to-budget');
                 if (toBudget < 0) {
                     await (0, _server_accounts_sync__WEBPACK_IMPORTED_MODULE_0__.addTransactions)(primaryAccount.id, [
                         {
                             amount: -toBudget,
                             category: category('Income').id,
-                            date: _shared_months__WEBPACK_IMPORTED_MODULE_9__.currentMonth() + '-01'
+                            date: _shared_months__WEBPACK_IMPORTED_MODULE_8__.currentMonth() + '-01'
                         }
                     ]);
                 }
                 // let sheetName = monthUtils.sheetForMonth(monthUtils.currentMonth());
                 // let toBudget = sheet.getCellValue(sheetName, 'to-budget');
                 // setBudget(monthUtils.currentMonth(), category('Savings'), toBudget);
-                await _server_sheet__WEBPACK_IMPORTED_MODULE_7__.waitOnSpreadsheet();
+                await _server_sheet__WEBPACK_IMPORTED_MODULE_6__.waitOnSpreadsheet();
             }
             async function createTestBudget(handlers) {
-                (0, _server_sync__WEBPACK_IMPORTED_MODULE_8__.setSyncingMode)('import');
+                (0, _server_sync__WEBPACK_IMPORTED_MODULE_7__.setSyncingMode)('import');
                 await _server_db__WEBPACK_IMPORTED_MODULE_4__.execQuery('PRAGMA journal_mode = OFF');
                 // Clear out the default categories. This is fine to do without
                 // going through the sync system because we are in import mode and
@@ -24949,7 +24981,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         bill: true
                     }
                 ];
-                await (0, _server_mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(() => (0, _server_sync__WEBPACK_IMPORTED_MODULE_8__.batchMessages)(async () => {
+                await (0, _server_mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(() => (0, _server_sync__WEBPACK_IMPORTED_MODULE_7__.batchMessages)(async () => {
                     for (const payee of payees) {
                         payee.id = await handlers['payee-create']({
                             name: payee.name
@@ -25041,8 +25073,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 });
                 const allGroups = (await (0, _server_mutators__WEBPACK_IMPORTED_MODULE_5__.runHandler)(handlers['get-categories'])).grouped;
-                (0, _server_sync__WEBPACK_IMPORTED_MODULE_8__.setSyncingMode)('import');
-                await (0, _server_mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(() => (0, _server_sync__WEBPACK_IMPORTED_MODULE_8__.batchMessages)(async () => {
+                (0, _server_sync__WEBPACK_IMPORTED_MODULE_7__.setSyncingMode)('import');
+                await (0, _server_mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(() => (0, _server_sync__WEBPACK_IMPORTED_MODULE_7__.batchMessages)(async () => {
                     for (const account of accounts) {
                         if (account.name === 'Bank of America') {
                             await fillPrimaryChecking(handlers, account, payees, allGroups);
@@ -25068,19 +25100,19 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                     }
                 }));
-                (0, _server_sync__WEBPACK_IMPORTED_MODULE_8__.setSyncingMode)('import');
+                (0, _server_sync__WEBPACK_IMPORTED_MODULE_7__.setSyncingMode)('import');
                 // This checks to see if the primary account is in the negative.
                 // This might happen depending on the transactions added, but we
                 // don't want to show that as it'd be weird. We modify the latest
                 // deposit transaction to force it to be positive
                 const primaryAccount = accounts.find((a) => a.name = 'Bank of America');
-                const { data: primaryBalance } = await (0, _server_aql__WEBPACK_IMPORTED_MODULE_1__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_10__.q)('transactions').filter({
+                const { data: primaryBalance } = await (0, _server_aql__WEBPACK_IMPORTED_MODULE_1__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_9__.q)('transactions').filter({
                     account: primaryAccount.id
                 }).calculate({
                     $sum: '$amount'
                 }).serialize());
                 if (primaryBalance < 0) {
-                    const { data: results } = await (0, _server_aql__WEBPACK_IMPORTED_MODULE_1__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_10__.q)('transactions').filter({
+                    const { data: results } = await (0, _server_aql__WEBPACK_IMPORTED_MODULE_1__.runQuery)((0, _shared_query__WEBPACK_IMPORTED_MODULE_9__.q)('transactions').filter({
                         account: primaryAccount.id,
                         amount: {
                             $gt: 0
@@ -25096,15 +25128,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     });
                 }
                 // Bust the cache and reload the spreadsheet
-                (0, _server_sync__WEBPACK_IMPORTED_MODULE_8__.setSyncingMode)('disabled');
-                await _server_prefs__WEBPACK_IMPORTED_MODULE_6__.savePrefs({
-                    isCached: false
-                });
-                await _server_sheet__WEBPACK_IMPORTED_MODULE_7__.reloadSpreadsheet(_server_db__WEBPACK_IMPORTED_MODULE_4__);
+                (0, _server_sync__WEBPACK_IMPORTED_MODULE_7__.setSyncingMode)('disabled');
+                await _server_sheet__WEBPACK_IMPORTED_MODULE_6__.reloadSpreadsheet(_server_db__WEBPACK_IMPORTED_MODULE_4__);
                 await _server_budget_base__WEBPACK_IMPORTED_MODULE_3__.createAllBudgets();
-                await _server_sheet__WEBPACK_IMPORTED_MODULE_7__.waitOnSpreadsheet();
+                await _server_sheet__WEBPACK_IMPORTED_MODULE_6__.waitOnSpreadsheet();
                 // Create some schedules
-                await (0, _server_mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(() => (0, _server_sync__WEBPACK_IMPORTED_MODULE_8__.batchMessages)(async () => {
+                await (0, _server_mutators__WEBPACK_IMPORTED_MODULE_5__.runMutator)(() => (0, _server_sync__WEBPACK_IMPORTED_MODULE_7__.batchMessages)(async () => {
                     const account = accounts.find((acc) => acc.name === 'Bank of America');
                     await (0, _server_mutators__WEBPACK_IMPORTED_MODULE_5__.runHandler)(handlers['schedule/create'], {
                         schedule: {
@@ -25126,7 +25155,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 op: 'is',
                                 field: 'date',
                                 value: {
-                                    start: _shared_months__WEBPACK_IMPORTED_MODULE_9__.currentDay(),
+                                    start: _shared_months__WEBPACK_IMPORTED_MODULE_8__.currentDay(),
                                     frequency: 'monthly',
                                     patterns: [],
                                     skipWeekend: false,
@@ -25159,7 +25188,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             {
                                 op: 'is',
                                 field: 'date',
-                                value: _shared_months__WEBPACK_IMPORTED_MODULE_9__.subDays(_shared_months__WEBPACK_IMPORTED_MODULE_9__.currentDay(), 1)
+                                value: _shared_months__WEBPACK_IMPORTED_MODULE_8__.subDays(_shared_months__WEBPACK_IMPORTED_MODULE_8__.currentDay(), 1)
                             },
                             {
                                 op: 'isapprox',
@@ -25178,7 +25207,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 op: 'is',
                                 field: 'date',
                                 value: {
-                                    start: _shared_months__WEBPACK_IMPORTED_MODULE_9__.subDays(_shared_months__WEBPACK_IMPORTED_MODULE_9__.currentDay(), 3),
+                                    start: _shared_months__WEBPACK_IMPORTED_MODULE_8__.subDays(_shared_months__WEBPACK_IMPORTED_MODULE_8__.currentDay(), 3),
                                     frequency: 'monthly',
                                     patterns: [],
                                     skipWeekend: false,
@@ -25207,7 +25236,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 op: 'is',
                                 field: 'date',
                                 value: {
-                                    start: _shared_months__WEBPACK_IMPORTED_MODULE_9__.addDays(_shared_months__WEBPACK_IMPORTED_MODULE_9__.currentDay(), 1),
+                                    start: _shared_months__WEBPACK_IMPORTED_MODULE_8__.addDays(_shared_months__WEBPACK_IMPORTED_MODULE_8__.currentDay(), 1),
                                     frequency: 'monthly',
                                     patterns: [],
                                     skipWeekend: false,
@@ -25661,8 +25690,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             /* harmony import */ var better_sqlite3__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! better-sqlite3 */ "better-sqlite3");
             /* harmony import */ var better_sqlite3__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(better_sqlite3__WEBPACK_IMPORTED_MODULE_0__);
-            /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
+            /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/v4.js");
             /* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../fs */ "./packages/loot-core/src/platform/server/fs/index.electron.ts");
+            /* harmony import */ var _normalise__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./normalise */ "./packages/loot-core/src/platform/server/sqlite/normalise.ts");
+            /* harmony import */ var _unicodeLike__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./unicodeLike */ "./packages/loot-core/src/platform/server/sqlite/unicodeLike.ts");
             // @ts-strict-ignore
             function verifyParamTypes(sql, arr) {
                 arr.forEach((val) => {
@@ -25745,9 +25776,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 }
             }
+            function regexp(regex, text) {
+                return new RegExp(regex).test(text) ? 1 : 0;
+            }
             function openDatabase(pathOrBuffer) {
                 const db = new (better_sqlite3__WEBPACK_IMPORTED_MODULE_0___default())(pathOrBuffer);
-                // Define Unicode-aware LOWER and UPPER implementation.
+                // Define Unicode-aware LOWER, UPPER, and LIKE implementation.
                 // This is necessary because better-sqlite3 uses SQLite build without ICU support.
                 // @ts-expect-error @types/better-sqlite3 does not support setting strict 3rd argument
                 db.function('UNICODE_LOWER', {
@@ -25757,6 +25791,18 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 db.function('UNICODE_UPPER', {
                     deterministic: true
                 }, (arg) => arg?.toUpperCase());
+                // @ts-expect-error @types/better-sqlite3 does not support setting strict 3rd argument
+                db.function('UNICODE_LIKE', {
+                    deterministic: true
+                }, _unicodeLike__WEBPACK_IMPORTED_MODULE_3__.unicodeLike);
+                // @ts-expect-error @types/better-sqlite3 does not support setting strict 3rd argument
+                db.function('REGEXP', {
+                    deterministic: true
+                }, regexp);
+                // @ts-expect-error @types/better-sqlite3 does not support setting strict 3rd argument
+                db.function('NORMALISE', {
+                    deterministic: true
+                }, _normalise__WEBPACK_IMPORTED_MODULE_2__.normalise);
                 return db;
             }
             function closeDatabase(db) {
@@ -25765,7 +25811,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             async function exportDatabase(db) {
                 // electron does not support better-sqlite serialize since v21
                 // save to file and read in the raw data.
-                const name = `backup-for-export-${(0, uuid__WEBPACK_IMPORTED_MODULE_2__["default"])()}.db`;
+                const name = `backup-for-export-${(0, uuid__WEBPACK_IMPORTED_MODULE_4__["default"])()}.db`;
                 await db.backup(name);
                 const data = await (0, _fs__WEBPACK_IMPORTED_MODULE_1__.readFile)(name, 'binary');
                 await (0, _fs__WEBPACK_IMPORTED_MODULE_1__.removeFile)(name);
@@ -25773,6 +25819,63 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             /***/ 
         }),
+        /***/ "./packages/loot-core/src/platform/server/sqlite/normalise.ts": 
+        /*!********************************************************************!*\
+          !*** ./packages/loot-core/src/platform/server/sqlite/normalise.ts ***!
+          \********************************************************************/
+        /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+                /* harmony export */ normalise: () => ( /* binding */normalise)
+                /* harmony export */ 
+            });
+            /* harmony import */ var _shared_normalisation__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../shared/normalisation */ "./packages/loot-core/src/shared/normalisation.ts");
+            function normalise(value) {
+                if (!value) {
+                    return null;
+                }
+                return (0, _shared_normalisation__WEBPACK_IMPORTED_MODULE_0__.getNormalisedString)(value);
+            }
+            /***/ 
+        }),
+        /***/ "./packages/loot-core/src/platform/server/sqlite/unicodeLike.ts": 
+        /*!**********************************************************************!*\
+          !*** ./packages/loot-core/src/platform/server/sqlite/unicodeLike.ts ***!
+          \**********************************************************************/
+        /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+                /* harmony export */ unicodeLike: () => ( /* binding */unicodeLike)
+                /* harmony export */ 
+            });
+            /* harmony import */ var lru_cache__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! lru-cache */ "./node_modules/lru-cache/index.js");
+            /* harmony import */ var lru_cache__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(lru_cache__WEBPACK_IMPORTED_MODULE_0__);
+            // @ts-strict-ignore
+            const likePatternCache = new (lru_cache__WEBPACK_IMPORTED_MODULE_0___default())({
+                max: 500
+            });
+            function unicodeLike(pattern, value) {
+                if (!pattern) {
+                    return 0;
+                }
+                if (!value) {
+                    value = '';
+                }
+                let cachedRegExp = likePatternCache.get(pattern);
+                if (!cachedRegExp) {
+                    // we don't escape ? and % because we don't know
+                    // whether they originate from the user input or from our query compiler.
+                    // Maybe improve the query compiler to correctly process these characters?
+                    const processedPattern = pattern.replace(/[.*+^${}()|[\]\\]/g, '\\$&').replaceAll('?', '.').replaceAll('%', '.*');
+                    cachedRegExp = new RegExp(processedPattern, 'i');
+                    likePatternCache.set(pattern, cachedRegExp);
+                }
+                return cachedRegExp.test(value) ? 1 : 0;
+            }
+            /***/ 
+        }),
         /***/ "./packages/loot-core/src/server/accounts/export-to-csv.ts": 
         /*!*****************************************************************!*\
           !*** ./packages/loot-core/src/server/accounts/export-to-csv.ts ***!
@@ -25837,6 +25940,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     {
                         IsParent: 'is_parent'
                     },
+                    {
+                        IsChild: 'is_child'
+                    },
+                    {
+                        SortOrder: 'sort_order'
+                    },
                     {
                         Notes: 'notes'
                     },
@@ -25855,23 +25964,28 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 ]).options({
                     splits: 'all'
                 }));
-                const parentsPayees = new Map();
+                // initialize a map to allow splits to have correct number of split from
+                const parentsChildCount = new Map();
+                const childSplitOrder = new Map();
+                // find children, their order, and total # siblings
                 for (const trans of transactions) {
-                    if (trans.IsParent) {
-                        parentsPayees.set(trans.Id, trans.Payee);
+                    if (trans.IsChild) {
+                        let childNumber = parentsChildCount.get(trans.ParentId) || 0;
+                        childNumber++;
+                        childSplitOrder.set(trans.Id, childNumber);
+                        parentsChildCount.set(trans.ParentId, childNumber);
                     }
                 }
-                // filter out any parent transactions
-                const noParents = transactions.filter((t) => !t.IsParent);
-                // map final properties for export and grab the payee for splits from their parent transaction
-                const transactionsForExport = noParents.map((trans) => {
+                // map final properties for export and grab the child count for splits from their parent transaction
+                const transactionsForExport = transactions.map((trans) => {
                     return {
                         Account: trans.Account,
                         Date: trans.Date,
-                        Payee: trans.ParentId ? parentsPayees.get(trans.ParentId) : trans.Payee,
-                        Notes: trans.Notes,
+                        Payee: trans.Payee,
+                        Notes: trans.IsParent ? '(SPLIT INTO ' + parentsChildCount.get(trans.Id) + ') ' + (trans.Notes || '') : trans.IsChild ? '(SPLIT ' + childSplitOrder.get(trans.Id) + ' OF ' + parentsChildCount.get(trans.ParentId) + ') ' + (trans.Notes || '') : trans.Notes,
                         Category: trans.Category,
-                        Amount: trans.Amount == null ? 0 : (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.integerToAmount)(trans.Amount),
+                        Amount: trans.IsParent ? 0 : trans.Amount == null ? 0 : (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.integerToAmount)(trans.Amount),
+                        Split_Amount: trans.IsParent ? (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.integerToAmount)(trans.Amount) : 0,
                         Cleared: trans.Reconciled === true ? 'Reconciled' : trans.Cleared === true ? 'Cleared' : 'Not cleared'
                     };
                 });
@@ -26480,6 +26594,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     ops: [
                         'is',
                         'contains',
+                        'matches',
                         'oneOf',
                         'isNot',
                         'doesNotContain',
@@ -26498,6 +26613,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     ops: [
                         'is',
                         'contains',
+                        'matches',
                         'oneOf',
                         'isNot',
                         'doesNotContain',
@@ -26509,7 +26625,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             assert(Array.isArray(value), 'no-empty-array', `oneOf must have an array value (field: ${fieldName}): ${JSON.stringify(value)}`);
                             return value.filter(Boolean).map((val) => val.toLowerCase());
                         }
-                        if (op === 'contains' || op === 'doesNotContain') {
+                        if (op === 'contains' || op === 'matches' || op === 'doesNotContain') {
                             assert(typeof value === 'string' && value.length > 0, 'no-empty-string', `contains must have non-empty string (field: ${fieldName})`);
                         }
                         return value.toLowerCase();
@@ -26750,6 +26866,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         this.field = null;
                         this.type = 'id';
                     }
+                    if (field === 'account') {
+                        assert(value, 'no-null', `Field cannot be empty: ${field}`);
+                    }
                     this.op = op;
                     this.rawValue = value;
                     this.value = value;
@@ -27008,7 +27127,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 lt: 1,
                 lte: 1,
                 contains: 0,
-                doesNotContain: 0
+                doesNotContain: 0,
+                matches: 0
             };
             function computeScore(rule) {
                 const initialScore = rule.conditions.reduce((score, condition) => {
@@ -27186,6 +27306,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
                 /* harmony export */ addTransactions: () => ( /* binding */addTransactions),
                 /* harmony export */ getGoCardlessAccounts: () => ( /* binding */getGoCardlessAccounts),
+                /* harmony export */ matchTransactions: () => ( /* binding */matchTransactions),
                 /* harmony export */ reconcileTransactions: () => ( /* binding */reconcileTransactions),
                 /* harmony export */ syncAccount: () => ( /* binding */syncAccount)
                 /* harmony export */ 
@@ -27298,7 +27419,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     startDate: since
                 }, {
                     'X-ACTUAL-TOKEN': userToken
-                });
+                }, 60000);
                 if (res.error_code) {
                     throw BankSyncError(res.error_type, res.error_code);
                 }
@@ -27388,33 +27509,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (trans.date == null) {
                         throw new Error('`date` is required when adding a transaction');
                     }
-                    let payee_name;
-                    // When the amount is equal to 0, we need to determine
-                    // if this is a "Credited" or "Debited" transaction. This means
-                    // that it matters whether the amount is a positive or negative zero.
-                    if (trans.amount > 0 || Object.is(Number(trans.amount), 0)) {
-                        const nameParts = [];
-                        const name = trans.debtorName || trans.remittanceInformationUnstructured || (trans.remittanceInformationUnstructuredArray || []).join(', ') || trans.additionalInformation;
-                        if (name) {
-                            nameParts.push((0, _title__WEBPACK_IMPORTED_MODULE_10__.title)(name));
-                        }
-                        if (trans.debtorAccount && trans.debtorAccount.iban) {
-                            nameParts.push('(' + trans.debtorAccount.iban.slice(0, 4) + ' XXX ' + trans.debtorAccount.iban.slice(-4) + ')');
-                        }
-                        payee_name = nameParts.join(' ');
-                    }
-                    else {
-                        const nameParts = [];
-                        const name = trans.creditorName || trans.remittanceInformationUnstructured || (trans.remittanceInformationUnstructuredArray || []).join(', ') || trans.additionalInformation;
-                        if (name) {
-                            nameParts.push((0, _title__WEBPACK_IMPORTED_MODULE_10__.title)(name));
-                        }
-                        if (trans.creditorAccount && trans.creditorAccount.iban) {
-                            nameParts.push('(' + trans.creditorAccount.iban.slice(0, 4) + ' XXX ' + trans.creditorAccount.iban.slice(-4) + ')');
-                        }
-                        payee_name = nameParts.join(' ');
+                    if (trans.payeeName == null) {
+                        throw new Error('`payeeName` is required when adding a transaction');
                     }
-                    trans.imported_payee = trans.imported_payee || payee_name;
+                    trans.imported_payee = trans.imported_payee || trans.payeeName;
                     if (trans.imported_payee) {
                         trans.imported_payee = trans.imported_payee.trim();
                     }
@@ -27422,10 +27520,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     // when rules are run, they have the right data. Resolving payees
                     // also simplifies the payee creation process
                     trans.account = acctId;
-                    trans.payee = await resolvePayee(trans, payee_name, payeesToCreate);
+                    trans.payee = await resolvePayee(trans, trans.payeeName, payeesToCreate);
                     trans.cleared = Boolean(trans.booked);
                     normalized.push({
-                        payee_name,
+                        payee_name: trans.payeeName,
                         trans: {
                             amount: (0, _shared_util__WEBPACK_IMPORTED_MODULE_3__.amountToInteger)(trans.amount),
                             payee: trans.payee,
@@ -27454,11 +27552,117 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 });
             }
-            async function reconcileTransactions(acctId, transactions, isBankSyncAccount = false) {
+            async function reconcileTransactions(acctId, transactions, isBankSyncAccount = false, isPreview = false) {
                 console.log('Performing transaction reconciliation');
-                const hasMatched = new Set();
                 const updated = [];
                 const added = [];
+                const updatedPreview = [];
+                const existingPayeeMap = new Map();
+                const { payeesToCreate, transactionsStep1, transactionsStep2, transactionsStep3 } = await matchTransactions(acctId, transactions, isBankSyncAccount);
+                // Finally, generate & commit the changes
+                for (const { trans, subtransactions, match } of transactionsStep3) {
+                    if (match && !trans.forceAddTransaction) {
+                        // Skip updating already reconciled (locked) transactions
+                        if (match.reconciled) {
+                            updatedPreview.push({
+                                transaction: trans,
+                                ignored: true
+                            });
+                            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 = {
+                            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 (!existingPayeeMap.has(existing.payee)) {
+                                const payee = await _db__WEBPACK_IMPORTED_MODULE_4__.getPayee(existing.payee);
+                                existingPayeeMap.set(existing.payee, payee?.name);
+                            }
+                            existing.payee_name = existingPayeeMap.get(existing.payee);
+                            existing.amount = (0, _shared_util__WEBPACK_IMPORTED_MODULE_3__.integerToAmount)(existing.amount);
+                            updatedPreview.push({
+                                transaction: trans,
+                                existing
+                            });
+                        }
+                        else {
+                            updatedPreview.push({
+                                transaction: trans,
+                                ignored: true
+                            });
+                        }
+                        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 { forceAddTransaction, ...newTrans } = trans;
+                        const finalTransaction = {
+                            ...newTrans,
+                            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);
+                        }
+                    }
+                }
+                if (!isPreview) {
+                    await createNewPayees(payeesToCreate, [
+                        ...added,
+                        ...updated
+                    ]);
+                    await (0, _transactions__WEBPACK_IMPORTED_MODULE_12__.batchUpdateTransactions)({
+                        added,
+                        updated
+                    });
+                }
+                console.log('Debug data for the operations:', {
+                    transactionsStep1,
+                    transactionsStep2,
+                    transactionsStep3,
+                    added,
+                    updated,
+                    updatedPreview
+                });
+                return {
+                    added: added.map((trans) => trans.id),
+                    updated: updated.map((trans) => trans.id),
+                    updatedPreview
+                };
+            }
+            async function matchTransactions(acctId, transactions, isBankSyncAccount = false) {
+                console.log('Performing transaction reconciliation matching');
+                const hasMatched = new Set();
                 const transactionNormalization = isBankSyncAccount ? normalizeBankSyncTransactions : normalizeTransactions;
                 const { normalized, payeesToCreate } = await transactionNormalization(transactions, acctId);
                 // The first pass runs the rules, and preps data for fuzzy matching
@@ -27486,15 +27690,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         // 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
-             -- If both ids are set, and we didn't match earlier then skip dedup
-             ( imported_id IS NULL OR ? IS NULL )
-             -- Look 7 days ahead, 7 days behind
-             AND date >= ? AND date <= ? AND amount = ?
-             AND account = ?
-        `, [
-                            trans.imported_id || null,
+                        fuzzyDataset = await _db__WEBPACK_IMPORTED_MODULE_4__.all(`SELECT id, is_parent, date, imported_id, payee, imported_payee, category, notes, reconciled, cleared, amount 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,
@@ -27554,80 +27751,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                     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 = {
-                            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
-                });
-                console.log('Debug data for the operations:', {
+                return {
+                    payeesToCreate,
                     transactionsStep1,
                     transactionsStep2,
-                    transactionsStep3,
-                    added,
-                    updated
-                });
-                return {
-                    added: added.map((trans) => trans.id),
-                    updated: updated.map((trans) => trans.id)
+                    transactionsStep3
                 };
             }
             // This is similar to `reconcileTransactions` except much simpler: it
@@ -28466,6 +28594,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             // Running contains with id will automatically reach into
                             // the `name` of the referenced table and do a string match
                             return apply(type === 'id' ? field + '.name' : field, '$like', '%' + value + '%');
+                        case 'matches':
+                            // Running contains with id will automatically reach into
+                            // the `name` of the referenced table and do a regex match
+                            return apply(type === 'id' ? field + '.name' : field, '$regexp', value);
                         case 'doesNotContain':
                             // Running contains with id will automatically reach into
                             // the `name` of the referenced table and do a string match
@@ -28978,6 +29110,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     date: transaction.date,
                     transfer_id: transaction.id,
                     notes: transaction.notes || null,
+                    schedule: transaction.schedule,
                     cleared: false
                 });
                 await _db__WEBPACK_IMPORTED_MODULE_0__.updateTransaction({
@@ -29035,7 +29168,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     payee: payee.id,
                     date: transaction.date,
                     notes: transaction.notes,
-                    amount: -transaction.amount
+                    amount: -transaction.amount,
+                    schedule: transaction.schedule
                 });
                 const categoryCleared = await clearCategory(transaction, transferredAccount);
                 if (categoryCleared) {
@@ -29126,6 +29260,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return isNaN(number) ? null : number;
             }
             function getDtOrDtTm(Date) {
+                if (!Date) {
+                    return null;
+                }
                 if ('DtTm' in Date) {
                     return Date.DtTm.slice(0, 10);
                 }
@@ -29204,9 +29341,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             __webpack_require__.r(__webpack_exports__);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
                 /* harmony export */ accountModel: () => ( /* binding */accountModel),
+                /* harmony export */ budgetModel: () => ( /* binding */budgetModel),
                 /* harmony export */ categoryGroupModel: () => ( /* binding */categoryGroupModel),
                 /* harmony export */ categoryModel: () => ( /* binding */categoryModel),
-                /* harmony export */ payeeModel: () => ( /* binding */payeeModel)
+                /* harmony export */ payeeModel: () => ( /* binding */payeeModel),
+                /* harmony export */ remoteFileModel: () => ( /* binding */remoteFileModel)
                 /* harmony export */ 
             });
             /* harmony import */ var _models__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./models */ "./packages/loot-core/src/server/models.ts");
@@ -29287,6 +29426,36 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     return payee;
                 }
             };
+            const remoteFileModel = {
+                toExternal(file) {
+                    if (file.deleted) {
+                        return null;
+                    }
+                    return {
+                        cloudFileId: file.fileId,
+                        state: 'remote',
+                        groupId: file.groupId,
+                        name: file.name,
+                        encryptKeyId: file.encryptKeyId,
+                        hasKey: file.hasKey
+                    };
+                },
+                fromExternal(file) {
+                    return {
+                        deleted: false,
+                        fileId: file.cloudFileId,
+                        ...file
+                    };
+                }
+            };
+            const budgetModel = {
+                toExternal(file) {
+                    return file;
+                },
+                fromExternal(file) {
+                    return file;
+                }
+            };
             /***/ 
         }),
         /***/ "./packages/loot-core/src/server/api.ts": 
@@ -29486,6 +29655,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     id: result.id
                 });
             };
+            handlers['api/get-budgets'] = async function () {
+                const budgets = await handlers['get-budgets']();
+                const files = await handlers['get-remote-files']() || [];
+                return [
+                    ...budgets.map((file) => _api_models__WEBPACK_IMPORTED_MODULE_8__.budgetModel.toExternal(file)),
+                    ...files.map((file) => _api_models__WEBPACK_IMPORTED_MODULE_8__.remoteFileModel.toExternal(file)).filter((file) => file)
+                ];
+            };
             handlers['api/sync'] = async function () {
                 const { id } = _prefs__WEBPACK_IMPORTED_MODULE_14__.getPrefs();
                 const result = await handlers['sync-budget']();
@@ -29631,11 +29808,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     payees
                 });
             };
-            handlers['api/transactions-import'] = withMutation(async function ({ accountId, transactions }) {
+            handlers['api/transactions-import'] = withMutation(async function ({ accountId, transactions, isPreview = false }) {
                 checkFileOpen();
                 return handlers['transactions-import']({
                     accountId,
-                    transactions
+                    transactions,
+                    isPreview
                 });
             });
             handlers['api/transactions-add'] = withMutation(async function ({ accountId, transactions, runTransfers = false, learnCategories = false }) {
@@ -29744,6 +29922,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     forced: true
                 });
             });
+            handlers['api/account-balance'] = withMutation(async function ({ id, cutoff = new Date() }) {
+                checkFileOpen();
+                return handlers['account-balance']({
+                    id,
+                    cutoff
+                });
+            });
             handlers['api/categories-get'] = async function ({ grouped } = {}) {
                 checkFileOpen();
                 const result = await handlers['get-categories']();
@@ -29796,6 +29981,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     transferId: transferCategoryId
                 });
             });
+            handlers['api/common-payees-get'] = async function () {
+                checkFileOpen();
+                const payees = await handlers['common-payees-get']();
+                return payees.map(_api_models__WEBPACK_IMPORTED_MODULE_8__.payeeModel.toExternal);
+            };
             handlers['api/payees-get'] = async function () {
                 checkFileOpen();
                 const payees = await handlers['payees-get']();
@@ -29828,6 +30018,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     ]
                 });
             });
+            handlers['api/payees-merge'] = withMutation(async function ({ targetId, mergeIds }) {
+                checkFileOpen();
+                return handlers['payees-merge']({
+                    targetId,
+                    mergeIds
+                });
+            });
             handlers['api/rules-get'] = async function () {
                 checkFileOpen();
                 return handlers['rules-get']();
@@ -29949,6 +30146,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ quoteAlias: () => ( /* binding */quoteAlias)
                 /* harmony export */ 
             });
+            /* harmony import */ var _shared_normalisation__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../shared/normalisation */ "./packages/loot-core/src/shared/normalisation.ts");
             // @ts-strict-ignore
             let _uid = 0;
             function resetUid() {
@@ -30690,7 +30888,18 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 'string',
                                 'string'
                             ]);
-                            return `${left} LIKE ${right}`;
+                            return `UNICODE_LIKE(${(0, _shared_normalisation__WEBPACK_IMPORTED_MODULE_0__.getNormalisedString)(right)}, NORMALISE(${left}))`;
+                        }
+                    case '$regexp':
+                        {
+                            const [left, right] = valArray(state, [
+                                lhs,
+                                rhs
+                            ], [
+                                'string',
+                                'string'
+                            ]);
+                            return `REGEXP(${right}, ${left})`;
                         }
                     case '$notlike':
                         {
@@ -30701,7 +30910,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 'string',
                                 'string'
                             ]);
-                            return `(${left} NOT LIKE ${right}\n OR ${left} IS NULL)`;
+                            return `(NOT UNICODE_LIKE(${(0, _shared_normalisation__WEBPACK_IMPORTED_MODULE_0__.getNormalisedString)(right)}, NORMALISE(${left}))\n OR ${left} IS NULL)`;
                         }
                     default:
                         throw new CompileError(`Unknown operator: ${op}`);
@@ -31636,7 +31845,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     transfer_acct: f('id', {
                         ref: 'accounts'
                     }),
-                    tombstone: f('boolean')
+                    tombstone: f('boolean'),
+                    favorite: f('boolean')
                 },
                 accounts: {
                     id: f('id'),
@@ -31647,6 +31857,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     closed: f('boolean'),
                     sort_order: f('float'),
                     tombstone: f('boolean'),
+                    account_id: f('string'),
+                    official_name: f('string'),
                     account_sync_source: f('string')
                 },
                 categories: {
@@ -31746,6 +31958,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     show_uncategorized: f('integer', {
                         default: 0
                     }),
+                    include_current: f('integer', {
+                        default: 0
+                    }),
                     selected_categories: f('json'),
                     graph_type: f('string', {
                         default: 'BarGraph'
@@ -31765,7 +31980,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     category: f('string'),
                     amount: f('integer'),
                     carryover: f('integer'),
-                    goal: f('integer')
+                    goal: f('integer'),
+                    long_goal: f('integer')
                 },
                 zero_budgets: {
                     id: f('id'),
@@ -31773,7 +31989,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     category: f('string'),
                     amount: f('integer'),
                     carryover: f('integer'),
-                    goal: f('integer')
+                    goal: f('integer'),
+                    long_goal: f('integer')
                 }
             };
             const schemaConfig = {
@@ -32158,7 +32375,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 return backups.map((backup) => ({
                     ...backup,
-                    date: backup.date ? date_fns__WEBPACK_IMPORTED_MODULE_6__["default"](backup.date, 'yyyy-MM-dd h:mm') : null
+                    date: backup.date ? date_fns__WEBPACK_IMPORTED_MODULE_6__["default"](backup.date, 'yyyy-MM-dd H:mm') : null
                 }));
             }
             async function updateBackups(backups) {
@@ -32283,6 +32500,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony export */ __webpack_require__.d(__webpack_exports__, {
                 /* harmony export */ copyPreviousMonth: () => ( /* binding */copyPreviousMonth),
                 /* harmony export */ copySinglePreviousMonth: () => ( /* binding */copySinglePreviousMonth),
+                /* harmony export */ coverOverbudgeted: () => ( /* binding */coverOverbudgeted),
                 /* harmony export */ coverOverspending: () => ( /* binding */coverOverspending),
                 /* harmony export */ getBudget: () => ( /* binding */getBudget),
                 /* harmony export */ getSheetValue: () => ( /* binding */getSheetValue),
@@ -32378,7 +32596,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     amount
                 });
             }
-            function setGoal({ month, category, goal }) {
+            function setGoal({ month, category, goal, long_goal }) {
                 const table = getBudgetTable();
                 const existing = _db__WEBPACK_IMPORTED_MODULE_2__.firstSync(`SELECT id FROM ${table} WHERE month = ? AND category = ?`, [
                     dbMonth(month),
@@ -32387,14 +32605,16 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if (existing) {
                     return _db__WEBPACK_IMPORTED_MODULE_2__.update(table, {
                         id: existing.id,
-                        goal
+                        goal,
+                        long_goal
                     });
                 }
                 return _db__WEBPACK_IMPORTED_MODULE_2__.insert(table, {
                     id: `${dbMonth(month)}-${category}`,
                     month: dbMonth(month),
                     category,
-                    goal
+                    goal,
+                    long_goal
                 });
             }
             function setBuffer(month, amount) {
@@ -32487,16 +32707,22 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         const spent1 = await getSheetValue(_shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(prevMonth1), 'sum-amount-' + cat.id);
                         const spent2 = await getSheetValue(_shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(prevMonth2), 'sum-amount-' + cat.id);
                         const spent3 = await getSheetValue(_shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(prevMonth3), 'sum-amount-' + cat.id);
-                        const avg = Math.round((spent1 + spent2 + spent3) / 3);
+                        let avg = Math.round((spent1 + spent2 + spent3) / 3);
+                        if (cat.is_income === 0) {
+                            avg *= -1;
+                        }
                         setBudget({
                             category: cat.id,
                             month,
-                            amount: -avg
+                            amount: avg
                         });
                     }
                 });
             }
             async function setNMonthAvg({ month, N, category }) {
+                const categoryFromDb = await _db__WEBPACK_IMPORTED_MODULE_2__.first('SELECT is_income FROM v_categories WHERE id = ?', [
+                    category
+                ]);
                 let prevMonth = _shared_months__WEBPACK_IMPORTED_MODULE_0__.prevMonth(month);
                 let sumAmount = 0;
                 for (let l = 0; l < N; l++) {
@@ -32504,11 +32730,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     prevMonth = _shared_months__WEBPACK_IMPORTED_MODULE_0__.prevMonth(prevMonth);
                 }
                 await (0, _sync__WEBPACK_IMPORTED_MODULE_5__.batchMessages)(async () => {
-                    const avg = Math.round(sumAmount / N);
+                    let avg = Math.round(sumAmount / N);
+                    if (categoryFromDb.is_income === 0) {
+                        avg *= -1;
+                    }
                     setBudget({
                         category,
                         month,
-                        amount: -avg
+                        amount: avg
                     });
                 });
             }
@@ -32563,6 +32792,16 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     amount: budgeted + amount
                 });
             }
+            async function coverOverbudgeted({ month, category }) {
+                const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(month);
+                const toBudget = await getSheetValue(sheetName, 'to-budget');
+                const categoryBudget = await getSheetValue(sheetName, 'budget-' + category);
+                await setBudget({
+                    category,
+                    month,
+                    amount: categoryBudget + toBudget
+                });
+            }
             async function transferCategory({ month, amount, from, to }) {
                 const sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(month);
                 const fromBudgeted = await getSheetValue(sheetName, 'budget-' + from);
@@ -32626,6 +32865,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             app.method('budget/reset-hold', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.resetHold)));
             app.method('budget/cover-overspending', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.coverOverspending)));
             app.method('budget/transfer-available', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.transferAvailable)));
+            app.method('budget/cover-overbudgeted', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.coverOverbudgeted)));
             app.method('budget/transfer-category', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.transferCategory)));
             app.method('budget/set-carryover', (0, _mutators__WEBPACK_IMPORTED_MODULE_1__.mutator)((0, _undo__WEBPACK_IMPORTED_MODULE_2__.undoable)(_actions__WEBPACK_IMPORTED_MODULE_3__.setCategoryCarryover)));
             /***/ 
@@ -32879,6 +33119,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     _sheet__WEBPACK_IMPORTED_MODULE_3__.get().set(`${sheetName}!budget-${budget.category}`, budget.amount || 0);
                     _sheet__WEBPACK_IMPORTED_MODULE_3__.get().set(`${sheetName}!carryover-${budget.category}`, budget.carryover === 1 ? true : false);
                     _sheet__WEBPACK_IMPORTED_MODULE_3__.get().set(`${sheetName}!goal-${budget.category}`, budget.goal);
+                    _sheet__WEBPACK_IMPORTED_MODULE_3__.get().set(`${sheetName}!long-goal-${budget.category}`, budget.long_goal);
                 }
             }
             function triggerBudgetChanges(oldValues, newValues) {
@@ -33188,7 +33429,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 await (0, _actions__WEBPACK_IMPORTED_MODULE_2__.setGoal)({
                                     category: category.id,
                                     month,
-                                    goal: budgeted - balance
+                                    goal: budgeted - balance,
+                                    long_goal: 0
                                 });
                                 num_sources += 1;
                             }
@@ -33914,35 +34156,34 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* 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
+            const TEMPLATE_PREFIX = '#template';
+            const GOAL_PREFIX = '#goal';
             async function applyTemplate({ month }) {
                 await storeTemplates();
-                const category_templates = await getTemplates(null);
-                await resetCategoryTargets({
-                    month,
-                    category: null
-                });
-                return processTemplate(month, false, category_templates);
+                const category_templates = await getTemplates(null, 'template');
+                const category_goals = await getTemplates(null, 'goal');
+                const ret = await processTemplate(month, false, category_templates);
+                await processGoals(category_goals, month);
+                return ret;
             }
             async function overwriteTemplate({ month }) {
                 await storeTemplates();
-                const category_templates = await getTemplates(null);
-                await resetCategoryTargets({
-                    month,
-                    category: null
-                });
-                return processTemplate(month, true, category_templates);
+                const category_templates = await getTemplates(null, 'template');
+                const category_goals = await getTemplates(null, 'goal');
+                const ret = await processTemplate(month, true, category_templates);
+                await processGoals(category_goals, month);
+                return ret;
             }
             async function applySingleCategoryTemplate({ month, category }) {
                 const categories = await _db__WEBPACK_IMPORTED_MODULE_2__.all(`SELECT * FROM v_categories WHERE id = ?`, [
                     category
                 ]);
                 await storeTemplates();
-                const category_templates = await getTemplates(categories[0]);
-                await resetCategoryTargets({
-                    month,
-                    category: categories
-                });
-                return processTemplate(month, true, category_templates);
+                const category_templates = await getTemplates(categories[0], 'template');
+                const category_goals = await getTemplates(categories[0], 'goal');
+                const ret = await processTemplate(month, true, category_templates, categories[0]);
+                await processGoals(category_goals, month, categories[0]);
+                return ret;
             }
             function runCheckTemplates() {
                 return checkTemplates();
@@ -33986,13 +34227,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         (0, _actions__WEBPACK_IMPORTED_MODULE_4__.setGoal)({
                             category: element.category,
                             goal: element.amount,
-                            month
+                            month,
+                            long_goal: 0
                         });
                     });
                 });
             }
-            async function resetCategoryTargets({ month, category }) {
-                let categories;
+            async function resetCategoryTargets(month, category) {
+                let categories = [];
                 if (category === null) {
                     categories = await getCategories();
                 }
@@ -34000,13 +34242,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     categories = category;
                 }
                 await (0, _sync__WEBPACK_IMPORTED_MODULE_3__.batchMessages)(async () => {
-                    categories.forEach((element) => {
+                    for (let i = 0; i < categories.length; i++) {
                         (0, _actions__WEBPACK_IMPORTED_MODULE_4__.setGoal)({
-                            category: element.id,
+                            category: categories[i].id,
                             goal: null,
-                            month
+                            month,
+                            long_goal: null
                         });
-                    });
+                    }
                 });
             }
             async function storeTemplates() {
@@ -34029,7 +34272,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 }
             }
-            async function getTemplates(category) {
+            async function getTemplates(category, directive) {
                 //retrieves template definitions from the database
                 const goal_def = await _db__WEBPACK_IMPORTED_MODULE_2__.all('SELECT * FROM categories WHERE goal_def IS NOT NULL');
                 const templates = [];
@@ -34037,24 +34280,41 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     templates[goal_def[ll].id] = JSON.parse(goal_def[ll].goal_def);
                 }
                 if (category) {
-                    const singleCategoryTemplate = {};
+                    const singleCategoryTemplate = [];
                     if (templates[category.id] !== undefined) {
-                        singleCategoryTemplate[category.id] = templates[category.id];
+                        singleCategoryTemplate[category.id] = templates[category.id].filter((t) => t.directive === directive);
+                        return singleCategoryTemplate;
                     }
+                    singleCategoryTemplate[category.id] = undefined;
                     return singleCategoryTemplate;
                 }
                 else {
-                    return templates;
+                    const categories = await getCategories();
+                    const ret = [];
+                    for (let cc = 0; cc < categories.length; cc++) {
+                        const id = categories[cc].id;
+                        if (templates[id]) {
+                            ret[id] = templates[id];
+                            ret[id] = ret[id].filter((t) => t.directive === directive);
+                        }
+                    }
+                    return ret;
                 }
             }
-            async function processTemplate(month, force, category_templates) {
+            async function processTemplate(month, force, category_templates, category) {
                 let num_applied = 0;
                 let errors = [];
                 const idealTemplate = [];
                 const setToZero = [];
                 let priority_list = [];
-                const categories = await getCategories();
+                let categories = [];
                 const categories_remove = [];
+                if (category) {
+                    categories[0] = category;
+                }
+                else {
+                    categories = await getCategories();
+                }
                 //clears templated categories
                 for (let c = 0; c < categories.length; c++) {
                     const category = categories[c];
@@ -34075,13 +34335,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             categories_remove.push(c);
                         }
                         else {
-                            // if we are overwritting add this category to list to zero
-                            setToZero.push({
-                                category: category.id,
-                                amount: 0,
-                                isIncome: category.is_income,
-                                isTemplate: template ? true : false
-                            });
+                            // add all categories with a template to the list to unset budget
+                            if (template?.length > 0) {
+                                setToZero.push({
+                                    category: category.id
+                                });
+                            }
                         }
                     }
                 }
@@ -34091,11 +34350,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 for (let i = categories_remove.length - 1; i >= 0; i--) {
                     categories.splice(categories_remove[i], 1);
                 }
-                // zero out the categories that need it
+                // zero out budget and goal from categories that need it
                 await setGoalBudget({
                     month,
-                    templateBudget: setToZero.filter((f) => f.isTemplate === true)
+                    templateBudget: setToZero
                 });
+                await resetCategoryTargets(month, categories);
                 // sort and filter down to just the requested priorities
                 priority_list = priority_list.sort(function (a, b) {
                     return a - b;
@@ -34225,10 +34485,34 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 }
             }
-            const TEMPLATE_PREFIX = '#template';
+            async function processGoals(goals, month, category) {
+                let categories = [];
+                if (category) {
+                    categories[0] = category;
+                }
+                else {
+                    categories = await getCategories();
+                }
+                for (let c = 0; c < categories.length; c++) {
+                    const cat_id = categories[c].id;
+                    const goal_lines = goals[cat_id];
+                    if (goal_lines?.length > 0) {
+                        await (0, _actions__WEBPACK_IMPORTED_MODULE_4__.setGoal)({
+                            month,
+                            category: cat_id,
+                            goal: (0, _shared_util__WEBPACK_IMPORTED_MODULE_1__.amountToInteger)(goal_lines[0].amount),
+                            long_goal: 1
+                        });
+                    }
+                }
+            }
             async function getCategoryTemplates(category) {
                 const templates = {};
-                let notes = await _db__WEBPACK_IMPORTED_MODULE_2__.all(`SELECT * FROM notes WHERE lower(note) like '%${TEMPLATE_PREFIX}%'`);
+                let notes = await _db__WEBPACK_IMPORTED_MODULE_2__.all(`
+    SELECT * FROM notes 
+    WHERE lower(note) like '%${TEMPLATE_PREFIX}%' 
+    OR lower(note) like '%${GOAL_PREFIX}%'
+     `);
                 if (category)
                     notes = notes.filter((n) => n.id === category.id);
                 for (let n = 0; n < notes.length; n++) {
@@ -34236,11 +34520,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     const template_lines = [];
                     for (let l = 0; l < lines.length; l++) {
                         const line = lines[l].trim();
-                        if (!line.toLowerCase().startsWith(TEMPLATE_PREFIX))
+                        if (!line.toLowerCase().startsWith(TEMPLATE_PREFIX) && !line.toLowerCase().startsWith(GOAL_PREFIX)) {
                             continue;
-                        const expression = line.slice(TEMPLATE_PREFIX.length);
+                        }
                         try {
-                            const parsed = (0, _goal_template_pegjs__WEBPACK_IMPORTED_MODULE_5__.parse)(expression);
+                            const parsed = (0, _goal_template_pegjs__WEBPACK_IMPORTED_MODULE_5__.parse)(line);
                             template_lines.push(parsed);
                         }
                         catch (e) {
@@ -35192,6 +35476,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ getAccounts: () => ( /* binding */getAccounts),
                 /* harmony export */ getCategories: () => ( /* binding */getCategories),
                 /* harmony export */ getCategoriesGrouped: () => ( /* binding */getCategoriesGrouped),
+                /* harmony export */ getCommonPayees: () => ( /* binding */getCommonPayees),
                 /* harmony export */ getDatabase: () => ( /* binding */getDatabase),
                 /* harmony export */ getDatabasePath: () => ( /* binding */getDatabasePath),
                 /* harmony export */ getOrphanedPayees: () => ( /* binding */getOrphanedPayees),
@@ -35214,7 +35499,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ moveCategory: () => ( /* binding */moveCategory),
                 /* harmony export */ moveCategoryGroup: () => ( /* binding */moveCategoryGroup),
                 /* harmony export */ openDatabase: () => ( /* binding */openDatabase),
-                /* harmony export */ reopenDatabase: () => ( /* binding */reopenDatabase),
                 /* harmony export */ run: () => ( /* binding */run),
                 /* harmony export */ runQuery: () => ( /* binding */runQuery),
                 /* harmony export */ select: () => ( /* binding */select),
@@ -35246,8 +35530,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             /* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../sync */ "./packages/loot-core/src/server/sync/index.ts");
             /* harmony import */ var _sort__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./sort */ "./packages/loot-core/src/server/db/sort.ts");
             // @ts-strict-ignore
-            let dbPath;
-            let db;
+            let dbPath = null;
+            let db = null;
             // Util
             function getDatabasePath() {
                 return dbPath;
@@ -35260,10 +35544,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 setDatabase(await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_3__.openDatabase(dbPath));
                 // await execQuery('PRAGMA journal_mode = WAL');
             }
-            async function reopenDatabase() {
-                await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_3__.closeDatabase(db);
-                setDatabase(await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_3__.openDatabase(dbPath));
-            }
             async function closeDatabase() {
                 if (db) {
                     await _platform_server_sqlite__WEBPACK_IMPORTED_MODULE_3__.closeDatabase(db);
@@ -35666,7 +35946,25 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
     SELECT p.*, COALESCE(a.name, p.name) AS name FROM payees p
     LEFT JOIN accounts a ON (p.transfer_acct = a.id AND a.tombstone = 0)
     WHERE p.tombstone = 0 AND (p.transfer_acct IS NULL OR a.id IS NOT NULL)
-    ORDER BY p.transfer_acct IS NULL DESC, p.name COLLATE NOCASE
+    ORDER BY p.transfer_acct IS NULL DESC, p.name COLLATE NOCASE, a.offbudget, a.sort_order
+  `);
+            }
+            function getCommonPayees() {
+                const threeMonthsAgo = '20240201';
+                const limit = 10;
+                return all(`
+    SELECT 	p.id as id, p.name as name, p.favorite as favorite, 
+      p.category as category, TRUE as common, NULL as transfer_acct,
+    count(*) as c, 
+    max(t.date) as latest
+    FROM payees p
+    LEFT JOIN v_transactions t on t.payee == p.id
+    WHERE LENGTH(p.name) > 0
+    GROUP BY p.id
+    HAVING latest > ${threeMonthsAgo}
+    ORDER BY c DESC ,p.transfer_acct IS NULL DESC, p.name 
+    COLLATE NOCASE
+    LIMIT ${limit}
   `);
             }
             function syncGetOrphanedPayees() {
@@ -37318,8 +37616,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         deleted,
                         learnCategories
                     });
-                    // Return all data updates to the frontend
-                    return result.updated;
+                    return result;
                 });
             });
             handlers['transaction-add'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(async function (transaction) {
@@ -37619,6 +37916,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     });
                 });
             });
+            handlers['common-payees-get'] = async function () {
+                return _db__WEBPACK_IMPORTED_MODULE_27__.getCommonPayees();
+            };
             handlers['payees-get'] = async function () {
                 return _db__WEBPACK_IMPORTED_MODULE_27__.getPayees();
             };
@@ -37737,6 +38037,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             handlers['accounts-get'] = async function () {
                 return _db__WEBPACK_IMPORTED_MODULE_27__.getAccounts();
             };
+            handlers['account-balance'] = async function ({ id, cutoff }) {
+                const { balance } = await _db__WEBPACK_IMPORTED_MODULE_27__.first('SELECT sum(amount) as balance FROM transactions WHERE acct = ? AND isParent = 0 AND tombstone = 0 AND date <= ?', [
+                    id,
+                    _db__WEBPACK_IMPORTED_MODULE_27__.toDateRepr((0, _shared_months__WEBPACK_IMPORTED_MODULE_11__.dayFromDate)(cutoff))
+                ]);
+                return balance ? balance : 0;
+            };
             handlers['account-properties'] = async function ({ id }) {
                 const { balance } = await _db__WEBPACK_IMPORTED_MODULE_27__.first('SELECT sum(amount) as balance FROM transactions WHERE acct = ? AND isParent = 0 AND tombstone = 0', [
                     id
@@ -37795,7 +38102,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const institution = {
                     name: externalAccount.institution ?? 'Unknown'
                 };
-                const bank = await _accounts_link__WEBPACK_IMPORTED_MODULE_15__.findOrCreateBank(institution, externalAccount.orgDomain);
+                const bank = await _accounts_link__WEBPACK_IMPORTED_MODULE_15__.findOrCreateBank(institution, externalAccount.orgDomain ?? externalAccount.orgId);
                 if (upgradingId) {
                     const accRow = await _db__WEBPACK_IMPORTED_MODULE_27__.first('SELECT * FROM accounts WHERE id = ?', [
                         upgradingId
@@ -38077,9 +38384,16 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         error: 'unauthorized'
                     };
                 }
-                return (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().SIMPLEFIN_SERVER + '/accounts', {}, {
-                    'X-ACTUAL-TOKEN': userToken
-                });
+                try {
+                    return await (0, _post__WEBPACK_IMPORTED_MODULE_37__.post)((0, _server_config__WEBPACK_IMPORTED_MODULE_42__.getServer)().SIMPLEFIN_SERVER + '/accounts', {}, {
+                        'X-ACTUAL-TOKEN': userToken
+                    }, 60000);
+                }
+                catch (error) {
+                    return {
+                        error_code: 'TIMED_OUT'
+                    };
+                }
             };
             handlers['gocardless-get-banks'] = async function (country) {
                 const userToken = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('user-token');
@@ -38129,7 +38443,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 ]);
                 const accounts = await _db__WEBPACK_IMPORTED_MODULE_27__.runQuery(`SELECT a.*, b.bank_id as bankId FROM accounts a
          LEFT JOIN banks b ON a.bank = b.id
-         WHERE a.tombstone = 0 AND a.closed = 0 ${id ? 'AND a.id = ?' : ''}`, id ? [
+         WHERE a.tombstone = 0 AND a.closed = 0 ${id ? 'AND a.id = ?' : ''}
+         ORDER BY a.offbudget, a.sort_order`, id ? [
                     id
                 ] : [], true);
                 const errors = [];
@@ -38142,7 +38457,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         try {
                             console.group('Bank Sync operation for account:', acct.name);
                             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);
                             matchedTransactions = matchedTransactions.concat(updated);
@@ -38163,7 +38477,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             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`
+                                    message: err.reason ? err.reason : `Account “${acct.name}” is not linked properly. Please link it again.`
                                 });
                             }
                             else {
@@ -38176,6 +38490,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 (0, _platform_exceptions__WEBPACK_IMPORTED_MODULE_4__.captureException)(err);
                             }
                         }
+                        finally {
+                            console.groupEnd();
+                        }
                     }
                 }
                 if (updatedAccounts.length > 0) {
@@ -38193,13 +38510,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     updatedAccounts
                 };
             };
-            handlers['transactions-import'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(function ({ accountId, transactions }) {
+            handlers['transactions-import'] = (0, _mutators__WEBPACK_IMPORTED_MODULE_34__.mutator)(function ({ accountId, transactions, isPreview }) {
                 return (0, _undo__WEBPACK_IMPORTED_MODULE_48__.withUndo)(async () => {
                     if (typeof accountId !== 'string') {
                         throw (0, _errors__WEBPACK_IMPORTED_MODULE_30__.APIError)('transactions-import: accountId must be an id');
                     }
                     try {
-                        return await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.reconcileTransactions(accountId, transactions);
+                        return await _accounts_sync__WEBPACK_IMPORTED_MODULE_18__.reconcileTransactions(accountId, transactions, false, isPreview);
                     }
                     catch (err) {
                         if (err instanceof _errors__WEBPACK_IMPORTED_MODULE_30__.TransactionError) {
@@ -38210,7 +38527,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                     }
                                 ],
                                 added: [],
-                                updated: []
+                                updated: [],
+                                updatedPreview: []
                             };
                         }
                         throw err;
@@ -38272,13 +38590,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if ('maxMonths' in prefs) {
                     await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('max-months', '' + prefs.maxMonths);
                 }
-                if ('autoUpdate' in prefs) {
-                    await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('auto-update', '' + prefs.autoUpdate);
-                    process.parentPort.postMessage({
-                        type: 'shouldAutoUpdate',
-                        flag: prefs.autoUpdate
-                    });
-                }
                 if ('documentDir' in prefs) {
                     if (await _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.exists(prefs.documentDir)) {
                         await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.setItem('document-dir', prefs.documentDir);
@@ -38293,10 +38604,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return 'ok';
             };
             handlers['load-global-prefs'] = async function () {
-                const [[, floatingSidebar], [, maxMonths], [, autoUpdate], [, documentDir], [, encryptKey], [, theme]] = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.multiGet([
+                const [[, floatingSidebar], [, maxMonths], [, documentDir], [, encryptKey], [, theme]] = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.multiGet([
                     'floating-sidebar',
                     'max-months',
-                    'auto-update',
                     'document-dir',
                     'encrypt-key',
                     'theme'
@@ -38304,7 +38614,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return {
                     floatingSidebar: floatingSidebar === 'true' ? true : false,
                     maxMonths: (0, _shared_util__WEBPACK_IMPORTED_MODULE_13__.stringToInteger)(maxMonths || ''),
-                    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 : 'auto'
@@ -39131,13 +39440,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 (0, _server_config__WEBPACK_IMPORTED_MODULE_42__.setServer)(url);
                 _platform_server_connection__WEBPACK_IMPORTED_MODULE_6__.init(socketName, _main_app__WEBPACK_IMPORTED_MODULE_33__.app.handlers);
-                if (!isDev && !_platform__WEBPACK_IMPORTED_MODULE_36__.isMobile && !_platform__WEBPACK_IMPORTED_MODULE_36__.isWeb) {
-                    const autoUpdate = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_5__.getItem('auto-update');
-                    process.parentPort.postMessage({
-                        type: 'shouldAutoUpdate',
-                        flag: autoUpdate == null || autoUpdate === 'true'
-                    });
-                }
                 // Allow running DB queries locally
                 global.$query = _aql__WEBPACK_IMPORTED_MODULE_22__.runQuery;
                 global.$q = _shared_query__WEBPACK_IMPORTED_MODULE_12__.q;
@@ -39646,18 +39948,23 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     throw new _errors__WEBPACK_IMPORTED_MODULE_1__.PostError(text);
                 }
             }
-            async function post(url, data, headers = {}) {
+            async function post(url, data, headers = {}, timeout = null) {
                 let text;
                 let res;
                 try {
+                    const controller = new AbortController();
+                    const timeoutId = setTimeout(() => controller.abort(), timeout);
+                    const signal = timeout ? controller.signal : null;
                     res = await (0, _platform_server_fetch__WEBPACK_IMPORTED_MODULE_0__.fetch)(url, {
                         method: 'POST',
                         body: JSON.stringify(data),
+                        signal,
                         headers: {
                             ...headers,
                             'Content-Type': 'application/json'
                         }
                     });
+                    clearTimeout(timeoutId);
                     text = await res.text();
                 }
                 catch (err) {
@@ -39856,11 +40163,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         showOffBudget: row.show_offbudget === 1,
                         showHiddenCategories: row.show_hidden === 1,
                         showUncategorized: row.show_uncategorized === 1,
+                        includeCurrentInterval: row.include_current === 1,
                         selectedCategories: row.selected_categories,
                         graphType: row.graph_type,
                         conditions: row.conditions,
-                        conditionsOp: row.conditions_op,
-                        data: row.metadata
+                        conditionsOp: row.conditions_op
                     };
                 },
                 fromJS(report) {
@@ -39879,11 +40186,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         show_offbudget: report.showOffBudget ? 1 : 0,
                         show_hidden: report.showHiddenCategories ? 1 : 0,
                         show_uncategorized: report.showUncategorized ? 1 : 0,
+                        include_current: report.includeCurrentInterval ? 1 : 0,
                         selected_categories: report.selectedCategories,
                         graph_type: report.graphType,
                         conditions: report.conditions,
-                        conditions_op: report.conditionsOp,
-                        metadata: report.data
+                        conditions_op: report.conditionsOp
                     };
                 }
             };
@@ -39935,7 +40242,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if (nameExists) {
                     throw new Error('There is already a filter named ' + item.name);
                 }
-                await _db__WEBPACK_IMPORTED_MODULE_1__.insertWithSchema('custom_reports', reportModel.fromJS(item));
+                await _db__WEBPACK_IMPORTED_MODULE_1__.updateWithSchema('custom_reports', reportModel.fromJS(item));
             }
             async function deleteReport(id) {
                 await _db__WEBPACK_IMPORTED_MODULE_1__.delete_('custom_reports', id);
@@ -39983,8 +40290,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             throw e;
                         }
                         return null;
-                    }).filter((res) => typeof res === 'string');
-                    return result.length ? result : null;
+                    });
+                    return result.filter((res) => typeof res === 'string').length ? result : null;
                 }
                 const conditionErrors = runValidation(rule.conditions, (cond) => new _accounts_rules__WEBPACK_IMPORTED_MODULE_1__.Condition(cond.op, cond.field, cond.value, cond.options, _shared_rules__WEBPACK_IMPORTED_MODULE_0__.FIELD_TYPES));
                 const actionErrors = runValidation(rule.actions, (action) => action.op === 'set-split-amount' ? new _accounts_rules__WEBPACK_IMPORTED_MODULE_1__.Action(action.op, null, action.value, action.options, _shared_rules__WEBPACK_IMPORTED_MODULE_0__.FIELD_TYPES) : action.op === 'link-schedule' ? new _accounts_rules__WEBPACK_IMPORTED_MODULE_1__.Action(action.op, null, action.value, null, _shared_rules__WEBPACK_IMPORTED_MODULE_0__.FIELD_TYPES) : new _accounts_rules__WEBPACK_IMPORTED_MODULE_1__.Action(action.op, action.field, action.value, action.options, _shared_rules__WEBPACK_IMPORTED_MODULE_0__.FIELD_TYPES));
@@ -41139,6 +41446,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         sheet.set(`${sheetName}!budget-${budget.category}`, budget.amount);
                         sheet.set(`${sheetName}!carryover-${budget.category}`, budget.carryover === 1 ? true : false);
                         sheet.set(`${sheetName}!goal-${budget.category}`, budget.goal);
+                        sheet.set(`${sheetName}!long-goal-${budget.category}`, budget.long_goal);
                     }
                 }
                 // For zero-based budgets, load the buffered amounts
@@ -41216,6 +41524,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ Graph: () => ( /* binding */Graph)
                 /* harmony export */ 
             });
+            /* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../prefs */ "./packages/loot-core/src/server/prefs.ts");
             // @ts-strict-ignore
             function Graph() {
                 const graph = {
@@ -41286,27 +41595,84 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                     return graph;
                 }
-                function topologicalSortUntil(name, visited, sorted) {
+                function topologicalSort(sourceNodes) {
+                    const visited = new Set();
+                    const sorted = [];
+                    const prefs = (0, _prefs__WEBPACK_IMPORTED_MODULE_0__.getPrefs)();
+                    const iterableTopologicalSort = prefs != null ? prefs['flags.iterableTopologicalSort'] : false;
+                    sourceNodes.forEach((name) => {
+                        if (!visited.has(name)) {
+                            if (iterableTopologicalSort) {
+                                topologicalSortIterable(name, visited, sorted);
+                            }
+                            else {
+                                topologicalSortUntil(name, visited, sorted, 0);
+                            }
+                        }
+                    });
+                    return sorted;
+                }
+                function topologicalSortUntil(name, visited, sorted, level) {
                     visited.add(name);
+                    if (level > 2500) {
+                        console.error('Limit of recursions reached while sorting budget: 2500');
+                        return;
+                    }
                     const iter = adjacent(name).values();
                     let cur = iter.next();
                     while (!cur.done) {
                         if (!visited.has(cur.value)) {
-                            topologicalSortUntil(cur.value, visited, sorted);
+                            topologicalSortUntil(cur.value, visited, sorted, level + 1);
                         }
                         cur = iter.next();
                     }
                     sorted.unshift(name);
                 }
-                function topologicalSort(sourceNodes) {
-                    const visited = new Set();
-                    const sorted = [];
-                    sourceNodes.forEach((name) => {
-                        if (!visited.has(name)) {
-                            topologicalSortUntil(name, visited, sorted);
+                function topologicalSortIterable(name, visited, sorted) {
+                    const stackTrace = [];
+                    stackTrace.push({
+                        count: -1,
+                        value: name,
+                        parent: '',
+                        level: 0
+                    });
+                    while (stackTrace.length > 0) {
+                        const current = stackTrace.slice(-1)[0];
+                        const adjacents = adjacent(current.value);
+                        if (current.count === -1) {
+                            current.count = adjacents.size;
+                        }
+                        if (current.count > 0) {
+                            const iter = adjacents.values();
+                            let cur = iter.next();
+                            while (!cur.done) {
+                                if (!visited.has(cur.value)) {
+                                    stackTrace.push({
+                                        count: -1,
+                                        parent: current.value,
+                                        value: cur.value,
+                                        level: current.level + 1
+                                    });
+                                }
+                                else {
+                                    current.count--;
+                                }
+                                cur = iter.next();
+                            }
                         }
-                    });
-                    return sorted;
+                        else {
+                            if (!visited.has(current.value)) {
+                                visited.add(current.value);
+                                sorted.unshift(current.value);
+                            }
+                            const removed = stackTrace.pop();
+                            for (let i = 0; i < stackTrace.length; i++) {
+                                if (stackTrace[i].value === removed.parent) {
+                                    stackTrace[i].count--;
+                                }
+                            }
+                        }
+                    }
                 }
                 function generateDOT() {
                     const edgeStrings = [];
@@ -41316,9 +41682,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                     });
                     return `
-      digraph G {
-       ${edgeStrings.join('\n').replace(/!/g, '_')}
-      }
+    digraph G {
+      ${edgeStrings.join('\n').replace(/!/g, '_')}
+    }
     `;
                 }
                 return graph;
@@ -43749,7 +44115,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             function _yearRange(start, end, inclusive = false) {
                 const years = [];
                 let year = yearFromDate(start);
-                while (date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](_parse(year), _parse(end))) {
+                const endYear = yearFromDate(end);
+                while (date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](_parse(year), _parse(endYear))) {
                     years.push(year);
                     year = addYears(year, 1);
                 }
@@ -43780,7 +44147,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             function _range(start, end, inclusive = false) {
                 const months = [];
                 let month = monthFromDate(start);
-                while (date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](_parse(month), _parse(end))) {
+                const endMonth = monthFromDate(end);
+                while (date_fns__WEBPACK_IMPORTED_MODULE_14__["default"](_parse(month), _parse(endMonth))) {
                     months.push(month);
                     month = addMonths(month, 1);
                 }
@@ -43879,6 +44247,22 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             });
             /***/ 
         }),
+        /***/ "./packages/loot-core/src/shared/normalisation.ts": 
+        /*!********************************************************!*\
+          !*** ./packages/loot-core/src/shared/normalisation.ts ***!
+          \********************************************************/
+        /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+            "use strict";
+            __webpack_require__.r(__webpack_exports__);
+            /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+                /* harmony export */ getNormalisedString: () => ( /* binding */getNormalisedString)
+                /* harmony export */ 
+            });
+            function getNormalisedString(value) {
+                return value.toLowerCase().normalize('NFD').replace(/\p{Diacritic}/gu, '');
+            }
+            /***/ 
+        }),
         /***/ "./packages/loot-core/src/shared/query.ts": 
         /*!************************************************!*\
           !*** ./packages/loot-core/src/shared/query.ts ***!
@@ -44087,6 +44471,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     ops: [
                         'is',
                         'contains',
+                        'matches',
                         'oneOf',
                         'isNot',
                         'doesNotContain',
@@ -44102,6 +44487,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     ops: [
                         'is',
                         'contains',
+                        'matches',
                         'oneOf',
                         'isNot',
                         'doesNotContain',
@@ -44144,7 +44530,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }));
             const ALLOCATION_METHODS = {
                 'fixed-amount': 'a fixed amount',
-                'fixed-percent': 'a fixed percent',
+                'fixed-percent': 'a fixed percent of the remainder',
                 remainder: 'an equal portion of the remainder'
             };
             function mapField(field, opts) {
@@ -44184,6 +44570,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         return 'is between';
                     case 'contains':
                         return 'contains';
+                    case 'matches':
+                        return 'matches';
                     case 'doesNotContain':
                         return 'does not contain';
                     case 'gt':
@@ -44442,7 +44830,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         $and: {
                             schedule: schedule.id,
                             date: {
-                                $gte: dateCond && dateCond.op === 'is' ? schedule.next_date : _months__WEBPACK_IMPORTED_MODULE_0__.subDays(schedule.next_date, 7)
+                                $gte: dateCond && dateCond.op === 'is' ? schedule.next_date : _months__WEBPACK_IMPORTED_MODULE_0__.subDays(schedule.next_date, 2)
                             }
                         }
                     };
@@ -44686,6 +45074,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ groupTransaction: () => ( /* binding */groupTransaction),
                 /* harmony export */ isPreviewId: () => ( /* binding */isPreviewId),
                 /* harmony export */ isTemporaryId: () => ( /* binding */isTemporaryId),
+                /* harmony export */ makeAsNonChildTransactions: () => ( /* binding */makeAsNonChildTransactions),
                 /* harmony export */ makeChild: () => ( /* binding */makeChild),
                 /* harmony export */ realizeTempTransactions: () => ( /* binding */realizeTempTransactions),
                 /* harmony export */ recalculateSplit: () => ( /* binding */recalculateSplit),
@@ -44733,6 +45122,18 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     error: null
                 };
             }
+            function makeNonChild(parent, data) {
+                return {
+                    amount: 0,
+                    ...data,
+                    cleared: parent.cleared != null ? parent.cleared : null,
+                    reconciled: parent.reconciled != null ? parent.reconciled : null,
+                    sort_order: parent.sort_order || null,
+                    starting_balance_flag: null,
+                    is_child: false,
+                    parent_id: null
+                };
+            }
             function recalculateSplit(trans) {
                 // Calculate the new total of split transactions and make sure
                 // that it equals the parent amount
@@ -44882,7 +45283,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 return replaceTransactions(transactions, transaction.id, (trans) => {
                     if (trans.is_parent) {
                         const parent = trans.id === transaction.id ? transaction : trans;
-                        const sub = trans.subtransactions?.map((t) => {
+                        const originalSubtransactions = parent.subtransactions ?? trans.subtransactions;
+                        const sub = originalSubtransactions?.map((t) => {
                             // Make sure to update the children to reflect the updated
                             // properties (if the parent updated)
                             let child = t;
@@ -44968,6 +45370,35 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }))
                 ];
             }
+            function makeAsNonChildTransactions(childTransactionsToUpdate, transactions) {
+                const [parentTransaction, ...childTransactions] = transactions;
+                const newNonChildTransactions = childTransactionsToUpdate.map((t) => makeNonChild(parentTransaction, t));
+                const remainingChildTransactions = childTransactions.filter((t) => !newNonChildTransactions.some((updatedTrans) => updatedTrans.id === t.id));
+                const nonChildTransactionsToUpdate = remainingChildTransactions.length === 1 ? [
+                    ...newNonChildTransactions,
+                    makeNonChild(parentTransaction, remainingChildTransactions[0])
+                ] : newNonChildTransactions;
+                const deleteParentTransaction = remainingChildTransactions.length <= 1;
+                const updatedParentTransaction = {
+                    ...parentTransaction,
+                    ...!deleteParentTransaction ? {
+                        amount: remainingChildTransactions.map((t) => t.amount).reduce((total, amount) => total + amount, 0)
+                    } : {}
+                };
+                return {
+                    updated: [
+                        ...!deleteParentTransaction ? [
+                            updatedParentTransaction
+                        ] : [],
+                        ...nonChildTransactionsToUpdate
+                    ],
+                    deleted: [
+                        ...deleteParentTransaction ? [
+                            updatedParentTransaction
+                        ] : []
+                    ]
+                };
+            }
             /***/ 
         }),
         /***/ "./packages/loot-core/src/shared/util.ts": 
@@ -45202,13 +45633,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 },
                 {
                     value: 'space-comma',
-                    label: '1 000,33',
-                    labelNoFraction: '1 000'
+                    label: '1\xa0000,33',
+                    labelNoFraction: '1\xa0000'
                 },
                 {
-                    value: 'space-dot',
-                    label: '1 000.33',
-                    labelNoFraction: '1 000'
+                    value: 'apostrophe-dot',
+                    label: '1’000.33',
+                    labelNoFraction: '1’000'
                 },
                 {
                     value: 'comma-dot-in',
@@ -45237,8 +45668,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         regex = /[^-0-9,]/g;
                         separator = ',';
                         break;
-                    case 'space-dot':
-                        locale = 'dje';
+                    case 'apostrophe-dot':
+                        locale = 'de-CH';
                         regex = /[^-0-9,.]/g;
                         separator = '.';
                         separatorRegex = /[,.]/g;
@@ -45295,6 +45726,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             function amountToCurrencyNoDecimal(n) {
                 return getNumberFormat({
+                    ...numberFormatConfig,
                     hideFraction: true
                 }).formatter.format(n);
             }
@@ -51088,9 +51520,11 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     var peg$c19 = "full";
                     var peg$c20 = "-";
                     var peg$c21 = "remainder";
-                    var peg$c22 = " ";
-                    var peg$c23 = ".";
-                    var peg$c24 = "%";
+                    var peg$c22 = "#template";
+                    var peg$c23 = "#goal";
+                    var peg$c24 = " ";
+                    var peg$c25 = ".";
+                    var peg$c26 = "%";
                     var peg$r0 = /^[0-9]/;
                     var peg$r1 = /^[1-9]/;
                     var peg$r2 = /^[^\r\n\t]/;
@@ -51117,58 +51551,62 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     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) {
+                    var peg$e23 = peg$literalExpectation("#template", false);
+                    var peg$e24 = peg$literalExpectation("#goal", false);
+                    var peg$e25 = peg$otherExpectation("space");
+                    var peg$e26 = peg$literalExpectation(" ", false);
+                    var peg$e27 = peg$otherExpectation("digit");
+                    var peg$e28 = peg$classExpectation([["0", "9"]], false, false);
+                    var peg$e29 = peg$otherExpectation("number");
+                    var peg$e30 = peg$classExpectation([["1", "9"]], false, false);
+                    var peg$e31 = peg$otherExpectation("amount");
+                    var peg$e32 = peg$literalExpectation(".", false);
+                    var peg$e33 = peg$otherExpectation("percentage");
+                    var peg$e34 = peg$literalExpectation("%", false);
+                    var peg$e35 = peg$otherExpectation("year");
+                    var peg$e36 = peg$otherExpectation("month");
+                    var peg$e37 = peg$literalExpectation("-", false);
+                    var peg$e38 = peg$otherExpectation("day");
+                    var peg$e39 = peg$otherExpectation("currency symbol");
+                    var peg$e40 = peg$anyExpectation();
+                    var peg$e41 = peg$otherExpectation("Name");
+                    var peg$e42 = peg$classExpectation(["\r", "\n", "\t"], true, false);
+                    var peg$f0 = function (template, percentOf, category) { return { type: 'percentage', percent: +percentOf.percent, previous: percentOf.prev, category, priority: template.priority, directive: template.directive }; };
+                    var peg$f1 = function (template, amount, weeks, starting, limit) { return { type: 'week', amount, weeks, starting, limit, priority: template.priority, directive: template.directive }; };
+                    var peg$f2 = function (template, amount, month, from, repeat) {
                         return {
                             type: from ? 'spend' : 'by',
                             amount,
                             month,
                             ...(repeat ? repeat[3] : {}),
                             from,
-                            priority: +priority
+                            priority: template.priority, directive: template.directive
                         };
                     };
-                    var peg$f3 = function (priority, monthly, limit) { return { type: 'simple', monthly, limit, priority: +priority }; };
-                    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 (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$f3 = function (template, monthly, limit) { return { type: 'simple', monthly, limit, priority: template.priority, directive: template.directive }; };
+                    var peg$f4 = function (template, limit) { return { type: 'simple', limit, priority: template.priority, directive: template.directive }; };
+                    var peg$f5 = function (template, full, name) { return { type: 'schedule', name, priority: template.priority, directive: template.directive, full }; };
+                    var peg$f6 = function (template, remainder, limit) { return { type: 'remainder', priority: null, directive: template.directive, weight: remainder, limit }; };
+                    var peg$f7 = function (template, amount) { return { type: 'average', amount: +amount, priority: template.priority, directive: template.directive }; };
+                    var peg$f8 = function (goal, amount) { return { type: 'simple', amount: amount, priority: null, directive: 'goal' }; };
+                    var peg$f9 = function () { return { annual: false }; };
+                    var peg$f10 = function (months) { return { annual: false, repeat: +months }; };
+                    var peg$f11 = function () { return { annual: true }; };
+                    var peg$f12 = function (years) { return { annual: true, repeat: +years }; };
+                    var peg$f13 = function (amount) { return { amount: amount, hold: true }; };
+                    var peg$f14 = function (amount) { return { amount: amount, hold: false }; };
+                    var peg$f15 = function (percent) { return { percent: percent, prev: true }; };
+                    var peg$f16 = function (percent) { return { percent: percent, prev: false }; };
+                    var peg$f17 = function () { return null; };
+                    var peg$f18 = function (n) { return +n; };
+                    var peg$f19 = function (month) { return month; };
+                    var peg$f20 = function () { return true; };
+                    var peg$f21 = function (number) { return number; };
+                    var peg$f22 = function (weight) { return +weight || 1; };
+                    var peg$f23 = function (priority) { return { priority: +priority, directive: 'template' }; };
+                    var peg$f24 = function (amount) { return +amount; };
+                    var peg$f25 = function (percent) { return +percent; };
+                    var peg$f26 = function (symbol) { return /\p{Sc}/u.test(symbol); };
                     var peg$currPos = 0;
                     var peg$savedPos = 0;
                     var peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -51296,20 +51734,26 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     function peg$parseexpr() {
                         var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13;
                         s0 = peg$currPos;
-                        s1 = peg$parsepriority();
-                        if (s1 === peg$FAILED) {
-                            s1 = null;
-                        }
-                        s2 = peg$parse_();
-                        if (s2 === peg$FAILED) {
-                            s2 = null;
-                        }
-                        s3 = peg$parsepercentOf();
-                        if (s3 !== peg$FAILED) {
-                            s4 = peg$parsename();
-                            if (s4 !== peg$FAILED) {
-                                peg$savedPos = s0;
-                                s0 = peg$f0(s1, s3, s4);
+                        s1 = peg$parsetemplate();
+                        if (s1 !== peg$FAILED) {
+                            s2 = peg$parse_();
+                            if (s2 !== peg$FAILED) {
+                                s3 = peg$parsepercentOf();
+                                if (s3 !== peg$FAILED) {
+                                    s4 = peg$parsename();
+                                    if (s4 !== peg$FAILED) {
+                                        peg$savedPos = s0;
+                                        s0 = peg$f0(s1, s3, s4);
+                                    }
+                                    else {
+                                        peg$currPos = s0;
+                                        s0 = peg$FAILED;
+                                    }
+                                }
+                                else {
+                                    peg$currPos = s0;
+                                    s0 = peg$FAILED;
+                                }
                             }
                             else {
                                 peg$currPos = s0;
@@ -51322,38 +51766,44 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                         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;
-                            }
-                            s3 = peg$parseamount();
-                            if (s3 !== peg$FAILED) {
-                                s4 = peg$parse_();
-                                if (s4 !== peg$FAILED) {
-                                    s5 = peg$parserepeatEvery();
-                                    if (s5 !== peg$FAILED) {
-                                        s6 = peg$parse_();
-                                        if (s6 !== peg$FAILED) {
-                                            s7 = peg$parseweekCount();
-                                            if (s7 !== peg$FAILED) {
-                                                s8 = peg$parse_();
-                                                if (s8 !== peg$FAILED) {
-                                                    s9 = peg$parsestarting();
-                                                    if (s9 !== peg$FAILED) {
-                                                        s10 = peg$parse_();
-                                                        if (s10 !== peg$FAILED) {
-                                                            s11 = peg$parsedate();
-                                                            if (s11 !== peg$FAILED) {
-                                                                s12 = peg$parselimit();
-                                                                if (s12 === peg$FAILED) {
-                                                                    s12 = null;
+                            s1 = peg$parsetemplate();
+                            if (s1 !== peg$FAILED) {
+                                s2 = peg$parse_();
+                                if (s2 !== peg$FAILED) {
+                                    s3 = peg$parseamount();
+                                    if (s3 !== peg$FAILED) {
+                                        s4 = peg$parse_();
+                                        if (s4 !== peg$FAILED) {
+                                            s5 = peg$parserepeatEvery();
+                                            if (s5 !== peg$FAILED) {
+                                                s6 = peg$parse_();
+                                                if (s6 !== peg$FAILED) {
+                                                    s7 = peg$parseweekCount();
+                                                    if (s7 !== peg$FAILED) {
+                                                        s8 = peg$parse_();
+                                                        if (s8 !== peg$FAILED) {
+                                                            s9 = peg$parsestarting();
+                                                            if (s9 !== peg$FAILED) {
+                                                                s10 = peg$parse_();
+                                                                if (s10 !== peg$FAILED) {
+                                                                    s11 = peg$parsedate();
+                                                                    if (s11 !== peg$FAILED) {
+                                                                        s12 = peg$parselimit();
+                                                                        if (s12 === peg$FAILED) {
+                                                                            s12 = null;
+                                                                        }
+                                                                        peg$savedPos = s0;
+                                                                        s0 = peg$f1(s1, s3, s7, s11, s12);
+                                                                    }
+                                                                    else {
+                                                                        peg$currPos = s0;
+                                                                        s0 = peg$FAILED;
+                                                                    }
+                                                                }
+                                                                else {
+                                                                    peg$currPos = s0;
+                                                                    s0 = peg$FAILED;
                                                                 }
-                                                                peg$savedPos = s0;
-                                                                s0 = peg$f1(s1, s3, s7, s11, s12);
                                                             }
                                                             else {
                                                                 peg$currPos = s0;
@@ -51401,39 +51851,45 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             }
                             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;
-                                }
-                                s3 = peg$parseamount();
-                                if (s3 !== peg$FAILED) {
-                                    s4 = peg$parse_();
-                                    if (s4 !== peg$FAILED) {
-                                        s5 = peg$parseby();
-                                        if (s5 !== peg$FAILED) {
-                                            s6 = peg$parse_();
-                                            if (s6 !== peg$FAILED) {
-                                                s7 = peg$parsemonth();
-                                                if (s7 !== peg$FAILED) {
-                                                    s8 = peg$parsespendFrom();
-                                                    if (s8 === peg$FAILED) {
-                                                        s8 = null;
-                                                    }
-                                                    s9 = peg$currPos;
-                                                    s10 = peg$parse_();
-                                                    if (s10 !== peg$FAILED) {
-                                                        s11 = peg$parserepeatEvery();
-                                                        if (s11 !== peg$FAILED) {
-                                                            s12 = peg$parse_();
-                                                            if (s12 !== peg$FAILED) {
-                                                                s13 = peg$parserepeat();
-                                                                if (s13 !== peg$FAILED) {
-                                                                    s10 = [s10, s11, s12, s13];
-                                                                    s9 = s10;
+                                s1 = peg$parsetemplate();
+                                if (s1 !== peg$FAILED) {
+                                    s2 = peg$parse_();
+                                    if (s2 !== peg$FAILED) {
+                                        s3 = peg$parseamount();
+                                        if (s3 !== peg$FAILED) {
+                                            s4 = peg$parse_();
+                                            if (s4 !== peg$FAILED) {
+                                                s5 = peg$parseby();
+                                                if (s5 !== peg$FAILED) {
+                                                    s6 = peg$parse_();
+                                                    if (s6 !== peg$FAILED) {
+                                                        s7 = peg$parsemonth();
+                                                        if (s7 !== peg$FAILED) {
+                                                            s8 = peg$parsespendFrom();
+                                                            if (s8 === peg$FAILED) {
+                                                                s8 = null;
+                                                            }
+                                                            s9 = peg$currPos;
+                                                            s10 = peg$parse_();
+                                                            if (s10 !== peg$FAILED) {
+                                                                s11 = peg$parserepeatEvery();
+                                                                if (s11 !== peg$FAILED) {
+                                                                    s12 = peg$parse_();
+                                                                    if (s12 !== peg$FAILED) {
+                                                                        s13 = peg$parserepeat();
+                                                                        if (s13 !== peg$FAILED) {
+                                                                            s10 = [s10, s11, s12, s13];
+                                                                            s9 = s10;
+                                                                        }
+                                                                        else {
+                                                                            peg$currPos = s9;
+                                                                            s9 = peg$FAILED;
+                                                                        }
+                                                                    }
+                                                                    else {
+                                                                        peg$currPos = s9;
+                                                                        s9 = peg$FAILED;
+                                                                    }
                                                                 }
                                                                 else {
                                                                     peg$currPos = s9;
@@ -51444,21 +51900,21 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                                                 peg$currPos = s9;
                                                                 s9 = peg$FAILED;
                                                             }
+                                                            if (s9 === peg$FAILED) {
+                                                                s9 = null;
+                                                            }
+                                                            peg$savedPos = s0;
+                                                            s0 = peg$f2(s1, s3, s7, s8, s9);
                                                         }
                                                         else {
-                                                            peg$currPos = s9;
-                                                            s9 = peg$FAILED;
+                                                            peg$currPos = s0;
+                                                            s0 = peg$FAILED;
                                                         }
                                                     }
                                                     else {
-                                                        peg$currPos = s9;
-                                                        s9 = peg$FAILED;
-                                                    }
-                                                    if (s9 === peg$FAILED) {
-                                                        s9 = null;
+                                                        peg$currPos = s0;
+                                                        s0 = peg$FAILED;
                                                     }
-                                                    peg$savedPos = s0;
-                                                    s0 = peg$f2(s1, s3, s7, s8, s9);
                                                 }
                                                 else {
                                                     peg$currPos = s0;
@@ -51486,22 +51942,28 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 }
                                 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;
-                                    }
-                                    s3 = peg$parseamount();
-                                    if (s3 !== peg$FAILED) {
-                                        s4 = peg$parselimit();
-                                        if (s4 === peg$FAILED) {
-                                            s4 = null;
+                                    s1 = peg$parsetemplate();
+                                    if (s1 !== peg$FAILED) {
+                                        s2 = peg$parse_();
+                                        if (s2 !== peg$FAILED) {
+                                            s3 = peg$parseamount();
+                                            if (s3 !== peg$FAILED) {
+                                                s4 = peg$parselimit();
+                                                if (s4 === peg$FAILED) {
+                                                    s4 = null;
+                                                }
+                                                peg$savedPos = s0;
+                                                s0 = peg$f3(s1, s3, s4);
+                                            }
+                                            else {
+                                                peg$currPos = s0;
+                                                s0 = peg$FAILED;
+                                            }
+                                        }
+                                        else {
+                                            peg$currPos = s0;
+                                            s0 = peg$FAILED;
                                         }
-                                        peg$savedPos = s0;
-                                        s0 = peg$f3(s1, s3, s4);
                                     }
                                     else {
                                         peg$currPos = s0;
@@ -51509,18 +51971,24 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                     }
                                     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;
-                                        }
-                                        s3 = peg$parselimit();
-                                        if (s3 !== peg$FAILED) {
-                                            peg$savedPos = s0;
-                                            s0 = peg$f4(s1, s3);
+                                        s1 = peg$parsetemplate();
+                                        if (s1 !== peg$FAILED) {
+                                            s2 = peg$parse_();
+                                            if (s2 !== peg$FAILED) {
+                                                s3 = peg$parselimit();
+                                                if (s3 !== peg$FAILED) {
+                                                    peg$savedPos = s0;
+                                                    s0 = peg$f4(s1, s3);
+                                                }
+                                                else {
+                                                    peg$currPos = s0;
+                                                    s0 = peg$FAILED;
+                                                }
+                                            }
+                                            else {
+                                                peg$currPos = s0;
+                                                s0 = peg$FAILED;
+                                            }
                                         }
                                         else {
                                             peg$currPos = s0;
@@ -51528,26 +51996,32 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                         }
                                         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;
-                                            }
-                                            s3 = peg$parseschedule();
-                                            if (s3 !== peg$FAILED) {
-                                                s4 = peg$parse_();
-                                                if (s4 !== peg$FAILED) {
-                                                    s5 = peg$parsefull();
-                                                    if (s5 === peg$FAILED) {
-                                                        s5 = null;
-                                                    }
-                                                    s6 = peg$parsename();
-                                                    if (s6 !== peg$FAILED) {
-                                                        peg$savedPos = s0;
-                                                        s0 = peg$f5(s1, s5, s6);
+                                            s1 = peg$parsetemplate();
+                                            if (s1 !== peg$FAILED) {
+                                                s2 = peg$parse_();
+                                                if (s2 !== peg$FAILED) {
+                                                    s3 = peg$parseschedule();
+                                                    if (s3 !== peg$FAILED) {
+                                                        s4 = peg$parse_();
+                                                        if (s4 !== peg$FAILED) {
+                                                            s5 = peg$parsefull();
+                                                            if (s5 === peg$FAILED) {
+                                                                s5 = null;
+                                                            }
+                                                            s6 = peg$parsename();
+                                                            if (s6 !== peg$FAILED) {
+                                                                peg$savedPos = s0;
+                                                                s0 = peg$f5(s1, s5, s6);
+                                                            }
+                                                            else {
+                                                                peg$currPos = s0;
+                                                                s0 = peg$FAILED;
+                                                            }
+                                                        }
+                                                        else {
+                                                            peg$currPos = s0;
+                                                            s0 = peg$FAILED;
+                                                        }
                                                     }
                                                     else {
                                                         peg$currPos = s0;
@@ -51565,18 +52039,28 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                             }
                                             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;
-                                                }
-                                                s3 = peg$parseremainder();
-                                                if (s3 !== peg$FAILED) {
-                                                    peg$savedPos = s0;
-                                                    s0 = peg$f6(s1, s3);
+                                                s1 = peg$parsetemplate();
+                                                if (s1 !== peg$FAILED) {
+                                                    s2 = peg$parse_();
+                                                    if (s2 !== peg$FAILED) {
+                                                        s3 = peg$parseremainder();
+                                                        if (s3 !== peg$FAILED) {
+                                                            s4 = peg$parselimit();
+                                                            if (s4 === peg$FAILED) {
+                                                                s4 = null;
+                                                            }
+                                                            peg$savedPos = s0;
+                                                            s0 = peg$f6(s1, s3, s4);
+                                                        }
+                                                        else {
+                                                            peg$currPos = s0;
+                                                            s0 = peg$FAILED;
+                                                        }
+                                                    }
+                                                    else {
+                                                        peg$currPos = s0;
+                                                        s0 = peg$FAILED;
+                                                    }
                                                 }
                                                 else {
                                                     peg$currPos = s0;
@@ -51584,46 +52068,52 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                                 }
                                                 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);
+                                                    s1 = peg$parsetemplate();
+                                                    if (s1 !== peg$FAILED) {
+                                                        s2 = peg$parse_();
+                                                        if (s2 !== peg$FAILED) {
+                                                            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;
                                                                         }
                                                                     }
-                                                                    if (s7 === peg$FAILED) {
-                                                                        s7 = null;
+                                                                    else {
+                                                                        peg$currPos = s0;
+                                                                        s0 = peg$FAILED;
                                                                     }
-                                                                    peg$savedPos = s0;
-                                                                    s0 = peg$f7(s1, s5);
                                                                 }
                                                                 else {
                                                                     peg$currPos = s0;
@@ -51644,6 +52134,25 @@ 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$parsegoal();
+                                                        if (s1 !== peg$FAILED) {
+                                                            s2 = peg$parseamount();
+                                                            if (s2 !== peg$FAILED) {
+                                                                peg$savedPos = s0;
+                                                                s0 = peg$f8(s1, s2);
+                                                            }
+                                                            else {
+                                                                peg$currPos = s0;
+                                                                s0 = peg$FAILED;
+                                                            }
+                                                        }
+                                                        else {
+                                                            peg$currPos = s0;
+                                                            s0 = peg$FAILED;
+                                                        }
+                                                    }
                                                 }
                                             }
                                         }
@@ -51669,7 +52178,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                         if (s1 !== peg$FAILED) {
                             peg$savedPos = s0;
-                            s1 = peg$f8();
+                            s1 = peg$f9();
                         }
                         s0 = s1;
                         if (s0 === peg$FAILED) {
@@ -51690,7 +52199,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                     }
                                     if (s3 !== peg$FAILED) {
                                         peg$savedPos = s0;
-                                        s0 = peg$f9(s1);
+                                        s0 = peg$f10(s1);
                                     }
                                     else {
                                         peg$currPos = s0;
@@ -51720,7 +52229,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 }
                                 if (s1 !== peg$FAILED) {
                                     peg$savedPos = s0;
-                                    s1 = peg$f10();
+                                    s1 = peg$f11();
                                 }
                                 s0 = s1;
                                 if (s0 === peg$FAILED) {
@@ -51741,7 +52250,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                             }
                                             if (s3 !== peg$FAILED) {
                                                 peg$savedPos = s0;
-                                                s0 = peg$f11(s1);
+                                                s0 = peg$f12(s1);
                                             }
                                             else {
                                                 peg$currPos = s0;
@@ -51796,7 +52305,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                         }
                                         if (s6 !== peg$FAILED) {
                                             peg$savedPos = s0;
-                                            s0 = peg$f12(s4);
+                                            s0 = peg$f13(s4);
                                         }
                                         else {
                                             peg$currPos = s0;
@@ -51835,7 +52344,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                     s4 = peg$parseamount();
                                     if (s4 !== peg$FAILED) {
                                         peg$savedPos = s0;
-                                        s0 = peg$f13(s4);
+                                        s0 = peg$f14(s4);
                                     }
                                     else {
                                         peg$currPos = s0;
@@ -51879,7 +52388,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                             s6 = peg$parse_();
                                             if (s6 !== peg$FAILED) {
                                                 peg$savedPos = s0;
-                                                s0 = peg$f14(s1);
+                                                s0 = peg$f15(s1);
                                             }
                                             else {
                                                 peg$currPos = s0;
@@ -51921,7 +52430,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                         s4 = peg$parse_();
                                         if (s4 !== peg$FAILED) {
                                             peg$savedPos = s0;
-                                            s0 = peg$f15(s1);
+                                            s0 = peg$f16(s1);
                                         }
                                         else {
                                             peg$currPos = s0;
@@ -51951,7 +52460,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         s1 = peg$parseweek();
                         if (s1 !== peg$FAILED) {
                             peg$savedPos = s0;
-                            s1 = peg$f16();
+                            s1 = peg$f17();
                         }
                         s0 = s1;
                         if (s0 === peg$FAILED) {
@@ -51963,7 +52472,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                     s3 = peg$parseweeks();
                                     if (s3 !== peg$FAILED) {
                                         peg$savedPos = s0;
-                                        s0 = peg$f17(s1);
+                                        s0 = peg$f18(s1);
                                     }
                                     else {
                                         peg$currPos = s0;
@@ -52016,7 +52525,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                             s6 = peg$parsemonth();
                                             if (s6 !== peg$FAILED) {
                                                 peg$savedPos = s0;
-                                                s0 = peg$f18(s6);
+                                                s0 = peg$f19(s6);
                                             }
                                             else {
                                                 peg$currPos = s0;
@@ -52242,7 +52751,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             s2 = peg$parse_();
                             if (s2 !== peg$FAILED) {
                                 peg$savedPos = s0;
-                                s0 = peg$f19();
+                                s0 = peg$f20();
                             }
                             else {
                                 peg$currPos = s0;
@@ -52256,7 +52765,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         return s0;
                     }
                     function peg$parsepriority() {
-                        var s0, s1, s2, s3;
+                        var s0, s1, s2;
                         s0 = peg$currPos;
                         if (input.substr(peg$currPos, 1).toLowerCase() === peg$c20) {
                             s1 = input.charAt(peg$currPos);
@@ -52271,15 +52780,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (s1 !== peg$FAILED) {
                             s2 = peg$parsenumber();
                             if (s2 !== peg$FAILED) {
-                                s3 = peg$parse_();
-                                if (s3 !== peg$FAILED) {
-                                    peg$savedPos = s0;
-                                    s0 = peg$f20(s2);
-                                }
-                                else {
-                                    peg$currPos = s0;
-                                    s0 = peg$FAILED;
-                                }
+                                peg$savedPos = s0;
+                                s0 = peg$f21(s2);
                             }
                             else {
                                 peg$currPos = s0;
@@ -52315,7 +52817,34 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 s3 = null;
                             }
                             peg$savedPos = s0;
-                            s0 = peg$f21(s3);
+                            s0 = peg$f22(s3);
+                        }
+                        else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                        return s0;
+                    }
+                    function peg$parsetemplate() {
+                        var s0, s1, s2;
+                        s0 = peg$currPos;
+                        if (input.substr(peg$currPos, 9) === peg$c22) {
+                            s1 = peg$c22;
+                            peg$currPos += 9;
+                        }
+                        else {
+                            s1 = peg$FAILED;
+                            if (peg$silentFails === 0) {
+                                peg$fail(peg$e23);
+                            }
+                        }
+                        if (s1 !== peg$FAILED) {
+                            s2 = peg$parsepriority();
+                            if (s2 === peg$FAILED) {
+                                s2 = null;
+                            }
+                            peg$savedPos = s0;
+                            s0 = peg$f23(s2);
                         }
                         else {
                             peg$currPos = s0;
@@ -52323,31 +52852,45 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                         return s0;
                     }
+                    function peg$parsegoal() {
+                        var s0;
+                        if (input.substr(peg$currPos, 5) === peg$c23) {
+                            s0 = peg$c23;
+                            peg$currPos += 5;
+                        }
+                        else {
+                            s0 = peg$FAILED;
+                            if (peg$silentFails === 0) {
+                                peg$fail(peg$e24);
+                            }
+                        }
+                        return s0;
+                    }
                     function peg$parse_() {
                         var s0, s1;
                         peg$silentFails++;
                         s0 = [];
                         if (input.charCodeAt(peg$currPos) === 32) {
-                            s1 = peg$c22;
+                            s1 = peg$c24;
                             peg$currPos++;
                         }
                         else {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e24);
+                                peg$fail(peg$e26);
                             }
                         }
                         if (s1 !== peg$FAILED) {
                             while (s1 !== peg$FAILED) {
                                 s0.push(s1);
                                 if (input.charCodeAt(peg$currPos) === 32) {
-                                    s1 = peg$c22;
+                                    s1 = peg$c24;
                                     peg$currPos++;
                                 }
                                 else {
                                     s1 = peg$FAILED;
                                     if (peg$silentFails === 0) {
-                                        peg$fail(peg$e24);
+                                        peg$fail(peg$e26);
                                     }
                                 }
                             }
@@ -52359,7 +52902,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$e23);
+                                peg$fail(peg$e25);
                             }
                         }
                         return s0;
@@ -52374,14 +52917,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         else {
                             s0 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e26);
+                                peg$fail(peg$e28);
                             }
                         }
                         peg$silentFails--;
                         if (s0 === peg$FAILED) {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e25);
+                                peg$fail(peg$e27);
                             }
                         }
                         return s0;
@@ -52411,7 +52954,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$e27);
+                                peg$fail(peg$e29);
                             }
                         }
                         return s0;
@@ -52427,7 +52970,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         else {
                             s2 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e28);
+                                peg$fail(peg$e30);
                             }
                         }
                         if (s2 !== peg$FAILED) {
@@ -52439,7 +52982,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             else {
                                 s4 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$e26);
+                                    peg$fail(peg$e28);
                                 }
                             }
                             while (s4 !== peg$FAILED) {
@@ -52451,7 +52994,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 else {
                                     s4 = peg$FAILED;
                                     if (peg$silentFails === 0) {
-                                        peg$fail(peg$e26);
+                                        peg$fail(peg$e28);
                                     }
                                 }
                             }
@@ -52498,13 +53041,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$c23;
+                                s7 = peg$c25;
                                 peg$currPos++;
                             }
                             else {
                                 s7 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$e30);
+                                    peg$fail(peg$e32);
                                 }
                             }
                             if (s7 !== peg$FAILED) {
@@ -52550,7 +53093,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         }
                         if (s3 !== peg$FAILED) {
                             peg$savedPos = s0;
-                            s0 = peg$f22(s3);
+                            s0 = peg$f24(s3);
                         }
                         else {
                             peg$currPos = s0;
@@ -52560,7 +53103,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$e29);
+                                peg$fail(peg$e31);
                             }
                         }
                         return s0;
@@ -52585,13 +53128,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (s3 !== peg$FAILED) {
                             s4 = peg$currPos;
                             if (input.charCodeAt(peg$currPos) === 46) {
-                                s5 = peg$c23;
+                                s5 = peg$c25;
                                 peg$currPos++;
                             }
                             else {
                                 s5 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$e30);
+                                    peg$fail(peg$e32);
                                 }
                             }
                             if (s5 !== peg$FAILED) {
@@ -52638,18 +53181,18 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 s2 = null;
                             }
                             if (input.charCodeAt(peg$currPos) === 37) {
-                                s3 = peg$c24;
+                                s3 = peg$c26;
                                 peg$currPos++;
                             }
                             else {
                                 s3 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$e32);
+                                    peg$fail(peg$e34);
                                 }
                             }
                             if (s3 !== peg$FAILED) {
                                 peg$savedPos = s0;
-                                s0 = peg$f23(s1);
+                                s0 = peg$f25(s1);
                             }
                             else {
                                 peg$currPos = s0;
@@ -52664,7 +53207,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$e31);
+                                peg$fail(peg$e33);
                             }
                         }
                         return s0;
@@ -52714,7 +53257,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$e35);
                             }
                         }
                         return s0;
@@ -52733,7 +53276,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             else {
                                 s3 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$e35);
+                                    peg$fail(peg$e37);
                                 }
                             }
                             if (s3 !== peg$FAILED) {
@@ -52773,7 +53316,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$e34);
+                                peg$fail(peg$e36);
                             }
                         }
                         return s0;
@@ -52809,7 +53352,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$e38);
                             }
                         }
                         return s0;
@@ -52827,7 +53370,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             else {
                                 s3 = peg$FAILED;
                                 if (peg$silentFails === 0) {
-                                    peg$fail(peg$e35);
+                                    peg$fail(peg$e37);
                                 }
                             }
                             if (s3 !== peg$FAILED) {
@@ -52869,12 +53412,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         else {
                             s1 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e38);
+                                peg$fail(peg$e40);
                             }
                         }
                         if (s1 !== peg$FAILED) {
                             peg$savedPos = peg$currPos;
-                            s2 = peg$f24(s1);
+                            s2 = peg$f26(s1);
                             if (s2) {
                                 s2 = undefined;
                             }
@@ -52898,7 +53441,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$e37);
+                                peg$fail(peg$e39);
                             }
                         }
                         return s0;
@@ -52915,7 +53458,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         else {
                             s2 = peg$FAILED;
                             if (peg$silentFails === 0) {
-                                peg$fail(peg$e40);
+                                peg$fail(peg$e42);
                             }
                         }
                         if (s2 !== peg$FAILED) {
@@ -52928,7 +53471,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 else {
                                     s2 = peg$FAILED;
                                     if (peg$silentFails === 0) {
-                                        peg$fail(peg$e40);
+                                        peg$fail(peg$e42);
                                     }
                                 }
                             }
@@ -52946,7 +53489,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$e39);
+                                peg$fail(peg$e41);
                             }
                         }
                         return s0;