diff --git a/.ai/cursorrules.md b/.ai/cursorrules.md
deleted file mode 100644
index f3323347..00000000
--- a/.ai/cursorrules.md
+++ /dev/null
@@ -1,64 +0,0 @@
-<!-- Copy this file to .cursorrules in the root of the project on your local machine if you'd like to use these rules with Cursor. -->
-
-You are an expert in Ruby, Ruby on Rails, Postgres, Tailwind, Stimulus, Hotwire and Turbo and always use the latest stable versions of those technologies.
-
-**Code Style and Structure**
-- Write concise, technical Ruby code with accurate examples.
-- Prefer iteration and modularization over code duplication.
-- Use descriptive variable names with auxiliary verbs (e.g., is_loading, has_error).
-- Structure files: models, controllers, views, helpers, services, jobs, mailers.
-
-**Naming Conventions**
-- Use snake_case for file names and directories (e.g., app/models/user_profile.rb).
-- Use CamelCase for classes and modules (e.g., UserProfile).
-
-**Ruby on Rails Usage**
-- Use Rails conventions for MVC structure.
-- Favor scopes over class methods for queries.
-- Use strong parameters for mass assignment protection.
-- Use partials to DRY up views.
-
-**Syntax and Formatting**
-- Use two spaces for indentation.
-- Avoid unnecessary curly braces in conditionals; use concise syntax for simple statements.
-- Use descriptive method names and keep methods short.
-
-**Commenting Code**
-- Write clear, concise comments to explain the purpose of individual functions and methods.
-- Use comments to describe the intent and functionality of complex logic.
-- Avoid redundant comments that state the obvious.
-
-**UI and Styling**
-- Use Tailwind CSS for styling.
-- Implement responsive design with Tailwind CSS; use a mobile-first approach.
-- Use Stimulus for JavaScript behavior.
-- Use Turbo for asynchronous actions and updates.
-
-**Performance Optimization**
-- Use eager loading to avoid N+1 queries.
-- Cache expensive queries and partials where appropriate.
-- Use background jobs for long-running tasks.
-- Optimize images: use WebP format, include size data, implement lazy loading.
-
-**Database Querying & Data Model Creation**
-- Use ActiveRecord for data querying and model creation.
-- Favor database constraints and indexes for data integrity and performance.
-- Use migrations to manage schema changes.
-
-**Key Conventions**
-- Follow Rails best practices for RESTful routing.
-- Optimize for performance and security.
-- Use environment variables for configuration.
-- Write tests for models, controllers, and features.
-
-**AI Guidelines**
-- Follow the user’s requirements carefully & to the letter.
-- Confirm, then write code!
-- Suggest solutions that I didn't think about—anticipate my needs
-- Focus on readability over being performant.
-- Fully implement all requested functionality.
-- Leave NO todo’s, placeholders or missing pieces.
-- Don't say things like "additional logic can be added here" — instead, add the logic.
-- Be concise. Minimize any other prose.
-- Consider new technologies and contrarian ideas, not just the conventional wisdom
-- If I ask for adjustments to code, do not repeat all of my code unnecessarily. Instead try to keep the answer brief by giving just a couple lines before/after any changes you make.
\ No newline at end of file
diff --git a/.cursor/rules/cursor_rules.mdc b/.cursor/rules/cursor_rules.mdc
new file mode 100644
index 00000000..7dfae3de
--- /dev/null
+++ b/.cursor/rules/cursor_rules.mdc
@@ -0,0 +1,53 @@
+---
+description: Guidelines for creating and maintaining Cursor rules to ensure consistency and effectiveness.
+globs: .cursor/rules/*.mdc
+alwaysApply: true
+---
+
+- **Required Rule Structure:**
+  ```markdown
+  ---
+  description: Clear, one-line description of what the rule enforces
+  globs: path/to/files/*.ext, other/path/**/*
+  alwaysApply: boolean
+  ---
+
+  - **Main Points in Bold**
+    - Sub-points with details
+    - Examples and explanations
+  ```
+
+- **File References:**
+  - Use `[filename](mdc:path/to/file)` ([filename](mdc:filename)) to reference files
+  - Example: [prisma.mdc](mdc:.cursor/rules/prisma.mdc) for rule references
+  - Example: [schema.prisma](mdc:prisma/schema.prisma) for code references
+
+- **Code Examples:**
+  - Use language-specific code blocks
+  ```typescript
+  // ✅ DO: Show good examples
+  const goodExample = true;
+  
+  // ❌ DON'T: Show anti-patterns
+  const badExample = false;
+  ```
+
+- **Rule Content Guidelines:**
+  - Start with high-level overview
+  - Include specific, actionable requirements
+  - Show examples of correct implementation
+  - Reference existing code when possible
+  - Keep rules DRY by referencing other rules
+
+- **Rule Maintenance:**
+  - Update rules when new patterns emerge
+  - Add examples from actual codebase
+  - Remove outdated patterns
+  - Cross-reference related rules
+
+- **Best Practices:**
+  - Use bullet points for clarity
+  - Keep descriptions concise
+  - Include both DO and DON'T examples
+  - Reference actual code over theoretical examples
+  - Use consistent formatting across rules 
\ No newline at end of file
diff --git a/.cursor/rules/general-rules.mdc b/.cursor/rules/general-rules.mdc
new file mode 100644
index 00000000..0684b649
--- /dev/null
+++ b/.cursor/rules/general-rules.mdc
@@ -0,0 +1,21 @@
+---
+description: Miscellaneous rules to get the AI to behave
+globs: *
+alwaysApply: true
+---
+# General rules for AI 
+
+- Use `Current.user` for the current user. Do NOT use `current_user`.
+- Use `Current.family` for the current family. Do NOT use `current_family`.
+- Prior to generating any code, carefully read the project conventions and guidelines
+  - Read [project-design.mdc](mdc:.cursor/rules/project-design.mdc) to understand the codebase
+  - Read [project-conventions.mdc](mdc:.cursor/rules/project-conventions.mdc) to understand _how_ to write code for the codebase
+  - Read [ui-ux-design-guidelines.mdc](mdc:.cursor/rules/ui-ux-design-guidelines.mdc) to understand how to implement frontend code specifically
+- Ignore i18n methods and files. Hardcode strings in English for now to optimize speed of development.
+
+## Prohibited actions
+
+- Do not run `rails server` in your responses.
+- Do not run `touch tmp/restart.txt`
+- Do not run `rails credentials`
+- Do not automatically run migrations
\ No newline at end of file
diff --git a/.cursor/rules/project-conventions.mdc b/.cursor/rules/project-conventions.mdc
new file mode 100644
index 00000000..2ac70891
--- /dev/null
+++ b/.cursor/rules/project-conventions.mdc
@@ -0,0 +1,73 @@
+---
+description: 
+globs: 
+alwaysApply: true
+---
+This rule serves as high-level documentation for how you should write code for the Maybe codebase. 
+
+## Project Tech Stack
+
+- Web framework: Ruby on Rails
+  - Minitest + fixtures for testing
+  - Propshaft for asset pipeline
+  - Hotwire Turbo/Stimulus for SPA-like UI/UX
+  - TailwindCSS for styles
+  - Lucide Icons for icons
+  - OpenAI for AI chat
+- Database: PostgreSQL
+- Jobs: Sidekiq + Redis
+- External
+  - Payments: Stripe
+  - User bank data syncing: Plaid 
+  - Market data: Synth (our custom API)
+
+## Project conventions
+
+These conventions should be used when writing code for Maybe.
+
+### Convention 1: Minimize dependencies, vanilla Rails is plenty
+
+Dependencies are a natural part of building software, but we aim to minimize them when possible to keep this open-source codebase easy to understand, maintain, and contribute to.
+
+- Push Rails to its limits before adding new dependencies
+- When a new dependency is added, there must be a strong technical or business reason to add it
+- When adding dependencies, you should favor old and reliable over new and flashy 
+
+### Convention 2: Leverage POROs and concerns over "service objects"
+
+This codebase adopts a "skinny controller, fat models" convention.  Furthermore, we put almost _everything_ directly in the `app/models/` folder and avoid separate folders for business logic such as `app/services/`.
+
+- Organize large pieces of business logic into Rails concerns and POROs (Plain ole' Ruby Objects)
+- While a Rails concern _may_ offer shared functionality (i.e. "duck types"), it can also be a "one-off" concern that is only included in one place for better organization and readability.
+- When concerns are used for code organization, they should be organized around the "traits" of a model; not for simply moving code to another spot in the codebase.
+- When possible, models should answer questions about themselves—for example, we might have a method, `account.balance_series` that returns a time-series of the account's most recent balances.  We prefer this over something more service-like such as `AccountSeries.new(account).call`.
+
+### Convention 3: Leverage Hotwire, write semantic HTML, CSS, and JS, prefer server-side solutions
+
+- Native HTML is always preferred over JS-based components
+  - Example 1: Use `<dialog>` element for modals instead of creating a custom component
+  - Example 2: Use `<details><summary>...</summary></details>` for disclosures rather than custom components
+- Leverage Turbo frames to break up the page over JS-driven client-side solutions
+  - Example 1: A good example of turbo frame usage is in [application.html.erb](mdc:app/views/layouts/application.html.erb) where we load [chats_controller.rb](mdc:app/controllers/chats_controller.rb) actions in a turbo frame in the global layout
+- Leverage query params in the URL for state over local storage and sessions.  If absolutely necessary, utilize the DB for persistent state.
+- Use Turbo streams to enhance functionality, but do not solely depend on it
+- Format currencies, numbers, dates, and other values server-side, then pass to Stimulus controllers for display only
+- Keep client-side code for where it truly shines.  For example, @bulk_select_controller.js is a case where server-side solutions would degrade the user experience significantly.  When bulk-selecting entries, client-side solutions are the way to go and Stimulus provides the right toolset to achieve this.
+- Always use the `icon` helper in [application_helper.rb](mdc:app/helpers/application_helper.rb) for icons.  NEVER use `lucide_icon` helper directly.
+
+The Hotwire suite (Turbo/Stimulus) works very well with these native elements and we optimize for this.
+
+### Convention 4: Optimize for simplicitly and clarity
+
+All code should maximize readability and simplicity.
+
+- Prioritize good OOP domain design over performance
+- Only focus on performance for critical and global areas of the codebase; otherwise, don't sweat the small stuff.
+  - Example 1: be mindful of loading large data payloads in global layouts
+  - Example 2: Avoid N+1 queries
+
+### Convention 5: Use ActiveRecord for complex validations, DB for simple ones, keep business logic out of DB
+
+- Enforce `null` checks, unique indexes, and other simple validations in the DB
+- ActiveRecord validations _may_ mirror the DB level ones, but not 100% necessary.  These are for convenience when error handling in forms.  Always prefer client-side form validation when possible.
+- Complex validations and business logic should remain in ActiveRecord
diff --git a/.cursor/rules/project-design.mdc b/.cursor/rules/project-design.mdc
new file mode 100644
index 00000000..4b60f2f9
--- /dev/null
+++ b/.cursor/rules/project-design.mdc
@@ -0,0 +1,249 @@
+---
+description: This rule explains the system architecture and data flow of the Rails app
+globs: *
+alwaysApply: true
+---
+
+This file outlines how the codebase is structured and how data flows through the app.
+
+This is a personal finance application built in Ruby on Rails.  The primary domain entities for this app are outlined below.  For an authoritative overview of the relationships, [schema.rb](mdc:db/schema.rb) is the source of truth.
+
+## App Modes
+
+The Maybe app runs in two distinct "modes", dictated by `Rails.application.config.app_mode`, which can be `managed` or `self_hosted`.
+
+- "Managed" - in managed mode, the Maybe team operates and manages servers for users
+- "Self Hosted" - in self hosted mode, users host the Maybe app on their own infrastructure, typically through Docker Compose.  We have an example [docker-compose.example.yml](mdc:docker-compose.example.yml) file that runs [Dockerfile](mdc:Dockerfile) for this mode.
+
+## Families and Users
+
+- `Family` - all Stripe subscriptions, financial accounts, and the majority of preferences are stored at the [family.rb](mdc:app/models/family.rb) level.
+- `User` - all [session.rb](mdc:app/models/session.rb) happen at the [user.rb](mdc:app/models/user.rb) level.  A user belongs to a `Family` and can either be an `admin` or a `member`.  Typically, a `Family` has a single admin, or "head of household" that manages finances while there will be several `member` users who can see the family's finances from varying perspectives.
+
+## Currency Preference
+
+Each `Family` selects a currency preference.  This becomes the "main" currency in which all records are "normalized" to via [exchange_rate.rb](mdc:app/models/exchange_rate.rb) records so that the Maybe app can calculate metrics, historical graphs, and other insights in a single family currency.
+
+## Accounts
+
+The center of the app's domain is the [account.rb](mdc:app/models/account.rb).  This represents a single financial account that has a `balance` and `currency`.  For example, an `Account` could be "Chase Checking", which is a single financial account at Chase Bank.  A user could have multiple accounts at a single institution (i.e. "Chase Checking", "Chase Credit Card", "Chase Savings") or an account could be a standalone account, such as "My Home" (a primary residence).
+
+### Accountables
+
+In the app, [account.rb](mdc:app/models/account.rb) is a Rails "delegated type" with the following subtypes (separate DB tables).  Each account has a `classification` or either `asset` or `liability`.  While the types are a flat hierarchy, below, they have been organized by their classification:
+
+- Asset accountables
+  - [depository.rb](mdc:app/models/depository.rb) - a typical "bank account" such as a savings or checking account
+  - [investment.rb](mdc:app/models/investment.rb) - an account that has "holdings" such as a brokerage, 401k, etc.
+  - [crypto.rb](mdc:app/models/crypto.rb) - an account that tracks the value of one or more crypto holdings
+  - [property.rb](mdc:app/models/property.rb) - an account that tracks the value of a physical property such as a house or rental property
+  - [vehicle.rb](mdc:app/models/vehicle.rb) - an account that tracks the value of a vehicle
+  - [other_asset.rb](mdc:app/models/other_asset.rb) - an asset that cannot be classified by the other account types.  For example, "jewelry".
+- Liability accountables
+  - [credit_card.rb](mdc:app/models/credit_card.rb) - an account that tracks the debt owed on a credit card
+  - [loan.rb](mdc:app/models/loan.rb) - an account that tracks the debt owed on a loan (i.e. mortgage, student loan)
+  - [other_liability.rb](mdc:app/models/other_liability.rb) - a liability that cannot be classified by the other account types.  For example, "IOU to a friend"
+
+### Account Balances
+
+An account [balance.rb](mdc:app/models/account/balance.rb) represents a single balance value for an account on a specific `date`.  A series of balance records is generated daily for each account and is how we show a user's historical balance graph.  
+
+- For simple accounts like a "Checking Account", the balance represents the amount of cash in the account for a date.  
+- For a more complex account like "Investment Brokerage", the `balance` represents the combination of the "cash balance" + "holdings value".  Each accountable type has different components that make up the "balance", but in all cases, the "balance" represents "How much the account is worth" (when `classification` is `asset`) or "How much is owed on the account" (when `classification` is `liability`)
+
+All balances are calculated daily by [balance_calculator.rb](mdc:app/models/account/balance_calculator.rb).
+
+### Account Holdings
+
+An account [holding.rb](mdc:app/models/holding.rb) applies to [investment.rb](mdc:app/models/investment.rb) type accounts and represents a `qty` of a certain [security.rb](mdc:app/models/security.rb) at a specific `price` on a specific `date`.
+
+For investment accounts with holdings, [base_calculator.rb](mdc:app/models/holding/base_calculator.rb) is used to calculate the daily historical holding quantities and prices, which are then rolled up into a final "Balance" for the account in [base_calculator.rb](mdc:app/models/account/balance/base_calculator.rb).
+
+### Account Entries
+
+An account [entry.rb](mdc:app/models/entry.rb) is also a Rails "delegated type".  `Entry` represents any record that _modifies_ an `Account` [balance.rb](mdc:app/models/account/balance.rb) and/or [holding.rb](mdc:app/models/holding.rb).  Therefore, every entry must have a `date`, `amount`, and `currency`.
+
+The `amount` of an [entry.rb](mdc:app/models/entry.rb) is a signed value.  A _negative_ amount is an "inflow" of money to that account.  A _positive_ value is an "outflow" of money from that account.  For example:
+
+- A negative amount for a credit card account represents a "payment" to that account, which _reduces_ its balance (since it is a `liability`)
+- A negative amount for a checking account represents an "income" to that account, which _increases_ its balance (since it is an `asset`)
+- A negative amount for an investment/brokerage trade represents a "sell" transaction, which _increases_ the cash balance of the account 
+
+There are 3 entry types, defined as [entryable.rb](mdc:app/models/entryable.rb) records: 
+
+- `Valuation` - an account [valuation.rb](mdc:app/models/valuation.rb) is an entry that says, "here is the value of this account on this date".  It is an absolute measure of an account value / debt.  If there is an `Valuation` of 5,000 for today's date, that means that the account balance will be 5,000 today.
+- `Transaction` - an account [transaction.rb](mdc:app/models/transaction.rb) is an entry that alters the account balance by the `amount`.  This is the most common type of entry and can be thought of as an "income" or "expense".  
+- `Trade` - an account [trade.rb](mdc:app/models/trade.rb) is an entry that only applies to an investment account.  This represents a "buy" or "sell" of a holding and has a `qty` and `price`.
+
+### Account Transfers
+
+A [transfer.rb](mdc:app/models/transfer.rb) represents a movement of money between two accounts.  A transfer has an inflow [transaction.rb](mdc:app/models/transaction.rb) and an outflow [transaction.rb](mdc:app/models/transaction.rb).  The Maybe system auto-matches transfers based on the following criteria:
+
+- Must be from different accounts
+- Must be within 4 days of each other
+- Must be the same currency
+- Must be opposite values
+
+There are two primary forms of a transfer:
+
+- Regular transfer - a normal movement of money between two accounts.  For example, "Transfer $500 from Checking account to Brokerage account". 
+- Debt payment - a special form of transfer where the _receiver_ of funds is a [loan.rb](mdc:app/models/loan.rb) type account.  
+
+Regular transfers are typically _excluded_ from income and expense calculations while a debt payment is considered an "expense".
+
+## Plaid Items
+
+A [plaid_item.rb](mdc:app/models/plaid_item.rb) represents a "connection" maintained by our external data provider, Plaid in the "hosted" mode of the app.  An "Item" has 1 or more [plaid_account.rb](mdc:app/models/plaid_account.rb) records, which are each associated 1:1 with an internal Maybe [account.rb](mdc:app/models/account.rb).
+
+All relevant metadata about the item and its underlying accounts are stored on [plaid_item.rb](mdc:app/models/plaid_item.rb) and [plaid_account.rb](mdc:app/models/plaid_account.rb), while the "normalized" data is then stored on internal Maybe domain models.
+
+## "Syncs"
+
+The Maybe app has the concept of a [syncable.rb](mdc:app/models/concerns/syncable.rb), which represents any model which can have its data "synced" in the background.  "Syncables" include:
+
+- `Account` - an account "sync" will sync account holdings, balances, and enhance transaction metadata
+- `PlaidItem` - a Plaid Item "sync" fetches data from Plaid APIs, normalizes that data, stores it on internal Maybe models, and then finally performs an "Account sync" for each of the underlying accounts created from the Plaid Item.
+- `Family` - a Family "sync" loops through the family's Plaid Items and individual Accounts and "syncs" each of them.  A family is synced once per day, automatically through [auto_sync.rb](mdc:app/controllers/concerns/auto_sync.rb).
+
+Each "sync" creates a [sync.rb](mdc:app/models/sync.rb) record in the database, which keeps track of the status of the sync, any errors that it encounters, and acts as an "audit table" for synced data.
+
+Below are brief descriptions of each type of sync in more detail.
+
+### Account Syncs
+
+The most important type of sync is the account sync.  It is orchestrated by the account's `sync_data` method, which performs a few important tasks:
+
+- Auto-matches transfer records for the account
+- Calculates daily [balance.rb](mdc:app/models/account/balance.rb) records for the account from `account.start_date` to `Date.current` using [base_calculator.rb](mdc:app/models/account/balance/base_calculator.rb)
+  - Balances are dependent on the calculation of [holding.rb](mdc:app/models/holding.rb), which uses [base_calculator.rb](mdc:app/models/account/holding/base_calculator.rb) 
+- Enriches transaction data if enabled by user
+
+An account sync happens every time an [entry.rb](mdc:app/models/entry.rb) is updated.
+
+### Plaid Item Syncs
+
+A Plaid Item sync is an ETL (extract, transform, load) operation:
+
+1. [plaid_item.rb](mdc:app/models/plaid_item.rb) fetches data from the external Plaid API
+2. [plaid_item.rb](mdc:app/models/plaid_item.rb) creates and loads this data to [plaid_account.rb](mdc:app/models/plaid_account.rb) records
+3. [plaid_item.rb](mdc:app/models/plaid_item.rb) and [plaid_account.rb](mdc:app/models/plaid_account.rb) transform and load data to [account.rb](mdc:app/models/account.rb) and [entry.rb](mdc:app/models/entry.rb), the internal Maybe representations of the data.
+
+### Family Syncs
+
+A family sync happens once daily via [auto_sync.rb](mdc:app/controllers/concerns/auto_sync.rb).  A family sync is an "orchestrator" of Account and Plaid Item syncs.
+
+## Data Providers
+
+The Maybe app utilizes several 3rd party data services to calculate historical account balances, enrich data, and more.  Since the app can be run in both "hosted" and "self hosted" mode, this means that data providers are _optional_ for self hosted users and must be configured.
+
+Because of this optionality, data providers must be configured at _runtime_ through [registry.rb](mdc:app/models/provider/registry.rb) utilizing [setting.rb](mdc:app/models/setting.rb) for runtime parameters like API keys:
+
+There are two types of 3rd party data in the Maybe app:
+
+1. "Concept" data
+2. One-off data
+
+### "Concept" data
+
+Since the app is self hostable, users may prefer using different providers for generic data like exchange rates and security prices.  When data is generic enough where we can easily swap out different providers, we call it a data "concept".
+
+Each "concept" has an interface defined in the `app/models/provider/concepts` directory.
+
+```
+app/models/
+  exchange_rate/
+    provided.rb # <- Responsible for selecting the concept provider from the registry
+  provider.rb # <- Base provider class
+  provider/
+    registry.rb <- Defines available providers by concept
+    concepts/
+      exchange_rate.rb <- defines the interface required for the exchange rate concept
+    synth.rb # <- Concrete provider implementation
+```
+
+### One-off data
+
+For data that does not fit neatly into a "concept", an interface is not required and the concrete provider may implement ad-hoc methods called directly in code.  For example, the [synth.rb](mdc:app/models/provider/synth.rb) provider has a `usage` method that is only applicable to this specific provider.  This should be called directly without any abstractions:
+
+```rb
+class SomeModel < Application
+  def synth_usage
+    Provider::Registry.get_provider(:synth)&.usage
+  end
+end
+```
+
+## "Provided" Concerns
+
+In general, domain models should not be calling [registry.rb](mdc:app/models/provider/registry.rb) directly.  When 3rd party data is required for a domain model, we use the `Provided` concern within that model's namespace.  This concern is primarily responsible for:
+
+- Choosing the provider to use for this "concept"
+- Providing convenience methods on the model for accessing data
+
+For example, [exchange_rate.rb](mdc:app/models/exchange_rate.rb) has a [provided.rb](mdc:app/models/exchange_rate/provided.rb) concern with the following convenience methods:
+
+```rb
+module ExchangeRate::Provided
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def provider
+      registry = Provider::Registry.for_concept(:exchange_rates)
+      registry.get_provider(:synth)
+    end
+
+    def find_or_fetch_rate(from:, to:, date: Date.current, cache: true)
+      # Implementation 
+    end
+
+    def sync_provider_rates(from:, to:, start_date:, end_date: Date.current)
+      # Implementation 
+    end
+  end
+end
+```
+
+This exposes a generic access pattern where the caller does not care _which_ provider has been chosen for the concept of exchange rates and can get a predictable response:
+
+```rb
+def access_patterns_example
+  # Call exchange rate provider directly
+  ExchangeRate.provider.fetch_exchange_rate(from: "USD", to: "CAD", date: Date.current)
+
+  # Call convenience method
+  ExchangeRate.sync_provider_rates(from: "USD", to: "CAD", start_date: 2.days.ago.to_date)
+end
+```
+
+## Concrete provider implementations
+
+Each 3rd party data provider should have a class under the `Provider::` namespace that inherits from `Provider` and returns `with_provider_response`, which will return a `Provider::ProviderResponse` object:
+
+```rb
+class ConcreteProvider < Provider
+  def fetch_some_data
+    with_provider_response do
+      ExampleData.new(
+        example: "data"
+      )
+    end
+  end
+end
+```
+
+The `with_provider_response` automatically catches provider errors, so concrete provider classes should raise when valid data is not possible:
+
+```rb
+class ConcreteProvider < Provider
+  def fetch_some_data
+    with_provider_response do
+      data = nil
+
+      # Raise an error if data cannot be returned
+      raise ProviderError.new("Could not find the data you need") if data.nil?
+
+      data
+    end
+  end
+end
+```
diff --git a/.cursor/rules/self_improve.mdc b/.cursor/rules/self_improve.mdc
new file mode 100644
index 00000000..40b31b6e
--- /dev/null
+++ b/.cursor/rules/self_improve.mdc
@@ -0,0 +1,72 @@
+---
+description: Guidelines for continuously improving Cursor rules based on emerging code patterns and best practices.
+globs: **/*
+alwaysApply: true
+---
+
+- **Rule Improvement Triggers:**
+  - New code patterns not covered by existing rules
+  - Repeated similar implementations across files
+  - Common error patterns that could be prevented
+  - New libraries or tools being used consistently
+  - Emerging best practices in the codebase
+
+- **Analysis Process:**
+  - Compare new code with existing rules
+  - Identify patterns that should be standardized
+  - Look for references to external documentation
+  - Check for consistent error handling patterns
+  - Monitor test patterns and coverage
+
+- **Rule Updates:**
+  - **Add New Rules When:**
+    - A new technology/pattern is used in 3+ files
+    - Common bugs could be prevented by a rule
+    - Code reviews repeatedly mention the same feedback
+    - New security or performance patterns emerge
+
+  - **Modify Existing Rules When:**
+    - Better examples exist in the codebase
+    - Additional edge cases are discovered
+    - Related rules have been updated
+    - Implementation details have changed
+
+- **Example Pattern Recognition:**
+  ```typescript
+  // If you see repeated patterns like:
+  const data = await prisma.user.findMany({
+    select: { id: true, email: true },
+    where: { status: 'ACTIVE' }
+  });
+  
+  // Consider adding to [prisma.mdc](mdc:.cursor/rules/prisma.mdc):
+  // - Standard select fields
+  // - Common where conditions
+  // - Performance optimization patterns
+  ```
+
+- **Rule Quality Checks:**
+  - Rules should be actionable and specific
+  - Examples should come from actual code
+  - References should be up to date
+  - Patterns should be consistently enforced
+
+- **Continuous Improvement:**
+  - Monitor code review comments
+  - Track common development questions
+  - Update rules after major refactors
+  - Add links to relevant documentation
+  - Cross-reference related rules
+
+- **Rule Deprecation:**
+  - Mark outdated patterns as deprecated
+  - Remove rules that no longer apply
+  - Update references to deprecated rules
+  - Document migration paths for old patterns
+
+- **Documentation Updates:**
+  - Keep examples synchronized with code
+  - Update references to external docs
+  - Maintain links between related rules
+  - Document breaking changes
+Follow [cursor_rules.mdc](mdc:.cursor/rules/cursor_rules.mdc) for proper rule formatting and structure.
diff --git a/.cursor/rules/stimulus_conventions.mdc b/.cursor/rules/stimulus_conventions.mdc
new file mode 100644
index 00000000..73bd16f8
--- /dev/null
+++ b/.cursor/rules/stimulus_conventions.mdc
@@ -0,0 +1,64 @@
+---
+description: 
+globs: 
+alwaysApply: false
+---
+This rule describes how to write Stimulus controllers.
+
+- **Use declarative actions, not imperative event listeners**
+  - Instead of assigning a Stimulus target and binding it to an event listener in the initializer, always write Controllers + ERB views declaratively by using Stimulus actions in ERB to call methods in the Stimulus JS controller.  Below are good vs. bad code.
+
+  BAD code:
+
+  ```js
+  // BAD!!!! DO NOT DO THIS!!
+  // Imperative - controller does all the work
+  export default class extends Controller {
+    static targets = ["button", "content"]
+
+    connect() {
+      this.buttonTarget.addEventListener("click", this.toggle.bind(this))
+    }
+
+    toggle() {
+      this.contentTarget.classList.toggle("hidden")
+      this.buttonTarget.textContent = this.contentTarget.classList.contains("hidden") ? "Show" : "Hide"
+    }
+  }
+  ```
+
+  GOOD code:
+
+  ```erb
+  <!-- Declarative - HTML declares what happens -->
+
+  <div data-controller="toggle">
+    <button data-action="click->toggle#toggle" data-toggle-target="button">Show</button>
+    <div data-toggle-target="content" class="hidden">Hello World!</div>
+  </div>
+  ```
+
+  ```js
+  // Declarative - controller just responds
+  export default class extends Controller {
+    static targets = ["button", "content"]
+
+    toggle() {
+      this.contentTarget.classList.toggle("hidden")
+      this.buttonTarget.textContent = this.contentTarget.classList.contains("hidden") ? "Show" : "Hide"
+    }
+  }
+  ```
+
+- **Keep Stimulus controllers lightweight and simple**
+  - Always aim for less than 7 controller targets. Any more is a sign of too much complexity.
+  - Use private methods and expose a clear public API
+
+- **Keep Stimulus controllers focused on what they do best**
+  - Domain logic does NOT belong in a Stimulus controller
+  - Stimulus controllers should aim for a single responsibility, or a group of highly related responsibilities
+  - Make good use of Stimulus's callbacks, actions, targets, values, and classes
+
+- **Component controllers should not be used outside the component**
+  - If a Stimulus controller is in the app/components directory, it should only be used in its component view. It should not be used anywhere in app/views.
+
diff --git a/.cursor/rules/testing.mdc b/.cursor/rules/testing.mdc
new file mode 100644
index 00000000..9fc95f82
--- /dev/null
+++ b/.cursor/rules/testing.mdc
@@ -0,0 +1,87 @@
+---
+description: 
+globs: test/**
+alwaysApply: false
+---
+Use this rule to learn how to write tests for the Maybe codebase.
+
+Due to the open-source nature of this project, we have chosen Minitest + Fixtures for testing to maximize familiarity and predictability.
+
+- **General testing rules**
+  - Always use Minitest and fixtures for testing, NEVER rspec or factories
+  - Keep fixtures to a minimum.  Most models should have 2-3 fixtures maximum that represent the "base cases" for that model.  "Edge cases" should be created on the fly, within the context of the test which it is needed.
+  - For tests that require a large number of fixture records to be created, use Rails helpers to help create the records needed for the test, then inline the creation. For example, [entries_test_helper.rb](mdc:test/support/entries_test_helper.rb) provides helpers to easily do this.
+
+- **Write minimal, effective tests**
+  - Use system tests sparingly as they increase the time to complete the test suite
+  - Only write tests for critical and important code paths
+  - Write tests as you go, when required
+  - Take a practical approach to testing.  Tests are effective when their presence _significantly increases confidence in the codebase_.
+
+  Below are examples of necessary vs. unnecessary tests:
+
+  ```rb
+  # GOOD!!
+  # Necessary test - in this case, we're testing critical domain business logic
+  test "syncs balances" do
+    Holding::Syncer.any_instance.expects(:sync_holdings).returns([]).once
+
+    @account.expects(:start_date).returns(2.days.ago.to_date)
+
+    Balance::ForwardCalculator.any_instance.expects(:calculate).returns(
+      [
+        Balance.new(date: 1.day.ago.to_date, balance: 1000, cash_balance: 1000, currency: "USD"),
+        Balance.new(date: Date.current, balance: 1000, cash_balance: 1000, currency: "USD")
+      ]
+    )
+
+    assert_difference "@account.balances.count", 2 do
+      Balance::Syncer.new(@account, strategy: :forward).sync_balances
+    end
+  end
+
+  # BAD!!
+  # Unnecessary test - in this case, this is simply testing ActiveRecord's functionality
+  test "saves balance" do 
+    balance_record = Balance.new(balance: 100, currency: "USD")
+
+    assert balance_record.save
+  end
+  ```
+
+- **Test boundaries correctly**
+  - Distinguish between commands and query methods. Test output of query methods; test that commands were called with the correct params. See an example below:
+
+  ```rb
+  class ExampleClass
+    def do_something
+      result = 2 + 2
+
+      CustomEventProcessor.process_result(result)
+
+      result
+    end
+  end
+
+  class ExampleClass < ActiveSupport::TestCase
+    test "boundaries are tested correctly" do 
+      result = ExampleClass.new.do_something
+
+      # GOOD - we're only testing that the command was received, not internal implementation details
+      # The actual tests for CustomEventProcessor belong in a different test suite!
+      CustomEventProcessor.expects(:process_result).with(4).once
+
+      # GOOD - we're testing the implementation of ExampleClass inside its own test suite
+      assert_equal 4, result
+    end
+  end
+  ```
+
+  - Never test the implementation details of one class in another classes test suite
+
+- **Stubs and mocks**
+  - Use `mocha` gem 
+  - Always prefer `OpenStruct` when creating mock instances, or in complex cases, a mock class
+  - Only mock what's necessary. If you're not testing return values, don't mock a return value.
+
+
diff --git a/.cursor/rules/ui-ux-design-guidelines.mdc b/.cursor/rules/ui-ux-design-guidelines.mdc
new file mode 100644
index 00000000..cabe097f
--- /dev/null
+++ b/.cursor/rules/ui-ux-design-guidelines.mdc
@@ -0,0 +1,22 @@
+---
+description: This file describes Maybe's design system and how views should be styled
+globs: app/views/**,app/helpers/**,app/javascript/controllers/**
+alwaysApply: true
+---
+Use the rules below when:
+
+- You are writing HTML
+- You are writing CSS
+- You are writing styles in a JavaScript Stimulus controller
+
+## Rules for AI (mandatory)
+
+The codebase uses TailwindCSS v4.x (the newest version) with a custom design system defined in [maybe-design-system.css](mdc:app/assets/tailwind/maybe-design-system.css)
+
+- Always start by referencing [maybe-design-system.css](mdc:app/assets/tailwind/maybe-design-system.css) to see the base primitives, functional tokens, and component tokens we use in the codebase
+- Always prefer using the functional "tokens" defined in @maybe-design-system.css when possible.
+  - Example 1: use `text-primary` rather than `text-white`
+  - Example 2: use `bg-container` rather than `bg-white`
+  - Example 3: use `border border-primary` rather than `border border-gray-200` 
+- Never create new styles in [maybe-design-system.css](mdc:app/assets/tailwind/maybe-design-system.css) or [application.css](mdc:app/assets/tailwind/application.css) without explicitly receiving permission to do so
+- Always generate semantic HTML
diff --git a/.cursor/rules/view_conventions.mdc b/.cursor/rules/view_conventions.mdc
new file mode 100644
index 00000000..935dc114
--- /dev/null
+++ b/.cursor/rules/view_conventions.mdc
@@ -0,0 +1,100 @@
+---
+description: 
+globs: app/views/**,app/javascript/**,app/components/**/*.js
+alwaysApply: false
+---
+Use this rule to learn how to write ERB views, partials, and Stimulus controllers should be incorporated into them.
+
+- **Component vs. Partial Decision Making**
+  - **Use ViewComponents when:**
+    - Element has complex logic or styling patterns
+    - Element will be reused across multiple views/contexts
+    - Element needs structured styling with variants/sizes (like buttons, badges)
+    - Element requires interactive behavior or Stimulus controllers
+    - Element has configurable slots or complex APIs
+    - Element needs accessibility features or ARIA support
+  
+  - **Use Partials when:**
+    - Element is primarily static HTML with minimal logic
+    - Element is used in only one or few specific contexts
+    - Element is simple template content (like CTAs, static sections)
+    - Element doesn't need variants, sizes, or complex configuration
+    - Element is more about content organization than reusable functionality
+
+- **Prefer components over partials**
+  - If there is a component available for the use case in app/components, use it
+  - If there is no component, look for a partial
+  - If there is no partial, decide between component or partial based on the criteria above
+
+- **Examples of Component vs. Partial Usage**
+  ```erb
+  <%# Component: Complex, reusable with variants and interactivity %>
+  <%= render DialogComponent.new(variant: :drawer) do |dialog| %>
+    <% dialog.with_header(title: "Account Settings") %>
+    <% dialog.with_body { "Dialog content here" } %>
+  <% end %>
+  
+  <%# Component: Interactive with complex styling options %>
+  <%= render ButtonComponent.new(text: "Save Changes", variant: "primary", confirm: "Are you sure?") %>
+  
+  <%# Component: Reusable with variants %>
+  <%= render FilledIconComponent.new(icon: "credit-card", variant: :surface) %>
+  
+  <%# Partial: Static template content %>
+  <%= render "shared/logo" %>
+  
+  <%# Partial: Simple, context-specific content with basic styling %>
+  <%= render "shared/trend_change", trend: @account.trend, comparison_label: "vs last month" %>
+  
+  <%# Partial: Simple divider/utility %>
+  <%= render "shared/ruler", classes: "my-4" %>
+  
+  <%# Partial: Simple form utility %>
+  <%= render "shared/form_errors", model: @account %>
+  ```
+
+- **Keep domain logic out of the views**
+   ```erb
+    <%# BAD!!! %>
+
+    <%# This belongs in the component file, not the template file! %>
+    <% button_classes = { class: "bg-blue-500 hover:bg-blue-600" } %>
+
+    <%= tag.button class: button_classes do %>
+      Save Account
+    <% end %>
+
+    <%# GOOD! %>
+
+    <%= tag.button class: computed_button_classes do %>
+      Save Account
+    <% end %>
+    ```
+
+- **Stimulus Integration in Views**
+  - Always use the **declarative approach** when integrating Stimulus controllers
+  - The ERB template should declare what happens, the Stimulus controller should respond
+  - Refer to [stimulus_conventions.mdc](mdc:.cursor/rules/stimulus_conventions.mdc) to learn how to incorporate them into 
+
+  GOOD Stimulus controller integration into views:
+
+  ```erb
+  <!-- Declarative - HTML declares what happens -->
+
+  <div data-controller="toggle">
+    <button data-action="click->toggle#toggle" data-toggle-target="button">Show</button>
+    <div data-toggle-target="content" class="hidden">Hello World!</div>
+  </div>
+  ```
+
+- **Stimulus Controller Placement Guidelines**
+  - **Component controllers** (in `app/components/`) should only be used within their component templates
+  - **Global controllers** (in `app/javascript/controllers/`) can be used across any view
+  - Pass data from Rails to Stimulus using `data-*-value` attributes, not inline JavaScript
+  - Use Stimulus targets to reference DOM elements, not manual `getElementById` calls
+
+- **Naming Conventions**
+  - **Components**: Use `ComponentName` suffix (e.g., `ButtonComponent`, `DialogComponent`, `FilledIconComponent`)
+  - **Partials**: Use underscore prefix (e.g., `_trend_change.html.erb`, `_form_errors.html.erb`, `_sync_indicator.html.erb`)
+  - **Shared partials**: Place in `app/views/shared/` directory for reusable content
+  - **Context-specific partials**: Place in relevant controller view directory (e.g., `accounts/_account_sidebar_tabs.html.erb`)
\ No newline at end of file
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index c2c4015d..9ae237ff 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-ARG RUBY_VERSION=3.3.4
+ARG RUBY_VERSION=3.4.4
 FROM ruby:${RUBY_VERSION}-slim-bullseye
 
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
@@ -10,6 +10,8 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
   imagemagick \
   iproute2 \
   libpq-dev \
+  libyaml-dev \
+  libyaml-0-2 \
   openssh-client \
   postgresql-client \
   vim
@@ -17,4 +19,8 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 RUN gem install bundler
 RUN gem install foreman
 
+# Install Node.js 20
+RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
+&& apt-get install -y nodejs
+
 WORKDIR /workspace
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 0f08d701..60b1866e 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -10,5 +10,13 @@
   "remoteEnv": {
     "PATH": "/workspace/bin:${containerEnv:PATH}"
   },
-  "postCreateCommand": "bundle install"
+  "postCreateCommand": "bundle install && npm install",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "biomejs.biome",
+        "EditorConfig.EditorConfig"
+      ]
+    }
+  }
 }
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 165d3e21..cf22c08a 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -1,4 +1,15 @@
-version: "3"
+x-db-env: &db_env
+  POSTGRES_USER: postgres
+  POSTGRES_DB: postgres
+  POSTGRES_PASSWORD: postgres
+
+x-rails-env: &rails_env
+  DB_HOST: db
+  HOST: "0.0.0.0"
+  POSTGRES_USER: postgres
+  POSTGRES_PASSWORD: postgres
+  BUNDLE_PATH: /bundle
+  REDIS_URL: redis://redis:6379/1
 
 services:
   app:
@@ -16,32 +27,41 @@ services:
     command: sleep infinity
 
     environment:
-      DB_HOST: db
-      HOST: "0.0.0.0"
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-      BUNDLE_PATH: /bundle
+      <<: *rails_env
 
     depends_on:
       - db
       - redis
 
+  worker:
+    build:
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
+    command: bundle exec sidekiq
+    restart: unless-stopped
+    environment:
+      <<: *rails_env
+    depends_on:
+      - redis
+
   redis:
     image: redis:latest
     ports:
       - "6379:6379"
+    restart: unless-stopped
+    volumes:
+      - redis-data:/data
   db:
     image: postgres:latest
     restart: unless-stopped
     volumes:
       - postgres-data:/var/lib/postgresql/data
     environment:
-      POSTGRES_USER: postgres
-      POSTGRES_DB: postgres
-      POSTGRES_PASSWORD: postgres
+      <<: *db_env
     ports:
       - "5432:5432"
 
 volumes:
   postgres-data:
+  redis-data:
   bundle_cache:
diff --git a/.env.example b/.env.example
index 9bce6ab7..f6804fff 100644
--- a/.env.example
+++ b/.env.example
@@ -1,11 +1,31 @@
+# ================================ PLEASE READ ===========================================================
+# This file outlines all the possible environment variables supported by the Maybe app for self hosting.
+#
+# If you're a developer setting up your local environment, please use `.env.local.example` instead.
+# ========================================================================================================
+
+# Required self-hosting vars
+# --------------------------------------------------------------------------------------------------------
+
+# Enables self hosting features (should be set to true unless you know what you're doing)
+SELF_HOSTED=true
+
+# Secret key used to encrypt credentials (https://api.rubyonrails.org/v7.1.3.2/classes/Rails/Application.html#method-i-secret_key_base)
+# Has to be a random string, generated eg. by running `openssl rand -hex 64`
+SECRET_KEY_BASE=secret-value
+
+# Optional self-hosting vars
+# --------------------------------------------------------------------------------------------------------
+
+# Optional: Synth API Key for exchange rates + stock prices
+# (you can also set this in your self-hosted settings page)
+# Get it here: https://synthfinance.com/
+SYNTH_API_KEY=
+
 # Custom port config
 # For users who have other applications listening at 3000, this allows them to set a value puma will listen to.
 PORT=3000
 
-# Exchange Rate API
-# This is used to convert between different currencies in the app. We use Synth, which is a Maybe product. You can sign up for a free account at synthfinance.com.
-SYNTH_API_KEY=
-
 # SMTP Configuration
 # This is only needed if you intend on sending emails from your Maybe instance (such as for password resets or email financial reports).
 # Resend.com is a good option that offers a free tier for sending emails.
@@ -28,60 +48,28 @@ POSTGRES_USER=postgres
 # This is the domain that your Maybe instance will be hosted at. It is used to generate links in emails and other places.
 APP_DOMAIN=
 
-## Error and Performance Monitoring
-# The app uses Sentry to monitor errors and performance. In reality, you likely don't need this unless you're deploying Maybe to many users.
-SENTRY_DSN=
-
-# If enabled, an invite code generated by `rake invites:create` is required to sign up as a new user.
-# This is useful for controlling who can sign up for your Maybe instance.
-REQUIRE_INVITE_CODE=false
-
-# Enables self hosting features (should be set to true for most folks)
-SELF_HOSTED=true
-
-# The hosting platform used to deploy the app (e.g. "render")
-# `localhost` (or unset) is used for local development and testing
-HOSTING_PLATFORM=localhost
-
-# Secret key used to encrypt credentials (https://api.rubyonrails.org/v7.1.3.2/classes/Rails/Application.html#method-i-secret_key_base)
-# Has to be a random string, generated eg. by running `openssl rand -hex 64`
-SECRET_KEY_BASE=secret-value
-
 # Disable enforcing SSL connections
 # DISABLE_SSL=true
 
-# ======================================================================================================
-# Upgrades Module - responsible for triggering upgrade alerts, prompts, and auto-upgrade functionality
-# ======================================================================================================
-#
-# UPGRADES_ENABLED: Enables Upgrader class functionality.
-# UPGRADES_MODE: Controls how the app will upgrade. `manual` means the user must manually upgrade the app. `auto` means the app will upgrade automatically (great for self-hosting)
-# UPGRADES_TARGET: Controls what the app will upgrade to. `release` means the app will upgrade to the latest release. `commit` means the app will upgrade to the latest commit.
-#
-UPGRADES_ENABLED=false # unless editing the flow, you should keep this `false` locally in development
-UPGRADES_MODE=manual # `manual` or `auto`
-UPGRADES_TARGET=release # `release` or `commit`
-
-
-# ======================================================================================================
-# Git Repository Module - responsible for fetching latest commit data for upgrades
-# ======================================================================================================
-#
-GITHUB_REPO_OWNER=maybe-finance
-GITHUB_REPO_NAME=maybe
-GITHUB_REPO_BRANCH=main
+# Active Record Encryption Keys (Optional)
+# These keys are used to encrypt sensitive data like API keys in the database.
+# If not provided, they will be automatically generated based on your SECRET_KEY_BASE.
+# You can generate your own keys by running: rails db:encryption:init
+# ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=
+# ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=
+# ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=
 
 # ======================================================================================================
 # Active Storage Configuration - responsible for storing file uploads
 # ======================================================================================================
 #
-# * Defaults to disk storage but you can also use Amazon S3, Google Cloud Storage, or Microsoft Azure Storage.
+# * Defaults to disk storage but you can also use Amazon S3 or Cloudflare R2
 # * Set the appropriate environment variables to use these services.
 # * Ensure libvips is installed on your system for image processing - https://github.com/libvips/libvips
 #
 # Amazon S3
 # ==========
-# ACTIVE_STORAGE_SERVICE=amazon
+# ACTIVE_STORAGE_SERVICE=amazon <- Enables Amazon S3 storage
 # S3_ACCESS_KEY_ID=
 # S3_SECRET_ACCESS_KEY=
 # S3_REGION= # defaults to `us-east-1` if not set
@@ -89,16 +77,9 @@ GITHUB_REPO_BRANCH=main
 #
 # Cloudflare R2
 # =============
-# ACTIVE_STORAGE_SERVICE=cloudflare
+# ACTIVE_STORAGE_SERVICE=cloudflare <- Enables Cloudflare R2 storage
 # CLOUDFLARE_ACCOUNT_ID=
 # CLOUDFLARE_ACCESS_KEY_ID=
 # CLOUDFLARE_SECRET_ACCESS_KEY=
 # CLOUDFLARE_BUCKET=
-
-# ======================================================================================================
-# Billing Module - responsible for handling billing
-# ======================================================================================================
 #
-STRIPE_PUBLISHABLE_KEY=
-STRIPE_SECRET_KEY=
-STRIPE_WEBHOOK_SECRET=
\ No newline at end of file
diff --git a/.env.local.example b/.env.local.example
new file mode 100644
index 00000000..d393f623
--- /dev/null
+++ b/.env.local.example
@@ -0,0 +1,5 @@
+# To enable / disable self-hosting features.
+SELF_HOSTED=false
+
+# Enable Synth market data (careful, this will use your API credits)
+SYNTH_API_KEY=yourapikeyhere
diff --git a/.env.test.example b/.env.test.example
index e5133c42..37fb9ef9 100644
--- a/.env.test.example
+++ b/.env.test.example
@@ -1,3 +1,5 @@
+SELF_HOSTED=false
+
 # ================
 # Data Providers
 # ---------------------------------------------------------------------------------
diff --git a/.erb-lint.yml b/.erb_lint.yml
similarity index 100%
rename from .erb-lint.yml
rename to .erb_lint.yml
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 760e2c01..4f1db63d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,27 +1,61 @@
 ---
 name: Bug report
-about: Create a report to help us improve
-title: 'Bug: '
-labels: ":bug: Bug"
+about: Open a bug report when you experience broken functionality within the latest
+  version of the Maybe app
+title: 'Bug: [Add descriptive title here]'
+labels: ''
 assignees: ''
 
 ---
 
-**Describe the bug**
+## Before you start (required)
+
+### General checklist
+
+- [ ] I have removed personal / sensitive data from screenshots and logs
+- [ ] I have searched [existing issues](https://github.com/maybe-finance/maybe/issues?q=is:issue) and [discussions](https://github.com/maybe-finance/maybe/discussions) to ensure this is not a duplicate issue
+    
+### How are you using Maybe?
+
+- [ ] I am a paying Maybe customer (hosted version)
+  - Paying Maybe users can also open requests in Intercom (if there is sensitive info involved)
+- [ ] I am a self-hosted user
+
+### Self hoster checklist
+
+_Paying, hosted users should delete this entire section._
+
+If you are a self-hosted user, please complete all of the information below.  Issues with incomplete information will be marked as `Needs Info` to help our small team prioritize bug fixes.
+
+- Self hosted app commit SHA (find in user menu): [enter commit sha here]
+  - [ ] I have confirmed that my app's commit is the latest version of Maybe
+- Where are you hosting?
+  - [ ] Render
+  - [ ] Docker Compose
+  - [ ] Umbrel
+  - [ ] Other (please specify)
+
+---
+
+## Bug description
+
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+### To Reproduce
+
+Be as specific as possible so Maybe maintainers can quickly reproduce the bug you're experiencing.
+
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+### Expected behavior
 
-**Screenshots / Recordings**
-If applicable, add screenshots or short video recordings to help show the bug in more detail.
+What is the intended behavior that you would expect?
 
-**Additional context**
-Add any other context about the problem here.
+### Screenshots and/or recordings
+
+We highly recommend providing additional context with screenshots and/or screen recordings.  This will _significantly_ improve the chances of the bug being addressed and fixed quickly.
diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
index 6a230e6e..87b14127 100644
--- a/.github/ISSUE_TEMPLATE/other.md
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -7,15 +7,33 @@ assignees: ''
 
 ---
 
-**PLEASE READ before opening an issue:**
+## Before you start (required)
 
-- Is this a feature request?  Please [open a feature request discussion](https://github.com/maybe-finance/maybe/discussions/new?category=feature-requests).
-- Do you need help or have a question?  Please [open a discussion](https://github.com/maybe-finance/maybe/discussions/new/choose) or [join our Discord](https://link.maybe.co/discord) and post to the "help" channel.
+### Is this a bug?
 
-----------------------
+A bug is _broken functionality_ of the app (i.e. it prevents you from using the app).  For bugs, please use the ["Bug Report" template](https://github.com/maybe-finance/maybe/issues) instead.
 
-**Is this issue related to a problem?  Please describe.**
+### Is this a bug with _sensitive info_?
 
-**Describe the work that needs to be done to address this issue**
+If you are a _paying_ Maybe user, you can open a support request in Intercom.
 
-**Additional context**
+### Is this a feature request?
+
+A feature request is functionality that you would like that is not already on our [Roadmap](https://github.com/maybe-finance/maybe/wiki/Roadmap).
+
+All feature requests should be opened in a [Feature request Discussion](https://github.com/maybe-finance/maybe/discussions/categories/feature-requests).
+
+Be sure to search existing discussions prior to opening a new feature request.
+
+### Is this related to Docker and/or hosting for self hosting?
+
+If you are having a Docker configuration issue, please do not open a Github issue unless you've identified a bug in our Dockerfile.  To get help with self hosting, there are several options:
+
+- **First**: Read our [Docker hosting guide](https://github.com/maybe-finance/maybe/tree/main/docs/hosting/docker.md) and follow it step-by-step
+- Open a [Docker Discussion](https://github.com/maybe-finance/maybe/discussions/categories/docker-compose-hosting)
+
+---
+
+## Issue description
+
+If your issue does not fall into the categories above, please provide a **descriptive and complete** overview of your issue.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c182886a..eae6bb5e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,12 +52,35 @@ jobs:
       - name: Lint code for consistent style
         run: bin/rubocop -f github
 
+  lint_js:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "npm"
+
+      - name: Install dependencies
+        run: npm install
+        shell: bash
+
+      - name: Lint/Format js code
+        run: npm run lint
+
   test:
     runs-on: ubuntu-latest
     timeout-minutes: 10
 
     env:
+      PLAID_CLIENT_ID: foo
+      PLAID_SECRET: bar
       DATABASE_URL: postgres://postgres:postgres@localhost:5432
+      REDIS_URL: redis://localhost:6379
       RAILS_ENV: test
 
     services:
@@ -70,6 +93,12 @@ jobs:
           - 5432:5432
         options: --health-cmd="pg_isready" --health-interval=10s --health-timeout=5s --health-retries=3
 
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+        options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
     steps:
       - name: Install packages
         run: sudo apt-get update && sudo apt-get install --no-install-recommends -y google-chrome-stable curl libvips postgresql-client libpq-dev
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 6ea13cc6..062d11b9 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,6 +1,13 @@
 name: Publish Docker image
 
 on:
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: 'Git ref (tag or commit SHA) to build'
+        required: true
+        type: string 
+        default: 'main'
   push:
     tags:
       - 'v*'
@@ -22,6 +29,8 @@ jobs:
     name: Build docker image
     needs: [ ci ]
 
+    timeout-minutes: 60
+
     runs-on: ubuntu-latest
 
     permissions:
@@ -31,6 +40,8 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.ref || github.ref }}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -65,9 +76,10 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: 'linux/amd64,linux/arm64'
           cache-from: type=gha
           cache-to: type=gha,mode=max
           provenance: false
           # https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry#adding-a-description-to-multi-arch-images
           outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=A multi-arch Docker image for the Maybe Rails app
+          build-args: BUILD_COMMIT_SHA=${{ github.sha }}
diff --git a/.gitignore b/.gitignore
index d8d688a0..24423a7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,12 +6,12 @@
 
 # Ignore bundler config.
 /.bundle
+/vendor/bundle
 
 # Ignore all environment files (except templates).
 /.env*
 !/.env*.erb
-!.env.example
-!.env.test.example
+!.env*.example
 
 # Ignore all logfiles and tempfiles.
 /log/*
@@ -43,7 +43,9 @@
 .idea
 
 # Ignore VS Code
-.vscode
+.vscode/*
+!.vscode/extensions.json
+!.vscode/*.code-snippets
 
 # Ignore macOS specific files
 */.DS_Store
@@ -59,4 +61,48 @@ compose-dev.yaml
 gcp-storage-keyfile.json
 
 coverage
-.cursorrules
\ No newline at end of file
+.cursorrules
+.cursor/rules/structure.mdc
+.cursor/rules/agent.mdc
+
+# Ignore node related files
+node_modules
+
+compose.yml
+
+plaid_test_accounts/
+
+# Added by Claude Task Master
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+dev-debug.log
+# Dependency directories
+node_modules/
+# Environment variables
+.env
+# Editor directories and files
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+*.roo*
+# OS specific
+# Task files
+.taskmaster/
+tasks.json
+.taskmaster/tasks/
+.taskmaster/reports/
+.taskmaster/state.json
+*.mcp.json
+scripts/
+.cursor/mcp.json
+.taskmasterconfig
+.windsurfrules
+.cursor/rules/dev_workflow.mdc
+.cursor/rules/taskmaster.mdc
diff --git a/.ruby-version b/.ruby-version
index a0891f56..f9892605 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.3.4
+3.4.4
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 00000000..ed57f55c
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,273 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Common Development Commands
+
+### Development Server
+- `bin/dev` - Start development server (Rails, Sidekiq, Tailwind CSS watcher)
+- `bin/rails server` - Start Rails server only
+- `bin/rails console` - Open Rails console
+
+### Testing
+- `bin/rails test` - Run all tests
+- `bin/rails test:db` - Run tests with database reset
+- `bin/rails test:system` - Run system tests only (use sparingly - they take longer)
+- `bin/rails test test/models/account_test.rb` - Run specific test file
+- `bin/rails test test/models/account_test.rb:42` - Run specific test at line
+
+### Linting & Formatting
+- `bin/rubocop` - Run Ruby linter
+- `npm run lint` - Check JavaScript/TypeScript code
+- `npm run lint:fix` - Fix JavaScript/TypeScript issues
+- `npm run format` - Format JavaScript/TypeScript code
+- `bin/brakeman` - Run security analysis
+
+### Database
+- `bin/rails db:prepare` - Create and migrate database
+- `bin/rails db:migrate` - Run pending migrations
+- `bin/rails db:rollback` - Rollback last migration
+- `bin/rails db:seed` - Load seed data
+
+### Setup
+- `bin/setup` - Initial project setup (installs dependencies, prepares database)
+
+## Pre-Pull Request CI Workflow
+
+ALWAYS run these commands before opening a pull request:
+
+1. **Tests** (Required):
+   - `bin/rails test` - Run all tests (always required)
+   - `bin/rails test:system` - Run system tests (only when applicable, they take longer)
+
+2. **Linting** (Required):
+   - `bin/rubocop -f github -a` - Ruby linting with auto-correct
+   - `bundle exec erb_lint ./app/**/*.erb -a` - ERB linting with auto-correct
+
+3. **Security** (Required):
+   - `bin/brakeman --no-pager` - Security analysis
+
+Only proceed with pull request creation if ALL checks pass.
+
+## General Development Rules
+
+### Authentication Context
+- Use `Current.user` for the current user. Do NOT use `current_user`.
+- Use `Current.family` for the current family. Do NOT use `current_family`.
+
+### Development Guidelines
+- Prior to generating any code, carefully read the project conventions and guidelines
+- Ignore i18n methods and files. Hardcode strings in English for now to optimize speed of development
+- Do not run `rails server` in your responses
+- Do not run `touch tmp/restart.txt`
+- Do not run `rails credentials`
+- Do not automatically run migrations
+
+## High-Level Architecture
+
+### Application Modes
+The Maybe app runs in two distinct modes:
+- **Managed**: The Maybe team operates and manages servers for users (Rails.application.config.app_mode = "managed")
+- **Self Hosted**: Users host the Maybe app on their own infrastructure, typically through Docker Compose (Rails.application.config.app_mode = "self_hosted")
+
+### Core Domain Model
+The application is built around financial data management with these key relationships:
+- **User** → has many **Accounts** → has many **Transactions**
+- **Account** types: checking, savings, credit cards, investments, crypto, loans, properties
+- **Transaction** → belongs to **Category**, can have **Tags** and **Rules**
+- **Investment accounts** → have **Holdings** → track **Securities** via **Trades**
+
+### API Architecture
+The application provides both internal and external APIs:
+- Internal API: Controllers serve JSON via Turbo for SPA-like interactions
+- External API: `/api/v1/` namespace with Doorkeeper OAuth and API key authentication
+- API responses use Jbuilder templates for JSON rendering
+- Rate limiting via Rack Attack with configurable limits per API key
+
+### Sync & Import System
+Two primary data ingestion methods:
+1. **Plaid Integration**: Real-time bank account syncing
+   - `PlaidItem` manages connections
+   - `Sync` tracks sync operations
+   - Background jobs handle data updates
+2. **CSV Import**: Manual data import with mapping
+   - `Import` manages import sessions
+   - Supports transaction and balance imports
+   - Custom field mapping with transformation rules
+
+### Background Processing
+Sidekiq handles asynchronous tasks:
+- Account syncing (`SyncAccountsJob`)
+- Import processing (`ImportDataJob`)
+- AI chat responses (`CreateChatResponseJob`)
+- Scheduled maintenance via sidekiq-cron
+
+### Frontend Architecture
+- **Hotwire Stack**: Turbo + Stimulus for reactive UI without heavy JavaScript
+- **ViewComponents**: Reusable UI components in `app/components/`
+- **Stimulus Controllers**: Handle interactivity, organized alongside components
+- **Charts**: D3.js for financial visualizations (time series, donut, sankey)
+- **Styling**: Tailwind CSS v4.x with custom design system
+  - Design system defined in `app/assets/tailwind/maybe-design-system.css`
+  - Always use functional tokens (e.g., `text-primary` not `text-white`)
+  - Prefer semantic HTML elements over JS components
+  - Use `icon` helper for icons, never `lucide_icon` directly
+
+### Multi-Currency Support
+- All monetary values stored in base currency (user's primary currency)
+- Exchange rates fetched from Synth API
+- `Money` objects handle currency conversion and formatting
+- Historical exchange rates for accurate reporting
+
+### Security & Authentication
+- Session-based auth for web users
+- API authentication via:
+  - OAuth2 (Doorkeeper) for third-party apps
+  - API keys with JWT tokens for direct API access
+- Scoped permissions system for API access
+- Strong parameters and CSRF protection throughout
+
+### Testing Philosophy
+- Comprehensive test coverage using Rails' built-in Minitest
+- Fixtures for test data (avoid FactoryBot)
+- Keep fixtures minimal (2-3 per model for base cases)
+- VCR for external API testing
+- System tests for critical user flows (use sparingly)
+- Test helpers in `test/support/` for common scenarios
+- Only test critical code paths that significantly increase confidence
+- Write tests as you go, when required
+
+### Performance Considerations
+- Database queries optimized with proper indexes
+- N+1 queries prevented via includes/joins
+- Background jobs for heavy operations
+- Caching strategies for expensive calculations
+- Turbo Frames for partial page updates
+
+### Development Workflow
+- Feature branches merged to `main`
+- Docker support for consistent environments
+- Environment variables via `.env` files
+- Lookbook for component development (`/lookbook`)
+- Letter Opener for email preview in development
+
+## Project Conventions
+
+### Convention 1: Minimize Dependencies
+- Push Rails to its limits before adding new dependencies
+- Strong technical/business reason required for new dependencies
+- Favor old and reliable over new and flashy
+
+### Convention 2: Skinny Controllers, Fat Models
+- Business logic in `app/models/` folder, avoid `app/services/`
+- Use Rails concerns and POROs for organization
+- Models should answer questions about themselves: `account.balance_series` not `AccountSeries.new(account).call`
+
+### Convention 3: Hotwire-First Frontend
+- **Native HTML preferred over JS components**
+  - Use `<dialog>` for modals, `<details><summary>` for disclosures
+- **Leverage Turbo frames** for page sections over client-side solutions
+- **Query params for state** over localStorage/sessions
+- **Server-side formatting** for currencies, numbers, dates
+- **Always use `icon` helper** in `application_helper.rb`, NEVER `lucide_icon` directly
+
+### Convention 4: Optimize for Simplicity
+- Prioritize good OOP domain design over performance
+- Focus performance only on critical/global areas (avoid N+1 queries, mindful of global layouts)
+
+### Convention 5: Database vs ActiveRecord Validations
+- Simple validations (null checks, unique indexes) in DB
+- ActiveRecord validations for convenience in forms (prefer client-side when possible)
+- Complex validations and business logic in ActiveRecord
+
+## TailwindCSS Design System
+
+### Design System Rules
+- **Always reference `app/assets/tailwind/maybe-design-system.css`** for primitives and tokens
+- **Use functional tokens** defined in design system:
+  - `text-primary` instead of `text-white`
+  - `bg-container` instead of `bg-white`
+  - `border border-primary` instead of `border border-gray-200`
+- **NEVER create new styles** in design system files without permission
+- **Always generate semantic HTML**
+
+## Component Architecture
+
+### ViewComponent vs Partials Decision Making
+
+**Use ViewComponents when:**
+- Element has complex logic or styling patterns
+- Element will be reused across multiple views/contexts
+- Element needs structured styling with variants/sizes
+- Element requires interactive behavior or Stimulus controllers
+- Element has configurable slots or complex APIs
+- Element needs accessibility features or ARIA support
+
+**Use Partials when:**
+- Element is primarily static HTML with minimal logic
+- Element is used in only one or few specific contexts
+- Element is simple template content
+- Element doesn't need variants, sizes, or complex configuration
+- Element is more about content organization than reusable functionality
+
+**Component Guidelines:**
+- Prefer components over partials when available
+- Keep domain logic OUT of view templates
+- Logic belongs in component files, not template files
+
+### Stimulus Controller Guidelines
+
+**Declarative Actions (Required):**
+```erb
+<!-- GOOD: Declarative - HTML declares what happens -->
+<div data-controller="toggle">
+  <button data-action="click->toggle#toggle" data-toggle-target="button">Show</button>
+  <div data-toggle-target="content" class="hidden">Hello World!</div>
+</div>
+```
+
+**Controller Best Practices:**
+- Keep controllers lightweight and simple (< 7 targets)
+- Use private methods and expose clear public API
+- Single responsibility or highly related responsibilities
+- Component controllers stay in component directory, global controllers in `app/javascript/controllers/`
+- Pass data via `data-*-value` attributes, not inline JavaScript
+
+## Testing Philosophy
+
+### General Testing Rules
+- **ALWAYS use Minitest + fixtures** (NEVER RSpec or factories)
+- Keep fixtures minimal (2-3 per model for base cases)
+- Create edge cases on-the-fly within test context
+- Use Rails helpers for large fixture creation needs
+
+### Test Quality Guidelines
+- **Write minimal, effective tests** - system tests sparingly
+- **Only test critical and important code paths**
+- **Test boundaries correctly:**
+  - Commands: test they were called with correct params
+  - Queries: test output
+  - Don't test implementation details of other classes
+
+### Testing Examples
+
+```ruby
+# GOOD - Testing critical domain business logic
+test "syncs balances" do
+  Holding::Syncer.any_instance.expects(:sync_holdings).returns([]).once
+  assert_difference "@account.balances.count", 2 do
+    Balance::Syncer.new(@account, strategy: :forward).sync_balances
+  end
+end
+
+# BAD - Testing ActiveRecord functionality
+test "saves balance" do 
+  balance_record = Balance.new(balance: 100, currency: "USD")
+  assert balance_record.save
+end
+```
+
+### Stubs and Mocks
+- Use `mocha` gem
+- Prefer `OpenStruct` for mock instances
+- Only mock what's necessary
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index aab5f572..45c1b426 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,6 +4,8 @@ It means so much that you're interested in contributing to Maybe! Seriously. Tha
 
 ## House Rules
 
+- Before contributing, familiarize yourself with our project conventions. You should read through our [Project Conventions Rule](https://github.com/maybe-finance/maybe/.cursor/rules/project-conventions.mdc), which is intended for LLMs, but is also an excellent primer on how we write code for Maybe.
+- While totally optional, consider using Cursor + VSCode as it will automatically apply our project conventions to your code via the `.cursor/rules` directory.
 - Before contributing, please check if it already exists in [issues](https://github.com/maybe-finance/maybe/issues) or [PRs](https://github.com/maybe-finance/maybe/pulls)
 - Given the speed at which we're moving on the codebase, we don't assign issues or "give" issues to anyone.
 - When multiple PRs are submitted for the same issue, we take the one that most succinctly & efficiently solves a given problem and stays within the scope of work.
diff --git a/Dockerfile b/Dockerfile
index f1ad0395..2092d0ef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,45 +1,47 @@
 # syntax = docker/dockerfile:1
 
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=3.3.4
-FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base
+ARG RUBY_VERSION=3.4.4
+FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim AS base
 
 # Rails app lives here
 WORKDIR /rails
 
 # Install base packages
 RUN apt-get update -qq && \
-    apt-get install --no-install-recommends -y curl libvips postgresql-client
+    apt-get install --no-install-recommends -y curl libvips postgresql-client libyaml-0-2
 
 # Set production environment
+ARG BUILD_COMMIT_SHA
 ENV RAILS_ENV="production" \
     BUNDLE_DEPLOYMENT="1" \
     BUNDLE_PATH="/usr/local/bundle" \
-    BUNDLE_WITHOUT="development"
-
-
+    BUNDLE_WITHOUT="development" \
+    BUILD_COMMIT_SHA=${BUILD_COMMIT_SHA}
+    
 # Throw-away build stage to reduce size of final image
-FROM base as build
+FROM base AS build
 
 # Install packages needed to build gems
-RUN apt-get install --no-install-recommends -y build-essential git libpq-dev pkg-config
+RUN apt-get install --no-install-recommends -y build-essential libpq-dev git pkg-config libyaml-dev
 
 # Install application gems
 COPY .ruby-version Gemfile Gemfile.lock ./
-RUN bundle install && \
-    rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git && \
-    bundle exec bootsnap precompile --gemfile
+RUN bundle install
+
+RUN rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git
+
+RUN bundle exec bootsnap precompile --gemfile -j 0
 
 # Copy application code
 COPY . .
 
 # Precompile bootsnap code for faster boot times
-RUN bundle exec bootsnap precompile app/ lib/
+RUN bundle exec bootsnap precompile -j 0 app/ lib/
 
 # Precompiling assets for production without requiring secret RAILS_MASTER_KEY
 RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
 
-
 # Final stage for app image
 FROM base
 
diff --git a/Gemfile b/Gemfile
index cdb9fca0..4f1a83c7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,10 +3,11 @@ source "https://rubygems.org"
 ruby file: ".ruby-version"
 
 # Rails
-gem "rails", "~> 7.2.1"
+gem "rails", "~> 7.2.2"
 
 # Drivers
 gem "pg", "~> 1.5"
+gem "redis", "~> 5.4"
 
 # Deployment
 gem "puma", ">= 5.0"
@@ -18,24 +19,43 @@ gem "propshaft"
 gem "tailwindcss-rails"
 gem "lucide-rails", github: "maybe-finance/lucide-rails"
 
-# Hotwire
+# Hotwire + UI
 gem "stimulus-rails"
 gem "turbo-rails"
+gem "view_component"
+
+# https://github.com/lookbook-hq/lookbook/issues/712
+# TODO: Remove max version constraint when fixed
+gem "lookbook", "2.3.11"
+
+gem "hotwire_combobox"
 
 # Background Jobs
-gem "good_job"
+gem "sidekiq"
+gem "sidekiq-cron"
 
-# Error logging
-gem "stackprof"
+# Monitoring
+gem "vernier"
+gem "rack-mini-profiler"
 gem "sentry-ruby"
 gem "sentry-rails"
+gem "sentry-sidekiq"
+gem "logtail-rails"
+gem "skylight", groups: [ :production ]
 
 # Active Storage
-gem "aws-sdk-s3", require: false
+gem "aws-sdk-s3", "~> 1.177.0", require: false
 gem "image_processing", ">= 1.2"
 
 # Other
+gem "ostruct"
 gem "bcrypt", "~> 3.1"
+gem "jwt"
+gem "jbuilder"
+
+# OAuth & API Security
+gem "doorkeeper"
+gem "rack-attack", "~> 6.6"
 gem "faraday"
 gem "faraday-retry"
 gem "faraday-multipart"
@@ -48,7 +68,17 @@ gem "csv"
 gem "redcarpet"
 gem "stripe"
 gem "intercom-rails"
-gem "holidays"
+gem "plaid"
+gem "rotp", "~> 6.3"
+gem "rqrcode", "~> 3.0"
+gem "activerecord-import"
+
+# State machines
+gem "aasm"
+gem "after_commit_everywhere", "~> 1.0"
+
+# AI
+gem "ruby-openai"
 
 group :development, :test do
   gem "debug", platforms: %i[mri windows]
@@ -59,12 +89,20 @@ group :development, :test do
   gem "dotenv-rails"
 end
 
+if ENV["BENCHMARKING_ENABLED"]
+  gem "dotenv-rails", groups: [ :production ]
+end
+
 group :development do
   gem "hotwire-livereload"
   gem "letter_opener"
   gem "ruby-lsp-rails"
   gem "web-console"
   gem "faker"
+  gem "benchmark-ips"
+  gem "stackprof"
+  gem "derailed_benchmarks"
+  gem "foreman"
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 155b548a..cacdf57a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,29 +8,31 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.1)
-      actionpack (= 7.2.1)
-      activesupport (= 7.2.1)
+    aasm (5.5.1)
+      concurrent-ruby (~> 1.0)
+    actioncable (7.2.2.1)
+      actionpack (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.1)
-      actionpack (= 7.2.1)
-      activejob (= 7.2.1)
-      activerecord (= 7.2.1)
-      activestorage (= 7.2.1)
-      activesupport (= 7.2.1)
+    actionmailbox (7.2.2.1)
+      actionpack (= 7.2.2.1)
+      activejob (= 7.2.2.1)
+      activerecord (= 7.2.2.1)
+      activestorage (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       mail (>= 2.8.0)
-    actionmailer (7.2.1)
-      actionpack (= 7.2.1)
-      actionview (= 7.2.1)
-      activejob (= 7.2.1)
-      activesupport (= 7.2.1)
+    actionmailer (7.2.2.1)
+      actionpack (= 7.2.2.1)
+      actionview (= 7.2.2.1)
+      activejob (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.1)
-      actionview (= 7.2.1)
-      activesupport (= 7.2.1)
+    actionpack (7.2.2.1)
+      actionview (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4, < 3.2)
@@ -39,36 +41,39 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.1)
-      actionpack (= 7.2.1)
-      activerecord (= 7.2.1)
-      activestorage (= 7.2.1)
-      activesupport (= 7.2.1)
+    actiontext (7.2.2.1)
+      actionpack (= 7.2.2.1)
+      activerecord (= 7.2.2.1)
+      activestorage (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.1)
-      activesupport (= 7.2.1)
+    actionview (7.2.2.1)
+      activesupport (= 7.2.2.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.2.1)
-      activesupport (= 7.2.1)
+    activejob (7.2.2.1)
+      activesupport (= 7.2.2.1)
       globalid (>= 0.3.6)
-    activemodel (7.2.1)
-      activesupport (= 7.2.1)
-    activerecord (7.2.1)
-      activemodel (= 7.2.1)
-      activesupport (= 7.2.1)
+    activemodel (7.2.2.1)
+      activesupport (= 7.2.2.1)
+    activerecord (7.2.2.1)
+      activemodel (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       timeout (>= 0.4.0)
-    activestorage (7.2.1)
-      actionpack (= 7.2.1)
-      activejob (= 7.2.1)
-      activerecord (= 7.2.1)
-      activesupport (= 7.2.1)
+    activerecord-import (2.2.0)
+      activerecord (>= 4.2)
+    activestorage (7.2.2.1)
+      actionpack (= 7.2.2.1)
+      activejob (= 7.2.2.1)
+      activerecord (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       marcel (~> 1.0)
-    activesupport (7.2.1)
+    activesupport (7.2.2.1)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
@@ -80,25 +85,32 @@ GEM
       tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    ast (2.4.2)
-    aws-eventstream (1.3.0)
-    aws-partitions (1.985.0)
-    aws-sdk-core (3.209.1)
+    after_commit_everywhere (1.6.0)
+      activerecord (>= 4.2)
+      activesupport
+    ast (2.4.3)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1113.0)
+    aws-sdk-core (3.225.1)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
+      aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
+      base64
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.94.0)
-      aws-sdk-core (~> 3, >= 3.207.0)
+      logger
+    aws-sdk-kms (1.104.0)
+      aws-sdk-core (~> 3, >= 3.225.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.167.0)
-      aws-sdk-core (~> 3, >= 3.207.0)
+    aws-sdk-s3 (1.177.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.0)
+    aws-sigv4 (1.12.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    base64 (0.2.0)
+    base64 (0.3.0)
     bcrypt (3.1.20)
+    benchmark (0.4.1)
+    benchmark-ips (2.14.0)
     better_html (2.1.1)
       actionview (>= 6.0)
       activesupport (>= 6.0)
@@ -106,11 +118,11 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.1.8)
+    bigdecimal (3.2.2)
     bindex (0.8.1)
-    bootsnap (1.18.4)
+    bootsnap (1.18.6)
       msgpack (~> 1.2)
-    brakeman (6.2.1)
+    brakeman (7.1.0)
       racc
     builder (3.3.0)
     capybara (3.40.0)
@@ -122,75 +134,112 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    childprocess (5.0.0)
+    childprocess (5.1.0)
+      logger (~> 1.5)
+    chunky_png (1.4.0)
     climate_control (1.2.0)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
     crack (1.0.0)
       bigdecimal
       rexml
     crass (1.0.6)
-    csv (3.3.0)
-    date (3.3.4)
-    debug (1.9.2)
+    cronex (0.15.0)
+      tzinfo
+      unicode (>= 0.4.4.5)
+    css_parser (1.21.1)
+      addressable
+    csv (3.3.5)
+    date (3.4.1)
+    debug (1.11.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    docile (1.4.0)
-    dotenv (3.1.4)
-    dotenv-rails (3.1.4)
-      dotenv (= 3.1.4)
+    derailed_benchmarks (2.2.1)
+      base64
+      benchmark-ips (~> 2)
+      bigdecimal
+      drb
+      get_process_mem
+      heapy (~> 0)
+      logger
+      memory_profiler (>= 0, < 2)
+      mini_histogram (>= 0.3.0)
+      mutex_m
+      ostruct
+      rack (>= 1)
+      rack-test
+      rake (> 10, < 14)
+      ruby-statistics (>= 4.0.1)
+      ruby2_keywords
+      thor (>= 0.19, < 2)
+    docile (1.4.1)
+    doorkeeper (5.8.2)
+      railties (>= 5)
+    dotenv (3.1.8)
+    dotenv-rails (3.1.8)
+      dotenv (= 3.1.8)
       railties (>= 6.1)
-    drb (2.2.1)
-    erb_lint (0.6.0)
+    drb (2.2.3)
+    erb (5.0.1)
+    erb_lint (0.9.0)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
       rainbow
       rubocop (>= 1)
       smart_properties
-    erubi (1.13.0)
+    erubi (1.13.1)
     et-orbi (1.2.11)
       tzinfo
-    faker (3.4.2)
+    event_stream_parser (1.0.0)
+    faker (3.5.2)
       i18n (>= 1.8.11, < 2)
-    faraday (2.12.0)
-      faraday-net_http (>= 2.0, < 3.4)
+    faraday (2.13.2)
+      faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (3.3.0)
-      net-http
-    faraday-retry (2.2.1)
+    faraday-multipart (1.1.1)
+      multipart-post (~> 2.0)
+    faraday-net_http (3.4.1)
+      net-http (>= 0.5.0)
+    faraday-retry (2.3.2)
       faraday (~> 2.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-arm-linux-gnu)
-    ffi (1.17.0-arm64-darwin)
-    ffi (1.17.0-x86-linux-gnu)
-    ffi (1.17.0-x86_64-darwin)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.2-aarch64-linux-gnu)
+    ffi (1.17.2-aarch64-linux-musl)
+    ffi (1.17.2-arm-linux-gnu)
+    ffi (1.17.2-arm-linux-musl)
+    ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86_64-darwin)
+    ffi (1.17.2-x86_64-linux-gnu)
+    ffi (1.17.2-x86_64-linux-musl)
+    foreman (0.88.1)
     fugit (1.11.1)
       et-orbi (~> 1, >= 1.2.11)
       raabro (~> 1.4)
+    get_process_mem (1.0.0)
+      bigdecimal (>= 2.0)
+      ffi (~> 1.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    good_job (4.3.0)
-      activejob (>= 6.1.0)
-      activerecord (>= 6.1.0)
-      concurrent-ruby (>= 1.3.1)
-      fugit (>= 1.11.0)
-      railties (>= 6.1.0)
-      thor (>= 1.0.0)
-    hashdiff (1.1.1)
-    highline (3.0.1)
-    holidays (8.8.0)
-    hotwire-livereload (1.4.1)
-      actioncable (>= 6.0.0)
+    hashdiff (1.2.0)
+    heapy (0.2.0)
+      thor
+    highline (3.1.2)
+      reline
+    hotwire-livereload (2.0.0)
+      actioncable (>= 7.0.0)
       listen (>= 3.0.0)
-      railties (>= 6.0.0)
-    i18n (1.14.6)
+      railties (>= 7.0.0)
+    hotwire_combobox (0.4.0)
+      platform_agent (>= 1.0.1)
+      rails (>= 7.0.7.2)
+      stimulus-rails (>= 1.2)
+      turbo-rails (>= 1.2)
+    htmlbeautifier (1.4.3)
+    htmlentities (4.3.4)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.14)
+    i18n-tasks (1.0.15)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       erubi
@@ -199,38 +248,71 @@ GEM
       parser (>= 3.2.2.1)
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.8, >= 1.8.1)
       terminal-table (>= 1.5.1)
-    image_processing (1.13.0)
-      mini_magick (>= 4.9.5, < 5)
+    image_processing (1.14.0)
+      mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
-    importmap-rails (2.0.2)
+    importmap-rails (2.1.0)
       actionpack (>= 6.0.0)
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
     inline_svg (1.10.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
-    intercom-rails (1.0.1)
+    intercom-rails (1.0.6)
       activesupport (> 4.0)
-    io-console (0.7.2)
-    irb (1.14.1)
+      jwt (~> 2.0)
+    io-console (0.8.0)
+    irb (1.15.2)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
+    jbuilder (2.13.0)
+      actionview (>= 5.0.0)
+      activesupport (>= 5.0.0)
     jmespath (1.6.2)
-    json (2.7.2)
-    language_server-protocol (3.17.0.3)
-    launchy (3.0.1)
+    json (2.12.2)
+    jwt (2.10.2)
+      base64
+    language_server-protocol (3.17.0.5)
+    launchy (3.1.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
+      logger (~> 1.6)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
+    lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.1)
-    loofah (2.22.0)
+    logger (1.7.0)
+    logtail (0.1.17)
+      msgpack (~> 1.0)
+    logtail-rack (0.2.6)
+      logtail (~> 0.1)
+      rack (>= 1.2, < 4.0)
+    logtail-rails (0.2.10)
+      actionpack (>= 5.0.0)
+      activerecord (>= 5.0.0)
+      logtail (~> 0.1, >= 0.1.14)
+      logtail-rack (~> 0.1)
+      railties (>= 5.0.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
+    lookbook (2.3.11)
+      activemodel
+      css_parser
+      htmlbeautifier (~> 1.3)
+      htmlentities (~> 4.3.4)
+      marcel (~> 1.0)
+      railties (>= 5.0)
+      redcarpet (~> 3.5)
+      rouge (>= 3.26, < 5.0)
+      view_component (>= 2.0)
+      yard (~> 0.9)
+      zeitwerk (~> 2.5)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
@@ -238,279 +320,366 @@ GEM
       net-smtp
     marcel (1.0.4)
     matrix (0.4.2)
-    mini_magick (4.13.2)
+    memory_profiler (1.1.0)
+    method_source (1.1.0)
+    mini_histogram (0.3.1)
+    mini_magick (5.2.0)
+      benchmark
+      logger
     mini_mime (1.1.5)
-    minitest (5.25.1)
-    mocha (2.4.5)
+    minitest (5.25.5)
+    mocha (2.7.1)
       ruby2_keywords (>= 0.0.5)
-    msgpack (1.7.2)
+    msgpack (1.8.0)
     multipart-post (2.4.1)
-    net-http (0.4.1)
+    mutex_m (0.3.0)
+    net-http (0.6.0)
       uri
-    net-imap (0.4.14)
+    net-imap (0.5.8)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
-    nio4r (2.7.3)
-    nokogiri (1.16.7-aarch64-linux)
+    nio4r (2.7.4)
+    nokogiri (1.18.8-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.16.7-arm-linux)
+    nokogiri (1.18.8-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.16.7-arm64-darwin)
+    nokogiri (1.18.8-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86-linux)
+    nokogiri (1.18.8-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-darwin)
+    nokogiri (1.18.8-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.18.8-x86_64-darwin)
       racc (~> 1.4)
-    octokit (9.1.0)
+    nokogiri (1.18.8-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.8-x86_64-linux-musl)
+      racc (~> 1.4)
+    octokit (10.0.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    pagy (9.1.0)
-    parallel (1.25.1)
-    parser (3.3.4.0)
+    ostruct (0.6.2)
+    pagy (9.3.5)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
-    pg (1.5.8)
-    prism (1.1.0)
+    pg (1.5.9)
+    plaid (41.0.0)
+      faraday (>= 1.0.1, < 3.0)
+      faraday-multipart (>= 1.0.1, < 2.0)
+    platform_agent (1.0.1)
+      activesupport (>= 5.2.0)
+      useragent (~> 0.16.3)
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.4.0)
     propshaft (1.1.0)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
       railties (>= 7.0.0)
-    psych (5.1.2)
+    psych (5.2.6)
+      date
       stringio
-    public_suffix (6.0.1)
-    puma (6.4.3)
+    public_suffix (6.0.2)
+    puma (6.6.0)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.1.7)
-    rack-session (2.0.0)
+    rack (3.1.16)
+    rack-attack (6.7.0)
+      rack (>= 1.0, < 4)
+    rack-mini-profiler (4.0.0)
+      rack (>= 1.2.0)
+    rack-session (2.1.1)
+      base64 (>= 0.1.0)
       rack (>= 3.0.0)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
-    rackup (2.1.0)
+    rackup (2.2.1)
       rack (>= 3)
-      webrick (~> 1.8)
-    rails (7.2.1)
-      actioncable (= 7.2.1)
-      actionmailbox (= 7.2.1)
-      actionmailer (= 7.2.1)
-      actionpack (= 7.2.1)
-      actiontext (= 7.2.1)
-      actionview (= 7.2.1)
-      activejob (= 7.2.1)
-      activemodel (= 7.2.1)
-      activerecord (= 7.2.1)
-      activestorage (= 7.2.1)
-      activesupport (= 7.2.1)
+    rails (7.2.2.1)
+      actioncable (= 7.2.2.1)
+      actionmailbox (= 7.2.2.1)
+      actionmailer (= 7.2.2.1)
+      actionpack (= 7.2.2.1)
+      actiontext (= 7.2.2.1)
+      actionview (= 7.2.2.1)
+      activejob (= 7.2.2.1)
+      activemodel (= 7.2.2.1)
+      activerecord (= 7.2.2.1)
+      activestorage (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       bundler (>= 1.15.0)
-      railties (= 7.2.1)
-    rails-dom-testing (2.2.0)
+      railties (= 7.2.2.1)
+    rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    rails-i18n (7.0.9)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    rails-i18n (7.0.10)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    rails-settings-cached (2.9.4)
+    rails-settings-cached (2.9.6)
       activerecord (>= 5.0.0)
       railties (>= 5.0.0)
-    railties (7.2.1)
-      actionpack (= 7.2.1)
-      activesupport (= 7.2.1)
+    railties (7.2.2.1)
+      actionpack (= 7.2.2.1)
+      activesupport (= 7.2.2.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.2.1)
+    rake (13.3.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbs (3.6.1)
+    rbs (3.9.4)
       logger
-    rdoc (6.7.0)
+    rdoc (6.14.2)
+      erb
       psych (>= 4.0.0)
-    redcarpet (3.6.0)
-    regexp_parser (2.9.2)
-    reline (0.5.10)
+    redcarpet (3.6.1)
+    redis (5.4.0)
+      redis-client (>= 0.22.0)
+    redis-client (0.25.0)
+      connection_pool
+    regexp_parser (2.10.0)
+    reline (0.6.1)
       io-console (~> 0.5)
-    rexml (3.3.8)
-    rubocop (1.65.1)
+    rexml (3.4.1)
+    rotp (6.3.0)
+    rouge (4.5.2)
+    rqrcode (3.1.0)
+      chunky_png (~> 1.0)
+      rqrcode_core (~> 2.0)
+    rqrcode_core (2.0.0)
+    rubocop (1.76.1)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.45.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
-      parser (>= 3.3.1.0)
-    rubocop-minitest (0.35.0)
-      rubocop (>= 1.61, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-performance (1.21.0)
-      rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.25.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.45.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.25.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rails (2.32.0)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails-omakase (1.0.0)
-      rubocop
-      rubocop-minitest
-      rubocop-performance
-      rubocop-rails
-    ruby-lsp (0.19.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rails-omakase (1.1.0)
+      rubocop (>= 1.72)
+      rubocop-performance (>= 1.24)
+      rubocop-rails (>= 2.30)
+    ruby-lsp (0.24.1)
       language_server-protocol (~> 3.17.0)
-      prism (>= 1.1, < 2.0)
-      rbs (>= 3, < 4)
+      prism (>= 1.2, < 2.0)
+      rbs (>= 3, < 5)
       sorbet-runtime (>= 0.5.10782)
-    ruby-lsp-rails (0.3.18)
-      ruby-lsp (>= 0.19.0, < 0.20.0)
+    ruby-lsp-rails (0.4.6)
+      ruby-lsp (>= 0.24.0, < 0.25.0)
+    ruby-openai (8.1.0)
+      event_stream_parser (>= 0.3.0, < 2.0.0)
+      faraday (>= 1)
+      faraday-multipart (>= 1)
     ruby-progressbar (1.13.0)
-    ruby-vips (2.2.2)
+    ruby-statistics (4.1.0)
+    ruby-vips (2.2.4)
       ffi (~> 1.12)
       logger
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+    rubyzip (2.4.1)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    securerandom (0.3.1)
-    selenium-webdriver (4.25.0)
+    securerandom (0.4.1)
+    selenium-webdriver (4.34.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sentry-rails (5.20.1)
+    sentry-rails (5.26.0)
       railties (>= 5.0)
-      sentry-ruby (~> 5.20.1)
-    sentry-ruby (5.20.1)
+      sentry-ruby (~> 5.26.0)
+    sentry-ruby (5.26.0)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+    sentry-sidekiq (5.26.0)
+      sentry-ruby (~> 5.26.0)
+      sidekiq (>= 3.0)
+    sidekiq (8.0.5)
+      connection_pool (>= 2.5.0)
+      json (>= 2.9.0)
+      logger (>= 1.6.2)
+      rack (>= 3.1.0)
+      redis-client (>= 0.23.2)
+    sidekiq-cron (2.3.0)
+      cronex (>= 0.13.0)
+      fugit (~> 1.8, >= 1.11.1)
+      globalid (>= 1.0.1)
+      sidekiq (>= 6.5.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
+    skylight (6.0.4)
+      activesupport (>= 5.2.0)
     smart_properties (1.17.0)
-    sorbet-runtime (0.5.11597)
-    stackprof (0.2.26)
+    sorbet-runtime (0.5.12163)
+    stackprof (0.2.27)
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
-    stringio (3.1.1)
-    stripe (13.0.0)
-    tailwindcss-rails (2.7.7)
+    stringio (3.1.7)
+    stripe (15.3.0)
+    tailwindcss-rails (4.2.3)
       railties (>= 7.0.0)
-    tailwindcss-rails (2.7.7-aarch64-linux)
-      railties (>= 7.0.0)
-    tailwindcss-rails (2.7.7-arm-linux)
-      railties (>= 7.0.0)
-    tailwindcss-rails (2.7.7-arm64-darwin)
-      railties (>= 7.0.0)
-    tailwindcss-rails (2.7.7-x86_64-darwin)
-      railties (>= 7.0.0)
-    tailwindcss-rails (2.7.7-x86_64-linux)
-      railties (>= 7.0.0)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
+      tailwindcss-ruby (~> 4.0)
+    tailwindcss-ruby (4.1.8)
+    tailwindcss-ruby (4.1.8-aarch64-linux-gnu)
+    tailwindcss-ruby (4.1.8-aarch64-linux-musl)
+    tailwindcss-ruby (4.1.8-arm64-darwin)
+    tailwindcss-ruby (4.1.8-x86_64-darwin)
+    tailwindcss-ruby (4.1.8-x86_64-linux-gnu)
+    tailwindcss-ruby (4.1.8-x86_64-linux-musl)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
     thor (1.3.2)
-    timeout (0.4.1)
-    turbo-rails (2.0.10)
-      actionpack (>= 6.0.0)
-      railties (>= 6.0.0)
+    timeout (0.4.3)
+    turbo-rails (2.0.16)
+      actionpack (>= 7.1.0)
+      railties (>= 7.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    uri (0.13.1)
-    useragent (0.16.10)
+    unicode (0.4.4.5)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.3)
+    useragent (0.16.11)
     vcr (6.3.1)
       base64
+    vernier (1.8.0)
+    view_component (3.23.2)
+      activesupport (>= 5.2.0, < 8.1)
+      concurrent-ruby (~> 1)
+      method_source (~> 1.0)
     web-console (4.2.1)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.24.0)
+    webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.8.2)
     websocket (1.2.11)
-    websocket-driver (0.7.6)
+    websocket-driver (0.8.0)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.18)
+    yard (0.9.37)
+    zeitwerk (2.7.3)
 
 PLATFORMS
-  aarch64-linux
-  arm-linux
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
   arm64-darwin
-  x86-linux
   x86_64-darwin
-  x86_64-linux
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
-  aws-sdk-s3
+  aasm
+  activerecord-import
+  after_commit_everywhere (~> 1.0)
+  aws-sdk-s3 (~> 1.177.0)
   bcrypt (~> 3.1)
+  benchmark-ips
   bootsnap
   brakeman
   capybara
   climate_control
   csv
   debug
+  derailed_benchmarks
+  doorkeeper
   dotenv-rails
   erb_lint
   faker
   faraday
   faraday-multipart
   faraday-retry
-  good_job
-  holidays
+  foreman
   hotwire-livereload
+  hotwire_combobox
   i18n-tasks
   image_processing (>= 1.2)
   importmap-rails
   inline_svg
   intercom-rails
+  jbuilder
+  jwt
   letter_opener
+  logtail-rails
+  lookbook (= 2.3.11)
   lucide-rails!
   mocha
   octokit
+  ostruct
   pagy
   pg (~> 1.5)
+  plaid
   propshaft
   puma (>= 5.0)
-  rails (~> 7.2.1)
+  rack-attack (~> 6.6)
+  rack-mini-profiler
+  rails (~> 7.2.2)
   rails-settings-cached
   redcarpet
+  redis (~> 5.4)
+  rotp (~> 6.3)
+  rqrcode (~> 3.0)
   rubocop-rails-omakase
   ruby-lsp-rails
+  ruby-openai
   selenium-webdriver
   sentry-rails
   sentry-ruby
+  sentry-sidekiq
+  sidekiq
+  sidekiq-cron
   simplecov
+  skylight
   stackprof
   stimulus-rails
   stripe
@@ -518,11 +687,13 @@ DEPENDENCIES
   turbo-rails
   tzinfo-data
   vcr
+  vernier
+  view_component
   web-console
   webmock
 
 RUBY VERSION
-   ruby 3.3.4p94
+   ruby 3.4.4p34
 
 BUNDLED WITH
-   2.5.9
+   2.6.9
diff --git a/Procfile.dev b/Procfile.dev
index 18f6d0df..eb6eadeb 100644
--- a/Procfile.dev
+++ b/Procfile.dev
@@ -1,3 +1,3 @@
-web: ${DEBUG:+rdbg -O -n -c --} bin/rails server -b 0.0.0.0
-css: bin/rails tailwindcss:watch
-worker: bundle exec good_job start
+web: bundle exec ${DEBUG:+rdbg -O -n -c --} bin/rails server -b 0.0.0.0
+css: bundle exec bin/rails tailwindcss:watch 2>/dev/null
+worker: bundle exec sidekiq
diff --git a/README.md b/README.md
index d6dd1082..18602345 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,10 @@
-<img width="1440" alt="dashboard_mockup" src="https://github.com/maybe-finance/maybe/assets/35243/a7763d0e-a942-42db-bde7-eb8d28106917">
-<sup><i>(Note: The image above is a mockup of what we're working towards. We're rapidly approaching the functionality shown, but not all of the parts are ready just yet.)</i></sup>
 
-# Maybe: The OS for your personal finances
+<img width="1190" alt="maybe_hero" src="https://github.com/user-attachments/assets/13fc5ef4-ce0f-4073-a163-9dbc3eb4c8e5" />
+
+# Maybe: The personal finance app for everyone
 
 <b>Get
-involved: [Discord](https://link.maybe.co/discord) • [Website](https://maybe.co) • [Issues](https://github.com/maybe-finance/maybe/issues)</b>
-
-_If you're looking for the previous React codebase, you can find it
-at [maybe-finance/maybe-archive](https://github.com/maybe-finance/maybe-archive)._
+involved: [Discord](https://link.maybe.co/discord) • [Website](https://maybefinance.com) • [Issues](https://github.com/maybe-finance/maybe/issues)</b>
 
 ## Backstory
 
@@ -27,11 +24,27 @@ and eventually offer a hosted version of the app for a small monthly fee.
 
 ## Maybe Hosting
 
-There are 3 primary ways to use the Maybe app:
+There are 2 primary ways to use the Maybe app:
 
-1. Managed (easiest) - _coming soon..._
-2. [One-click deploy](docs/hosting/one-click-deploy.md)
-3. [Self-host with Docker](docs/hosting/docker.md)
+1. Managed (easiest) - we're in alpha and release invites in our Discord
+2. [Self-host with Docker](docs/hosting/docker.md)
+
+## Contributing
+
+Before contributing, you'll likely find it helpful
+to [understand context and general vision/direction](https://github.com/maybe-finance/maybe/wiki).
+
+Once you've done that, please visit
+our [contributing guide](https://github.com/maybe-finance/maybe/blob/main/CONTRIBUTING.md)
+to get started!
+
+### Performance Issues
+
+With data-heavy apps, inevitably, there are performance issues. We've set up a public dashboard showing the problematic requests, along with the stacktraces to help debug them.
+
+Any contributions that help improve performance are very much welcome.
+
+https://oss.skylight.io/app/applications/XDpPIXEX52oi/recent/6h/endpoints
 
 ## Local Development Setup
 
@@ -42,19 +55,19 @@ The instructions below are for developers to get started with contributing to th
 
 ### Requirements
 
-- Ruby 3.3.4
+- See `.ruby-version` file for required Ruby version
 - PostgreSQL >9.3 (ideally, latest stable version)
 
 After cloning the repo, the basic setup commands are:
 
 ```sh
 cd maybe
-cp .env.example .env
+cp .env.local.example .env.local
 bin/setup
 bin/dev
 
 # Optionally, load demo data
-rake demo_data:reset
+rake demo_data:default
 ```
 
 And visit http://localhost:3000 to see the app. You can use the following
@@ -75,46 +88,10 @@ If you'd like multi-currency support, there are a few extra steps to follow.
 
 ### Setup Guides
 
-#### Dev Container (optional)
-
-This is 100% optional and meant for devs who don't want to worry about
-installing requirements manually for their platform. You can
-follow [this guide](https://code.visualstudio.com/docs/devcontainers/containers)
-to learn more about Dev Containers.
-
-If you run into `could not connect to server` errors, you may need to change
-your `.env`'s `DB_HOST` environment variable value to `db` to point to the
-Postgres container.
-
-#### Mac
-
-Please visit
-our [Mac dev setup guide](https://github.com/maybe-finance/maybe/wiki/Mac-Dev-Setup-Guide).
-
-#### Linux
-
-Please visit
-our [Linux dev setup guide](https://github.com/maybe-finance/maybe/wiki/Linux-Dev-Setup-Guide).
-
-#### Windows
-
-Please visit
-our [Windows dev setup guide](https://github.com/maybe-finance/maybe/wiki/Windows-Dev-Setup-Guide).
-
-### Testing Emails
-
-In development, we use `letter_opener` to automatically open emails in your
-browser. When an email sends locally, a new browser tab will open with a
-preview.
-
-## Contributing
-
-Before contributing, you'll likely find it helpful
-to [understand context and general vision/direction](https://github.com/maybe-finance/maybe/wiki).
-
-Once you've done that, please visit
-our [contributing guide](https://github.com/maybe-finance/maybe/blob/main/CONTRIBUTING.md)
-to get started!
+- [Mac dev setup guide](https://github.com/maybe-finance/maybe/wiki/Mac-Dev-Setup-Guide)
+- [Linux dev setup guide](https://github.com/maybe-finance/maybe/wiki/Linux-Dev-Setup-Guide)
+- [Windows dev setup guide](https://github.com/maybe-finance/maybe/wiki/Windows-Dev-Setup-Guide)
+- Dev containers - visit [this guide](https://code.visualstudio.com/docs/devcontainers/containers) to learn more
 
 ## Repo Activity
 
diff --git a/app/assets/fonts/geist/Geist-Black.woff2 b/app/assets/fonts/geist/Geist-Black.woff2
new file mode 100644
index 00000000..32ccbc99
Binary files /dev/null and b/app/assets/fonts/geist/Geist-Black.woff2 differ
diff --git a/app/assets/fonts/geist/Geist-Bold.woff2 b/app/assets/fonts/geist/Geist-Bold.woff2
new file mode 100644
index 00000000..cb112fb5
Binary files /dev/null and b/app/assets/fonts/geist/Geist-Bold.woff2 differ
diff --git a/app/assets/fonts/geist/Geist-ExtraBold.woff2 b/app/assets/fonts/geist/Geist-ExtraBold.woff2
new file mode 100644
index 00000000..0c8065c8
Binary files /dev/null and b/app/assets/fonts/geist/Geist-ExtraBold.woff2 differ
diff --git a/app/assets/fonts/geist/Geist-ExtraLight.woff2 b/app/assets/fonts/geist/Geist-ExtraLight.woff2
new file mode 100644
index 00000000..d42a9be0
Binary files /dev/null and b/app/assets/fonts/geist/Geist-ExtraLight.woff2 differ
diff --git a/app/assets/fonts/geist/Geist-Light.woff2 b/app/assets/fonts/geist/Geist-Light.woff2
new file mode 100644
index 00000000..f67fafee
Binary files /dev/null and b/app/assets/fonts/geist/Geist-Light.woff2 differ
diff --git a/app/assets/fonts/geist/Geist-Medium.woff2 b/app/assets/fonts/geist/Geist-Medium.woff2
new file mode 100644
index 00000000..9f5717da
Binary files /dev/null and b/app/assets/fonts/geist/Geist-Medium.woff2 differ
diff --git a/app/assets/fonts/geist/Geist-Regular.woff2 b/app/assets/fonts/geist/Geist-Regular.woff2
new file mode 100644
index 00000000..a7b2ff8c
Binary files /dev/null and b/app/assets/fonts/geist/Geist-Regular.woff2 differ
diff --git a/app/assets/fonts/geist/Geist-SemiBold.woff2 b/app/assets/fonts/geist/Geist-SemiBold.woff2
new file mode 100644
index 00000000..91d63ebb
Binary files /dev/null and b/app/assets/fonts/geist/Geist-SemiBold.woff2 differ
diff --git a/app/assets/fonts/geist/Geist-Thin.woff2 b/app/assets/fonts/geist/Geist-Thin.woff2
new file mode 100644
index 00000000..d4dbf549
Binary files /dev/null and b/app/assets/fonts/geist/Geist-Thin.woff2 differ
diff --git a/app/assets/fonts/geist/Geist[wght].woff2 b/app/assets/fonts/geist/Geist[wght].woff2
new file mode 100644
index 00000000..6fd61c44
Binary files /dev/null and b/app/assets/fonts/geist/Geist[wght].woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono-Black.woff2 b/app/assets/fonts/geist_mono/GeistMono-Black.woff2
new file mode 100644
index 00000000..5609afd3
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono-Black.woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono-Bold.woff2 b/app/assets/fonts/geist_mono/GeistMono-Bold.woff2
new file mode 100644
index 00000000..3bb7b951
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono-Bold.woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono-Light.woff2 b/app/assets/fonts/geist_mono/GeistMono-Light.woff2
new file mode 100644
index 00000000..c43c125c
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono-Light.woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono-Medium.woff2 b/app/assets/fonts/geist_mono/GeistMono-Medium.woff2
new file mode 100644
index 00000000..67495e48
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono-Medium.woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono-Regular.woff2 b/app/assets/fonts/geist_mono/GeistMono-Regular.woff2
new file mode 100644
index 00000000..d6d865af
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono-Regular.woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono-SemiBold.woff2 b/app/assets/fonts/geist_mono/GeistMono-SemiBold.woff2
new file mode 100644
index 00000000..bf25a1da
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono-SemiBold.woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono-Thin.woff2 b/app/assets/fonts/geist_mono/GeistMono-Thin.woff2
new file mode 100644
index 00000000..76b4619d
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono-Thin.woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono-UltraBlack.woff2 b/app/assets/fonts/geist_mono/GeistMono-UltraBlack.woff2
new file mode 100644
index 00000000..ffb26733
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono-UltraBlack.woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono-UltraLight.woff2 b/app/assets/fonts/geist_mono/GeistMono-UltraLight.woff2
new file mode 100644
index 00000000..9c6469bf
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono-UltraLight.woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono[wght].woff2 b/app/assets/fonts/geist_mono/GeistMono[wght].woff2
new file mode 100644
index 00000000..dae00379
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono[wght].woff2 differ
diff --git a/app/assets/images/ai-dark.svg b/app/assets/images/ai-dark.svg
new file mode 100644
index 00000000..bdcbfea6
--- /dev/null
+++ b/app/assets/images/ai-dark.svg
@@ -0,0 +1,71 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="none">
+  <g filter="url(#filter0_i_2942_1229)">
+    <rect width="32" height="32" rx="10" fill="url(#paint0_linear_2942_1229)"/>
+    <rect width="32" height="32" rx="10" fill="white" fill-opacity="0.07" style="mix-blend-mode:plus-lighter"/>
+  </g>
+  <g filter="url(#filter1_ii_2942_1229)">
+    <rect x="1.75" y="1.75" width="28.5" height="28.5" rx="8" fill="url(#paint1_linear_2942_1229)"/>
+  </g>
+  <path d="M21.524 8.8489C21.9357 8.84115 22.2757 9.16862 22.2835 9.58033C22.3104 11.0111 22.3592 12.4355 22.4277 13.8639C22.4474 14.2752 22.1299 14.6246 21.7186 14.6443C21.3073 14.664 20.9579 14.3466 20.9382 13.9353C20.8691 12.4933 20.8198 11.0544 20.7926 9.60841C20.7848 9.1967 21.1123 8.85665 21.524 8.8489Z" fill="#141414"/>
+  <path d="M21.524 8.8489C21.9357 8.84115 22.2757 9.16862 22.2835 9.58033C22.3104 11.0111 22.3592 12.4355 22.4277 13.8639C22.4474 14.2752 22.1299 14.6246 21.7186 14.6443C21.3073 14.664 20.9579 14.3466 20.9382 13.9353C20.8691 12.4933 20.8198 11.0544 20.7926 9.60841C20.7848 9.1967 21.1123 8.85665 21.524 8.8489Z" fill="url(#paint2_linear_2942_1229)"/>
+  <path d="M15.4203 9.51724C15.6565 9.17999 15.5747 8.71506 15.2375 8.47877C14.9002 8.24249 14.4353 8.32434 14.199 8.66158C13.5874 9.53452 12.935 10.3942 12.2667 11.2747C12.0113 11.6113 11.7536 11.951 11.4949 12.2955C11.4948 12.2256 11.4945 12.1549 11.494 12.0833C11.4899 11.4759 11.4682 10.827 11.3511 10.1757C11.2781 9.77047 10.8905 9.50105 10.4852 9.57398C10.0799 9.64691 9.8105 10.0346 9.88343 10.4398C9.97721 10.9609 9.99884 11.5056 10.0029 12.0935C10.0039 12.2387 10.0037 12.3886 10.0036 12.5417C10.0032 12.9877 10.0028 13.4604 10.0303 13.919C10.0365 14.0218 10.0632 14.1185 10.1062 14.2053C9.39275 15.2317 8.72212 16.2913 8.16155 17.3909C8.15394 17.4058 8.14271 17.427 8.12867 17.4534C8.04301 17.6148 7.85275 17.9733 7.74077 18.3186C7.67701 18.5151 7.60594 18.7988 7.63944 19.0917C7.65733 19.2481 7.70803 19.4336 7.8297 19.6082C7.95607 19.7894 8.13073 19.9179 8.32815 19.9925C9.5403 20.4508 10.8812 20.4975 12.1498 20.4009C13.1799 20.3225 14.2197 20.1434 15.1461 19.9837C15.358 19.9472 15.5639 19.9117 15.7625 19.8787C16.1687 19.8111 16.4432 19.4271 16.3756 19.0209C16.3081 18.6147 15.924 18.3402 15.5178 18.4077C15.3021 18.4436 15.0842 18.4811 14.8647 18.5189C13.9419 18.6776 12.9891 18.8415 12.0367 18.914C10.998 18.9931 10.0276 18.956 9.18383 18.7076C9.25117 18.5246 9.34702 18.3419 9.42851 18.1866C9.45032 18.145 9.47115 18.1053 9.49008 18.0682C10.2409 16.5954 11.2184 15.1729 12.268 13.7535C12.6447 13.2441 13.035 12.7296 13.4266 12.2134C14.1092 11.3136 14.7956 10.4088 15.4203 9.51724Z" fill="#141414"/>
+  <path d="M15.4203 9.51724C15.6565 9.17999 15.5747 8.71506 15.2375 8.47877C14.9002 8.24249 14.4353 8.32434 14.199 8.66158C13.5874 9.53452 12.935 10.3942 12.2667 11.2747C12.0113 11.6113 11.7536 11.951 11.4949 12.2955C11.4948 12.2256 11.4945 12.1549 11.494 12.0833C11.4899 11.4759 11.4682 10.827 11.3511 10.1757C11.2781 9.77047 10.8905 9.50105 10.4852 9.57398C10.0799 9.64691 9.8105 10.0346 9.88343 10.4398C9.97721 10.9609 9.99884 11.5056 10.0029 12.0935C10.0039 12.2387 10.0037 12.3886 10.0036 12.5417C10.0032 12.9877 10.0028 13.4604 10.0303 13.919C10.0365 14.0218 10.0632 14.1185 10.1062 14.2053C9.39275 15.2317 8.72212 16.2913 8.16155 17.3909C8.15394 17.4058 8.14271 17.427 8.12867 17.4534C8.04301 17.6148 7.85275 17.9733 7.74077 18.3186C7.67701 18.5151 7.60594 18.7988 7.63944 19.0917C7.65733 19.2481 7.70803 19.4336 7.8297 19.6082C7.95607 19.7894 8.13073 19.9179 8.32815 19.9925C9.5403 20.4508 10.8812 20.4975 12.1498 20.4009C13.1799 20.3225 14.2197 20.1434 15.1461 19.9837C15.358 19.9472 15.5639 19.9117 15.7625 19.8787C16.1687 19.8111 16.4432 19.4271 16.3756 19.0209C16.3081 18.6147 15.924 18.3402 15.5178 18.4077C15.3021 18.4436 15.0842 18.4811 14.8647 18.5189C13.9419 18.6776 12.9891 18.8415 12.0367 18.914C10.998 18.9931 10.0276 18.956 9.18383 18.7076C9.25117 18.5246 9.34702 18.3419 9.42851 18.1866C9.45032 18.145 9.47115 18.1053 9.49008 18.0682C10.2409 16.5954 11.2184 15.1729 12.268 13.7535C12.6447 13.2441 13.035 12.7296 13.4266 12.2134C14.1092 11.3136 14.7956 10.4088 15.4203 9.51724Z" fill="url(#paint3_linear_2942_1229)"/>
+  <path d="M21.5709 21.534C21.6983 21.1424 21.484 20.7217 21.0924 20.5944C20.7008 20.467 20.2801 20.6813 20.1528 21.0729C19.9756 21.6179 19.7424 22.0319 19.4518 22.3169C19.1738 22.5896 18.8105 22.7774 18.2938 22.8258C17.5241 22.898 16.7434 22.5737 16.4029 22.0103C16.1898 21.6579 15.7315 21.545 15.3791 21.758C15.0267 21.971 14.9137 22.4294 15.1267 22.7818C15.8398 23.9614 17.2577 24.4207 18.4329 24.3105C19.2796 24.2311 19.9656 23.9017 20.496 23.3815C21.0138 22.8737 21.3481 22.2193 21.5709 21.534Z" fill="#141414"/>
+  <path d="M21.5709 21.534C21.6983 21.1424 21.484 20.7217 21.0924 20.5944C20.7008 20.467 20.2801 20.6813 20.1528 21.0729C19.9756 21.6179 19.7424 22.0319 19.4518 22.3169C19.1738 22.5896 18.8105 22.7774 18.2938 22.8258C17.5241 22.898 16.7434 22.5737 16.4029 22.0103C16.1898 21.6579 15.7315 21.545 15.3791 21.758C15.0267 21.971 14.9137 22.4294 15.1267 22.7818C15.8398 23.9614 17.2577 24.4207 18.4329 24.3105C19.2796 24.2311 19.9656 23.9017 20.496 23.3815C21.0138 22.8737 21.3481 22.2193 21.5709 21.534Z" fill="url(#paint4_linear_2942_1229)"/>
+  <defs>
+    <filter id="filter0_i_2942_1229" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+      <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+      <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset/>
+      <feGaussianBlur stdDeviation="0.49869"/>
+      <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+      <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
+      <feBlend mode="normal" in2="shape" result="effect1_innerShadow_2942_1229"/>
+    </filter>
+    <filter id="filter1_ii_2942_1229" x="1.75" y="0.75" width="28.5" height="30.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+      <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+      <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="-1"/>
+      <feGaussianBlur stdDeviation="1"/>
+      <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+      <feColorMatrix type="matrix" values="0 0 0 0 0.980392 0 0 0 0 0.309804 0 0 0 0 0.67451 0 0 0 0.2 0"/>
+      <feBlend mode="normal" in2="shape" result="effect1_innerShadow_2942_1229"/>
+      <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="1"/>
+      <feGaussianBlur stdDeviation="1"/>
+      <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+      <feColorMatrix type="matrix" values="0 0 0 0 0.2 0 0 0 0 0.835294 0 0 0 0 1 0 0 0 0.15 0"/>
+      <feBlend mode="normal" in2="effect1_innerShadow_2942_1229" result="effect2_innerShadow_2942_1229"/>
+    </filter>
+    <linearGradient id="paint0_linear_2942_1229" x1="16" y1="0" x2="16" y2="32" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#22CCEE"/>
+      <stop offset="0.274483" stop-color="#1570EF"/>
+      <stop offset="0.629793" stop-color="#6927DA"/>
+      <stop offset="1" stop-color="#F23E94"/>
+    </linearGradient>
+    <linearGradient id="paint1_linear_2942_1229" x1="16" y1="10.6562" x2="16" y2="30.25" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#171717"/>
+      <stop offset="0.3" stop-color="#0B0B0B"/>
+    </linearGradient>
+    <linearGradient id="paint2_linear_2942_1229" x1="17.8739" y1="7.84186" x2="13.7328" y2="23.2967" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#22CCEE"/>
+      <stop offset="0.274483" stop-color="#1570EF"/>
+      <stop offset="0.629793" stop-color="#6927DA"/>
+      <stop offset="1" stop-color="#F23E94"/>
+    </linearGradient>
+    <linearGradient id="paint3_linear_2942_1229" x1="17.8739" y1="7.84186" x2="13.7328" y2="23.2967" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#22CCEE"/>
+      <stop offset="0.274483" stop-color="#1570EF"/>
+      <stop offset="0.629793" stop-color="#6927DA"/>
+      <stop offset="1" stop-color="#F23E94"/>
+    </linearGradient>
+    <linearGradient id="paint4_linear_2942_1229" x1="17.8739" y1="7.84186" x2="13.7328" y2="23.2967" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#22CCEE"/>
+      <stop offset="0.274483" stop-color="#1570EF"/>
+      <stop offset="0.629793" stop-color="#6927DA"/>
+      <stop offset="1" stop-color="#F23E94"/>
+    </linearGradient>
+  </defs>
+</svg>
\ No newline at end of file
diff --git a/app/assets/images/ai.svg b/app/assets/images/ai.svg
new file mode 100644
index 00000000..94f17808
--- /dev/null
+++ b/app/assets/images/ai.svg
@@ -0,0 +1,71 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="none">
+  <g filter="url(#filter0_i_2942_1218)">
+    <rect width="32" height="32" rx="10" fill="url(#paint0_linear_2942_1218)"/>
+    <rect width="32" height="32" rx="10" fill="white" fill-opacity="0.07" style="mix-blend-mode:plus-lighter"/>
+  </g>
+  <g filter="url(#filter1_ii_2942_1218)">
+    <rect x="1.75" y="1.75" width="28.5" height="28.5" rx="8" fill="url(#paint1_linear_2942_1218)"/>
+  </g>
+  <path d="M21.524 8.8489C21.9357 8.84115 22.2757 9.16862 22.2835 9.58033C22.3104 11.0111 22.3592 12.4355 22.4277 13.8639C22.4474 14.2752 22.1299 14.6246 21.7186 14.6443C21.3073 14.664 20.9579 14.3466 20.9382 13.9353C20.8691 12.4933 20.8198 11.0544 20.7926 9.60841C20.7848 9.1967 21.1123 8.85665 21.524 8.8489Z" fill="#141414"/>
+  <path d="M21.524 8.8489C21.9357 8.84115 22.2757 9.16862 22.2835 9.58033C22.3104 11.0111 22.3592 12.4355 22.4277 13.8639C22.4474 14.2752 22.1299 14.6246 21.7186 14.6443C21.3073 14.664 20.9579 14.3466 20.9382 13.9353C20.8691 12.4933 20.8198 11.0544 20.7926 9.60841C20.7848 9.1967 21.1123 8.85665 21.524 8.8489Z" fill="url(#paint2_linear_2942_1218)"/>
+  <path d="M15.4203 9.51724C15.6565 9.17999 15.5747 8.71506 15.2375 8.47877C14.9002 8.24249 14.4353 8.32434 14.199 8.66158C13.5874 9.53452 12.935 10.3942 12.2667 11.2747C12.0113 11.6113 11.7536 11.951 11.4949 12.2955C11.4948 12.2256 11.4945 12.1549 11.494 12.0833C11.4899 11.4759 11.4682 10.827 11.3511 10.1757C11.2781 9.77047 10.8905 9.50105 10.4852 9.57398C10.0799 9.64691 9.8105 10.0346 9.88343 10.4398C9.97721 10.9609 9.99884 11.5056 10.0029 12.0935C10.0039 12.2387 10.0037 12.3886 10.0036 12.5417C10.0032 12.9877 10.0028 13.4604 10.0303 13.919C10.0365 14.0218 10.0632 14.1185 10.1062 14.2053C9.39275 15.2317 8.72212 16.2913 8.16155 17.3909C8.15394 17.4058 8.14271 17.427 8.12867 17.4534C8.04301 17.6148 7.85275 17.9733 7.74077 18.3186C7.67701 18.5151 7.60594 18.7988 7.63944 19.0917C7.65733 19.2481 7.70803 19.4336 7.8297 19.6082C7.95607 19.7894 8.13073 19.9179 8.32815 19.9925C9.5403 20.4508 10.8812 20.4975 12.1498 20.4009C13.1799 20.3225 14.2197 20.1434 15.1461 19.9837C15.358 19.9472 15.5639 19.9117 15.7625 19.8787C16.1687 19.8111 16.4432 19.4271 16.3756 19.0209C16.3081 18.6147 15.924 18.3402 15.5178 18.4077C15.3021 18.4436 15.0842 18.4811 14.8647 18.5189C13.9419 18.6776 12.9891 18.8415 12.0367 18.914C10.998 18.9931 10.0276 18.956 9.18383 18.7076C9.25117 18.5246 9.34702 18.3419 9.42851 18.1866C9.45032 18.145 9.47115 18.1053 9.49008 18.0682C10.2409 16.5954 11.2184 15.1729 12.268 13.7535C12.6447 13.2441 13.035 12.7296 13.4266 12.2134C14.1092 11.3136 14.7956 10.4088 15.4203 9.51724Z" fill="#141414"/>
+  <path d="M15.4203 9.51724C15.6565 9.17999 15.5747 8.71506 15.2375 8.47877C14.9002 8.24249 14.4353 8.32434 14.199 8.66158C13.5874 9.53452 12.935 10.3942 12.2667 11.2747C12.0113 11.6113 11.7536 11.951 11.4949 12.2955C11.4948 12.2256 11.4945 12.1549 11.494 12.0833C11.4899 11.4759 11.4682 10.827 11.3511 10.1757C11.2781 9.77047 10.8905 9.50105 10.4852 9.57398C10.0799 9.64691 9.8105 10.0346 9.88343 10.4398C9.97721 10.9609 9.99884 11.5056 10.0029 12.0935C10.0039 12.2387 10.0037 12.3886 10.0036 12.5417C10.0032 12.9877 10.0028 13.4604 10.0303 13.919C10.0365 14.0218 10.0632 14.1185 10.1062 14.2053C9.39275 15.2317 8.72212 16.2913 8.16155 17.3909C8.15394 17.4058 8.14271 17.427 8.12867 17.4534C8.04301 17.6148 7.85275 17.9733 7.74077 18.3186C7.67701 18.5151 7.60594 18.7988 7.63944 19.0917C7.65733 19.2481 7.70803 19.4336 7.8297 19.6082C7.95607 19.7894 8.13073 19.9179 8.32815 19.9925C9.5403 20.4508 10.8812 20.4975 12.1498 20.4009C13.1799 20.3225 14.2197 20.1434 15.1461 19.9837C15.358 19.9472 15.5639 19.9117 15.7625 19.8787C16.1687 19.8111 16.4432 19.4271 16.3756 19.0209C16.3081 18.6147 15.924 18.3402 15.5178 18.4077C15.3021 18.4436 15.0842 18.4811 14.8647 18.5189C13.9419 18.6776 12.9891 18.8415 12.0367 18.914C10.998 18.9931 10.0276 18.956 9.18383 18.7076C9.25117 18.5246 9.34702 18.3419 9.42851 18.1866C9.45032 18.145 9.47115 18.1053 9.49008 18.0682C10.2409 16.5954 11.2184 15.1729 12.268 13.7535C12.6447 13.2441 13.035 12.7296 13.4266 12.2134C14.1092 11.3136 14.7956 10.4088 15.4203 9.51724Z" fill="url(#paint3_linear_2942_1218)"/>
+  <path d="M21.5709 21.534C21.6983 21.1424 21.484 20.7217 21.0924 20.5944C20.7008 20.467 20.2801 20.6813 20.1528 21.0729C19.9756 21.6179 19.7424 22.0319 19.4518 22.3169C19.1738 22.5896 18.8105 22.7774 18.2938 22.8258C17.5241 22.898 16.7434 22.5737 16.4029 22.0103C16.1898 21.6579 15.7315 21.545 15.3791 21.758C15.0267 21.971 14.9137 22.4294 15.1267 22.7818C15.8398 23.9614 17.2577 24.4207 18.4329 24.3105C19.2796 24.2311 19.9656 23.9017 20.496 23.3815C21.0138 22.8737 21.3481 22.2193 21.5709 21.534Z" fill="#141414"/>
+  <path d="M21.5709 21.534C21.6983 21.1424 21.484 20.7217 21.0924 20.5944C20.7008 20.467 20.2801 20.6813 20.1528 21.0729C19.9756 21.6179 19.7424 22.0319 19.4518 22.3169C19.1738 22.5896 18.8105 22.7774 18.2938 22.8258C17.5241 22.898 16.7434 22.5737 16.4029 22.0103C16.1898 21.6579 15.7315 21.545 15.3791 21.758C15.0267 21.971 14.9137 22.4294 15.1267 22.7818C15.8398 23.9614 17.2577 24.4207 18.4329 24.3105C19.2796 24.2311 19.9656 23.9017 20.496 23.3815C21.0138 22.8737 21.3481 22.2193 21.5709 21.534Z" fill="url(#paint4_linear_2942_1218)"/>
+  <defs>
+    <filter id="filter0_i_2942_1218" x="0" y="0" width="32" height="32" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+      <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+      <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset/>
+      <feGaussianBlur stdDeviation="0.49869"/>
+      <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+      <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
+      <feBlend mode="normal" in2="shape" result="effect1_innerShadow_2942_1218"/>
+    </filter>
+    <filter id="filter1_ii_2942_1218" x="1.75" y="0.861111" width="28.5" height="30.2778" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+      <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+      <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="-0.888889"/>
+      <feGaussianBlur stdDeviation="0.888889"/>
+      <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+      <feColorMatrix type="matrix" values="0 0 0 0 0.980392 0 0 0 0 0.309804 0 0 0 0 0.67451 0 0 0 0.1 0"/>
+      <feBlend mode="normal" in2="shape" result="effect1_innerShadow_2942_1218"/>
+      <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+      <feOffset dy="0.888889"/>
+      <feGaussianBlur stdDeviation="0.888889"/>
+      <feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+      <feColorMatrix type="matrix" values="0 0 0 0 0.2 0 0 0 0 0.835294 0 0 0 0 1 0 0 0 0.1 0"/>
+      <feBlend mode="normal" in2="effect1_innerShadow_2942_1218" result="effect2_innerShadow_2942_1218"/>
+    </filter>
+    <linearGradient id="paint0_linear_2942_1218" x1="16" y1="0" x2="16" y2="32" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#22CCEE"/>
+      <stop offset="0.274483" stop-color="#1570EF"/>
+      <stop offset="0.629793" stop-color="#6927DA"/>
+      <stop offset="1" stop-color="#F23E94"/>
+    </linearGradient>
+    <linearGradient id="paint1_linear_2942_1218" x1="16" y1="10.6562" x2="16" y2="30.25" gradientUnits="userSpaceOnUse">
+      <stop stop-color="white"/>
+      <stop offset="0.3" stop-color="#F7F7F7"/>
+    </linearGradient>
+    <linearGradient id="paint2_linear_2942_1218" x1="17.8739" y1="7.84186" x2="13.7328" y2="23.2967" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#22CCEE"/>
+      <stop offset="0.274483" stop-color="#1570EF"/>
+      <stop offset="0.629793" stop-color="#6927DA"/>
+      <stop offset="1" stop-color="#F23E94"/>
+    </linearGradient>
+    <linearGradient id="paint3_linear_2942_1218" x1="17.8739" y1="7.84186" x2="13.7328" y2="23.2967" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#22CCEE"/>
+      <stop offset="0.274483" stop-color="#1570EF"/>
+      <stop offset="0.629793" stop-color="#6927DA"/>
+      <stop offset="1" stop-color="#F23E94"/>
+    </linearGradient>
+    <linearGradient id="paint4_linear_2942_1218" x1="17.8739" y1="7.84186" x2="13.7328" y2="23.2967" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#22CCEE"/>
+      <stop offset="0.274483" stop-color="#1570EF"/>
+      <stop offset="0.629793" stop-color="#6927DA"/>
+      <stop offset="1" stop-color="#F23E94"/>
+    </linearGradient>
+  </defs>
+</svg>
\ No newline at end of file
diff --git a/app/assets/images/icon-assistant.svg b/app/assets/images/icon-assistant.svg
new file mode 100644
index 00000000..7ba1299f
--- /dev/null
+++ b/app/assets/images/icon-assistant.svg
@@ -0,0 +1,37 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <rect x="0.75" y="0.75" width="18.5" height="18.5" rx="5.25"
+        class="gradient-fill"
+        fill="url(#paint0_linear_2046_1939)" />
+    <rect x="0.75" y="0.75" width="18.5" height="18.5" rx="5.25" stroke="currentColor" stroke-width="1.5" />
+    <path
+        d="M13.166 5.78146C13.4233 5.77662 13.6358 5.98129 13.6407 6.2386C13.6575 7.13281 13.688 8.02308 13.7308 8.91583C13.7431 9.1729 13.5447 9.39128 13.2876 9.40361C13.0306 9.41593 12.8122 9.21753 12.7999 8.96046C12.7567 8.05922 12.7259 7.1599 12.7089 6.25615C12.704 5.99883 12.9087 5.78631 13.166 5.78146Z"
+        fill="currentColor" />
+    <path
+        d="M9.35116 6.19917C9.49883 5.98839 9.44768 5.69781 9.2369 5.55013C9.02612 5.40246 8.73554 5.45361 8.58786 5.66439C8.20561 6.20997 7.79785 6.74728 7.3802 7.29762C7.22057 7.50796 7.05946 7.72025 6.89782 7.93558C6.89774 7.8919 6.89758 7.84771 6.89727 7.80294C6.89466 7.42332 6.88115 7.01776 6.8079 6.61074C6.76232 6.35744 6.52004 6.18906 6.26674 6.23464C6.01345 6.28022 5.84506 6.5225 5.89064 6.7758C5.94925 7.10149 5.96277 7.44189 5.9653 7.80935C5.96592 7.90008 5.96583 7.9938 5.96575 8.08947C5.96549 8.36824 5.96523 8.66365 5.98243 8.95029C5.98629 9.01454 6.00299 9.07497 6.02989 9.12923C5.58396 9.77068 5.16482 10.433 4.81446 11.1202C4.8097 11.1296 4.80269 11.1428 4.79392 11.1593C4.74038 11.2602 4.62146 11.4842 4.55147 11.7C4.51162 11.8229 4.46721 12.0002 4.48814 12.1832C4.49932 12.281 4.53101 12.3969 4.60706 12.506C4.68604 12.6193 4.7952 12.6996 4.91859 12.7462C5.67618 13.0326 6.51425 13.0618 7.30714 13.0015C7.95092 12.9525 8.60078 12.8405 9.17979 12.7407C9.31222 12.7179 9.44094 12.6957 9.56504 12.6751C9.81891 12.6329 9.99049 12.3928 9.94826 12.1389C9.90603 11.8851 9.66599 11.7135 9.41211 11.7557C9.27728 11.7782 9.14113 11.8016 9.00391 11.8252C8.42721 11.9244 7.83168 12.0269 7.2364 12.0722C6.58727 12.1216 5.98075 12.0984 5.45339 11.9432C5.49547 11.8288 5.55538 11.7146 5.60631 11.6175C5.61995 11.5915 5.63296 11.5667 5.64479 11.5435C6.11404 10.623 6.72498 9.73396 7.38096 8.84686C7.61644 8.52843 7.86038 8.20687 8.10509 7.8843C8.53175 7.3219 8.96074 6.75642 9.35116 6.19917Z"
+        fill="currentColor" />
+    <path
+        d="M13.1953 13.7096C13.2749 13.4649 13.141 13.2019 12.8962 13.1224C12.6515 13.0428 12.3886 13.1767 12.309 13.4215C12.1983 13.7621 12.0525 14.0208 11.8709 14.199C11.6971 14.3694 11.4701 14.4868 11.1471 14.517C10.6661 14.5621 10.1781 14.3594 9.96528 14.0074C9.83214 13.7871 9.54566 13.7165 9.32541 13.8496C9.10516 13.9828 9.03455 14.2693 9.16769 14.4895C9.61336 15.2268 10.4996 15.5138 11.2341 15.445C11.7632 15.3954 12.192 15.1895 12.5235 14.8644C12.8471 14.547 13.0561 14.1379 13.1953 13.7096Z"
+        fill="currentColor" />
+    <path
+        d="M13.166 5.78146C13.4233 5.77662 13.6358 5.98129 13.6407 6.2386C13.6575 7.13281 13.688 8.02308 13.7308 8.91583C13.7431 9.1729 13.5447 9.39128 13.2876 9.40361C13.0306 9.41593 12.8122 9.21753 12.7999 8.96046C12.7567 8.05922 12.7259 7.1599 12.7089 6.25615C12.704 5.99883 12.9087 5.78631 13.166 5.78146Z"
+        stroke="currentColor" stroke-width="0.3" stroke-linecap="round" />
+    <path
+        d="M9.35116 6.19917C9.49883 5.98839 9.44768 5.69781 9.2369 5.55013C9.02612 5.40246 8.73554 5.45361 8.58786 5.66439C8.20561 6.20997 7.79785 6.74728 7.3802 7.29762C7.22057 7.50796 7.05946 7.72025 6.89782 7.93558C6.89774 7.8919 6.89758 7.84771 6.89727 7.80294C6.89466 7.42332 6.88115 7.01776 6.8079 6.61074C6.76232 6.35744 6.52004 6.18906 6.26674 6.23464C6.01345 6.28022 5.84506 6.5225 5.89064 6.7758C5.94925 7.10149 5.96277 7.44189 5.9653 7.80935C5.96592 7.90008 5.96583 7.9938 5.96575 8.08947C5.96549 8.36824 5.96523 8.66365 5.98243 8.95029C5.98629 9.01454 6.00299 9.07497 6.02989 9.12923C5.58396 9.77068 5.16482 10.433 4.81446 11.1202C4.8097 11.1296 4.80269 11.1428 4.79392 11.1593C4.74038 11.2602 4.62146 11.4842 4.55147 11.7C4.51162 11.8229 4.46721 12.0002 4.48814 12.1832C4.49932 12.281 4.53101 12.3969 4.60706 12.506C4.68604 12.6193 4.7952 12.6996 4.91859 12.7462C5.67618 13.0326 6.51425 13.0618 7.30714 13.0015C7.95092 12.9525 8.60078 12.8405 9.17979 12.7407C9.31222 12.7179 9.44094 12.6957 9.56504 12.6751C9.81891 12.6329 9.99049 12.3928 9.94826 12.1389C9.90603 11.8851 9.66599 11.7135 9.41211 11.7557C9.27728 11.7782 9.14113 11.8016 9.00391 11.8252C8.42721 11.9244 7.83168 12.0269 7.2364 12.0722C6.58727 12.1216 5.98075 12.0984 5.45339 11.9432C5.49547 11.8288 5.55538 11.7146 5.60631 11.6175C5.61995 11.5915 5.63296 11.5667 5.64479 11.5435C6.11404 10.623 6.72498 9.73396 7.38096 8.84686C7.61644 8.52843 7.86038 8.20687 8.10509 7.8843C8.53175 7.3219 8.96074 6.75642 9.35116 6.19917Z"
+        stroke="currentColor" stroke-width="0.3" stroke-linecap="round" />
+    <path
+        d="M13.1953 13.7096C13.2749 13.4649 13.141 13.2019 12.8962 13.1224C12.6515 13.0428 12.3886 13.1767 12.309 13.4215C12.1983 13.7621 12.0525 14.0208 11.8709 14.199C11.6971 14.3694 11.4701 14.4868 11.1471 14.517C10.6661 14.5621 10.1781 14.3594 9.96528 14.0074C9.83214 13.7871 9.54566 13.7165 9.32541 13.8496C9.10516 13.9828 9.03455 14.2693 9.16769 14.4895C9.61336 15.2268 10.4996 15.5138 11.2341 15.445C11.7632 15.3954 12.192 15.1895 12.5235 14.8644C12.8471 14.547 13.0561 14.1379 13.1953 13.7096Z"
+        stroke="currentColor" stroke-width="0.3" stroke-linecap="round" />
+    <style>
+        [data-theme=dark] .gradient-fill {
+            fill: transparent;
+        }
+    </style>
+    <defs>
+        <linearGradient id="paint0_linear_2046_1939" x1="10" y1="6.25" x2="10" y2="20"
+            gradientUnits="userSpaceOnUse">
+            <stop stop-color="white" />
+            <stop offset="0.3" stop-color="#F7F7F7" />
+        </linearGradient>
+    </defs>
+</svg>
+    
\ No newline at end of file
diff --git a/app/assets/images/icon-csv.svg b/app/assets/images/icon-csv.svg
new file mode 100644
index 00000000..ce835a31
--- /dev/null
+++ b/app/assets/images/icon-csv.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+        d="M2.5 7.5H17.5M2.5 12.5H17.5M7.5 7.5V17.5M12.5 7.5V17.5M4.16667 2.5H15.8333C16.7538 2.5 17.5 3.24619 17.5 4.16667V15.8333C17.5 16.7538 16.7538 17.5 15.8333 17.5H4.16667C3.24619 17.5 2.5 16.7538 2.5 15.8333V4.16667C2.5 3.24619 3.24619 2.5 4.16667 2.5Z"
+        stroke="#737373" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+</svg>
\ No newline at end of file
diff --git a/app/assets/images/logo-color.png b/app/assets/images/logo-color.png
new file mode 100644
index 00000000..f536c33e
Binary files /dev/null and b/app/assets/images/logo-color.png differ
diff --git a/app/assets/images/logomark-color.svg b/app/assets/images/logomark-color.svg
new file mode 100644
index 00000000..2c1bf71d
--- /dev/null
+++ b/app/assets/images/logomark-color.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 36 36" fill="none">
+  <path d="M8.39804 24.0315H4.09584C3.07641 24.0315 2.25 24.8609 2.25 25.8841C2.25 26.9072 3.07641 27.7367 4.09584 27.7367H8.39804C9.41747 27.7367 10.2439 26.9072 10.2439 25.8841C10.2439 24.8609 9.41747 24.0315 8.39804 24.0315Z" fill="#F23E94"/>
+  <path d="M27.6403 27.7359H31.9425C32.9619 27.7359 33.7883 26.9065 33.7883 25.8833C33.7883 24.8601 32.9619 24.0307 31.9425 24.0307H27.6403C26.6209 24.0307 25.7945 24.8601 25.7945 25.8833C25.7945 26.9065 26.6209 27.7359 27.6403 27.7359Z" fill="#F23E94"/>
+  <path d="M19.7588 24.0189H16.2567C15.2373 24.0189 14.4109 24.8483 14.4109 25.8715C14.4109 26.8947 15.2373 27.7241 16.2567 27.7241H19.7588C20.7783 27.7241 21.6047 26.8947 21.6047 25.8715C21.6047 24.8483 20.7783 24.0189 19.7588 24.0189Z" fill="#F23E94"/>
+  <path d="M25.9683 22.4047H30.1112C31.1306 22.4047 31.957 21.5753 31.957 20.5521C31.957 19.529 31.1306 18.6995 30.1112 18.6995H25.9683C24.9489 18.6995 24.1225 19.529 24.1225 20.5521C24.1225 21.5753 24.9489 22.4047 25.9683 22.4047Z" fill="#6927DA"/>
+  <path d="M9.99971 18.6993H5.85685C4.83742 18.6993 4.01101 19.5288 4.01101 20.5519C4.01101 21.5751 4.83742 22.4045 5.85685 22.4045H9.99971C11.0191 22.4045 11.8455 21.5751 11.8455 20.5519C11.8455 19.5288 11.0191 18.6993 9.99971 18.6993Z" fill="#6927DA"/>
+  <path d="M21.0888 18.6875H14.924C13.9045 18.6875 13.0781 19.517 13.0781 20.5401C13.0781 21.5633 13.9045 22.3927 14.924 22.3927H21.0888C22.1082 22.3927 22.9346 21.5633 22.9346 20.5401C22.9346 19.517 22.1082 18.6875 21.0888 18.6875Z" fill="#6927DA"/>
+  <path d="M15.5578 13.2072H7.69136C6.67193 13.2072 5.84552 14.0366 5.84552 15.0598C5.84552 16.0829 6.67193 16.9123 7.69136 16.9123H15.5578C16.5772 16.9123 17.4036 16.0829 17.4036 15.0598C17.4036 14.0366 16.5772 13.2072 15.5578 13.2072Z" fill="#1570EF"/>
+  <path d="M20.9094 16.9116H28.2735C29.2929 16.9116 30.1193 16.0821 30.1193 15.059C30.1193 14.0358 29.2929 13.2064 28.2735 13.2064L20.9094 13.2064C19.89 13.2064 19.0636 14.0358 19.0636 15.059C19.0636 16.0821 19.89 16.9116 20.9094 16.9116Z" fill="#1570EF"/>
+  <path d="M26.5036 7.875H22.3515C21.3321 7.875 20.5057 8.70443 20.5057 9.72759C20.5057 10.7507 21.3321 11.5802 22.3515 11.5802H26.5036C27.523 11.5802 28.3494 10.7507 28.3494 9.72759C28.3494 8.70443 27.523 7.875 26.5036 7.875Z" fill="#22CCEE"/>
+  <path d="M13.6077 7.875H9.45557C8.43614 7.875 7.60973 8.70443 7.60973 9.72759C7.60973 10.7507 8.43614 11.5802 9.45557 11.5802H13.6077C14.6271 11.5802 15.4535 10.7507 15.4535 9.72759C15.4535 8.70443 14.6271 7.875 13.6077 7.875Z" fill="#22CCEE"/>
+</svg>
\ No newline at end of file
diff --git a/app/assets/images/maybe-plus-background.png b/app/assets/images/maybe-plus-background.png
new file mode 100644
index 00000000..29d626d1
Binary files /dev/null and b/app/assets/images/maybe-plus-background.png differ
diff --git a/app/assets/images/maybe-plus-background.svg b/app/assets/images/maybe-plus-background.svg
new file mode 100644
index 00000000..670c9c09
--- /dev/null
+++ b/app/assets/images/maybe-plus-background.svg
@@ -0,0 +1,2811 @@
+<svg width="404" height="300" viewBox="0 0 404 300" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_5025_1103)">
+<g opacity="0.7">
+<path d="M44.2609 -76.2609C44.2609 -77.2214 45.0395 -78 46 -78C46.9605 -78 47.7391 -77.2214 47.7391 -76.2609V-73.4783C47.7391 -72.5178 46.9605 -71.7391 46 -71.7391C45.0395 -71.7391 44.2609 -72.5178 44.2609 -73.4783V-76.2609Z" fill="url(#paint0_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M49.4783 -68.2609C48.5178 -68.2609 47.7391 -69.0395 47.7391 -70C47.7391 -70.9605 48.5178 -71.7391 49.4783 -71.7391H52.2609C53.2214 -71.7391 54 -70.9605 54 -70C54 -69.0395 53.2214 -68.2609 52.2609 -68.2609H49.4783Z" fill="url(#paint1_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M39.7391 -68.2609C38.7786 -68.2609 38 -69.0395 38 -70C38 -70.9605 38.7786 -71.7391 39.7391 -71.7391H42.5217C43.4822 -71.7391 44.2609 -70.9605 44.2609 -70C44.2609 -69.0395 43.4822 -68.2609 42.5217 -68.2609H39.7391Z" fill="url(#paint2_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M44.2609 -66.5217C44.2609 -67.4822 45.0395 -68.2609 46 -68.2609C46.9605 -68.2609 47.7391 -67.4822 47.7391 -66.5217V-63.7391C47.7391 -62.7786 46.9605 -62 46 -62C45.0395 -62 44.2609 -62.7786 44.2609 -63.7391V-66.5217Z" fill="url(#paint3_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 -76.2609C68.2609 -77.2214 69.0395 -78 70 -78C70.9605 -78 71.7391 -77.2214 71.7391 -76.2609V-73.4783C71.7391 -72.5178 70.9605 -71.7391 70 -71.7391C69.0395 -71.7391 68.2609 -72.5178 68.2609 -73.4783V-76.2609Z" fill="url(#paint4_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M73.4783 -68.2609C72.5178 -68.2609 71.7391 -69.0395 71.7391 -70C71.7391 -70.9605 72.5178 -71.7391 73.4783 -71.7391H76.2609C77.2214 -71.7391 78 -70.9605 78 -70C78 -69.0395 77.2214 -68.2609 76.2609 -68.2609H73.4783Z" fill="url(#paint5_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M63.7391 -68.2609C62.7786 -68.2609 62 -69.0395 62 -70C62 -70.9605 62.7786 -71.7391 63.7391 -71.7391H66.5217C67.4822 -71.7391 68.2609 -70.9605 68.2609 -70C68.2609 -69.0395 67.4822 -68.2609 66.5217 -68.2609H63.7391Z" fill="url(#paint6_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 -66.5217C68.2609 -67.4822 69.0395 -68.2609 70 -68.2609C70.9605 -68.2609 71.7391 -67.4822 71.7391 -66.5217V-63.7391C71.7391 -62.7786 70.9605 -62 70 -62C69.0395 -62 68.2609 -62.7786 68.2609 -63.7391V-66.5217Z" fill="url(#paint7_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 -76.2609C92.2609 -77.2214 93.0395 -78 94 -78C94.9605 -78 95.7391 -77.2214 95.7391 -76.2609V-73.4783C95.7391 -72.5178 94.9605 -71.7391 94 -71.7391C93.0395 -71.7391 92.2609 -72.5178 92.2609 -73.4783V-76.2609Z" fill="url(#paint8_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M97.4783 -68.2609C96.5178 -68.2609 95.7391 -69.0395 95.7391 -70C95.7391 -70.9605 96.5178 -71.7391 97.4783 -71.7391H100.261C101.221 -71.7391 102 -70.9605 102 -70C102 -69.0395 101.221 -68.2609 100.261 -68.2609H97.4783Z" fill="url(#paint9_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M87.7391 -68.2609C86.7786 -68.2609 86 -69.0395 86 -70C86 -70.9605 86.7786 -71.7391 87.7391 -71.7391H90.5217C91.4822 -71.7391 92.2609 -70.9605 92.2609 -70C92.2609 -69.0395 91.4822 -68.2609 90.5217 -68.2609H87.7391Z" fill="url(#paint10_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 -66.5217C92.2609 -67.4822 93.0395 -68.2609 94 -68.2609C94.9605 -68.2609 95.7391 -67.4822 95.7391 -66.5217V-63.7391C95.7391 -62.7786 94.9605 -62 94 -62C93.0395 -62 92.2609 -62.7786 92.2609 -63.7391V-66.5217Z" fill="url(#paint11_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 -76.2609C116.261 -77.2214 117.04 -78 118 -78C118.96 -78 119.739 -77.2214 119.739 -76.2609V-73.4783C119.739 -72.5178 118.96 -71.7391 118 -71.7391C117.04 -71.7391 116.261 -72.5178 116.261 -73.4783V-76.2609Z" fill="url(#paint12_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M121.478 -68.2609C120.518 -68.2609 119.739 -69.0395 119.739 -70C119.739 -70.9605 120.518 -71.7391 121.478 -71.7391H124.261C125.221 -71.7391 126 -70.9605 126 -70C126 -69.0395 125.221 -68.2609 124.261 -68.2609H121.478Z" fill="url(#paint13_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M111.739 -68.2609C110.779 -68.2609 110 -69.0395 110 -70C110 -70.9605 110.779 -71.7391 111.739 -71.7391H114.522C115.482 -71.7391 116.261 -70.9605 116.261 -70C116.261 -69.0395 115.482 -68.2609 114.522 -68.2609H111.739Z" fill="url(#paint14_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 -66.5217C116.261 -67.4822 117.04 -68.2609 118 -68.2609C118.96 -68.2609 119.739 -67.4822 119.739 -66.5217V-63.7391C119.739 -62.7786 118.96 -62 118 -62C117.04 -62 116.261 -62.7786 116.261 -63.7391V-66.5217Z" fill="url(#paint15_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 -76.2609C140.261 -77.2214 141.04 -78 142 -78C142.96 -78 143.739 -77.2214 143.739 -76.2609V-73.4783C143.739 -72.5178 142.96 -71.7391 142 -71.7391C141.04 -71.7391 140.261 -72.5178 140.261 -73.4783V-76.2609Z" fill="url(#paint16_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M145.478 -68.2609C144.518 -68.2609 143.739 -69.0395 143.739 -70C143.739 -70.9605 144.518 -71.7391 145.478 -71.7391H148.261C149.221 -71.7391 150 -70.9605 150 -70C150 -69.0395 149.221 -68.2609 148.261 -68.2609H145.478Z" fill="url(#paint17_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M135.739 -68.2609C134.779 -68.2609 134 -69.0395 134 -70C134 -70.9605 134.779 -71.7391 135.739 -71.7391H138.522C139.482 -71.7391 140.261 -70.9605 140.261 -70C140.261 -69.0395 139.482 -68.2609 138.522 -68.2609H135.739Z" fill="url(#paint18_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 -66.5217C140.261 -67.4822 141.04 -68.2609 142 -68.2609C142.96 -68.2609 143.739 -67.4822 143.739 -66.5217V-63.7391C143.739 -62.7786 142.96 -62 142 -62C141.04 -62 140.261 -62.7786 140.261 -63.7391V-66.5217Z" fill="url(#paint19_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 -76.2609C164.261 -77.2214 165.04 -78 166 -78C166.96 -78 167.739 -77.2214 167.739 -76.2609V-73.4783C167.739 -72.5178 166.96 -71.7391 166 -71.7391C165.04 -71.7391 164.261 -72.5178 164.261 -73.4783V-76.2609Z" fill="url(#paint20_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M169.478 -68.2609C168.518 -68.2609 167.739 -69.0395 167.739 -70C167.739 -70.9605 168.518 -71.7391 169.478 -71.7391H172.261C173.221 -71.7391 174 -70.9605 174 -70C174 -69.0395 173.221 -68.2609 172.261 -68.2609H169.478Z" fill="url(#paint21_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M159.739 -68.2609C158.779 -68.2609 158 -69.0395 158 -70C158 -70.9605 158.779 -71.7391 159.739 -71.7391H162.522C163.482 -71.7391 164.261 -70.9605 164.261 -70C164.261 -69.0395 163.482 -68.2609 162.522 -68.2609H159.739Z" fill="url(#paint22_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 -66.5217C164.261 -67.4822 165.04 -68.2609 166 -68.2609C166.96 -68.2609 167.739 -67.4822 167.739 -66.5217V-63.7391C167.739 -62.7786 166.96 -62 166 -62C165.04 -62 164.261 -62.7786 164.261 -63.7391V-66.5217Z" fill="url(#paint23_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 -76.2609C188.261 -77.2214 189.04 -78 190 -78C190.96 -78 191.739 -77.2214 191.739 -76.2609V-73.4783C191.739 -72.5178 190.96 -71.7391 190 -71.7391C189.04 -71.7391 188.261 -72.5178 188.261 -73.4783V-76.2609Z" fill="url(#paint24_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M193.478 -68.2609C192.518 -68.2609 191.739 -69.0395 191.739 -70C191.739 -70.9605 192.518 -71.7391 193.478 -71.7391H196.261C197.221 -71.7391 198 -70.9605 198 -70C198 -69.0395 197.221 -68.2609 196.261 -68.2609H193.478Z" fill="url(#paint25_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M183.739 -68.2609C182.779 -68.2609 182 -69.0395 182 -70C182 -70.9605 182.779 -71.7391 183.739 -71.7391H186.522C187.482 -71.7391 188.261 -70.9605 188.261 -70C188.261 -69.0395 187.482 -68.2609 186.522 -68.2609H183.739Z" fill="url(#paint26_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 -66.5217C188.261 -67.4822 189.04 -68.2609 190 -68.2609C190.96 -68.2609 191.739 -67.4822 191.739 -66.5217V-63.7391C191.739 -62.7786 190.96 -62 190 -62C189.04 -62 188.261 -62.7786 188.261 -63.7391V-66.5217Z" fill="url(#paint27_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 -76.2609C212.261 -77.2214 213.04 -78 214 -78C214.96 -78 215.739 -77.2214 215.739 -76.2609V-73.4783C215.739 -72.5178 214.96 -71.7391 214 -71.7391C213.04 -71.7391 212.261 -72.5178 212.261 -73.4783V-76.2609Z" fill="url(#paint28_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M217.478 -68.2609C216.518 -68.2609 215.739 -69.0395 215.739 -70C215.739 -70.9605 216.518 -71.7391 217.478 -71.7391H220.261C221.221 -71.7391 222 -70.9605 222 -70C222 -69.0395 221.221 -68.2609 220.261 -68.2609H217.478Z" fill="url(#paint29_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M207.739 -68.2609C206.779 -68.2609 206 -69.0395 206 -70C206 -70.9605 206.779 -71.7391 207.739 -71.7391H210.522C211.482 -71.7391 212.261 -70.9605 212.261 -70C212.261 -69.0395 211.482 -68.2609 210.522 -68.2609H207.739Z" fill="url(#paint30_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 -66.5217C212.261 -67.4822 213.04 -68.2609 214 -68.2609C214.96 -68.2609 215.739 -67.4822 215.739 -66.5217V-63.7391C215.739 -62.7786 214.96 -62 214 -62C213.04 -62 212.261 -62.7786 212.261 -63.7391V-66.5217Z" fill="url(#paint31_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 -76.2609C236.261 -77.2214 237.04 -78 238 -78C238.96 -78 239.739 -77.2214 239.739 -76.2609V-73.4783C239.739 -72.5178 238.96 -71.7391 238 -71.7391C237.04 -71.7391 236.261 -72.5178 236.261 -73.4783V-76.2609Z" fill="url(#paint32_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M241.478 -68.2609C240.518 -68.2609 239.739 -69.0395 239.739 -70C239.739 -70.9605 240.518 -71.7391 241.478 -71.7391H244.261C245.221 -71.7391 246 -70.9605 246 -70C246 -69.0395 245.221 -68.2609 244.261 -68.2609H241.478Z" fill="url(#paint33_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M231.739 -68.2609C230.779 -68.2609 230 -69.0395 230 -70C230 -70.9605 230.779 -71.7391 231.739 -71.7391H234.522C235.482 -71.7391 236.261 -70.9605 236.261 -70C236.261 -69.0395 235.482 -68.2609 234.522 -68.2609H231.739Z" fill="url(#paint34_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 -66.5217C236.261 -67.4822 237.04 -68.2609 238 -68.2609C238.96 -68.2609 239.739 -67.4822 239.739 -66.5217V-63.7391C239.739 -62.7786 238.96 -62 238 -62C237.04 -62 236.261 -62.7786 236.261 -63.7391V-66.5217Z" fill="url(#paint35_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 -76.2609C260.261 -77.2214 261.04 -78 262 -78C262.96 -78 263.739 -77.2214 263.739 -76.2609V-73.4783C263.739 -72.5178 262.96 -71.7391 262 -71.7391C261.04 -71.7391 260.261 -72.5178 260.261 -73.4783V-76.2609Z" fill="url(#paint36_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M265.478 -68.2609C264.518 -68.2609 263.739 -69.0395 263.739 -70C263.739 -70.9605 264.518 -71.7391 265.478 -71.7391H268.261C269.221 -71.7391 270 -70.9605 270 -70C270 -69.0395 269.221 -68.2609 268.261 -68.2609H265.478Z" fill="url(#paint37_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M255.739 -68.2609C254.779 -68.2609 254 -69.0395 254 -70C254 -70.9605 254.779 -71.7391 255.739 -71.7391H258.522C259.482 -71.7391 260.261 -70.9605 260.261 -70C260.261 -69.0395 259.482 -68.2609 258.522 -68.2609H255.739Z" fill="url(#paint38_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 -66.5217C260.261 -67.4822 261.04 -68.2609 262 -68.2609C262.96 -68.2609 263.739 -67.4822 263.739 -66.5217V-63.7391C263.739 -62.7786 262.96 -62 262 -62C261.04 -62 260.261 -62.7786 260.261 -63.7391V-66.5217Z" fill="url(#paint39_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 -76.2609C284.261 -77.2214 285.04 -78 286 -78C286.96 -78 287.739 -77.2214 287.739 -76.2609V-73.4783C287.739 -72.5178 286.96 -71.7391 286 -71.7391C285.04 -71.7391 284.261 -72.5178 284.261 -73.4783V-76.2609Z" fill="url(#paint40_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M289.478 -68.2609C288.518 -68.2609 287.739 -69.0395 287.739 -70C287.739 -70.9605 288.518 -71.7391 289.478 -71.7391H292.261C293.221 -71.7391 294 -70.9605 294 -70C294 -69.0395 293.221 -68.2609 292.261 -68.2609H289.478Z" fill="url(#paint41_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M279.739 -68.2609C278.779 -68.2609 278 -69.0395 278 -70C278 -70.9605 278.779 -71.7391 279.739 -71.7391H282.522C283.482 -71.7391 284.261 -70.9605 284.261 -70C284.261 -69.0395 283.482 -68.2609 282.522 -68.2609H279.739Z" fill="url(#paint42_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 -66.5217C284.261 -67.4822 285.04 -68.2609 286 -68.2609C286.96 -68.2609 287.739 -67.4822 287.739 -66.5217V-63.7391C287.739 -62.7786 286.96 -62 286 -62C285.04 -62 284.261 -62.7786 284.261 -63.7391V-66.5217Z" fill="url(#paint43_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 -76.2609C308.261 -77.2214 309.04 -78 310 -78C310.96 -78 311.739 -77.2214 311.739 -76.2609V-73.4783C311.739 -72.5178 310.96 -71.7391 310 -71.7391C309.04 -71.7391 308.261 -72.5178 308.261 -73.4783V-76.2609Z" fill="url(#paint44_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M313.478 -68.2609C312.518 -68.2609 311.739 -69.0395 311.739 -70C311.739 -70.9605 312.518 -71.7391 313.478 -71.7391H316.261C317.221 -71.7391 318 -70.9605 318 -70C318 -69.0395 317.221 -68.2609 316.261 -68.2609H313.478Z" fill="url(#paint45_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M303.739 -68.2609C302.779 -68.2609 302 -69.0395 302 -70C302 -70.9605 302.779 -71.7391 303.739 -71.7391H306.522C307.482 -71.7391 308.261 -70.9605 308.261 -70C308.261 -69.0395 307.482 -68.2609 306.522 -68.2609H303.739Z" fill="url(#paint46_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 -66.5217C308.261 -67.4822 309.04 -68.2609 310 -68.2609C310.96 -68.2609 311.739 -67.4822 311.739 -66.5217V-63.7391C311.739 -62.7786 310.96 -62 310 -62C309.04 -62 308.261 -62.7786 308.261 -63.7391V-66.5217Z" fill="url(#paint47_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 -76.2609C332.261 -77.2214 333.04 -78 334 -78C334.96 -78 335.739 -77.2214 335.739 -76.2609V-73.4783C335.739 -72.5178 334.96 -71.7391 334 -71.7391C333.04 -71.7391 332.261 -72.5178 332.261 -73.4783V-76.2609Z" fill="url(#paint48_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M337.478 -68.2609C336.518 -68.2609 335.739 -69.0395 335.739 -70C335.739 -70.9605 336.518 -71.7391 337.478 -71.7391H340.261C341.221 -71.7391 342 -70.9605 342 -70C342 -69.0395 341.221 -68.2609 340.261 -68.2609H337.478Z" fill="url(#paint49_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M327.739 -68.2609C326.779 -68.2609 326 -69.0395 326 -70C326 -70.9605 326.779 -71.7391 327.739 -71.7391H330.522C331.482 -71.7391 332.261 -70.9605 332.261 -70C332.261 -69.0395 331.482 -68.2609 330.522 -68.2609H327.739Z" fill="url(#paint50_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 -66.5217C332.261 -67.4822 333.04 -68.2609 334 -68.2609C334.96 -68.2609 335.739 -67.4822 335.739 -66.5217V-63.7391C335.739 -62.7786 334.96 -62 334 -62C333.04 -62 332.261 -62.7786 332.261 -63.7391V-66.5217Z" fill="url(#paint51_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 -76.2609C356.261 -77.2214 357.04 -78 358 -78C358.96 -78 359.739 -77.2214 359.739 -76.2609V-73.4783C359.739 -72.5178 358.96 -71.7391 358 -71.7391C357.04 -71.7391 356.261 -72.5178 356.261 -73.4783V-76.2609Z" fill="url(#paint52_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M361.478 -68.2609C360.518 -68.2609 359.739 -69.0395 359.739 -70C359.739 -70.9605 360.518 -71.7391 361.478 -71.7391H364.261C365.221 -71.7391 366 -70.9605 366 -70C366 -69.0395 365.221 -68.2609 364.261 -68.2609H361.478Z" fill="url(#paint53_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M351.739 -68.2609C350.779 -68.2609 350 -69.0395 350 -70C350 -70.9605 350.779 -71.7391 351.739 -71.7391H354.522C355.482 -71.7391 356.261 -70.9605 356.261 -70C356.261 -69.0395 355.482 -68.2609 354.522 -68.2609H351.739Z" fill="url(#paint54_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 -66.5217C356.261 -67.4822 357.04 -68.2609 358 -68.2609C358.96 -68.2609 359.739 -67.4822 359.739 -66.5217V-63.7391C359.739 -62.7786 358.96 -62 358 -62C357.04 -62 356.261 -62.7786 356.261 -63.7391V-66.5217Z" fill="url(#paint55_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M44.2609 -52.2609C44.2609 -53.2214 45.0395 -54 46 -54C46.9605 -54 47.7391 -53.2214 47.7391 -52.2609V-49.4783C47.7391 -48.5178 46.9605 -47.7391 46 -47.7391C45.0395 -47.7391 44.2609 -48.5178 44.2609 -49.4783V-52.2609Z" fill="url(#paint56_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M49.4783 -44.2609C48.5178 -44.2609 47.7391 -45.0395 47.7391 -46C47.7391 -46.9605 48.5178 -47.7391 49.4783 -47.7391H52.2609C53.2214 -47.7391 54 -46.9605 54 -46C54 -45.0395 53.2214 -44.2609 52.2609 -44.2609H49.4783Z" fill="url(#paint57_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M39.7391 -44.2609C38.7786 -44.2609 38 -45.0395 38 -46C38 -46.9605 38.7786 -47.7391 39.7391 -47.7391H42.5217C43.4822 -47.7391 44.2609 -46.9605 44.2609 -46C44.2609 -45.0395 43.4822 -44.2609 42.5217 -44.2609H39.7391Z" fill="url(#paint58_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M44.2609 -42.5217C44.2609 -43.4822 45.0395 -44.2609 46 -44.2609C46.9605 -44.2609 47.7391 -43.4822 47.7391 -42.5217V-39.7391C47.7391 -38.7786 46.9605 -38 46 -38C45.0395 -38 44.2609 -38.7786 44.2609 -39.7391V-42.5217Z" fill="url(#paint59_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 -52.2609C68.2609 -53.2214 69.0395 -54 70 -54C70.9605 -54 71.7391 -53.2214 71.7391 -52.2609V-49.4783C71.7391 -48.5178 70.9605 -47.7391 70 -47.7391C69.0395 -47.7391 68.2609 -48.5178 68.2609 -49.4783V-52.2609Z" fill="url(#paint60_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M73.4783 -44.2609C72.5178 -44.2609 71.7391 -45.0395 71.7391 -46C71.7391 -46.9605 72.5178 -47.7391 73.4783 -47.7391H76.2609C77.2214 -47.7391 78 -46.9605 78 -46C78 -45.0395 77.2214 -44.2609 76.2609 -44.2609H73.4783Z" fill="url(#paint61_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M63.7391 -44.2609C62.7786 -44.2609 62 -45.0395 62 -46C62 -46.9605 62.7786 -47.7391 63.7391 -47.7391H66.5217C67.4822 -47.7391 68.2609 -46.9605 68.2609 -46C68.2609 -45.0395 67.4822 -44.2609 66.5217 -44.2609H63.7391Z" fill="url(#paint62_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 -42.5217C68.2609 -43.4822 69.0395 -44.2609 70 -44.2609C70.9605 -44.2609 71.7391 -43.4822 71.7391 -42.5217V-39.7391C71.7391 -38.7786 70.9605 -38 70 -38C69.0395 -38 68.2609 -38.7786 68.2609 -39.7391V-42.5217Z" fill="url(#paint63_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 -52.2609C92.2609 -53.2214 93.0395 -54 94 -54C94.9605 -54 95.7391 -53.2214 95.7391 -52.2609V-49.4783C95.7391 -48.5178 94.9605 -47.7391 94 -47.7391C93.0395 -47.7391 92.2609 -48.5178 92.2609 -49.4783V-52.2609Z" fill="url(#paint64_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M97.4783 -44.2609C96.5178 -44.2609 95.7391 -45.0395 95.7391 -46C95.7391 -46.9605 96.5178 -47.7391 97.4783 -47.7391H100.261C101.221 -47.7391 102 -46.9605 102 -46C102 -45.0395 101.221 -44.2609 100.261 -44.2609H97.4783Z" fill="url(#paint65_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M87.7391 -44.2609C86.7786 -44.2609 86 -45.0395 86 -46C86 -46.9605 86.7786 -47.7391 87.7391 -47.7391H90.5217C91.4822 -47.7391 92.2609 -46.9605 92.2609 -46C92.2609 -45.0395 91.4822 -44.2609 90.5217 -44.2609H87.7391Z" fill="url(#paint66_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 -42.5217C92.2609 -43.4822 93.0395 -44.2609 94 -44.2609C94.9605 -44.2609 95.7391 -43.4822 95.7391 -42.5217V-39.7391C95.7391 -38.7786 94.9605 -38 94 -38C93.0395 -38 92.2609 -38.7786 92.2609 -39.7391V-42.5217Z" fill="url(#paint67_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 -52.2609C116.261 -53.2214 117.04 -54 118 -54C118.96 -54 119.739 -53.2214 119.739 -52.2609V-49.4783C119.739 -48.5178 118.96 -47.7391 118 -47.7391C117.04 -47.7391 116.261 -48.5178 116.261 -49.4783V-52.2609Z" fill="url(#paint68_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M121.478 -44.2609C120.518 -44.2609 119.739 -45.0395 119.739 -46C119.739 -46.9605 120.518 -47.7391 121.478 -47.7391H124.261C125.221 -47.7391 126 -46.9605 126 -46C126 -45.0395 125.221 -44.2609 124.261 -44.2609H121.478Z" fill="url(#paint69_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M111.739 -44.2609C110.779 -44.2609 110 -45.0395 110 -46C110 -46.9605 110.779 -47.7391 111.739 -47.7391H114.522C115.482 -47.7391 116.261 -46.9605 116.261 -46C116.261 -45.0395 115.482 -44.2609 114.522 -44.2609H111.739Z" fill="url(#paint70_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 -42.5217C116.261 -43.4822 117.04 -44.2609 118 -44.2609C118.96 -44.2609 119.739 -43.4822 119.739 -42.5217V-39.7391C119.739 -38.7786 118.96 -38 118 -38C117.04 -38 116.261 -38.7786 116.261 -39.7391V-42.5217Z" fill="url(#paint71_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 -52.2609C140.261 -53.2214 141.04 -54 142 -54C142.96 -54 143.739 -53.2214 143.739 -52.2609V-49.4783C143.739 -48.5178 142.96 -47.7391 142 -47.7391C141.04 -47.7391 140.261 -48.5178 140.261 -49.4783V-52.2609Z" fill="url(#paint72_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M145.478 -44.2609C144.518 -44.2609 143.739 -45.0395 143.739 -46C143.739 -46.9605 144.518 -47.7391 145.478 -47.7391H148.261C149.221 -47.7391 150 -46.9605 150 -46C150 -45.0395 149.221 -44.2609 148.261 -44.2609H145.478Z" fill="url(#paint73_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M135.739 -44.2609C134.779 -44.2609 134 -45.0395 134 -46C134 -46.9605 134.779 -47.7391 135.739 -47.7391H138.522C139.482 -47.7391 140.261 -46.9605 140.261 -46C140.261 -45.0395 139.482 -44.2609 138.522 -44.2609H135.739Z" fill="url(#paint74_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 -42.5217C140.261 -43.4822 141.04 -44.2609 142 -44.2609C142.96 -44.2609 143.739 -43.4822 143.739 -42.5217V-39.7391C143.739 -38.7786 142.96 -38 142 -38C141.04 -38 140.261 -38.7786 140.261 -39.7391V-42.5217Z" fill="url(#paint75_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 -52.2609C164.261 -53.2214 165.04 -54 166 -54C166.96 -54 167.739 -53.2214 167.739 -52.2609V-49.4783C167.739 -48.5178 166.96 -47.7391 166 -47.7391C165.04 -47.7391 164.261 -48.5178 164.261 -49.4783V-52.2609Z" fill="url(#paint76_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M169.478 -44.2609C168.518 -44.2609 167.739 -45.0395 167.739 -46C167.739 -46.9605 168.518 -47.7391 169.478 -47.7391H172.261C173.221 -47.7391 174 -46.9605 174 -46C174 -45.0395 173.221 -44.2609 172.261 -44.2609H169.478Z" fill="url(#paint77_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M159.739 -44.2609C158.779 -44.2609 158 -45.0395 158 -46C158 -46.9605 158.779 -47.7391 159.739 -47.7391H162.522C163.482 -47.7391 164.261 -46.9605 164.261 -46C164.261 -45.0395 163.482 -44.2609 162.522 -44.2609H159.739Z" fill="url(#paint78_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 -42.5217C164.261 -43.4822 165.04 -44.2609 166 -44.2609C166.96 -44.2609 167.739 -43.4822 167.739 -42.5217V-39.7391C167.739 -38.7786 166.96 -38 166 -38C165.04 -38 164.261 -38.7786 164.261 -39.7391V-42.5217Z" fill="url(#paint79_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 -52.2609C188.261 -53.2214 189.04 -54 190 -54C190.96 -54 191.739 -53.2214 191.739 -52.2609V-49.4783C191.739 -48.5178 190.96 -47.7391 190 -47.7391C189.04 -47.7391 188.261 -48.5178 188.261 -49.4783V-52.2609Z" fill="url(#paint80_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M193.478 -44.2609C192.518 -44.2609 191.739 -45.0395 191.739 -46C191.739 -46.9605 192.518 -47.7391 193.478 -47.7391H196.261C197.221 -47.7391 198 -46.9605 198 -46C198 -45.0395 197.221 -44.2609 196.261 -44.2609H193.478Z" fill="url(#paint81_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M183.739 -44.2609C182.779 -44.2609 182 -45.0395 182 -46C182 -46.9605 182.779 -47.7391 183.739 -47.7391H186.522C187.482 -47.7391 188.261 -46.9605 188.261 -46C188.261 -45.0395 187.482 -44.2609 186.522 -44.2609H183.739Z" fill="url(#paint82_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 -42.5217C188.261 -43.4822 189.04 -44.2609 190 -44.2609C190.96 -44.2609 191.739 -43.4822 191.739 -42.5217V-39.7391C191.739 -38.7786 190.96 -38 190 -38C189.04 -38 188.261 -38.7786 188.261 -39.7391V-42.5217Z" fill="url(#paint83_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 -52.2609C212.261 -53.2214 213.04 -54 214 -54C214.96 -54 215.739 -53.2214 215.739 -52.2609V-49.4783C215.739 -48.5178 214.96 -47.7391 214 -47.7391C213.04 -47.7391 212.261 -48.5178 212.261 -49.4783V-52.2609Z" fill="url(#paint84_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M217.478 -44.2609C216.518 -44.2609 215.739 -45.0395 215.739 -46C215.739 -46.9605 216.518 -47.7391 217.478 -47.7391H220.261C221.221 -47.7391 222 -46.9605 222 -46C222 -45.0395 221.221 -44.2609 220.261 -44.2609H217.478Z" fill="url(#paint85_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M207.739 -44.2609C206.779 -44.2609 206 -45.0395 206 -46C206 -46.9605 206.779 -47.7391 207.739 -47.7391H210.522C211.482 -47.7391 212.261 -46.9605 212.261 -46C212.261 -45.0395 211.482 -44.2609 210.522 -44.2609H207.739Z" fill="url(#paint86_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 -42.5217C212.261 -43.4822 213.04 -44.2609 214 -44.2609C214.96 -44.2609 215.739 -43.4822 215.739 -42.5217V-39.7391C215.739 -38.7786 214.96 -38 214 -38C213.04 -38 212.261 -38.7786 212.261 -39.7391V-42.5217Z" fill="url(#paint87_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 -52.2609C236.261 -53.2214 237.04 -54 238 -54C238.96 -54 239.739 -53.2214 239.739 -52.2609V-49.4783C239.739 -48.5178 238.96 -47.7391 238 -47.7391C237.04 -47.7391 236.261 -48.5178 236.261 -49.4783V-52.2609Z" fill="url(#paint88_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M241.478 -44.2609C240.518 -44.2609 239.739 -45.0395 239.739 -46C239.739 -46.9605 240.518 -47.7391 241.478 -47.7391H244.261C245.221 -47.7391 246 -46.9605 246 -46C246 -45.0395 245.221 -44.2609 244.261 -44.2609H241.478Z" fill="url(#paint89_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M231.739 -44.2609C230.779 -44.2609 230 -45.0395 230 -46C230 -46.9605 230.779 -47.7391 231.739 -47.7391H234.522C235.482 -47.7391 236.261 -46.9605 236.261 -46C236.261 -45.0395 235.482 -44.2609 234.522 -44.2609H231.739Z" fill="url(#paint90_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 -42.5217C236.261 -43.4822 237.04 -44.2609 238 -44.2609C238.96 -44.2609 239.739 -43.4822 239.739 -42.5217V-39.7391C239.739 -38.7786 238.96 -38 238 -38C237.04 -38 236.261 -38.7786 236.261 -39.7391V-42.5217Z" fill="url(#paint91_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 -52.2609C260.261 -53.2214 261.04 -54 262 -54C262.96 -54 263.739 -53.2214 263.739 -52.2609V-49.4783C263.739 -48.5178 262.96 -47.7391 262 -47.7391C261.04 -47.7391 260.261 -48.5178 260.261 -49.4783V-52.2609Z" fill="url(#paint92_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M265.478 -44.2609C264.518 -44.2609 263.739 -45.0395 263.739 -46C263.739 -46.9605 264.518 -47.7391 265.478 -47.7391H268.261C269.221 -47.7391 270 -46.9605 270 -46C270 -45.0395 269.221 -44.2609 268.261 -44.2609H265.478Z" fill="url(#paint93_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M255.739 -44.2609C254.779 -44.2609 254 -45.0395 254 -46C254 -46.9605 254.779 -47.7391 255.739 -47.7391H258.522C259.482 -47.7391 260.261 -46.9605 260.261 -46C260.261 -45.0395 259.482 -44.2609 258.522 -44.2609H255.739Z" fill="url(#paint94_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 -42.5217C260.261 -43.4822 261.04 -44.2609 262 -44.2609C262.96 -44.2609 263.739 -43.4822 263.739 -42.5217V-39.7391C263.739 -38.7786 262.96 -38 262 -38C261.04 -38 260.261 -38.7786 260.261 -39.7391V-42.5217Z" fill="url(#paint95_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 -52.2609C284.261 -53.2214 285.04 -54 286 -54C286.96 -54 287.739 -53.2214 287.739 -52.2609V-49.4783C287.739 -48.5178 286.96 -47.7391 286 -47.7391C285.04 -47.7391 284.261 -48.5178 284.261 -49.4783V-52.2609Z" fill="url(#paint96_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M289.478 -44.2609C288.518 -44.2609 287.739 -45.0395 287.739 -46C287.739 -46.9605 288.518 -47.7391 289.478 -47.7391H292.261C293.221 -47.7391 294 -46.9605 294 -46C294 -45.0395 293.221 -44.2609 292.261 -44.2609H289.478Z" fill="url(#paint97_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M279.739 -44.2609C278.779 -44.2609 278 -45.0395 278 -46C278 -46.9605 278.779 -47.7391 279.739 -47.7391H282.522C283.482 -47.7391 284.261 -46.9605 284.261 -46C284.261 -45.0395 283.482 -44.2609 282.522 -44.2609H279.739Z" fill="url(#paint98_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 -42.5217C284.261 -43.4822 285.04 -44.2609 286 -44.2609C286.96 -44.2609 287.739 -43.4822 287.739 -42.5217V-39.7391C287.739 -38.7786 286.96 -38 286 -38C285.04 -38 284.261 -38.7786 284.261 -39.7391V-42.5217Z" fill="url(#paint99_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 -52.2609C308.261 -53.2214 309.04 -54 310 -54C310.96 -54 311.739 -53.2214 311.739 -52.2609V-49.4783C311.739 -48.5178 310.96 -47.7391 310 -47.7391C309.04 -47.7391 308.261 -48.5178 308.261 -49.4783V-52.2609Z" fill="url(#paint100_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M313.478 -44.2609C312.518 -44.2609 311.739 -45.0395 311.739 -46C311.739 -46.9605 312.518 -47.7391 313.478 -47.7391H316.261C317.221 -47.7391 318 -46.9605 318 -46C318 -45.0395 317.221 -44.2609 316.261 -44.2609H313.478Z" fill="url(#paint101_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M303.739 -44.2609C302.779 -44.2609 302 -45.0395 302 -46C302 -46.9605 302.779 -47.7391 303.739 -47.7391H306.522C307.482 -47.7391 308.261 -46.9605 308.261 -46C308.261 -45.0395 307.482 -44.2609 306.522 -44.2609H303.739Z" fill="url(#paint102_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 -42.5217C308.261 -43.4822 309.04 -44.2609 310 -44.2609C310.96 -44.2609 311.739 -43.4822 311.739 -42.5217V-39.7391C311.739 -38.7786 310.96 -38 310 -38C309.04 -38 308.261 -38.7786 308.261 -39.7391V-42.5217Z" fill="url(#paint103_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 -52.2609C332.261 -53.2214 333.04 -54 334 -54C334.96 -54 335.739 -53.2214 335.739 -52.2609V-49.4783C335.739 -48.5178 334.96 -47.7391 334 -47.7391C333.04 -47.7391 332.261 -48.5178 332.261 -49.4783V-52.2609Z" fill="url(#paint104_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M337.478 -44.2609C336.518 -44.2609 335.739 -45.0395 335.739 -46C335.739 -46.9605 336.518 -47.7391 337.478 -47.7391H340.261C341.221 -47.7391 342 -46.9605 342 -46C342 -45.0395 341.221 -44.2609 340.261 -44.2609H337.478Z" fill="url(#paint105_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M327.739 -44.2609C326.779 -44.2609 326 -45.0395 326 -46C326 -46.9605 326.779 -47.7391 327.739 -47.7391H330.522C331.482 -47.7391 332.261 -46.9605 332.261 -46C332.261 -45.0395 331.482 -44.2609 330.522 -44.2609H327.739Z" fill="url(#paint106_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 -42.5217C332.261 -43.4822 333.04 -44.2609 334 -44.2609C334.96 -44.2609 335.739 -43.4822 335.739 -42.5217V-39.7391C335.739 -38.7786 334.96 -38 334 -38C333.04 -38 332.261 -38.7786 332.261 -39.7391V-42.5217Z" fill="url(#paint107_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 -52.2609C356.261 -53.2214 357.04 -54 358 -54C358.96 -54 359.739 -53.2214 359.739 -52.2609V-49.4783C359.739 -48.5178 358.96 -47.7391 358 -47.7391C357.04 -47.7391 356.261 -48.5178 356.261 -49.4783V-52.2609Z" fill="url(#paint108_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M361.478 -44.2609C360.518 -44.2609 359.739 -45.0395 359.739 -46C359.739 -46.9605 360.518 -47.7391 361.478 -47.7391H364.261C365.221 -47.7391 366 -46.9605 366 -46C366 -45.0395 365.221 -44.2609 364.261 -44.2609H361.478Z" fill="url(#paint109_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M351.739 -44.2609C350.779 -44.2609 350 -45.0395 350 -46C350 -46.9605 350.779 -47.7391 351.739 -47.7391H354.522C355.482 -47.7391 356.261 -46.9605 356.261 -46C356.261 -45.0395 355.482 -44.2609 354.522 -44.2609H351.739Z" fill="url(#paint110_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 -42.5217C356.261 -43.4822 357.04 -44.2609 358 -44.2609C358.96 -44.2609 359.739 -43.4822 359.739 -42.5217V-39.7391C359.739 -38.7786 358.96 -38 358 -38C357.04 -38 356.261 -38.7786 356.261 -39.7391V-42.5217Z" fill="url(#paint111_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M44.2609 -28.2609C44.2609 -29.2214 45.0395 -30 46 -30C46.9605 -30 47.7391 -29.2214 47.7391 -28.2609V-25.4783C47.7391 -24.5178 46.9605 -23.7391 46 -23.7391C45.0395 -23.7391 44.2609 -24.5178 44.2609 -25.4783V-28.2609Z" fill="url(#paint112_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M49.4783 -20.2609C48.5178 -20.2609 47.7391 -21.0395 47.7391 -22C47.7391 -22.9605 48.5178 -23.7391 49.4783 -23.7391H52.2609C53.2214 -23.7391 54 -22.9605 54 -22C54 -21.0395 53.2214 -20.2609 52.2609 -20.2609H49.4783Z" fill="url(#paint113_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M39.7391 -20.2609C38.7786 -20.2609 38 -21.0395 38 -22C38 -22.9605 38.7786 -23.7391 39.7391 -23.7391H42.5217C43.4822 -23.7391 44.2609 -22.9605 44.2609 -22C44.2609 -21.0395 43.4822 -20.2609 42.5217 -20.2609H39.7391Z" fill="url(#paint114_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M44.2609 -18.5217C44.2609 -19.4822 45.0395 -20.2609 46 -20.2609C46.9605 -20.2609 47.7391 -19.4822 47.7391 -18.5217V-15.7391C47.7391 -14.7786 46.9605 -14 46 -14C45.0395 -14 44.2609 -14.7786 44.2609 -15.7391V-18.5217Z" fill="url(#paint115_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 -28.2609C68.2609 -29.2214 69.0395 -30 70 -30C70.9605 -30 71.7391 -29.2214 71.7391 -28.2609V-25.4783C71.7391 -24.5178 70.9605 -23.7391 70 -23.7391C69.0395 -23.7391 68.2609 -24.5178 68.2609 -25.4783V-28.2609Z" fill="url(#paint116_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M73.4783 -20.2609C72.5178 -20.2609 71.7391 -21.0395 71.7391 -22C71.7391 -22.9605 72.5178 -23.7391 73.4783 -23.7391H76.2609C77.2214 -23.7391 78 -22.9605 78 -22C78 -21.0395 77.2214 -20.2609 76.2609 -20.2609H73.4783Z" fill="url(#paint117_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M63.7391 -20.2609C62.7786 -20.2609 62 -21.0395 62 -22C62 -22.9605 62.7786 -23.7391 63.7391 -23.7391H66.5217C67.4822 -23.7391 68.2609 -22.9605 68.2609 -22C68.2609 -21.0395 67.4822 -20.2609 66.5217 -20.2609H63.7391Z" fill="url(#paint118_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 -18.5217C68.2609 -19.4822 69.0395 -20.2609 70 -20.2609C70.9605 -20.2609 71.7391 -19.4822 71.7391 -18.5217V-15.7391C71.7391 -14.7786 70.9605 -14 70 -14C69.0395 -14 68.2609 -14.7786 68.2609 -15.7391V-18.5217Z" fill="url(#paint119_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 -28.2609C92.2609 -29.2214 93.0395 -30 94 -30C94.9605 -30 95.7391 -29.2214 95.7391 -28.2609V-25.4783C95.7391 -24.5178 94.9605 -23.7391 94 -23.7391C93.0395 -23.7391 92.2609 -24.5178 92.2609 -25.4783V-28.2609Z" fill="url(#paint120_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M97.4783 -20.2609C96.5178 -20.2609 95.7391 -21.0395 95.7391 -22C95.7391 -22.9605 96.5178 -23.7391 97.4783 -23.7391H100.261C101.221 -23.7391 102 -22.9605 102 -22C102 -21.0395 101.221 -20.2609 100.261 -20.2609H97.4783Z" fill="url(#paint121_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M87.7391 -20.2609C86.7786 -20.2609 86 -21.0395 86 -22C86 -22.9605 86.7786 -23.7391 87.7391 -23.7391H90.5217C91.4822 -23.7391 92.2609 -22.9605 92.2609 -22C92.2609 -21.0395 91.4822 -20.2609 90.5217 -20.2609H87.7391Z" fill="url(#paint122_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 -18.5217C92.2609 -19.4822 93.0395 -20.2609 94 -20.2609C94.9605 -20.2609 95.7391 -19.4822 95.7391 -18.5217V-15.7391C95.7391 -14.7786 94.9605 -14 94 -14C93.0395 -14 92.2609 -14.7786 92.2609 -15.7391V-18.5217Z" fill="url(#paint123_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 -28.2609C116.261 -29.2214 117.04 -30 118 -30C118.96 -30 119.739 -29.2214 119.739 -28.2609V-25.4783C119.739 -24.5178 118.96 -23.7391 118 -23.7391C117.04 -23.7391 116.261 -24.5178 116.261 -25.4783V-28.2609Z" fill="url(#paint124_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M121.478 -20.2609C120.518 -20.2609 119.739 -21.0395 119.739 -22C119.739 -22.9605 120.518 -23.7391 121.478 -23.7391H124.261C125.221 -23.7391 126 -22.9605 126 -22C126 -21.0395 125.221 -20.2609 124.261 -20.2609H121.478Z" fill="url(#paint125_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M111.739 -20.2609C110.779 -20.2609 110 -21.0395 110 -22C110 -22.9605 110.779 -23.7391 111.739 -23.7391H114.522C115.482 -23.7391 116.261 -22.9605 116.261 -22C116.261 -21.0395 115.482 -20.2609 114.522 -20.2609H111.739Z" fill="url(#paint126_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 -18.5217C116.261 -19.4822 117.04 -20.2609 118 -20.2609C118.96 -20.2609 119.739 -19.4822 119.739 -18.5217V-15.7391C119.739 -14.7786 118.96 -14 118 -14C117.04 -14 116.261 -14.7786 116.261 -15.7391V-18.5217Z" fill="url(#paint127_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 -28.2609C140.261 -29.2214 141.04 -30 142 -30C142.96 -30 143.739 -29.2214 143.739 -28.2609V-25.4783C143.739 -24.5178 142.96 -23.7391 142 -23.7391C141.04 -23.7391 140.261 -24.5178 140.261 -25.4783V-28.2609Z" fill="url(#paint128_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M145.478 -20.2609C144.518 -20.2609 143.739 -21.0395 143.739 -22C143.739 -22.9605 144.518 -23.7391 145.478 -23.7391H148.261C149.221 -23.7391 150 -22.9605 150 -22C150 -21.0395 149.221 -20.2609 148.261 -20.2609H145.478Z" fill="url(#paint129_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M135.739 -20.2609C134.779 -20.2609 134 -21.0395 134 -22C134 -22.9605 134.779 -23.7391 135.739 -23.7391H138.522C139.482 -23.7391 140.261 -22.9605 140.261 -22C140.261 -21.0395 139.482 -20.2609 138.522 -20.2609H135.739Z" fill="url(#paint130_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 -18.5217C140.261 -19.4822 141.04 -20.2609 142 -20.2609C142.96 -20.2609 143.739 -19.4822 143.739 -18.5217V-15.7391C143.739 -14.7786 142.96 -14 142 -14C141.04 -14 140.261 -14.7786 140.261 -15.7391V-18.5217Z" fill="url(#paint131_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 -28.2609C164.261 -29.2214 165.04 -30 166 -30C166.96 -30 167.739 -29.2214 167.739 -28.2609V-25.4783C167.739 -24.5178 166.96 -23.7391 166 -23.7391C165.04 -23.7391 164.261 -24.5178 164.261 -25.4783V-28.2609Z" fill="url(#paint132_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M169.478 -20.2609C168.518 -20.2609 167.739 -21.0395 167.739 -22C167.739 -22.9605 168.518 -23.7391 169.478 -23.7391H172.261C173.221 -23.7391 174 -22.9605 174 -22C174 -21.0395 173.221 -20.2609 172.261 -20.2609H169.478Z" fill="url(#paint133_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M159.739 -20.2609C158.779 -20.2609 158 -21.0395 158 -22C158 -22.9605 158.779 -23.7391 159.739 -23.7391H162.522C163.482 -23.7391 164.261 -22.9605 164.261 -22C164.261 -21.0395 163.482 -20.2609 162.522 -20.2609H159.739Z" fill="url(#paint134_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 -18.5217C164.261 -19.4822 165.04 -20.2609 166 -20.2609C166.96 -20.2609 167.739 -19.4822 167.739 -18.5217V-15.7391C167.739 -14.7786 166.96 -14 166 -14C165.04 -14 164.261 -14.7786 164.261 -15.7391V-18.5217Z" fill="url(#paint135_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 -28.2609C188.261 -29.2214 189.04 -30 190 -30C190.96 -30 191.739 -29.2214 191.739 -28.2609V-25.4783C191.739 -24.5178 190.96 -23.7391 190 -23.7391C189.04 -23.7391 188.261 -24.5178 188.261 -25.4783V-28.2609Z" fill="url(#paint136_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M193.478 -20.2609C192.518 -20.2609 191.739 -21.0395 191.739 -22C191.739 -22.9605 192.518 -23.7391 193.478 -23.7391H196.261C197.221 -23.7391 198 -22.9605 198 -22C198 -21.0395 197.221 -20.2609 196.261 -20.2609H193.478Z" fill="url(#paint137_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M183.739 -20.2609C182.779 -20.2609 182 -21.0395 182 -22C182 -22.9605 182.779 -23.7391 183.739 -23.7391H186.522C187.482 -23.7391 188.261 -22.9605 188.261 -22C188.261 -21.0395 187.482 -20.2609 186.522 -20.2609H183.739Z" fill="url(#paint138_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 -18.5217C188.261 -19.4822 189.04 -20.2609 190 -20.2609C190.96 -20.2609 191.739 -19.4822 191.739 -18.5217V-15.7391C191.739 -14.7786 190.96 -14 190 -14C189.04 -14 188.261 -14.7786 188.261 -15.7391V-18.5217Z" fill="url(#paint139_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 -28.2609C212.261 -29.2214 213.04 -30 214 -30C214.96 -30 215.739 -29.2214 215.739 -28.2609V-25.4783C215.739 -24.5178 214.96 -23.7391 214 -23.7391C213.04 -23.7391 212.261 -24.5178 212.261 -25.4783V-28.2609Z" fill="url(#paint140_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M217.478 -20.2609C216.518 -20.2609 215.739 -21.0395 215.739 -22C215.739 -22.9605 216.518 -23.7391 217.478 -23.7391H220.261C221.221 -23.7391 222 -22.9605 222 -22C222 -21.0395 221.221 -20.2609 220.261 -20.2609H217.478Z" fill="url(#paint141_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M207.739 -20.2609C206.779 -20.2609 206 -21.0395 206 -22C206 -22.9605 206.779 -23.7391 207.739 -23.7391H210.522C211.482 -23.7391 212.261 -22.9605 212.261 -22C212.261 -21.0395 211.482 -20.2609 210.522 -20.2609H207.739Z" fill="url(#paint142_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 -18.5217C212.261 -19.4822 213.04 -20.2609 214 -20.2609C214.96 -20.2609 215.739 -19.4822 215.739 -18.5217V-15.7391C215.739 -14.7786 214.96 -14 214 -14C213.04 -14 212.261 -14.7786 212.261 -15.7391V-18.5217Z" fill="url(#paint143_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 -28.2609C236.261 -29.2214 237.04 -30 238 -30C238.96 -30 239.739 -29.2214 239.739 -28.2609V-25.4783C239.739 -24.5178 238.96 -23.7391 238 -23.7391C237.04 -23.7391 236.261 -24.5178 236.261 -25.4783V-28.2609Z" fill="url(#paint144_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M241.478 -20.2609C240.518 -20.2609 239.739 -21.0395 239.739 -22C239.739 -22.9605 240.518 -23.7391 241.478 -23.7391H244.261C245.221 -23.7391 246 -22.9605 246 -22C246 -21.0395 245.221 -20.2609 244.261 -20.2609H241.478Z" fill="url(#paint145_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M231.739 -20.2609C230.779 -20.2609 230 -21.0395 230 -22C230 -22.9605 230.779 -23.7391 231.739 -23.7391H234.522C235.482 -23.7391 236.261 -22.9605 236.261 -22C236.261 -21.0395 235.482 -20.2609 234.522 -20.2609H231.739Z" fill="url(#paint146_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 -18.5217C236.261 -19.4822 237.04 -20.2609 238 -20.2609C238.96 -20.2609 239.739 -19.4822 239.739 -18.5217V-15.7391C239.739 -14.7786 238.96 -14 238 -14C237.04 -14 236.261 -14.7786 236.261 -15.7391V-18.5217Z" fill="url(#paint147_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 -28.2609C260.261 -29.2214 261.04 -30 262 -30C262.96 -30 263.739 -29.2214 263.739 -28.2609V-25.4783C263.739 -24.5178 262.96 -23.7391 262 -23.7391C261.04 -23.7391 260.261 -24.5178 260.261 -25.4783V-28.2609Z" fill="url(#paint148_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M265.478 -20.2609C264.518 -20.2609 263.739 -21.0395 263.739 -22C263.739 -22.9605 264.518 -23.7391 265.478 -23.7391H268.261C269.221 -23.7391 270 -22.9605 270 -22C270 -21.0395 269.221 -20.2609 268.261 -20.2609H265.478Z" fill="url(#paint149_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M255.739 -20.2609C254.779 -20.2609 254 -21.0395 254 -22C254 -22.9605 254.779 -23.7391 255.739 -23.7391H258.522C259.482 -23.7391 260.261 -22.9605 260.261 -22C260.261 -21.0395 259.482 -20.2609 258.522 -20.2609H255.739Z" fill="url(#paint150_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 -18.5217C260.261 -19.4822 261.04 -20.2609 262 -20.2609C262.96 -20.2609 263.739 -19.4822 263.739 -18.5217V-15.7391C263.739 -14.7786 262.96 -14 262 -14C261.04 -14 260.261 -14.7786 260.261 -15.7391V-18.5217Z" fill="url(#paint151_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 -28.2609C284.261 -29.2214 285.04 -30 286 -30C286.96 -30 287.739 -29.2214 287.739 -28.2609V-25.4783C287.739 -24.5178 286.96 -23.7391 286 -23.7391C285.04 -23.7391 284.261 -24.5178 284.261 -25.4783V-28.2609Z" fill="url(#paint152_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M289.478 -20.2609C288.518 -20.2609 287.739 -21.0395 287.739 -22C287.739 -22.9605 288.518 -23.7391 289.478 -23.7391H292.261C293.221 -23.7391 294 -22.9605 294 -22C294 -21.0395 293.221 -20.2609 292.261 -20.2609H289.478Z" fill="url(#paint153_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M279.739 -20.2609C278.779 -20.2609 278 -21.0395 278 -22C278 -22.9605 278.779 -23.7391 279.739 -23.7391H282.522C283.482 -23.7391 284.261 -22.9605 284.261 -22C284.261 -21.0395 283.482 -20.2609 282.522 -20.2609H279.739Z" fill="url(#paint154_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 -18.5217C284.261 -19.4822 285.04 -20.2609 286 -20.2609C286.96 -20.2609 287.739 -19.4822 287.739 -18.5217V-15.7391C287.739 -14.7786 286.96 -14 286 -14C285.04 -14 284.261 -14.7786 284.261 -15.7391V-18.5217Z" fill="url(#paint155_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 -28.2609C308.261 -29.2214 309.04 -30 310 -30C310.96 -30 311.739 -29.2214 311.739 -28.2609V-25.4783C311.739 -24.5178 310.96 -23.7391 310 -23.7391C309.04 -23.7391 308.261 -24.5178 308.261 -25.4783V-28.2609Z" fill="url(#paint156_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M313.478 -20.2609C312.518 -20.2609 311.739 -21.0395 311.739 -22C311.739 -22.9605 312.518 -23.7391 313.478 -23.7391H316.261C317.221 -23.7391 318 -22.9605 318 -22C318 -21.0395 317.221 -20.2609 316.261 -20.2609H313.478Z" fill="url(#paint157_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M303.739 -20.2609C302.779 -20.2609 302 -21.0395 302 -22C302 -22.9605 302.779 -23.7391 303.739 -23.7391H306.522C307.482 -23.7391 308.261 -22.9605 308.261 -22C308.261 -21.0395 307.482 -20.2609 306.522 -20.2609H303.739Z" fill="url(#paint158_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 -18.5217C308.261 -19.4822 309.04 -20.2609 310 -20.2609C310.96 -20.2609 311.739 -19.4822 311.739 -18.5217V-15.7391C311.739 -14.7786 310.96 -14 310 -14C309.04 -14 308.261 -14.7786 308.261 -15.7391V-18.5217Z" fill="url(#paint159_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 -28.2609C332.261 -29.2214 333.04 -30 334 -30C334.96 -30 335.739 -29.2214 335.739 -28.2609V-25.4783C335.739 -24.5178 334.96 -23.7391 334 -23.7391C333.04 -23.7391 332.261 -24.5178 332.261 -25.4783V-28.2609Z" fill="url(#paint160_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M337.478 -20.2609C336.518 -20.2609 335.739 -21.0395 335.739 -22C335.739 -22.9605 336.518 -23.7391 337.478 -23.7391H340.261C341.221 -23.7391 342 -22.9605 342 -22C342 -21.0395 341.221 -20.2609 340.261 -20.2609H337.478Z" fill="url(#paint161_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M327.739 -20.2609C326.779 -20.2609 326 -21.0395 326 -22C326 -22.9605 326.779 -23.7391 327.739 -23.7391H330.522C331.482 -23.7391 332.261 -22.9605 332.261 -22C332.261 -21.0395 331.482 -20.2609 330.522 -20.2609H327.739Z" fill="url(#paint162_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 -18.5217C332.261 -19.4822 333.04 -20.2609 334 -20.2609C334.96 -20.2609 335.739 -19.4822 335.739 -18.5217V-15.7391C335.739 -14.7786 334.96 -14 334 -14C333.04 -14 332.261 -14.7786 332.261 -15.7391V-18.5217Z" fill="url(#paint163_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 -28.2609C356.261 -29.2214 357.04 -30 358 -30C358.96 -30 359.739 -29.2214 359.739 -28.2609V-25.4783C359.739 -24.5178 358.96 -23.7391 358 -23.7391C357.04 -23.7391 356.261 -24.5178 356.261 -25.4783V-28.2609Z" fill="url(#paint164_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M361.478 -20.2609C360.518 -20.2609 359.739 -21.0395 359.739 -22C359.739 -22.9605 360.518 -23.7391 361.478 -23.7391H364.261C365.221 -23.7391 366 -22.9605 366 -22C366 -21.0395 365.221 -20.2609 364.261 -20.2609H361.478Z" fill="url(#paint165_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M351.739 -20.2609C350.779 -20.2609 350 -21.0395 350 -22C350 -22.9605 350.779 -23.7391 351.739 -23.7391H354.522C355.482 -23.7391 356.261 -22.9605 356.261 -22C356.261 -21.0395 355.482 -20.2609 354.522 -20.2609H351.739Z" fill="url(#paint166_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 -18.5217C356.261 -19.4822 357.04 -20.2609 358 -20.2609C358.96 -20.2609 359.739 -19.4822 359.739 -18.5217V-15.7391C359.739 -14.7786 358.96 -14 358 -14C357.04 -14 356.261 -14.7786 356.261 -15.7391V-18.5217Z" fill="url(#paint167_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M44.2609 -4.26086C44.2609 -5.22136 45.0395 -6 46 -6C46.9605 -6 47.7391 -5.22137 47.7391 -4.26087V-1.47826C47.7391 -0.517768 46.9605 0.260872 46 0.260872C45.0395 0.260872 44.2609 -0.517768 44.2609 -1.47826V-4.26086Z" fill="url(#paint168_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M49.4783 3.73913C48.5178 3.73913 47.7391 2.9605 47.7391 2C47.7391 1.0395 48.5178 0.260872 49.4783 0.260872H52.2609C53.2214 0.260872 54 1.0395 54 2C54 2.9605 53.2214 3.73913 52.2609 3.73913H49.4783Z" fill="url(#paint169_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M39.7391 3.73913C38.7786 3.73913 38 2.9605 38 2C38 1.0395 38.7786 0.260872 39.7391 0.260872H42.5217C43.4822 0.260872 44.2609 1.0395 44.2609 2C44.2609 2.9605 43.4822 3.73913 42.5217 3.73913H39.7391Z" fill="url(#paint170_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M44.2609 5.47826C44.2609 4.51777 45.0395 3.73913 46 3.73913C46.9605 3.73913 47.7391 4.51777 47.7391 5.47826V8.26086C47.7391 9.22136 46.9605 10 46 10C45.0395 10 44.2609 9.22136 44.2609 8.26086V5.47826Z" fill="url(#paint171_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 -4.26086C68.2609 -5.22136 69.0395 -6 70 -6C70.9605 -6 71.7391 -5.22137 71.7391 -4.26087V-1.47826C71.7391 -0.517768 70.9605 0.260872 70 0.260872C69.0395 0.260872 68.2609 -0.517768 68.2609 -1.47826V-4.26086Z" fill="url(#paint172_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M73.4783 3.73913C72.5178 3.73913 71.7391 2.9605 71.7391 2C71.7391 1.0395 72.5178 0.260872 73.4783 0.260872H76.2609C77.2214 0.260872 78 1.0395 78 2C78 2.9605 77.2214 3.73913 76.2609 3.73913H73.4783Z" fill="url(#paint173_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M63.7391 3.73913C62.7786 3.73913 62 2.9605 62 2C62 1.0395 62.7786 0.260872 63.7391 0.260872H66.5217C67.4822 0.260872 68.2609 1.0395 68.2609 2C68.2609 2.9605 67.4822 3.73913 66.5217 3.73913H63.7391Z" fill="url(#paint174_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 5.47826C68.2609 4.51777 69.0395 3.73913 70 3.73913C70.9605 3.73913 71.7391 4.51777 71.7391 5.47826V8.26086C71.7391 9.22136 70.9605 10 70 10C69.0395 10 68.2609 9.22136 68.2609 8.26086V5.47826Z" fill="url(#paint175_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 -4.26086C92.2609 -5.22136 93.0395 -6 94 -6C94.9605 -6 95.7391 -5.22137 95.7391 -4.26087V-1.47826C95.7391 -0.517768 94.9605 0.260872 94 0.260872C93.0395 0.260872 92.2609 -0.517768 92.2609 -1.47826V-4.26086Z" fill="url(#paint176_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M97.4783 3.73913C96.5178 3.73913 95.7391 2.9605 95.7391 2C95.7391 1.0395 96.5178 0.260872 97.4783 0.260872H100.261C101.221 0.260872 102 1.0395 102 2C102 2.9605 101.221 3.73913 100.261 3.73913H97.4783Z" fill="url(#paint177_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M87.7391 3.73913C86.7786 3.73913 86 2.9605 86 2C86 1.0395 86.7786 0.260872 87.7391 0.260872H90.5217C91.4822 0.260872 92.2609 1.0395 92.2609 2C92.2609 2.9605 91.4822 3.73913 90.5217 3.73913H87.7391Z" fill="url(#paint178_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 5.47826C92.2609 4.51777 93.0395 3.73913 94 3.73913C94.9605 3.73913 95.7391 4.51777 95.7391 5.47826V8.26086C95.7391 9.22136 94.9605 10 94 10C93.0395 10 92.2609 9.22136 92.2609 8.26086V5.47826Z" fill="url(#paint179_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 -4.26086C116.261 -5.22136 117.04 -6 118 -6C118.96 -6 119.739 -5.22137 119.739 -4.26087V-1.47826C119.739 -0.517768 118.96 0.260872 118 0.260872C117.04 0.260872 116.261 -0.517768 116.261 -1.47826V-4.26086Z" fill="url(#paint180_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M121.478 3.73913C120.518 3.73913 119.739 2.9605 119.739 2C119.739 1.0395 120.518 0.260872 121.478 0.260872H124.261C125.221 0.260872 126 1.0395 126 2C126 2.9605 125.221 3.73913 124.261 3.73913H121.478Z" fill="url(#paint181_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M111.739 3.73913C110.779 3.73913 110 2.9605 110 2C110 1.0395 110.779 0.260872 111.739 0.260872H114.522C115.482 0.260872 116.261 1.0395 116.261 2C116.261 2.9605 115.482 3.73913 114.522 3.73913H111.739Z" fill="url(#paint182_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 5.47826C116.261 4.51777 117.04 3.73913 118 3.73913C118.96 3.73913 119.739 4.51777 119.739 5.47826V8.26086C119.739 9.22136 118.96 10 118 10C117.04 10 116.261 9.22136 116.261 8.26086V5.47826Z" fill="url(#paint183_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 -4.26086C140.261 -5.22136 141.04 -6 142 -6C142.96 -6 143.739 -5.22137 143.739 -4.26087V-1.47826C143.739 -0.517768 142.96 0.260872 142 0.260872C141.04 0.260872 140.261 -0.517768 140.261 -1.47826V-4.26086Z" fill="url(#paint184_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M145.478 3.73913C144.518 3.73913 143.739 2.9605 143.739 2C143.739 1.0395 144.518 0.260872 145.478 0.260872H148.261C149.221 0.260872 150 1.0395 150 2C150 2.9605 149.221 3.73913 148.261 3.73913H145.478Z" fill="url(#paint185_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M135.739 3.73913C134.779 3.73913 134 2.9605 134 2C134 1.0395 134.779 0.260872 135.739 0.260872H138.522C139.482 0.260872 140.261 1.0395 140.261 2C140.261 2.9605 139.482 3.73913 138.522 3.73913H135.739Z" fill="url(#paint186_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 5.47826C140.261 4.51777 141.04 3.73913 142 3.73913C142.96 3.73913 143.739 4.51777 143.739 5.47826V8.26086C143.739 9.22136 142.96 10 142 10C141.04 10 140.261 9.22136 140.261 8.26086V5.47826Z" fill="url(#paint187_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 -4.26086C164.261 -5.22136 165.04 -6 166 -6C166.96 -6 167.739 -5.22137 167.739 -4.26087V-1.47826C167.739 -0.517768 166.96 0.260872 166 0.260872C165.04 0.260872 164.261 -0.517768 164.261 -1.47826V-4.26086Z" fill="url(#paint188_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M169.478 3.73913C168.518 3.73913 167.739 2.9605 167.739 2C167.739 1.0395 168.518 0.260872 169.478 0.260872H172.261C173.221 0.260872 174 1.0395 174 2C174 2.9605 173.221 3.73913 172.261 3.73913H169.478Z" fill="url(#paint189_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M159.739 3.73913C158.779 3.73913 158 2.9605 158 2C158 1.0395 158.779 0.260872 159.739 0.260872H162.522C163.482 0.260872 164.261 1.0395 164.261 2C164.261 2.9605 163.482 3.73913 162.522 3.73913H159.739Z" fill="url(#paint190_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 5.47826C164.261 4.51777 165.04 3.73913 166 3.73913C166.96 3.73913 167.739 4.51777 167.739 5.47826V8.26086C167.739 9.22136 166.96 10 166 10C165.04 10 164.261 9.22136 164.261 8.26086V5.47826Z" fill="url(#paint191_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 -4.26086C188.261 -5.22136 189.04 -6 190 -6C190.96 -6 191.739 -5.22137 191.739 -4.26087V-1.47826C191.739 -0.517768 190.96 0.260872 190 0.260872C189.04 0.260872 188.261 -0.517768 188.261 -1.47826V-4.26086Z" fill="url(#paint192_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M193.478 3.73913C192.518 3.73913 191.739 2.9605 191.739 2C191.739 1.0395 192.518 0.260872 193.478 0.260872H196.261C197.221 0.260872 198 1.0395 198 2C198 2.9605 197.221 3.73913 196.261 3.73913H193.478Z" fill="url(#paint193_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M183.739 3.73913C182.779 3.73913 182 2.9605 182 2C182 1.0395 182.779 0.260872 183.739 0.260872H186.522C187.482 0.260872 188.261 1.0395 188.261 2C188.261 2.9605 187.482 3.73913 186.522 3.73913H183.739Z" fill="url(#paint194_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 5.47826C188.261 4.51777 189.04 3.73913 190 3.73913C190.96 3.73913 191.739 4.51777 191.739 5.47826V8.26086C191.739 9.22136 190.96 10 190 10C189.04 10 188.261 9.22136 188.261 8.26086V5.47826Z" fill="url(#paint195_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 -4.26086C212.261 -5.22136 213.04 -6 214 -6C214.96 -6 215.739 -5.22137 215.739 -4.26087V-1.47826C215.739 -0.517768 214.96 0.260872 214 0.260872C213.04 0.260872 212.261 -0.517768 212.261 -1.47826V-4.26086Z" fill="url(#paint196_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M217.478 3.73913C216.518 3.73913 215.739 2.9605 215.739 2C215.739 1.0395 216.518 0.260872 217.478 0.260872H220.261C221.221 0.260872 222 1.0395 222 2C222 2.9605 221.221 3.73913 220.261 3.73913H217.478Z" fill="url(#paint197_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M207.739 3.73913C206.779 3.73913 206 2.9605 206 2C206 1.0395 206.779 0.260872 207.739 0.260872H210.522C211.482 0.260872 212.261 1.0395 212.261 2C212.261 2.9605 211.482 3.73913 210.522 3.73913H207.739Z" fill="url(#paint198_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 5.47826C212.261 4.51777 213.04 3.73913 214 3.73913C214.96 3.73913 215.739 4.51777 215.739 5.47826V8.26086C215.739 9.22136 214.96 10 214 10C213.04 10 212.261 9.22136 212.261 8.26086V5.47826Z" fill="url(#paint199_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 -4.26086C236.261 -5.22136 237.04 -6 238 -6C238.96 -6 239.739 -5.22137 239.739 -4.26087V-1.47826C239.739 -0.517768 238.96 0.260872 238 0.260872C237.04 0.260872 236.261 -0.517768 236.261 -1.47826V-4.26086Z" fill="url(#paint200_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M241.478 3.73913C240.518 3.73913 239.739 2.9605 239.739 2C239.739 1.0395 240.518 0.260872 241.478 0.260872H244.261C245.221 0.260872 246 1.0395 246 2C246 2.9605 245.221 3.73913 244.261 3.73913H241.478Z" fill="url(#paint201_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M231.739 3.73913C230.779 3.73913 230 2.9605 230 2C230 1.0395 230.779 0.260872 231.739 0.260872H234.522C235.482 0.260872 236.261 1.0395 236.261 2C236.261 2.9605 235.482 3.73913 234.522 3.73913H231.739Z" fill="url(#paint202_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 5.47826C236.261 4.51777 237.04 3.73913 238 3.73913C238.96 3.73913 239.739 4.51777 239.739 5.47826V8.26086C239.739 9.22136 238.96 10 238 10C237.04 10 236.261 9.22136 236.261 8.26086V5.47826Z" fill="url(#paint203_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 -4.26086C260.261 -5.22136 261.04 -6 262 -6C262.96 -6 263.739 -5.22137 263.739 -4.26087V-1.47826C263.739 -0.517768 262.96 0.260872 262 0.260872C261.04 0.260872 260.261 -0.517768 260.261 -1.47826V-4.26086Z" fill="url(#paint204_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M265.478 3.73913C264.518 3.73913 263.739 2.9605 263.739 2C263.739 1.0395 264.518 0.260872 265.478 0.260872H268.261C269.221 0.260872 270 1.0395 270 2C270 2.9605 269.221 3.73913 268.261 3.73913H265.478Z" fill="url(#paint205_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M255.739 3.73913C254.779 3.73913 254 2.9605 254 2C254 1.0395 254.779 0.260872 255.739 0.260872H258.522C259.482 0.260872 260.261 1.0395 260.261 2C260.261 2.9605 259.482 3.73913 258.522 3.73913H255.739Z" fill="url(#paint206_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 5.47826C260.261 4.51777 261.04 3.73913 262 3.73913C262.96 3.73913 263.739 4.51777 263.739 5.47826V8.26086C263.739 9.22136 262.96 10 262 10C261.04 10 260.261 9.22136 260.261 8.26086V5.47826Z" fill="url(#paint207_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 -4.26086C284.261 -5.22136 285.04 -6 286 -6C286.96 -6 287.739 -5.22137 287.739 -4.26087V-1.47826C287.739 -0.517768 286.96 0.260872 286 0.260872C285.04 0.260872 284.261 -0.517768 284.261 -1.47826V-4.26086Z" fill="url(#paint208_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M289.478 3.73913C288.518 3.73913 287.739 2.9605 287.739 2C287.739 1.0395 288.518 0.260872 289.478 0.260872H292.261C293.221 0.260872 294 1.0395 294 2C294 2.9605 293.221 3.73913 292.261 3.73913H289.478Z" fill="url(#paint209_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M279.739 3.73913C278.779 3.73913 278 2.9605 278 2C278 1.0395 278.779 0.260872 279.739 0.260872H282.522C283.482 0.260872 284.261 1.0395 284.261 2C284.261 2.9605 283.482 3.73913 282.522 3.73913H279.739Z" fill="url(#paint210_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 5.47826C284.261 4.51777 285.04 3.73913 286 3.73913C286.96 3.73913 287.739 4.51777 287.739 5.47826V8.26086C287.739 9.22136 286.96 10 286 10C285.04 10 284.261 9.22136 284.261 8.26086V5.47826Z" fill="url(#paint211_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 -4.26086C308.261 -5.22136 309.04 -6 310 -6C310.96 -6 311.739 -5.22137 311.739 -4.26087V-1.47826C311.739 -0.517768 310.96 0.260872 310 0.260872C309.04 0.260872 308.261 -0.517768 308.261 -1.47826V-4.26086Z" fill="url(#paint212_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M313.478 3.73913C312.518 3.73913 311.739 2.9605 311.739 2C311.739 1.0395 312.518 0.260872 313.478 0.260872H316.261C317.221 0.260872 318 1.0395 318 2C318 2.9605 317.221 3.73913 316.261 3.73913H313.478Z" fill="url(#paint213_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M303.739 3.73913C302.779 3.73913 302 2.9605 302 2C302 1.0395 302.779 0.260872 303.739 0.260872H306.522C307.482 0.260872 308.261 1.0395 308.261 2C308.261 2.9605 307.482 3.73913 306.522 3.73913H303.739Z" fill="url(#paint214_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 5.47826C308.261 4.51777 309.04 3.73913 310 3.73913C310.96 3.73913 311.739 4.51777 311.739 5.47826V8.26086C311.739 9.22136 310.96 10 310 10C309.04 10 308.261 9.22136 308.261 8.26086V5.47826Z" fill="url(#paint215_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 -4.26086C332.261 -5.22136 333.04 -6 334 -6C334.96 -6 335.739 -5.22137 335.739 -4.26087V-1.47826C335.739 -0.517768 334.96 0.260872 334 0.260872C333.04 0.260872 332.261 -0.517768 332.261 -1.47826V-4.26086Z" fill="url(#paint216_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M337.478 3.73913C336.518 3.73913 335.739 2.9605 335.739 2C335.739 1.0395 336.518 0.260872 337.478 0.260872H340.261C341.221 0.260872 342 1.0395 342 2C342 2.9605 341.221 3.73913 340.261 3.73913H337.478Z" fill="url(#paint217_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M327.739 3.73913C326.779 3.73913 326 2.9605 326 2C326 1.0395 326.779 0.260872 327.739 0.260872H330.522C331.482 0.260872 332.261 1.0395 332.261 2C332.261 2.9605 331.482 3.73913 330.522 3.73913H327.739Z" fill="url(#paint218_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 5.47826C332.261 4.51777 333.04 3.73913 334 3.73913C334.96 3.73913 335.739 4.51777 335.739 5.47826V8.26086C335.739 9.22136 334.96 10 334 10C333.04 10 332.261 9.22136 332.261 8.26086V5.47826Z" fill="url(#paint219_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 -4.26086C356.261 -5.22136 357.04 -6 358 -6C358.96 -6 359.739 -5.22137 359.739 -4.26087V-1.47826C359.739 -0.517768 358.96 0.260872 358 0.260872C357.04 0.260872 356.261 -0.517768 356.261 -1.47826V-4.26086Z" fill="url(#paint220_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M361.478 3.73913C360.518 3.73913 359.739 2.9605 359.739 2C359.739 1.0395 360.518 0.260872 361.478 0.260872H364.261C365.221 0.260872 366 1.0395 366 2C366 2.9605 365.221 3.73913 364.261 3.73913H361.478Z" fill="url(#paint221_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M351.739 3.73913C350.779 3.73913 350 2.9605 350 2C350 1.0395 350.779 0.260872 351.739 0.260872H354.522C355.482 0.260872 356.261 1.0395 356.261 2C356.261 2.9605 355.482 3.73913 354.522 3.73913H351.739Z" fill="url(#paint222_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 5.47826C356.261 4.51777 357.04 3.73913 358 3.73913C358.96 3.73913 359.739 4.51777 359.739 5.47826V8.26086C359.739 9.22136 358.96 10 358 10C357.04 10 356.261 9.22136 356.261 8.26086V5.47826Z" fill="url(#paint223_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M44.2609 19.7391C44.2609 18.7786 45.0395 18 46 18C46.9605 18 47.7391 18.7786 47.7391 19.7391V22.5217C47.7391 23.4822 46.9605 24.2609 46 24.2609C45.0395 24.2609 44.2609 23.4822 44.2609 22.5217V19.7391Z" fill="url(#paint224_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M49.4783 27.7391C48.5178 27.7391 47.7391 26.9605 47.7391 26C47.7391 25.0395 48.5178 24.2609 49.4783 24.2609H52.2609C53.2214 24.2609 54 25.0395 54 26C54 26.9605 53.2214 27.7391 52.2609 27.7391H49.4783Z" fill="url(#paint225_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M39.7391 27.7391C38.7786 27.7391 38 26.9605 38 26C38 25.0395 38.7786 24.2609 39.7391 24.2609H42.5217C43.4822 24.2609 44.2609 25.0395 44.2609 26C44.2609 26.9605 43.4822 27.7391 42.5217 27.7391H39.7391Z" fill="url(#paint226_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M44.2609 29.4783C44.2609 28.5178 45.0395 27.7391 46 27.7391C46.9605 27.7391 47.7391 28.5178 47.7391 29.4783V32.2609C47.7391 33.2214 46.9605 34 46 34C45.0395 34 44.2609 33.2214 44.2609 32.2609V29.4783Z" fill="url(#paint227_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 19.7391C68.2609 18.7786 69.0395 18 70 18C70.9605 18 71.7391 18.7786 71.7391 19.7391V22.5217C71.7391 23.4822 70.9605 24.2609 70 24.2609C69.0395 24.2609 68.2609 23.4822 68.2609 22.5217V19.7391Z" fill="url(#paint228_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M73.4783 27.7391C72.5178 27.7391 71.7391 26.9605 71.7391 26C71.7391 25.0395 72.5178 24.2609 73.4783 24.2609H76.2609C77.2214 24.2609 78 25.0395 78 26C78 26.9605 77.2214 27.7391 76.2609 27.7391H73.4783Z" fill="url(#paint229_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M63.7391 27.7391C62.7786 27.7391 62 26.9605 62 26C62 25.0395 62.7786 24.2609 63.7391 24.2609H66.5217C67.4822 24.2609 68.2609 25.0395 68.2609 26C68.2609 26.9605 67.4822 27.7391 66.5217 27.7391H63.7391Z" fill="url(#paint230_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 29.4783C68.2609 28.5178 69.0395 27.7391 70 27.7391C70.9605 27.7391 71.7391 28.5178 71.7391 29.4783V32.2609C71.7391 33.2214 70.9605 34 70 34C69.0395 34 68.2609 33.2214 68.2609 32.2609V29.4783Z" fill="url(#paint231_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 19.7391C92.2609 18.7786 93.0395 18 94 18C94.9605 18 95.7391 18.7786 95.7391 19.7391V22.5217C95.7391 23.4822 94.9605 24.2609 94 24.2609C93.0395 24.2609 92.2609 23.4822 92.2609 22.5217V19.7391Z" fill="url(#paint232_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M97.4783 27.7391C96.5178 27.7391 95.7391 26.9605 95.7391 26C95.7391 25.0395 96.5178 24.2609 97.4783 24.2609H100.261C101.221 24.2609 102 25.0395 102 26C102 26.9605 101.221 27.7391 100.261 27.7391H97.4783Z" fill="url(#paint233_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M87.7391 27.7391C86.7786 27.7391 86 26.9605 86 26C86 25.0395 86.7786 24.2609 87.7391 24.2609H90.5217C91.4822 24.2609 92.2609 25.0395 92.2609 26C92.2609 26.9605 91.4822 27.7391 90.5217 27.7391H87.7391Z" fill="url(#paint234_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 29.4783C92.2609 28.5178 93.0395 27.7391 94 27.7391C94.9605 27.7391 95.7391 28.5178 95.7391 29.4783V32.2609C95.7391 33.2214 94.9605 34 94 34C93.0395 34 92.2609 33.2214 92.2609 32.2609V29.4783Z" fill="url(#paint235_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 19.7391C116.261 18.7786 117.04 18 118 18C118.96 18 119.739 18.7786 119.739 19.7391V22.5217C119.739 23.4822 118.96 24.2609 118 24.2609C117.04 24.2609 116.261 23.4822 116.261 22.5217V19.7391Z" fill="url(#paint236_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M121.478 27.7391C120.518 27.7391 119.739 26.9605 119.739 26C119.739 25.0395 120.518 24.2609 121.478 24.2609H124.261C125.221 24.2609 126 25.0395 126 26C126 26.9605 125.221 27.7391 124.261 27.7391H121.478Z" fill="url(#paint237_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M111.739 27.7391C110.779 27.7391 110 26.9605 110 26C110 25.0395 110.779 24.2609 111.739 24.2609H114.522C115.482 24.2609 116.261 25.0395 116.261 26C116.261 26.9605 115.482 27.7391 114.522 27.7391H111.739Z" fill="url(#paint238_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 29.4783C116.261 28.5178 117.04 27.7391 118 27.7391C118.96 27.7391 119.739 28.5178 119.739 29.4783V32.2609C119.739 33.2214 118.96 34 118 34C117.04 34 116.261 33.2214 116.261 32.2609V29.4783Z" fill="url(#paint239_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 19.7391C140.261 18.7786 141.04 18 142 18C142.96 18 143.739 18.7786 143.739 19.7391V22.5217C143.739 23.4822 142.96 24.2609 142 24.2609C141.04 24.2609 140.261 23.4822 140.261 22.5217V19.7391Z" fill="url(#paint240_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M145.478 27.7391C144.518 27.7391 143.739 26.9605 143.739 26C143.739 25.0395 144.518 24.2609 145.478 24.2609H148.261C149.221 24.2609 150 25.0395 150 26C150 26.9605 149.221 27.7391 148.261 27.7391H145.478Z" fill="url(#paint241_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M135.739 27.7391C134.779 27.7391 134 26.9605 134 26C134 25.0395 134.779 24.2609 135.739 24.2609H138.522C139.482 24.2609 140.261 25.0395 140.261 26C140.261 26.9605 139.482 27.7391 138.522 27.7391H135.739Z" fill="url(#paint242_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 29.4783C140.261 28.5178 141.04 27.7391 142 27.7391C142.96 27.7391 143.739 28.5178 143.739 29.4783V32.2609C143.739 33.2214 142.96 34 142 34C141.04 34 140.261 33.2214 140.261 32.2609V29.4783Z" fill="url(#paint243_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 19.7391C164.261 18.7786 165.04 18 166 18C166.96 18 167.739 18.7786 167.739 19.7391V22.5217C167.739 23.4822 166.96 24.2609 166 24.2609C165.04 24.2609 164.261 23.4822 164.261 22.5217V19.7391Z" fill="url(#paint244_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M169.478 27.7391C168.518 27.7391 167.739 26.9605 167.739 26C167.739 25.0395 168.518 24.2609 169.478 24.2609H172.261C173.221 24.2609 174 25.0395 174 26C174 26.9605 173.221 27.7391 172.261 27.7391H169.478Z" fill="url(#paint245_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M159.739 27.7391C158.779 27.7391 158 26.9605 158 26C158 25.0395 158.779 24.2609 159.739 24.2609H162.522C163.482 24.2609 164.261 25.0395 164.261 26C164.261 26.9605 163.482 27.7391 162.522 27.7391H159.739Z" fill="url(#paint246_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 29.4783C164.261 28.5178 165.04 27.7391 166 27.7391C166.96 27.7391 167.739 28.5178 167.739 29.4783V32.2609C167.739 33.2214 166.96 34 166 34C165.04 34 164.261 33.2214 164.261 32.2609V29.4783Z" fill="url(#paint247_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 19.7391C188.261 18.7786 189.04 18 190 18C190.96 18 191.739 18.7786 191.739 19.7391V22.5217C191.739 23.4822 190.96 24.2609 190 24.2609C189.04 24.2609 188.261 23.4822 188.261 22.5217V19.7391Z" fill="url(#paint248_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M193.478 27.7391C192.518 27.7391 191.739 26.9605 191.739 26C191.739 25.0395 192.518 24.2609 193.478 24.2609H196.261C197.221 24.2609 198 25.0395 198 26C198 26.9605 197.221 27.7391 196.261 27.7391H193.478Z" fill="url(#paint249_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M183.739 27.7391C182.779 27.7391 182 26.9605 182 26C182 25.0395 182.779 24.2609 183.739 24.2609H186.522C187.482 24.2609 188.261 25.0395 188.261 26C188.261 26.9605 187.482 27.7391 186.522 27.7391H183.739Z" fill="url(#paint250_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 29.4783C188.261 28.5178 189.04 27.7391 190 27.7391C190.96 27.7391 191.739 28.5178 191.739 29.4783V32.2609C191.739 33.2214 190.96 34 190 34C189.04 34 188.261 33.2214 188.261 32.2609V29.4783Z" fill="url(#paint251_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 19.7391C212.261 18.7786 213.04 18 214 18C214.96 18 215.739 18.7786 215.739 19.7391V22.5217C215.739 23.4822 214.96 24.2609 214 24.2609C213.04 24.2609 212.261 23.4822 212.261 22.5217V19.7391Z" fill="url(#paint252_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M217.478 27.7391C216.518 27.7391 215.739 26.9605 215.739 26C215.739 25.0395 216.518 24.2609 217.478 24.2609H220.261C221.221 24.2609 222 25.0395 222 26C222 26.9605 221.221 27.7391 220.261 27.7391H217.478Z" fill="url(#paint253_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M207.739 27.7391C206.779 27.7391 206 26.9605 206 26C206 25.0395 206.779 24.2609 207.739 24.2609H210.522C211.482 24.2609 212.261 25.0395 212.261 26C212.261 26.9605 211.482 27.7391 210.522 27.7391H207.739Z" fill="url(#paint254_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 29.4783C212.261 28.5178 213.04 27.7391 214 27.7391C214.96 27.7391 215.739 28.5178 215.739 29.4783V32.2609C215.739 33.2214 214.96 34 214 34C213.04 34 212.261 33.2214 212.261 32.2609V29.4783Z" fill="url(#paint255_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 19.7391C236.261 18.7786 237.04 18 238 18C238.96 18 239.739 18.7786 239.739 19.7391V22.5217C239.739 23.4822 238.96 24.2609 238 24.2609C237.04 24.2609 236.261 23.4822 236.261 22.5217V19.7391Z" fill="url(#paint256_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M241.478 27.7391C240.518 27.7391 239.739 26.9605 239.739 26C239.739 25.0395 240.518 24.2609 241.478 24.2609H244.261C245.221 24.2609 246 25.0395 246 26C246 26.9605 245.221 27.7391 244.261 27.7391H241.478Z" fill="url(#paint257_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M231.739 27.7391C230.779 27.7391 230 26.9605 230 26C230 25.0395 230.779 24.2609 231.739 24.2609H234.522C235.482 24.2609 236.261 25.0395 236.261 26C236.261 26.9605 235.482 27.7391 234.522 27.7391H231.739Z" fill="url(#paint258_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 29.4783C236.261 28.5178 237.04 27.7391 238 27.7391C238.96 27.7391 239.739 28.5178 239.739 29.4783V32.2609C239.739 33.2214 238.96 34 238 34C237.04 34 236.261 33.2214 236.261 32.2609V29.4783Z" fill="url(#paint259_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 19.7391C260.261 18.7786 261.04 18 262 18C262.96 18 263.739 18.7786 263.739 19.7391V22.5217C263.739 23.4822 262.96 24.2609 262 24.2609C261.04 24.2609 260.261 23.4822 260.261 22.5217V19.7391Z" fill="url(#paint260_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M265.478 27.7391C264.518 27.7391 263.739 26.9605 263.739 26C263.739 25.0395 264.518 24.2609 265.478 24.2609H268.261C269.221 24.2609 270 25.0395 270 26C270 26.9605 269.221 27.7391 268.261 27.7391H265.478Z" fill="url(#paint261_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M255.739 27.7391C254.779 27.7391 254 26.9605 254 26C254 25.0395 254.779 24.2609 255.739 24.2609H258.522C259.482 24.2609 260.261 25.0395 260.261 26C260.261 26.9605 259.482 27.7391 258.522 27.7391H255.739Z" fill="url(#paint262_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 29.4783C260.261 28.5178 261.04 27.7391 262 27.7391C262.96 27.7391 263.739 28.5178 263.739 29.4783V32.2609C263.739 33.2214 262.96 34 262 34C261.04 34 260.261 33.2214 260.261 32.2609V29.4783Z" fill="url(#paint263_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 19.7391C284.261 18.7786 285.04 18 286 18C286.96 18 287.739 18.7786 287.739 19.7391V22.5217C287.739 23.4822 286.96 24.2609 286 24.2609C285.04 24.2609 284.261 23.4822 284.261 22.5217V19.7391Z" fill="url(#paint264_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M289.478 27.7391C288.518 27.7391 287.739 26.9605 287.739 26C287.739 25.0395 288.518 24.2609 289.478 24.2609H292.261C293.221 24.2609 294 25.0395 294 26C294 26.9605 293.221 27.7391 292.261 27.7391H289.478Z" fill="url(#paint265_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M279.739 27.7391C278.779 27.7391 278 26.9605 278 26C278 25.0395 278.779 24.2609 279.739 24.2609H282.522C283.482 24.2609 284.261 25.0395 284.261 26C284.261 26.9605 283.482 27.7391 282.522 27.7391H279.739Z" fill="url(#paint266_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 29.4783C284.261 28.5178 285.04 27.7391 286 27.7391C286.96 27.7391 287.739 28.5178 287.739 29.4783V32.2609C287.739 33.2214 286.96 34 286 34C285.04 34 284.261 33.2214 284.261 32.2609V29.4783Z" fill="url(#paint267_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 19.7391C308.261 18.7786 309.04 18 310 18C310.96 18 311.739 18.7786 311.739 19.7391V22.5217C311.739 23.4822 310.96 24.2609 310 24.2609C309.04 24.2609 308.261 23.4822 308.261 22.5217V19.7391Z" fill="url(#paint268_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M313.478 27.7391C312.518 27.7391 311.739 26.9605 311.739 26C311.739 25.0395 312.518 24.2609 313.478 24.2609H316.261C317.221 24.2609 318 25.0395 318 26C318 26.9605 317.221 27.7391 316.261 27.7391H313.478Z" fill="url(#paint269_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M303.739 27.7391C302.779 27.7391 302 26.9605 302 26C302 25.0395 302.779 24.2609 303.739 24.2609H306.522C307.482 24.2609 308.261 25.0395 308.261 26C308.261 26.9605 307.482 27.7391 306.522 27.7391H303.739Z" fill="url(#paint270_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 29.4783C308.261 28.5178 309.04 27.7391 310 27.7391C310.96 27.7391 311.739 28.5178 311.739 29.4783V32.2609C311.739 33.2214 310.96 34 310 34C309.04 34 308.261 33.2214 308.261 32.2609V29.4783Z" fill="url(#paint271_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 19.7391C332.261 18.7786 333.04 18 334 18C334.96 18 335.739 18.7786 335.739 19.7391V22.5217C335.739 23.4822 334.96 24.2609 334 24.2609C333.04 24.2609 332.261 23.4822 332.261 22.5217V19.7391Z" fill="url(#paint272_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M337.478 27.7391C336.518 27.7391 335.739 26.9605 335.739 26C335.739 25.0395 336.518 24.2609 337.478 24.2609H340.261C341.221 24.2609 342 25.0395 342 26C342 26.9605 341.221 27.7391 340.261 27.7391H337.478Z" fill="url(#paint273_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M327.739 27.7391C326.779 27.7391 326 26.9605 326 26C326 25.0395 326.779 24.2609 327.739 24.2609H330.522C331.482 24.2609 332.261 25.0395 332.261 26C332.261 26.9605 331.482 27.7391 330.522 27.7391H327.739Z" fill="url(#paint274_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 29.4783C332.261 28.5178 333.04 27.7391 334 27.7391C334.96 27.7391 335.739 28.5178 335.739 29.4783V32.2609C335.739 33.2214 334.96 34 334 34C333.04 34 332.261 33.2214 332.261 32.2609V29.4783Z" fill="url(#paint275_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 19.7391C356.261 18.7786 357.04 18 358 18C358.96 18 359.739 18.7786 359.739 19.7391V22.5217C359.739 23.4822 358.96 24.2609 358 24.2609C357.04 24.2609 356.261 23.4822 356.261 22.5217V19.7391Z" fill="url(#paint276_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M361.478 27.7391C360.518 27.7391 359.739 26.9605 359.739 26C359.739 25.0395 360.518 24.2609 361.478 24.2609H364.261C365.221 24.2609 366 25.0395 366 26C366 26.9605 365.221 27.7391 364.261 27.7391H361.478Z" fill="url(#paint277_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M351.739 27.7391C350.779 27.7391 350 26.9605 350 26C350 25.0395 350.779 24.2609 351.739 24.2609H354.522C355.482 24.2609 356.261 25.0395 356.261 26C356.261 26.9605 355.482 27.7391 354.522 27.7391H351.739Z" fill="url(#paint278_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 29.4783C356.261 28.5178 357.04 27.7391 358 27.7391C358.96 27.7391 359.739 28.5178 359.739 29.4783V32.2609C359.739 33.2214 358.96 34 358 34C357.04 34 356.261 33.2214 356.261 32.2609V29.4783Z" fill="url(#paint279_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M44.2609 43.7391C44.2609 42.7786 45.0395 42 46 42C46.9605 42 47.7391 42.7786 47.7391 43.7391V46.5217C47.7391 47.4822 46.9605 48.2609 46 48.2609C45.0395 48.2609 44.2609 47.4822 44.2609 46.5217V43.7391Z" fill="url(#paint280_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M49.4783 51.7391C48.5178 51.7391 47.7391 50.9605 47.7391 50C47.7391 49.0395 48.5178 48.2609 49.4783 48.2609H52.2609C53.2214 48.2609 54 49.0395 54 50C54 50.9605 53.2214 51.7391 52.2609 51.7391H49.4783Z" fill="url(#paint281_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M39.7391 51.7391C38.7786 51.7391 38 50.9605 38 50C38 49.0395 38.7786 48.2609 39.7391 48.2609H42.5217C43.4822 48.2609 44.2609 49.0395 44.2609 50C44.2609 50.9605 43.4822 51.7391 42.5217 51.7391H39.7391Z" fill="url(#paint282_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M44.2609 53.4783C44.2609 52.5178 45.0395 51.7391 46 51.7391C46.9605 51.7391 47.7391 52.5178 47.7391 53.4783V56.2609C47.7391 57.2214 46.9605 58 46 58C45.0395 58 44.2609 57.2214 44.2609 56.2609V53.4783Z" fill="url(#paint283_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 43.7391C68.2609 42.7786 69.0395 42 70 42C70.9605 42 71.7391 42.7786 71.7391 43.7391V46.5217C71.7391 47.4822 70.9605 48.2609 70 48.2609C69.0395 48.2609 68.2609 47.4822 68.2609 46.5217V43.7391Z" fill="url(#paint284_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M73.4783 51.7391C72.5178 51.7391 71.7391 50.9605 71.7391 50C71.7391 49.0395 72.5178 48.2609 73.4783 48.2609H76.2609C77.2214 48.2609 78 49.0395 78 50C78 50.9605 77.2214 51.7391 76.2609 51.7391H73.4783Z" fill="url(#paint285_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M63.7391 51.7391C62.7786 51.7391 62 50.9605 62 50C62 49.0395 62.7786 48.2609 63.7391 48.2609H66.5217C67.4822 48.2609 68.2609 49.0395 68.2609 50C68.2609 50.9605 67.4822 51.7391 66.5217 51.7391H63.7391Z" fill="url(#paint286_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 53.4783C68.2609 52.5178 69.0395 51.7391 70 51.7391C70.9605 51.7391 71.7391 52.5178 71.7391 53.4783V56.2609C71.7391 57.2214 70.9605 58 70 58C69.0395 58 68.2609 57.2214 68.2609 56.2609V53.4783Z" fill="url(#paint287_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 43.7391C92.2609 42.7786 93.0395 42 94 42C94.9605 42 95.7391 42.7786 95.7391 43.7391V46.5217C95.7391 47.4822 94.9605 48.2609 94 48.2609C93.0395 48.2609 92.2609 47.4822 92.2609 46.5217V43.7391Z" fill="url(#paint288_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M97.4783 51.7391C96.5178 51.7391 95.7391 50.9605 95.7391 50C95.7391 49.0395 96.5178 48.2609 97.4783 48.2609H100.261C101.221 48.2609 102 49.0395 102 50C102 50.9605 101.221 51.7391 100.261 51.7391H97.4783Z" fill="url(#paint289_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M87.7391 51.7391C86.7786 51.7391 86 50.9605 86 50C86 49.0395 86.7786 48.2609 87.7391 48.2609H90.5217C91.4822 48.2609 92.2609 49.0395 92.2609 50C92.2609 50.9605 91.4822 51.7391 90.5217 51.7391H87.7391Z" fill="url(#paint290_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 53.4783C92.2609 52.5178 93.0395 51.7391 94 51.7391C94.9605 51.7391 95.7391 52.5178 95.7391 53.4783V56.2609C95.7391 57.2214 94.9605 58 94 58C93.0395 58 92.2609 57.2214 92.2609 56.2609V53.4783Z" fill="url(#paint291_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 43.7391C116.261 42.7786 117.04 42 118 42C118.96 42 119.739 42.7786 119.739 43.7391V46.5217C119.739 47.4822 118.96 48.2609 118 48.2609C117.04 48.2609 116.261 47.4822 116.261 46.5217V43.7391Z" fill="url(#paint292_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M121.478 51.7391C120.518 51.7391 119.739 50.9605 119.739 50C119.739 49.0395 120.518 48.2609 121.478 48.2609H124.261C125.221 48.2609 126 49.0395 126 50C126 50.9605 125.221 51.7391 124.261 51.7391H121.478Z" fill="url(#paint293_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M111.739 51.7391C110.779 51.7391 110 50.9605 110 50C110 49.0395 110.779 48.2609 111.739 48.2609H114.522C115.482 48.2609 116.261 49.0395 116.261 50C116.261 50.9605 115.482 51.7391 114.522 51.7391H111.739Z" fill="url(#paint294_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 53.4783C116.261 52.5178 117.04 51.7391 118 51.7391C118.96 51.7391 119.739 52.5178 119.739 53.4783V56.2609C119.739 57.2214 118.96 58 118 58C117.04 58 116.261 57.2214 116.261 56.2609V53.4783Z" fill="url(#paint295_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 43.7391C140.261 42.7786 141.04 42 142 42C142.96 42 143.739 42.7786 143.739 43.7391V46.5217C143.739 47.4822 142.96 48.2609 142 48.2609C141.04 48.2609 140.261 47.4822 140.261 46.5217V43.7391Z" fill="url(#paint296_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M145.478 51.7391C144.518 51.7391 143.739 50.9605 143.739 50C143.739 49.0395 144.518 48.2609 145.478 48.2609H148.261C149.221 48.2609 150 49.0395 150 50C150 50.9605 149.221 51.7391 148.261 51.7391H145.478Z" fill="url(#paint297_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M135.739 51.7391C134.779 51.7391 134 50.9605 134 50C134 49.0395 134.779 48.2609 135.739 48.2609H138.522C139.482 48.2609 140.261 49.0395 140.261 50C140.261 50.9605 139.482 51.7391 138.522 51.7391H135.739Z" fill="url(#paint298_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 53.4783C140.261 52.5178 141.04 51.7391 142 51.7391C142.96 51.7391 143.739 52.5178 143.739 53.4783V56.2609C143.739 57.2214 142.96 58 142 58C141.04 58 140.261 57.2214 140.261 56.2609V53.4783Z" fill="url(#paint299_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 43.7391C164.261 42.7786 165.04 42 166 42C166.96 42 167.739 42.7786 167.739 43.7391V46.5217C167.739 47.4822 166.96 48.2609 166 48.2609C165.04 48.2609 164.261 47.4822 164.261 46.5217V43.7391Z" fill="url(#paint300_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M169.478 51.7391C168.518 51.7391 167.739 50.9605 167.739 50C167.739 49.0395 168.518 48.2609 169.478 48.2609H172.261C173.221 48.2609 174 49.0395 174 50C174 50.9605 173.221 51.7391 172.261 51.7391H169.478Z" fill="url(#paint301_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M159.739 51.7391C158.779 51.7391 158 50.9605 158 50C158 49.0395 158.779 48.2609 159.739 48.2609H162.522C163.482 48.2609 164.261 49.0395 164.261 50C164.261 50.9605 163.482 51.7391 162.522 51.7391H159.739Z" fill="url(#paint302_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 53.4783C164.261 52.5178 165.04 51.7391 166 51.7391C166.96 51.7391 167.739 52.5178 167.739 53.4783V56.2609C167.739 57.2214 166.96 58 166 58C165.04 58 164.261 57.2214 164.261 56.2609V53.4783Z" fill="url(#paint303_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 43.7391C188.261 42.7786 189.04 42 190 42C190.96 42 191.739 42.7786 191.739 43.7391V46.5217C191.739 47.4822 190.96 48.2609 190 48.2609C189.04 48.2609 188.261 47.4822 188.261 46.5217V43.7391Z" fill="url(#paint304_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M193.478 51.7391C192.518 51.7391 191.739 50.9605 191.739 50C191.739 49.0395 192.518 48.2609 193.478 48.2609H196.261C197.221 48.2609 198 49.0395 198 50C198 50.9605 197.221 51.7391 196.261 51.7391H193.478Z" fill="url(#paint305_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M183.739 51.7391C182.779 51.7391 182 50.9605 182 50C182 49.0395 182.779 48.2609 183.739 48.2609H186.522C187.482 48.2609 188.261 49.0395 188.261 50C188.261 50.9605 187.482 51.7391 186.522 51.7391H183.739Z" fill="url(#paint306_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 53.4783C188.261 52.5178 189.04 51.7391 190 51.7391C190.96 51.7391 191.739 52.5178 191.739 53.4783V56.2609C191.739 57.2214 190.96 58 190 58C189.04 58 188.261 57.2214 188.261 56.2609V53.4783Z" fill="url(#paint307_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 43.7391C212.261 42.7786 213.04 42 214 42C214.96 42 215.739 42.7786 215.739 43.7391V46.5217C215.739 47.4822 214.96 48.2609 214 48.2609C213.04 48.2609 212.261 47.4822 212.261 46.5217V43.7391Z" fill="url(#paint308_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M217.478 51.7391C216.518 51.7391 215.739 50.9605 215.739 50C215.739 49.0395 216.518 48.2609 217.478 48.2609H220.261C221.221 48.2609 222 49.0395 222 50C222 50.9605 221.221 51.7391 220.261 51.7391H217.478Z" fill="url(#paint309_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M207.739 51.7391C206.779 51.7391 206 50.9605 206 50C206 49.0395 206.779 48.2609 207.739 48.2609H210.522C211.482 48.2609 212.261 49.0395 212.261 50C212.261 50.9605 211.482 51.7391 210.522 51.7391H207.739Z" fill="url(#paint310_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 53.4783C212.261 52.5178 213.04 51.7391 214 51.7391C214.96 51.7391 215.739 52.5178 215.739 53.4783V56.2609C215.739 57.2214 214.96 58 214 58C213.04 58 212.261 57.2214 212.261 56.2609V53.4783Z" fill="url(#paint311_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 43.7391C236.261 42.7786 237.04 42 238 42C238.96 42 239.739 42.7786 239.739 43.7391V46.5217C239.739 47.4822 238.96 48.2609 238 48.2609C237.04 48.2609 236.261 47.4822 236.261 46.5217V43.7391Z" fill="url(#paint312_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M241.478 51.7391C240.518 51.7391 239.739 50.9605 239.739 50C239.739 49.0395 240.518 48.2609 241.478 48.2609H244.261C245.221 48.2609 246 49.0395 246 50C246 50.9605 245.221 51.7391 244.261 51.7391H241.478Z" fill="url(#paint313_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M231.739 51.7391C230.779 51.7391 230 50.9605 230 50C230 49.0395 230.779 48.2609 231.739 48.2609H234.522C235.482 48.2609 236.261 49.0395 236.261 50C236.261 50.9605 235.482 51.7391 234.522 51.7391H231.739Z" fill="url(#paint314_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 53.4783C236.261 52.5178 237.04 51.7391 238 51.7391C238.96 51.7391 239.739 52.5178 239.739 53.4783V56.2609C239.739 57.2214 238.96 58 238 58C237.04 58 236.261 57.2214 236.261 56.2609V53.4783Z" fill="url(#paint315_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 43.7391C260.261 42.7786 261.04 42 262 42C262.96 42 263.739 42.7786 263.739 43.7391V46.5217C263.739 47.4822 262.96 48.2609 262 48.2609C261.04 48.2609 260.261 47.4822 260.261 46.5217V43.7391Z" fill="url(#paint316_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M265.478 51.7391C264.518 51.7391 263.739 50.9605 263.739 50C263.739 49.0395 264.518 48.2609 265.478 48.2609H268.261C269.221 48.2609 270 49.0395 270 50C270 50.9605 269.221 51.7391 268.261 51.7391H265.478Z" fill="url(#paint317_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M255.739 51.7391C254.779 51.7391 254 50.9605 254 50C254 49.0395 254.779 48.2609 255.739 48.2609H258.522C259.482 48.2609 260.261 49.0395 260.261 50C260.261 50.9605 259.482 51.7391 258.522 51.7391H255.739Z" fill="url(#paint318_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 53.4783C260.261 52.5178 261.04 51.7391 262 51.7391C262.96 51.7391 263.739 52.5178 263.739 53.4783V56.2609C263.739 57.2214 262.96 58 262 58C261.04 58 260.261 57.2214 260.261 56.2609V53.4783Z" fill="url(#paint319_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 43.7391C284.261 42.7786 285.04 42 286 42C286.96 42 287.739 42.7786 287.739 43.7391V46.5217C287.739 47.4822 286.96 48.2609 286 48.2609C285.04 48.2609 284.261 47.4822 284.261 46.5217V43.7391Z" fill="url(#paint320_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M289.478 51.7391C288.518 51.7391 287.739 50.9605 287.739 50C287.739 49.0395 288.518 48.2609 289.478 48.2609H292.261C293.221 48.2609 294 49.0395 294 50C294 50.9605 293.221 51.7391 292.261 51.7391H289.478Z" fill="url(#paint321_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M279.739 51.7391C278.779 51.7391 278 50.9605 278 50C278 49.0395 278.779 48.2609 279.739 48.2609H282.522C283.482 48.2609 284.261 49.0395 284.261 50C284.261 50.9605 283.482 51.7391 282.522 51.7391H279.739Z" fill="url(#paint322_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 53.4783C284.261 52.5178 285.04 51.7391 286 51.7391C286.96 51.7391 287.739 52.5178 287.739 53.4783V56.2609C287.739 57.2214 286.96 58 286 58C285.04 58 284.261 57.2214 284.261 56.2609V53.4783Z" fill="url(#paint323_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 43.7391C308.261 42.7786 309.04 42 310 42C310.96 42 311.739 42.7786 311.739 43.7391V46.5217C311.739 47.4822 310.96 48.2609 310 48.2609C309.04 48.2609 308.261 47.4822 308.261 46.5217V43.7391Z" fill="url(#paint324_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M313.478 51.7391C312.518 51.7391 311.739 50.9605 311.739 50C311.739 49.0395 312.518 48.2609 313.478 48.2609H316.261C317.221 48.2609 318 49.0395 318 50C318 50.9605 317.221 51.7391 316.261 51.7391H313.478Z" fill="url(#paint325_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M303.739 51.7391C302.779 51.7391 302 50.9605 302 50C302 49.0395 302.779 48.2609 303.739 48.2609H306.522C307.482 48.2609 308.261 49.0395 308.261 50C308.261 50.9605 307.482 51.7391 306.522 51.7391H303.739Z" fill="url(#paint326_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 53.4783C308.261 52.5178 309.04 51.7391 310 51.7391C310.96 51.7391 311.739 52.5178 311.739 53.4783V56.2609C311.739 57.2214 310.96 58 310 58C309.04 58 308.261 57.2214 308.261 56.2609V53.4783Z" fill="url(#paint327_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 43.7391C332.261 42.7786 333.04 42 334 42C334.96 42 335.739 42.7786 335.739 43.7391V46.5217C335.739 47.4822 334.96 48.2609 334 48.2609C333.04 48.2609 332.261 47.4822 332.261 46.5217V43.7391Z" fill="url(#paint328_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M337.478 51.7391C336.518 51.7391 335.739 50.9605 335.739 50C335.739 49.0395 336.518 48.2609 337.478 48.2609H340.261C341.221 48.2609 342 49.0395 342 50C342 50.9605 341.221 51.7391 340.261 51.7391H337.478Z" fill="url(#paint329_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M327.739 51.7391C326.779 51.7391 326 50.9605 326 50C326 49.0395 326.779 48.2609 327.739 48.2609H330.522C331.482 48.2609 332.261 49.0395 332.261 50C332.261 50.9605 331.482 51.7391 330.522 51.7391H327.739Z" fill="url(#paint330_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 53.4783C332.261 52.5178 333.04 51.7391 334 51.7391C334.96 51.7391 335.739 52.5178 335.739 53.4783V56.2609C335.739 57.2214 334.96 58 334 58C333.04 58 332.261 57.2214 332.261 56.2609V53.4783Z" fill="url(#paint331_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 43.7391C356.261 42.7786 357.04 42 358 42C358.96 42 359.739 42.7786 359.739 43.7391V46.5217C359.739 47.4822 358.96 48.2609 358 48.2609C357.04 48.2609 356.261 47.4822 356.261 46.5217V43.7391Z" fill="url(#paint332_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M361.478 51.7391C360.518 51.7391 359.739 50.9605 359.739 50C359.739 49.0395 360.518 48.2609 361.478 48.2609H364.261C365.221 48.2609 366 49.0395 366 50C366 50.9605 365.221 51.7391 364.261 51.7391H361.478Z" fill="url(#paint333_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M351.739 51.7391C350.779 51.7391 350 50.9605 350 50C350 49.0395 350.779 48.2609 351.739 48.2609H354.522C355.482 48.2609 356.261 49.0395 356.261 50C356.261 50.9605 355.482 51.7391 354.522 51.7391H351.739Z" fill="url(#paint334_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 53.4783C356.261 52.5178 357.04 51.7391 358 51.7391C358.96 51.7391 359.739 52.5178 359.739 53.4783V56.2609C359.739 57.2214 358.96 58 358 58C357.04 58 356.261 57.2214 356.261 56.2609V53.4783Z" fill="url(#paint335_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M44.2609 67.7391C44.2609 66.7786 45.0395 66 46 66C46.9605 66 47.7391 66.7786 47.7391 67.7391V70.5217C47.7391 71.4822 46.9605 72.2609 46 72.2609C45.0395 72.2609 44.2609 71.4822 44.2609 70.5217V67.7391Z" fill="url(#paint336_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M49.4783 75.7391C48.5178 75.7391 47.7391 74.9605 47.7391 74C47.7391 73.0395 48.5178 72.2609 49.4783 72.2609H52.2609C53.2214 72.2609 54 73.0395 54 74C54 74.9605 53.2214 75.7391 52.2609 75.7391H49.4783Z" fill="url(#paint337_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M39.7391 75.7391C38.7786 75.7391 38 74.9605 38 74C38 73.0395 38.7786 72.2609 39.7391 72.2609H42.5217C43.4822 72.2609 44.2609 73.0395 44.2609 74C44.2609 74.9605 43.4822 75.7391 42.5217 75.7391H39.7391Z" fill="url(#paint338_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M44.2609 77.4783C44.2609 76.5178 45.0395 75.7391 46 75.7391C46.9605 75.7391 47.7391 76.5178 47.7391 77.4783V80.2609C47.7391 81.2214 46.9605 82 46 82C45.0395 82 44.2609 81.2214 44.2609 80.2609V77.4783Z" fill="url(#paint339_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 67.7391C68.2609 66.7786 69.0395 66 70 66C70.9605 66 71.7391 66.7786 71.7391 67.7391V70.5217C71.7391 71.4822 70.9605 72.2609 70 72.2609C69.0395 72.2609 68.2609 71.4822 68.2609 70.5217V67.7391Z" fill="url(#paint340_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M73.4783 75.7391C72.5178 75.7391 71.7391 74.9605 71.7391 74C71.7391 73.0395 72.5178 72.2609 73.4783 72.2609H76.2609C77.2214 72.2609 78 73.0395 78 74C78 74.9605 77.2214 75.7391 76.2609 75.7391H73.4783Z" fill="url(#paint341_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M63.7391 75.7391C62.7786 75.7391 62 74.9605 62 74C62 73.0395 62.7786 72.2609 63.7391 72.2609H66.5217C67.4822 72.2609 68.2609 73.0395 68.2609 74C68.2609 74.9605 67.4822 75.7391 66.5217 75.7391H63.7391Z" fill="url(#paint342_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 77.4783C68.2609 76.5178 69.0395 75.7391 70 75.7391C70.9605 75.7391 71.7391 76.5178 71.7391 77.4783V80.2609C71.7391 81.2214 70.9605 82 70 82C69.0395 82 68.2609 81.2214 68.2609 80.2609V77.4783Z" fill="url(#paint343_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 67.7391C92.2609 66.7786 93.0395 66 94 66C94.9605 66 95.7391 66.7786 95.7391 67.7391V70.5217C95.7391 71.4822 94.9605 72.2609 94 72.2609C93.0395 72.2609 92.2609 71.4822 92.2609 70.5217V67.7391Z" fill="url(#paint344_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M97.4783 75.7391C96.5178 75.7391 95.7391 74.9605 95.7391 74C95.7391 73.0395 96.5178 72.2609 97.4783 72.2609H100.261C101.221 72.2609 102 73.0395 102 74C102 74.9605 101.221 75.7391 100.261 75.7391H97.4783Z" fill="url(#paint345_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M87.7391 75.7391C86.7786 75.7391 86 74.9605 86 74C86 73.0395 86.7786 72.2609 87.7391 72.2609H90.5217C91.4822 72.2609 92.2609 73.0395 92.2609 74C92.2609 74.9605 91.4822 75.7391 90.5217 75.7391H87.7391Z" fill="url(#paint346_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 77.4783C92.2609 76.5178 93.0395 75.7391 94 75.7391C94.9605 75.7391 95.7391 76.5178 95.7391 77.4783V80.2609C95.7391 81.2214 94.9605 82 94 82C93.0395 82 92.2609 81.2214 92.2609 80.2609V77.4783Z" fill="url(#paint347_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 67.7391C116.261 66.7786 117.04 66 118 66C118.96 66 119.739 66.7786 119.739 67.7391V70.5217C119.739 71.4822 118.96 72.2609 118 72.2609C117.04 72.2609 116.261 71.4822 116.261 70.5217V67.7391Z" fill="url(#paint348_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M121.478 75.7391C120.518 75.7391 119.739 74.9605 119.739 74C119.739 73.0395 120.518 72.2609 121.478 72.2609H124.261C125.221 72.2609 126 73.0395 126 74C126 74.9605 125.221 75.7391 124.261 75.7391H121.478Z" fill="url(#paint349_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M111.739 75.7391C110.779 75.7391 110 74.9605 110 74C110 73.0395 110.779 72.2609 111.739 72.2609H114.522C115.482 72.2609 116.261 73.0395 116.261 74C116.261 74.9605 115.482 75.7391 114.522 75.7391H111.739Z" fill="url(#paint350_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 77.4783C116.261 76.5178 117.04 75.7391 118 75.7391C118.96 75.7391 119.739 76.5178 119.739 77.4783V80.2609C119.739 81.2214 118.96 82 118 82C117.04 82 116.261 81.2214 116.261 80.2609V77.4783Z" fill="url(#paint351_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 67.7391C140.261 66.7786 141.04 66 142 66C142.96 66 143.739 66.7786 143.739 67.7391V70.5217C143.739 71.4822 142.96 72.2609 142 72.2609C141.04 72.2609 140.261 71.4822 140.261 70.5217V67.7391Z" fill="url(#paint352_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M145.478 75.7391C144.518 75.7391 143.739 74.9605 143.739 74C143.739 73.0395 144.518 72.2609 145.478 72.2609H148.261C149.221 72.2609 150 73.0395 150 74C150 74.9605 149.221 75.7391 148.261 75.7391H145.478Z" fill="url(#paint353_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M135.739 75.7391C134.779 75.7391 134 74.9605 134 74C134 73.0395 134.779 72.2609 135.739 72.2609H138.522C139.482 72.2609 140.261 73.0395 140.261 74C140.261 74.9605 139.482 75.7391 138.522 75.7391H135.739Z" fill="url(#paint354_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 77.4783C140.261 76.5178 141.04 75.7391 142 75.7391C142.96 75.7391 143.739 76.5178 143.739 77.4783V80.2609C143.739 81.2214 142.96 82 142 82C141.04 82 140.261 81.2214 140.261 80.2609V77.4783Z" fill="url(#paint355_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 67.7391C164.261 66.7786 165.04 66 166 66C166.96 66 167.739 66.7786 167.739 67.7391V70.5217C167.739 71.4822 166.96 72.2609 166 72.2609C165.04 72.2609 164.261 71.4822 164.261 70.5217V67.7391Z" fill="url(#paint356_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M169.478 75.7391C168.518 75.7391 167.739 74.9605 167.739 74C167.739 73.0395 168.518 72.2609 169.478 72.2609H172.261C173.221 72.2609 174 73.0395 174 74C174 74.9605 173.221 75.7391 172.261 75.7391H169.478Z" fill="url(#paint357_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M159.739 75.7391C158.779 75.7391 158 74.9605 158 74C158 73.0395 158.779 72.2609 159.739 72.2609H162.522C163.482 72.2609 164.261 73.0395 164.261 74C164.261 74.9605 163.482 75.7391 162.522 75.7391H159.739Z" fill="url(#paint358_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 77.4783C164.261 76.5178 165.04 75.7391 166 75.7391C166.96 75.7391 167.739 76.5178 167.739 77.4783V80.2609C167.739 81.2214 166.96 82 166 82C165.04 82 164.261 81.2214 164.261 80.2609V77.4783Z" fill="url(#paint359_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 67.7391C188.261 66.7786 189.04 66 190 66C190.96 66 191.739 66.7786 191.739 67.7391V70.5217C191.739 71.4822 190.96 72.2609 190 72.2609C189.04 72.2609 188.261 71.4822 188.261 70.5217V67.7391Z" fill="url(#paint360_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M193.478 75.7391C192.518 75.7391 191.739 74.9605 191.739 74C191.739 73.0395 192.518 72.2609 193.478 72.2609H196.261C197.221 72.2609 198 73.0395 198 74C198 74.9605 197.221 75.7391 196.261 75.7391H193.478Z" fill="url(#paint361_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M183.739 75.7391C182.779 75.7391 182 74.9605 182 74C182 73.0395 182.779 72.2609 183.739 72.2609H186.522C187.482 72.2609 188.261 73.0395 188.261 74C188.261 74.9605 187.482 75.7391 186.522 75.7391H183.739Z" fill="url(#paint362_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 77.4783C188.261 76.5178 189.04 75.7391 190 75.7391C190.96 75.7391 191.739 76.5178 191.739 77.4783V80.2609C191.739 81.2214 190.96 82 190 82C189.04 82 188.261 81.2214 188.261 80.2609V77.4783Z" fill="url(#paint363_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 67.7391C212.261 66.7786 213.04 66 214 66C214.96 66 215.739 66.7786 215.739 67.7391V70.5217C215.739 71.4822 214.96 72.2609 214 72.2609C213.04 72.2609 212.261 71.4822 212.261 70.5217V67.7391Z" fill="url(#paint364_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M217.478 75.7391C216.518 75.7391 215.739 74.9605 215.739 74C215.739 73.0395 216.518 72.2609 217.478 72.2609H220.261C221.221 72.2609 222 73.0395 222 74C222 74.9605 221.221 75.7391 220.261 75.7391H217.478Z" fill="url(#paint365_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M207.739 75.7391C206.779 75.7391 206 74.9605 206 74C206 73.0395 206.779 72.2609 207.739 72.2609H210.522C211.482 72.2609 212.261 73.0395 212.261 74C212.261 74.9605 211.482 75.7391 210.522 75.7391H207.739Z" fill="url(#paint366_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 77.4783C212.261 76.5178 213.04 75.7391 214 75.7391C214.96 75.7391 215.739 76.5178 215.739 77.4783V80.2609C215.739 81.2214 214.96 82 214 82C213.04 82 212.261 81.2214 212.261 80.2609V77.4783Z" fill="url(#paint367_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 67.7391C236.261 66.7786 237.04 66 238 66C238.96 66 239.739 66.7786 239.739 67.7391V70.5217C239.739 71.4822 238.96 72.2609 238 72.2609C237.04 72.2609 236.261 71.4822 236.261 70.5217V67.7391Z" fill="url(#paint368_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M241.478 75.7391C240.518 75.7391 239.739 74.9605 239.739 74C239.739 73.0395 240.518 72.2609 241.478 72.2609H244.261C245.221 72.2609 246 73.0395 246 74C246 74.9605 245.221 75.7391 244.261 75.7391H241.478Z" fill="url(#paint369_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M231.739 75.7391C230.779 75.7391 230 74.9605 230 74C230 73.0395 230.779 72.2609 231.739 72.2609H234.522C235.482 72.2609 236.261 73.0395 236.261 74C236.261 74.9605 235.482 75.7391 234.522 75.7391H231.739Z" fill="url(#paint370_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 77.4783C236.261 76.5178 237.04 75.7391 238 75.7391C238.96 75.7391 239.739 76.5178 239.739 77.4783V80.2609C239.739 81.2214 238.96 82 238 82C237.04 82 236.261 81.2214 236.261 80.2609V77.4783Z" fill="url(#paint371_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 67.7391C260.261 66.7786 261.04 66 262 66C262.96 66 263.739 66.7786 263.739 67.7391V70.5217C263.739 71.4822 262.96 72.2609 262 72.2609C261.04 72.2609 260.261 71.4822 260.261 70.5217V67.7391Z" fill="url(#paint372_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M265.478 75.7391C264.518 75.7391 263.739 74.9605 263.739 74C263.739 73.0395 264.518 72.2609 265.478 72.2609H268.261C269.221 72.2609 270 73.0395 270 74C270 74.9605 269.221 75.7391 268.261 75.7391H265.478Z" fill="url(#paint373_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M255.739 75.7391C254.779 75.7391 254 74.9605 254 74C254 73.0395 254.779 72.2609 255.739 72.2609H258.522C259.482 72.2609 260.261 73.0395 260.261 74C260.261 74.9605 259.482 75.7391 258.522 75.7391H255.739Z" fill="url(#paint374_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 77.4783C260.261 76.5178 261.04 75.7391 262 75.7391C262.96 75.7391 263.739 76.5178 263.739 77.4783V80.2609C263.739 81.2214 262.96 82 262 82C261.04 82 260.261 81.2214 260.261 80.2609V77.4783Z" fill="url(#paint375_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 67.7391C284.261 66.7786 285.04 66 286 66C286.96 66 287.739 66.7786 287.739 67.7391V70.5217C287.739 71.4822 286.96 72.2609 286 72.2609C285.04 72.2609 284.261 71.4822 284.261 70.5217V67.7391Z" fill="url(#paint376_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M289.478 75.7391C288.518 75.7391 287.739 74.9605 287.739 74C287.739 73.0395 288.518 72.2609 289.478 72.2609H292.261C293.221 72.2609 294 73.0395 294 74C294 74.9605 293.221 75.7391 292.261 75.7391H289.478Z" fill="url(#paint377_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M279.739 75.7391C278.779 75.7391 278 74.9605 278 74C278 73.0395 278.779 72.2609 279.739 72.2609H282.522C283.482 72.2609 284.261 73.0395 284.261 74C284.261 74.9605 283.482 75.7391 282.522 75.7391H279.739Z" fill="url(#paint378_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 77.4783C284.261 76.5178 285.04 75.7391 286 75.7391C286.96 75.7391 287.739 76.5178 287.739 77.4783V80.2609C287.739 81.2214 286.96 82 286 82C285.04 82 284.261 81.2214 284.261 80.2609V77.4783Z" fill="url(#paint379_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 67.7391C308.261 66.7786 309.04 66 310 66C310.96 66 311.739 66.7786 311.739 67.7391V70.5217C311.739 71.4822 310.96 72.2609 310 72.2609C309.04 72.2609 308.261 71.4822 308.261 70.5217V67.7391Z" fill="url(#paint380_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M313.478 75.7391C312.518 75.7391 311.739 74.9605 311.739 74C311.739 73.0395 312.518 72.2609 313.478 72.2609H316.261C317.221 72.2609 318 73.0395 318 74C318 74.9605 317.221 75.7391 316.261 75.7391H313.478Z" fill="url(#paint381_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M303.739 75.7391C302.779 75.7391 302 74.9605 302 74C302 73.0395 302.779 72.2609 303.739 72.2609H306.522C307.482 72.2609 308.261 73.0395 308.261 74C308.261 74.9605 307.482 75.7391 306.522 75.7391H303.739Z" fill="url(#paint382_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 77.4783C308.261 76.5178 309.04 75.7391 310 75.7391C310.96 75.7391 311.739 76.5178 311.739 77.4783V80.2609C311.739 81.2214 310.96 82 310 82C309.04 82 308.261 81.2214 308.261 80.2609V77.4783Z" fill="url(#paint383_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 67.7391C332.261 66.7786 333.04 66 334 66C334.96 66 335.739 66.7786 335.739 67.7391V70.5217C335.739 71.4822 334.96 72.2609 334 72.2609C333.04 72.2609 332.261 71.4822 332.261 70.5217V67.7391Z" fill="url(#paint384_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M337.478 75.7391C336.518 75.7391 335.739 74.9605 335.739 74C335.739 73.0395 336.518 72.2609 337.478 72.2609H340.261C341.221 72.2609 342 73.0395 342 74C342 74.9605 341.221 75.7391 340.261 75.7391H337.478Z" fill="url(#paint385_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M327.739 75.7391C326.779 75.7391 326 74.9605 326 74C326 73.0395 326.779 72.2609 327.739 72.2609H330.522C331.482 72.2609 332.261 73.0395 332.261 74C332.261 74.9605 331.482 75.7391 330.522 75.7391H327.739Z" fill="url(#paint386_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 77.4783C332.261 76.5178 333.04 75.7391 334 75.7391C334.96 75.7391 335.739 76.5178 335.739 77.4783V80.2609C335.739 81.2214 334.96 82 334 82C333.04 82 332.261 81.2214 332.261 80.2609V77.4783Z" fill="url(#paint387_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 67.7391C356.261 66.7786 357.04 66 358 66C358.96 66 359.739 66.7786 359.739 67.7391V70.5217C359.739 71.4822 358.96 72.2609 358 72.2609C357.04 72.2609 356.261 71.4822 356.261 70.5217V67.7391Z" fill="url(#paint388_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M361.478 75.7391C360.518 75.7391 359.739 74.9605 359.739 74C359.739 73.0395 360.518 72.2609 361.478 72.2609H364.261C365.221 72.2609 366 73.0395 366 74C366 74.9605 365.221 75.7391 364.261 75.7391H361.478Z" fill="url(#paint389_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M351.739 75.7391C350.779 75.7391 350 74.9605 350 74C350 73.0395 350.779 72.2609 351.739 72.2609H354.522C355.482 72.2609 356.261 73.0395 356.261 74C356.261 74.9605 355.482 75.7391 354.522 75.7391H351.739Z" fill="url(#paint390_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 77.4783C356.261 76.5178 357.04 75.7391 358 75.7391C358.96 75.7391 359.739 76.5178 359.739 77.4783V80.2609C359.739 81.2214 358.96 82 358 82C357.04 82 356.261 81.2214 356.261 80.2609V77.4783Z" fill="url(#paint391_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M44.2609 91.7391C44.2609 90.7786 45.0395 90 46 90C46.9605 90 47.7391 90.7786 47.7391 91.7391V94.5217C47.7391 95.4822 46.9605 96.2609 46 96.2609C45.0395 96.2609 44.2609 95.4822 44.2609 94.5217V91.7391Z" fill="url(#paint392_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M49.4783 99.7391C48.5178 99.7391 47.7391 98.9605 47.7391 98C47.7391 97.0395 48.5178 96.2609 49.4783 96.2609H52.2609C53.2214 96.2609 54 97.0395 54 98C54 98.9605 53.2214 99.7391 52.2609 99.7391H49.4783Z" fill="url(#paint393_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M39.7391 99.7391C38.7786 99.7391 38 98.9605 38 98C38 97.0395 38.7786 96.2609 39.7391 96.2609H42.5217C43.4822 96.2609 44.2609 97.0395 44.2609 98C44.2609 98.9605 43.4822 99.7391 42.5217 99.7391H39.7391Z" fill="url(#paint394_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M44.2609 101.478C44.2609 100.518 45.0395 99.7391 46 99.7391C46.9605 99.7391 47.7391 100.518 47.7391 101.478V104.261C47.7391 105.221 46.9605 106 46 106C45.0395 106 44.2609 105.221 44.2609 104.261V101.478Z" fill="url(#paint395_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 91.7391C68.2609 90.7786 69.0395 90 70 90C70.9605 90 71.7391 90.7786 71.7391 91.7391V94.5217C71.7391 95.4822 70.9605 96.2609 70 96.2609C69.0395 96.2609 68.2609 95.4822 68.2609 94.5217V91.7391Z" fill="url(#paint396_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M73.4783 99.7391C72.5178 99.7391 71.7391 98.9605 71.7391 98C71.7391 97.0395 72.5178 96.2609 73.4783 96.2609H76.2609C77.2214 96.2609 78 97.0395 78 98C78 98.9605 77.2214 99.7391 76.2609 99.7391H73.4783Z" fill="url(#paint397_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M63.7391 99.7391C62.7786 99.7391 62 98.9605 62 98C62 97.0395 62.7786 96.2609 63.7391 96.2609H66.5217C67.4822 96.2609 68.2609 97.0395 68.2609 98C68.2609 98.9605 67.4822 99.7391 66.5217 99.7391H63.7391Z" fill="url(#paint398_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 101.478C68.2609 100.518 69.0395 99.7391 70 99.7391C70.9605 99.7391 71.7391 100.518 71.7391 101.478V104.261C71.7391 105.221 70.9605 106 70 106C69.0395 106 68.2609 105.221 68.2609 104.261V101.478Z" fill="url(#paint399_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 91.7391C92.2609 90.7786 93.0395 90 94 90C94.9605 90 95.7391 90.7786 95.7391 91.7391V94.5217C95.7391 95.4822 94.9605 96.2609 94 96.2609C93.0395 96.2609 92.2609 95.4822 92.2609 94.5217V91.7391Z" fill="url(#paint400_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M97.4783 99.7391C96.5178 99.7391 95.7391 98.9605 95.7391 98C95.7391 97.0395 96.5178 96.2609 97.4783 96.2609H100.261C101.221 96.2609 102 97.0395 102 98C102 98.9605 101.221 99.7391 100.261 99.7391H97.4783Z" fill="url(#paint401_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M87.7391 99.7391C86.7786 99.7391 86 98.9605 86 98C86 97.0395 86.7786 96.2609 87.7391 96.2609H90.5217C91.4822 96.2609 92.2609 97.0395 92.2609 98C92.2609 98.9605 91.4822 99.7391 90.5217 99.7391H87.7391Z" fill="url(#paint402_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 101.478C92.2609 100.518 93.0395 99.7391 94 99.7391C94.9605 99.7391 95.7391 100.518 95.7391 101.478V104.261C95.7391 105.221 94.9605 106 94 106C93.0395 106 92.2609 105.221 92.2609 104.261V101.478Z" fill="url(#paint403_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 91.7391C116.261 90.7786 117.04 90 118 90C118.96 90 119.739 90.7786 119.739 91.7391V94.5217C119.739 95.4822 118.96 96.2609 118 96.2609C117.04 96.2609 116.261 95.4822 116.261 94.5217V91.7391Z" fill="url(#paint404_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M121.478 99.7391C120.518 99.7391 119.739 98.9605 119.739 98C119.739 97.0395 120.518 96.2609 121.478 96.2609H124.261C125.221 96.2609 126 97.0395 126 98C126 98.9605 125.221 99.7391 124.261 99.7391H121.478Z" fill="url(#paint405_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M111.739 99.7391C110.779 99.7391 110 98.9605 110 98C110 97.0395 110.779 96.2609 111.739 96.2609H114.522C115.482 96.2609 116.261 97.0395 116.261 98C116.261 98.9605 115.482 99.7391 114.522 99.7391H111.739Z" fill="url(#paint406_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 101.478C116.261 100.518 117.04 99.7391 118 99.7391C118.96 99.7391 119.739 100.518 119.739 101.478V104.261C119.739 105.221 118.96 106 118 106C117.04 106 116.261 105.221 116.261 104.261V101.478Z" fill="url(#paint407_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 91.7391C140.261 90.7786 141.04 90 142 90C142.96 90 143.739 90.7786 143.739 91.7391V94.5217C143.739 95.4822 142.96 96.2609 142 96.2609C141.04 96.2609 140.261 95.4822 140.261 94.5217V91.7391Z" fill="url(#paint408_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M145.478 99.7391C144.518 99.7391 143.739 98.9605 143.739 98C143.739 97.0395 144.518 96.2609 145.478 96.2609H148.261C149.221 96.2609 150 97.0395 150 98C150 98.9605 149.221 99.7391 148.261 99.7391H145.478Z" fill="url(#paint409_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M135.739 99.7391C134.779 99.7391 134 98.9605 134 98C134 97.0395 134.779 96.2609 135.739 96.2609H138.522C139.482 96.2609 140.261 97.0395 140.261 98C140.261 98.9605 139.482 99.7391 138.522 99.7391H135.739Z" fill="url(#paint410_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 101.478C140.261 100.518 141.04 99.7391 142 99.7391C142.96 99.7391 143.739 100.518 143.739 101.478V104.261C143.739 105.221 142.96 106 142 106C141.04 106 140.261 105.221 140.261 104.261V101.478Z" fill="url(#paint411_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 91.7391C164.261 90.7786 165.04 90 166 90C166.96 90 167.739 90.7786 167.739 91.7391V94.5217C167.739 95.4822 166.96 96.2609 166 96.2609C165.04 96.2609 164.261 95.4822 164.261 94.5217V91.7391Z" fill="url(#paint412_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M169.478 99.7391C168.518 99.7391 167.739 98.9605 167.739 98C167.739 97.0395 168.518 96.2609 169.478 96.2609H172.261C173.221 96.2609 174 97.0395 174 98C174 98.9605 173.221 99.7391 172.261 99.7391H169.478Z" fill="url(#paint413_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M159.739 99.7391C158.779 99.7391 158 98.9605 158 98C158 97.0395 158.779 96.2609 159.739 96.2609H162.522C163.482 96.2609 164.261 97.0395 164.261 98C164.261 98.9605 163.482 99.7391 162.522 99.7391H159.739Z" fill="url(#paint414_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 101.478C164.261 100.518 165.04 99.7391 166 99.7391C166.96 99.7391 167.739 100.518 167.739 101.478V104.261C167.739 105.221 166.96 106 166 106C165.04 106 164.261 105.221 164.261 104.261V101.478Z" fill="url(#paint415_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 91.7391C188.261 90.7786 189.04 90 190 90C190.96 90 191.739 90.7786 191.739 91.7391V94.5217C191.739 95.4822 190.96 96.2609 190 96.2609C189.04 96.2609 188.261 95.4822 188.261 94.5217V91.7391Z" fill="url(#paint416_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M193.478 99.7391C192.518 99.7391 191.739 98.9605 191.739 98C191.739 97.0395 192.518 96.2609 193.478 96.2609H196.261C197.221 96.2609 198 97.0395 198 98C198 98.9605 197.221 99.7391 196.261 99.7391H193.478Z" fill="url(#paint417_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M183.739 99.7391C182.779 99.7391 182 98.9605 182 98C182 97.0395 182.779 96.2609 183.739 96.2609H186.522C187.482 96.2609 188.261 97.0395 188.261 98C188.261 98.9605 187.482 99.7391 186.522 99.7391H183.739Z" fill="url(#paint418_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 101.478C188.261 100.518 189.04 99.7391 190 99.7391C190.96 99.7391 191.739 100.518 191.739 101.478V104.261C191.739 105.221 190.96 106 190 106C189.04 106 188.261 105.221 188.261 104.261V101.478Z" fill="url(#paint419_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 91.7391C212.261 90.7786 213.04 90 214 90C214.96 90 215.739 90.7786 215.739 91.7391V94.5217C215.739 95.4822 214.96 96.2609 214 96.2609C213.04 96.2609 212.261 95.4822 212.261 94.5217V91.7391Z" fill="url(#paint420_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M217.478 99.7391C216.518 99.7391 215.739 98.9605 215.739 98C215.739 97.0395 216.518 96.2609 217.478 96.2609H220.261C221.221 96.2609 222 97.0395 222 98C222 98.9605 221.221 99.7391 220.261 99.7391H217.478Z" fill="url(#paint421_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M207.739 99.7391C206.779 99.7391 206 98.9605 206 98C206 97.0395 206.779 96.2609 207.739 96.2609H210.522C211.482 96.2609 212.261 97.0395 212.261 98C212.261 98.9605 211.482 99.7391 210.522 99.7391H207.739Z" fill="url(#paint422_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 101.478C212.261 100.518 213.04 99.7391 214 99.7391C214.96 99.7391 215.739 100.518 215.739 101.478V104.261C215.739 105.221 214.96 106 214 106C213.04 106 212.261 105.221 212.261 104.261V101.478Z" fill="url(#paint423_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 91.7391C236.261 90.7786 237.04 90 238 90C238.96 90 239.739 90.7786 239.739 91.7391V94.5217C239.739 95.4822 238.96 96.2609 238 96.2609C237.04 96.2609 236.261 95.4822 236.261 94.5217V91.7391Z" fill="url(#paint424_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M241.478 99.7391C240.518 99.7391 239.739 98.9605 239.739 98C239.739 97.0395 240.518 96.2609 241.478 96.2609H244.261C245.221 96.2609 246 97.0395 246 98C246 98.9605 245.221 99.7391 244.261 99.7391H241.478Z" fill="url(#paint425_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M231.739 99.7391C230.779 99.7391 230 98.9605 230 98C230 97.0395 230.779 96.2609 231.739 96.2609H234.522C235.482 96.2609 236.261 97.0395 236.261 98C236.261 98.9605 235.482 99.7391 234.522 99.7391H231.739Z" fill="url(#paint426_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 101.478C236.261 100.518 237.04 99.7391 238 99.7391C238.96 99.7391 239.739 100.518 239.739 101.478V104.261C239.739 105.221 238.96 106 238 106C237.04 106 236.261 105.221 236.261 104.261V101.478Z" fill="url(#paint427_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 91.7391C260.261 90.7786 261.04 90 262 90C262.96 90 263.739 90.7786 263.739 91.7391V94.5217C263.739 95.4822 262.96 96.2609 262 96.2609C261.04 96.2609 260.261 95.4822 260.261 94.5217V91.7391Z" fill="url(#paint428_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M265.478 99.7391C264.518 99.7391 263.739 98.9605 263.739 98C263.739 97.0395 264.518 96.2609 265.478 96.2609H268.261C269.221 96.2609 270 97.0395 270 98C270 98.9605 269.221 99.7391 268.261 99.7391H265.478Z" fill="url(#paint429_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M255.739 99.7391C254.779 99.7391 254 98.9605 254 98C254 97.0395 254.779 96.2609 255.739 96.2609H258.522C259.482 96.2609 260.261 97.0395 260.261 98C260.261 98.9605 259.482 99.7391 258.522 99.7391H255.739Z" fill="url(#paint430_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 101.478C260.261 100.518 261.04 99.7391 262 99.7391C262.96 99.7391 263.739 100.518 263.739 101.478V104.261C263.739 105.221 262.96 106 262 106C261.04 106 260.261 105.221 260.261 104.261V101.478Z" fill="url(#paint431_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 91.7391C284.261 90.7786 285.04 90 286 90C286.96 90 287.739 90.7786 287.739 91.7391V94.5217C287.739 95.4822 286.96 96.2609 286 96.2609C285.04 96.2609 284.261 95.4822 284.261 94.5217V91.7391Z" fill="url(#paint432_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M289.478 99.7391C288.518 99.7391 287.739 98.9605 287.739 98C287.739 97.0395 288.518 96.2609 289.478 96.2609H292.261C293.221 96.2609 294 97.0395 294 98C294 98.9605 293.221 99.7391 292.261 99.7391H289.478Z" fill="url(#paint433_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M279.739 99.7391C278.779 99.7391 278 98.9605 278 98C278 97.0395 278.779 96.2609 279.739 96.2609H282.522C283.482 96.2609 284.261 97.0395 284.261 98C284.261 98.9605 283.482 99.7391 282.522 99.7391H279.739Z" fill="url(#paint434_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 101.478C284.261 100.518 285.04 99.7391 286 99.7391C286.96 99.7391 287.739 100.518 287.739 101.478V104.261C287.739 105.221 286.96 106 286 106C285.04 106 284.261 105.221 284.261 104.261V101.478Z" fill="url(#paint435_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 91.7391C308.261 90.7786 309.04 90 310 90C310.96 90 311.739 90.7786 311.739 91.7391V94.5217C311.739 95.4822 310.96 96.2609 310 96.2609C309.04 96.2609 308.261 95.4822 308.261 94.5217V91.7391Z" fill="url(#paint436_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M313.478 99.7391C312.518 99.7391 311.739 98.9605 311.739 98C311.739 97.0395 312.518 96.2609 313.478 96.2609H316.261C317.221 96.2609 318 97.0395 318 98C318 98.9605 317.221 99.7391 316.261 99.7391H313.478Z" fill="url(#paint437_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M303.739 99.7391C302.779 99.7391 302 98.9605 302 98C302 97.0395 302.779 96.2609 303.739 96.2609H306.522C307.482 96.2609 308.261 97.0395 308.261 98C308.261 98.9605 307.482 99.7391 306.522 99.7391H303.739Z" fill="url(#paint438_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 101.478C308.261 100.518 309.04 99.7391 310 99.7391C310.96 99.7391 311.739 100.518 311.739 101.478V104.261C311.739 105.221 310.96 106 310 106C309.04 106 308.261 105.221 308.261 104.261V101.478Z" fill="url(#paint439_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 91.7391C332.261 90.7786 333.04 90 334 90C334.96 90 335.739 90.7786 335.739 91.7391V94.5217C335.739 95.4822 334.96 96.2609 334 96.2609C333.04 96.2609 332.261 95.4822 332.261 94.5217V91.7391Z" fill="url(#paint440_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M337.478 99.7391C336.518 99.7391 335.739 98.9605 335.739 98C335.739 97.0395 336.518 96.2609 337.478 96.2609H340.261C341.221 96.2609 342 97.0395 342 98C342 98.9605 341.221 99.7391 340.261 99.7391H337.478Z" fill="url(#paint441_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M327.739 99.7391C326.779 99.7391 326 98.9605 326 98C326 97.0395 326.779 96.2609 327.739 96.2609H330.522C331.482 96.2609 332.261 97.0395 332.261 98C332.261 98.9605 331.482 99.7391 330.522 99.7391H327.739Z" fill="url(#paint442_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 101.478C332.261 100.518 333.04 99.7391 334 99.7391C334.96 99.7391 335.739 100.518 335.739 101.478V104.261C335.739 105.221 334.96 106 334 106C333.04 106 332.261 105.221 332.261 104.261V101.478Z" fill="url(#paint443_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 91.7391C356.261 90.7786 357.04 90 358 90C358.96 90 359.739 90.7786 359.739 91.7391V94.5217C359.739 95.4822 358.96 96.2609 358 96.2609C357.04 96.2609 356.261 95.4822 356.261 94.5217V91.7391Z" fill="url(#paint444_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M361.478 99.7391C360.518 99.7391 359.739 98.9605 359.739 98C359.739 97.0395 360.518 96.2609 361.478 96.2609H364.261C365.221 96.2609 366 97.0395 366 98C366 98.9605 365.221 99.7391 364.261 99.7391H361.478Z" fill="url(#paint445_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M351.739 99.7391C350.779 99.7391 350 98.9605 350 98C350 97.0395 350.779 96.2609 351.739 96.2609H354.522C355.482 96.2609 356.261 97.0395 356.261 98C356.261 98.9605 355.482 99.7391 354.522 99.7391H351.739Z" fill="url(#paint446_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 101.478C356.261 100.518 357.04 99.7391 358 99.7391C358.96 99.7391 359.739 100.518 359.739 101.478V104.261C359.739 105.221 358.96 106 358 106C357.04 106 356.261 105.221 356.261 104.261V101.478Z" fill="url(#paint447_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M44.2609 115.739C44.2609 114.779 45.0395 114 46 114C46.9605 114 47.7391 114.779 47.7391 115.739V118.522C47.7391 119.482 46.9605 120.261 46 120.261C45.0395 120.261 44.2609 119.482 44.2609 118.522V115.739Z" fill="url(#paint448_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M49.4783 123.739C48.5178 123.739 47.7391 122.96 47.7391 122C47.7391 121.04 48.5178 120.261 49.4783 120.261H52.2609C53.2214 120.261 54 121.04 54 122C54 122.96 53.2214 123.739 52.2609 123.739H49.4783Z" fill="url(#paint449_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M39.7391 123.739C38.7786 123.739 38 122.96 38 122C38 121.04 38.7786 120.261 39.7391 120.261H42.5217C43.4822 120.261 44.2609 121.04 44.2609 122C44.2609 122.96 43.4822 123.739 42.5217 123.739H39.7391Z" fill="url(#paint450_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M44.2609 125.478C44.2609 124.518 45.0395 123.739 46 123.739C46.9605 123.739 47.7391 124.518 47.7391 125.478V128.261C47.7391 129.221 46.9605 130 46 130C45.0395 130 44.2609 129.221 44.2609 128.261V125.478Z" fill="url(#paint451_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 115.739C68.2609 114.779 69.0395 114 70 114C70.9605 114 71.7391 114.779 71.7391 115.739V118.522C71.7391 119.482 70.9605 120.261 70 120.261C69.0395 120.261 68.2609 119.482 68.2609 118.522V115.739Z" fill="url(#paint452_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M73.4783 123.739C72.5178 123.739 71.7391 122.96 71.7391 122C71.7391 121.04 72.5178 120.261 73.4783 120.261H76.2609C77.2214 120.261 78 121.04 78 122C78 122.96 77.2214 123.739 76.2609 123.739H73.4783Z" fill="url(#paint453_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M63.7391 123.739C62.7786 123.739 62 122.96 62 122C62 121.04 62.7786 120.261 63.7391 120.261H66.5217C67.4822 120.261 68.2609 121.04 68.2609 122C68.2609 122.96 67.4822 123.739 66.5217 123.739H63.7391Z" fill="url(#paint454_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 125.478C68.2609 124.518 69.0395 123.739 70 123.739C70.9605 123.739 71.7391 124.518 71.7391 125.478V128.261C71.7391 129.221 70.9605 130 70 130C69.0395 130 68.2609 129.221 68.2609 128.261V125.478Z" fill="url(#paint455_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 115.739C92.2609 114.779 93.0395 114 94 114C94.9605 114 95.7391 114.779 95.7391 115.739V118.522C95.7391 119.482 94.9605 120.261 94 120.261C93.0395 120.261 92.2609 119.482 92.2609 118.522V115.739Z" fill="url(#paint456_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M97.4783 123.739C96.5178 123.739 95.7391 122.96 95.7391 122C95.7391 121.04 96.5178 120.261 97.4783 120.261H100.261C101.221 120.261 102 121.04 102 122C102 122.96 101.221 123.739 100.261 123.739H97.4783Z" fill="url(#paint457_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M87.7391 123.739C86.7786 123.739 86 122.96 86 122C86 121.04 86.7786 120.261 87.7391 120.261H90.5217C91.4822 120.261 92.2609 121.04 92.2609 122C92.2609 122.96 91.4822 123.739 90.5217 123.739H87.7391Z" fill="url(#paint458_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 125.478C92.2609 124.518 93.0395 123.739 94 123.739C94.9605 123.739 95.7391 124.518 95.7391 125.478V128.261C95.7391 129.221 94.9605 130 94 130C93.0395 130 92.2609 129.221 92.2609 128.261V125.478Z" fill="url(#paint459_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 115.739C116.261 114.779 117.04 114 118 114C118.96 114 119.739 114.779 119.739 115.739V118.522C119.739 119.482 118.96 120.261 118 120.261C117.04 120.261 116.261 119.482 116.261 118.522V115.739Z" fill="url(#paint460_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M121.478 123.739C120.518 123.739 119.739 122.96 119.739 122C119.739 121.04 120.518 120.261 121.478 120.261H124.261C125.221 120.261 126 121.04 126 122C126 122.96 125.221 123.739 124.261 123.739H121.478Z" fill="url(#paint461_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M111.739 123.739C110.779 123.739 110 122.96 110 122C110 121.04 110.779 120.261 111.739 120.261H114.522C115.482 120.261 116.261 121.04 116.261 122C116.261 122.96 115.482 123.739 114.522 123.739H111.739Z" fill="url(#paint462_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 125.478C116.261 124.518 117.04 123.739 118 123.739C118.96 123.739 119.739 124.518 119.739 125.478V128.261C119.739 129.221 118.96 130 118 130C117.04 130 116.261 129.221 116.261 128.261V125.478Z" fill="url(#paint463_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 115.739C140.261 114.779 141.04 114 142 114C142.96 114 143.739 114.779 143.739 115.739V118.522C143.739 119.482 142.96 120.261 142 120.261C141.04 120.261 140.261 119.482 140.261 118.522V115.739Z" fill="url(#paint464_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M145.478 123.739C144.518 123.739 143.739 122.96 143.739 122C143.739 121.04 144.518 120.261 145.478 120.261H148.261C149.221 120.261 150 121.04 150 122C150 122.96 149.221 123.739 148.261 123.739H145.478Z" fill="url(#paint465_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M135.739 123.739C134.779 123.739 134 122.96 134 122C134 121.04 134.779 120.261 135.739 120.261H138.522C139.482 120.261 140.261 121.04 140.261 122C140.261 122.96 139.482 123.739 138.522 123.739H135.739Z" fill="url(#paint466_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 125.478C140.261 124.518 141.04 123.739 142 123.739C142.96 123.739 143.739 124.518 143.739 125.478V128.261C143.739 129.221 142.96 130 142 130C141.04 130 140.261 129.221 140.261 128.261V125.478Z" fill="url(#paint467_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 115.739C164.261 114.779 165.04 114 166 114C166.96 114 167.739 114.779 167.739 115.739V118.522C167.739 119.482 166.96 120.261 166 120.261C165.04 120.261 164.261 119.482 164.261 118.522V115.739Z" fill="url(#paint468_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M169.478 123.739C168.518 123.739 167.739 122.96 167.739 122C167.739 121.04 168.518 120.261 169.478 120.261H172.261C173.221 120.261 174 121.04 174 122C174 122.96 173.221 123.739 172.261 123.739H169.478Z" fill="url(#paint469_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M159.739 123.739C158.779 123.739 158 122.96 158 122C158 121.04 158.779 120.261 159.739 120.261H162.522C163.482 120.261 164.261 121.04 164.261 122C164.261 122.96 163.482 123.739 162.522 123.739H159.739Z" fill="url(#paint470_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 125.478C164.261 124.518 165.04 123.739 166 123.739C166.96 123.739 167.739 124.518 167.739 125.478V128.261C167.739 129.221 166.96 130 166 130C165.04 130 164.261 129.221 164.261 128.261V125.478Z" fill="url(#paint471_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 115.739C188.261 114.779 189.04 114 190 114C190.96 114 191.739 114.779 191.739 115.739V118.522C191.739 119.482 190.96 120.261 190 120.261C189.04 120.261 188.261 119.482 188.261 118.522V115.739Z" fill="url(#paint472_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M193.478 123.739C192.518 123.739 191.739 122.96 191.739 122C191.739 121.04 192.518 120.261 193.478 120.261H196.261C197.221 120.261 198 121.04 198 122C198 122.96 197.221 123.739 196.261 123.739H193.478Z" fill="url(#paint473_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M183.739 123.739C182.779 123.739 182 122.96 182 122C182 121.04 182.779 120.261 183.739 120.261H186.522C187.482 120.261 188.261 121.04 188.261 122C188.261 122.96 187.482 123.739 186.522 123.739H183.739Z" fill="url(#paint474_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 125.478C188.261 124.518 189.04 123.739 190 123.739C190.96 123.739 191.739 124.518 191.739 125.478V128.261C191.739 129.221 190.96 130 190 130C189.04 130 188.261 129.221 188.261 128.261V125.478Z" fill="url(#paint475_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 115.739C212.261 114.779 213.04 114 214 114C214.96 114 215.739 114.779 215.739 115.739V118.522C215.739 119.482 214.96 120.261 214 120.261C213.04 120.261 212.261 119.482 212.261 118.522V115.739Z" fill="url(#paint476_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M217.478 123.739C216.518 123.739 215.739 122.96 215.739 122C215.739 121.04 216.518 120.261 217.478 120.261H220.261C221.221 120.261 222 121.04 222 122C222 122.96 221.221 123.739 220.261 123.739H217.478Z" fill="url(#paint477_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M207.739 123.739C206.779 123.739 206 122.96 206 122C206 121.04 206.779 120.261 207.739 120.261H210.522C211.482 120.261 212.261 121.04 212.261 122C212.261 122.96 211.482 123.739 210.522 123.739H207.739Z" fill="url(#paint478_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 125.478C212.261 124.518 213.04 123.739 214 123.739C214.96 123.739 215.739 124.518 215.739 125.478V128.261C215.739 129.221 214.96 130 214 130C213.04 130 212.261 129.221 212.261 128.261V125.478Z" fill="url(#paint479_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 115.739C236.261 114.779 237.04 114 238 114C238.96 114 239.739 114.779 239.739 115.739V118.522C239.739 119.482 238.96 120.261 238 120.261C237.04 120.261 236.261 119.482 236.261 118.522V115.739Z" fill="url(#paint480_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M241.478 123.739C240.518 123.739 239.739 122.96 239.739 122C239.739 121.04 240.518 120.261 241.478 120.261H244.261C245.221 120.261 246 121.04 246 122C246 122.96 245.221 123.739 244.261 123.739H241.478Z" fill="url(#paint481_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M231.739 123.739C230.779 123.739 230 122.96 230 122C230 121.04 230.779 120.261 231.739 120.261H234.522C235.482 120.261 236.261 121.04 236.261 122C236.261 122.96 235.482 123.739 234.522 123.739H231.739Z" fill="url(#paint482_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 125.478C236.261 124.518 237.04 123.739 238 123.739C238.96 123.739 239.739 124.518 239.739 125.478V128.261C239.739 129.221 238.96 130 238 130C237.04 130 236.261 129.221 236.261 128.261V125.478Z" fill="url(#paint483_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 115.739C260.261 114.779 261.04 114 262 114C262.96 114 263.739 114.779 263.739 115.739V118.522C263.739 119.482 262.96 120.261 262 120.261C261.04 120.261 260.261 119.482 260.261 118.522V115.739Z" fill="url(#paint484_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M265.478 123.739C264.518 123.739 263.739 122.96 263.739 122C263.739 121.04 264.518 120.261 265.478 120.261H268.261C269.221 120.261 270 121.04 270 122C270 122.96 269.221 123.739 268.261 123.739H265.478Z" fill="url(#paint485_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M255.739 123.739C254.779 123.739 254 122.96 254 122C254 121.04 254.779 120.261 255.739 120.261H258.522C259.482 120.261 260.261 121.04 260.261 122C260.261 122.96 259.482 123.739 258.522 123.739H255.739Z" fill="url(#paint486_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 125.478C260.261 124.518 261.04 123.739 262 123.739C262.96 123.739 263.739 124.518 263.739 125.478V128.261C263.739 129.221 262.96 130 262 130C261.04 130 260.261 129.221 260.261 128.261V125.478Z" fill="url(#paint487_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 115.739C284.261 114.779 285.04 114 286 114C286.96 114 287.739 114.779 287.739 115.739V118.522C287.739 119.482 286.96 120.261 286 120.261C285.04 120.261 284.261 119.482 284.261 118.522V115.739Z" fill="url(#paint488_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M289.478 123.739C288.518 123.739 287.739 122.96 287.739 122C287.739 121.04 288.518 120.261 289.478 120.261H292.261C293.221 120.261 294 121.04 294 122C294 122.96 293.221 123.739 292.261 123.739H289.478Z" fill="url(#paint489_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M279.739 123.739C278.779 123.739 278 122.96 278 122C278 121.04 278.779 120.261 279.739 120.261H282.522C283.482 120.261 284.261 121.04 284.261 122C284.261 122.96 283.482 123.739 282.522 123.739H279.739Z" fill="url(#paint490_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 125.478C284.261 124.518 285.04 123.739 286 123.739C286.96 123.739 287.739 124.518 287.739 125.478V128.261C287.739 129.221 286.96 130 286 130C285.04 130 284.261 129.221 284.261 128.261V125.478Z" fill="url(#paint491_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 115.739C308.261 114.779 309.04 114 310 114C310.96 114 311.739 114.779 311.739 115.739V118.522C311.739 119.482 310.96 120.261 310 120.261C309.04 120.261 308.261 119.482 308.261 118.522V115.739Z" fill="url(#paint492_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M313.478 123.739C312.518 123.739 311.739 122.96 311.739 122C311.739 121.04 312.518 120.261 313.478 120.261H316.261C317.221 120.261 318 121.04 318 122C318 122.96 317.221 123.739 316.261 123.739H313.478Z" fill="url(#paint493_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M303.739 123.739C302.779 123.739 302 122.96 302 122C302 121.04 302.779 120.261 303.739 120.261H306.522C307.482 120.261 308.261 121.04 308.261 122C308.261 122.96 307.482 123.739 306.522 123.739H303.739Z" fill="url(#paint494_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 125.478C308.261 124.518 309.04 123.739 310 123.739C310.96 123.739 311.739 124.518 311.739 125.478V128.261C311.739 129.221 310.96 130 310 130C309.04 130 308.261 129.221 308.261 128.261V125.478Z" fill="url(#paint495_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 115.739C332.261 114.779 333.04 114 334 114C334.96 114 335.739 114.779 335.739 115.739V118.522C335.739 119.482 334.96 120.261 334 120.261C333.04 120.261 332.261 119.482 332.261 118.522V115.739Z" fill="url(#paint496_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M337.478 123.739C336.518 123.739 335.739 122.96 335.739 122C335.739 121.04 336.518 120.261 337.478 120.261H340.261C341.221 120.261 342 121.04 342 122C342 122.96 341.221 123.739 340.261 123.739H337.478Z" fill="url(#paint497_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M327.739 123.739C326.779 123.739 326 122.96 326 122C326 121.04 326.779 120.261 327.739 120.261H330.522C331.482 120.261 332.261 121.04 332.261 122C332.261 122.96 331.482 123.739 330.522 123.739H327.739Z" fill="url(#paint498_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 125.478C332.261 124.518 333.04 123.739 334 123.739C334.96 123.739 335.739 124.518 335.739 125.478V128.261C335.739 129.221 334.96 130 334 130C333.04 130 332.261 129.221 332.261 128.261V125.478Z" fill="url(#paint499_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 115.739C356.261 114.779 357.04 114 358 114C358.96 114 359.739 114.779 359.739 115.739V118.522C359.739 119.482 358.96 120.261 358 120.261C357.04 120.261 356.261 119.482 356.261 118.522V115.739Z" fill="url(#paint500_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M361.478 123.739C360.518 123.739 359.739 122.96 359.739 122C359.739 121.04 360.518 120.261 361.478 120.261H364.261C365.221 120.261 366 121.04 366 122C366 122.96 365.221 123.739 364.261 123.739H361.478Z" fill="url(#paint501_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M351.739 123.739C350.779 123.739 350 122.96 350 122C350 121.04 350.779 120.261 351.739 120.261H354.522C355.482 120.261 356.261 121.04 356.261 122C356.261 122.96 355.482 123.739 354.522 123.739H351.739Z" fill="url(#paint502_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 125.478C356.261 124.518 357.04 123.739 358 123.739C358.96 123.739 359.739 124.518 359.739 125.478V128.261C359.739 129.221 358.96 130 358 130C357.04 130 356.261 129.221 356.261 128.261V125.478Z" fill="url(#paint503_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M44.2609 139.739C44.2609 138.779 45.0395 138 46 138C46.9605 138 47.7391 138.779 47.7391 139.739V142.522C47.7391 143.482 46.9605 144.261 46 144.261C45.0395 144.261 44.2609 143.482 44.2609 142.522V139.739Z" fill="url(#paint504_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M49.4783 147.739C48.5178 147.739 47.7391 146.96 47.7391 146C47.7391 145.04 48.5178 144.261 49.4783 144.261H52.2609C53.2214 144.261 54 145.04 54 146C54 146.96 53.2214 147.739 52.2609 147.739H49.4783Z" fill="url(#paint505_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M39.7391 147.739C38.7786 147.739 38 146.96 38 146C38 145.04 38.7786 144.261 39.7391 144.261H42.5217C43.4822 144.261 44.2609 145.04 44.2609 146C44.2609 146.96 43.4822 147.739 42.5217 147.739H39.7391Z" fill="url(#paint506_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M44.2609 149.478C44.2609 148.518 45.0395 147.739 46 147.739C46.9605 147.739 47.7391 148.518 47.7391 149.478V152.261C47.7391 153.221 46.9605 154 46 154C45.0395 154 44.2609 153.221 44.2609 152.261V149.478Z" fill="url(#paint507_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 139.739C68.2609 138.779 69.0395 138 70 138C70.9605 138 71.7391 138.779 71.7391 139.739V142.522C71.7391 143.482 70.9605 144.261 70 144.261C69.0395 144.261 68.2609 143.482 68.2609 142.522V139.739Z" fill="url(#paint508_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M73.4783 147.739C72.5178 147.739 71.7391 146.96 71.7391 146C71.7391 145.04 72.5178 144.261 73.4783 144.261H76.2609C77.2214 144.261 78 145.04 78 146C78 146.96 77.2214 147.739 76.2609 147.739H73.4783Z" fill="url(#paint509_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M63.7391 147.739C62.7786 147.739 62 146.96 62 146C62 145.04 62.7786 144.261 63.7391 144.261H66.5217C67.4822 144.261 68.2609 145.04 68.2609 146C68.2609 146.96 67.4822 147.739 66.5217 147.739H63.7391Z" fill="url(#paint510_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M68.2609 149.478C68.2609 148.518 69.0395 147.739 70 147.739C70.9605 147.739 71.7391 148.518 71.7391 149.478V152.261C71.7391 153.221 70.9605 154 70 154C69.0395 154 68.2609 153.221 68.2609 152.261V149.478Z" fill="url(#paint511_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 139.739C92.2609 138.779 93.0395 138 94 138C94.9605 138 95.7391 138.779 95.7391 139.739V142.522C95.7391 143.482 94.9605 144.261 94 144.261C93.0395 144.261 92.2609 143.482 92.2609 142.522V139.739Z" fill="url(#paint512_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M97.4783 147.739C96.5178 147.739 95.7391 146.96 95.7391 146C95.7391 145.04 96.5178 144.261 97.4783 144.261H100.261C101.221 144.261 102 145.04 102 146C102 146.96 101.221 147.739 100.261 147.739H97.4783Z" fill="url(#paint513_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M87.7391 147.739C86.7786 147.739 86 146.96 86 146C86 145.04 86.7786 144.261 87.7391 144.261H90.5217C91.4822 144.261 92.2609 145.04 92.2609 146C92.2609 146.96 91.4822 147.739 90.5217 147.739H87.7391Z" fill="url(#paint514_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M92.2609 149.478C92.2609 148.518 93.0395 147.739 94 147.739C94.9605 147.739 95.7391 148.518 95.7391 149.478V152.261C95.7391 153.221 94.9605 154 94 154C93.0395 154 92.2609 153.221 92.2609 152.261V149.478Z" fill="url(#paint515_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 139.739C116.261 138.779 117.04 138 118 138C118.96 138 119.739 138.779 119.739 139.739V142.522C119.739 143.482 118.96 144.261 118 144.261C117.04 144.261 116.261 143.482 116.261 142.522V139.739Z" fill="url(#paint516_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M121.478 147.739C120.518 147.739 119.739 146.96 119.739 146C119.739 145.04 120.518 144.261 121.478 144.261H124.261C125.221 144.261 126 145.04 126 146C126 146.96 125.221 147.739 124.261 147.739H121.478Z" fill="url(#paint517_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M111.739 147.739C110.779 147.739 110 146.96 110 146C110 145.04 110.779 144.261 111.739 144.261H114.522C115.482 144.261 116.261 145.04 116.261 146C116.261 146.96 115.482 147.739 114.522 147.739H111.739Z" fill="url(#paint518_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M116.261 149.478C116.261 148.518 117.04 147.739 118 147.739C118.96 147.739 119.739 148.518 119.739 149.478V152.261C119.739 153.221 118.96 154 118 154C117.04 154 116.261 153.221 116.261 152.261V149.478Z" fill="url(#paint519_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 139.739C140.261 138.779 141.04 138 142 138C142.96 138 143.739 138.779 143.739 139.739V142.522C143.739 143.482 142.96 144.261 142 144.261C141.04 144.261 140.261 143.482 140.261 142.522V139.739Z" fill="url(#paint520_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M145.478 147.739C144.518 147.739 143.739 146.96 143.739 146C143.739 145.04 144.518 144.261 145.478 144.261H148.261C149.221 144.261 150 145.04 150 146C150 146.96 149.221 147.739 148.261 147.739H145.478Z" fill="url(#paint521_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M135.739 147.739C134.779 147.739 134 146.96 134 146C134 145.04 134.779 144.261 135.739 144.261H138.522C139.482 144.261 140.261 145.04 140.261 146C140.261 146.96 139.482 147.739 138.522 147.739H135.739Z" fill="url(#paint522_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M140.261 149.478C140.261 148.518 141.04 147.739 142 147.739C142.96 147.739 143.739 148.518 143.739 149.478V152.261C143.739 153.221 142.96 154 142 154C141.04 154 140.261 153.221 140.261 152.261V149.478Z" fill="url(#paint523_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 139.739C164.261 138.779 165.04 138 166 138C166.96 138 167.739 138.779 167.739 139.739V142.522C167.739 143.482 166.96 144.261 166 144.261C165.04 144.261 164.261 143.482 164.261 142.522V139.739Z" fill="url(#paint524_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M169.478 147.739C168.518 147.739 167.739 146.96 167.739 146C167.739 145.04 168.518 144.261 169.478 144.261H172.261C173.221 144.261 174 145.04 174 146C174 146.96 173.221 147.739 172.261 147.739H169.478Z" fill="url(#paint525_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M159.739 147.739C158.779 147.739 158 146.96 158 146C158 145.04 158.779 144.261 159.739 144.261H162.522C163.482 144.261 164.261 145.04 164.261 146C164.261 146.96 163.482 147.739 162.522 147.739H159.739Z" fill="url(#paint526_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M164.261 149.478C164.261 148.518 165.04 147.739 166 147.739C166.96 147.739 167.739 148.518 167.739 149.478V152.261C167.739 153.221 166.96 154 166 154C165.04 154 164.261 153.221 164.261 152.261V149.478Z" fill="url(#paint527_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 139.739C188.261 138.779 189.04 138 190 138C190.96 138 191.739 138.779 191.739 139.739V142.522C191.739 143.482 190.96 144.261 190 144.261C189.04 144.261 188.261 143.482 188.261 142.522V139.739Z" fill="url(#paint528_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M193.478 147.739C192.518 147.739 191.739 146.96 191.739 146C191.739 145.04 192.518 144.261 193.478 144.261H196.261C197.221 144.261 198 145.04 198 146C198 146.96 197.221 147.739 196.261 147.739H193.478Z" fill="url(#paint529_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M183.739 147.739C182.779 147.739 182 146.96 182 146C182 145.04 182.779 144.261 183.739 144.261H186.522C187.482 144.261 188.261 145.04 188.261 146C188.261 146.96 187.482 147.739 186.522 147.739H183.739Z" fill="url(#paint530_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M188.261 149.478C188.261 148.518 189.04 147.739 190 147.739C190.96 147.739 191.739 148.518 191.739 149.478V152.261C191.739 153.221 190.96 154 190 154C189.04 154 188.261 153.221 188.261 152.261V149.478Z" fill="url(#paint531_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 139.739C212.261 138.779 213.04 138 214 138C214.96 138 215.739 138.779 215.739 139.739V142.522C215.739 143.482 214.96 144.261 214 144.261C213.04 144.261 212.261 143.482 212.261 142.522V139.739Z" fill="url(#paint532_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M217.478 147.739C216.518 147.739 215.739 146.96 215.739 146C215.739 145.04 216.518 144.261 217.478 144.261H220.261C221.221 144.261 222 145.04 222 146C222 146.96 221.221 147.739 220.261 147.739H217.478Z" fill="url(#paint533_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M207.739 147.739C206.779 147.739 206 146.96 206 146C206 145.04 206.779 144.261 207.739 144.261H210.522C211.482 144.261 212.261 145.04 212.261 146C212.261 146.96 211.482 147.739 210.522 147.739H207.739Z" fill="url(#paint534_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M212.261 149.478C212.261 148.518 213.04 147.739 214 147.739C214.96 147.739 215.739 148.518 215.739 149.478V152.261C215.739 153.221 214.96 154 214 154C213.04 154 212.261 153.221 212.261 152.261V149.478Z" fill="url(#paint535_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 139.739C236.261 138.779 237.04 138 238 138C238.96 138 239.739 138.779 239.739 139.739V142.522C239.739 143.482 238.96 144.261 238 144.261C237.04 144.261 236.261 143.482 236.261 142.522V139.739Z" fill="url(#paint536_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M241.478 147.739C240.518 147.739 239.739 146.96 239.739 146C239.739 145.04 240.518 144.261 241.478 144.261H244.261C245.221 144.261 246 145.04 246 146C246 146.96 245.221 147.739 244.261 147.739H241.478Z" fill="url(#paint537_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M231.739 147.739C230.779 147.739 230 146.96 230 146C230 145.04 230.779 144.261 231.739 144.261H234.522C235.482 144.261 236.261 145.04 236.261 146C236.261 146.96 235.482 147.739 234.522 147.739H231.739Z" fill="url(#paint538_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M236.261 149.478C236.261 148.518 237.04 147.739 238 147.739C238.96 147.739 239.739 148.518 239.739 149.478V152.261C239.739 153.221 238.96 154 238 154C237.04 154 236.261 153.221 236.261 152.261V149.478Z" fill="url(#paint539_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 139.739C260.261 138.779 261.04 138 262 138C262.96 138 263.739 138.779 263.739 139.739V142.522C263.739 143.482 262.96 144.261 262 144.261C261.04 144.261 260.261 143.482 260.261 142.522V139.739Z" fill="url(#paint540_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M265.478 147.739C264.518 147.739 263.739 146.96 263.739 146C263.739 145.04 264.518 144.261 265.478 144.261H268.261C269.221 144.261 270 145.04 270 146C270 146.96 269.221 147.739 268.261 147.739H265.478Z" fill="url(#paint541_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M255.739 147.739C254.779 147.739 254 146.96 254 146C254 145.04 254.779 144.261 255.739 144.261H258.522C259.482 144.261 260.261 145.04 260.261 146C260.261 146.96 259.482 147.739 258.522 147.739H255.739Z" fill="url(#paint542_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M260.261 149.478C260.261 148.518 261.04 147.739 262 147.739C262.96 147.739 263.739 148.518 263.739 149.478V152.261C263.739 153.221 262.96 154 262 154C261.04 154 260.261 153.221 260.261 152.261V149.478Z" fill="url(#paint543_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 139.739C284.261 138.779 285.04 138 286 138C286.96 138 287.739 138.779 287.739 139.739V142.522C287.739 143.482 286.96 144.261 286 144.261C285.04 144.261 284.261 143.482 284.261 142.522V139.739Z" fill="url(#paint544_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M289.478 147.739C288.518 147.739 287.739 146.96 287.739 146C287.739 145.04 288.518 144.261 289.478 144.261H292.261C293.221 144.261 294 145.04 294 146C294 146.96 293.221 147.739 292.261 147.739H289.478Z" fill="url(#paint545_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M279.739 147.739C278.779 147.739 278 146.96 278 146C278 145.04 278.779 144.261 279.739 144.261H282.522C283.482 144.261 284.261 145.04 284.261 146C284.261 146.96 283.482 147.739 282.522 147.739H279.739Z" fill="url(#paint546_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M284.261 149.478C284.261 148.518 285.04 147.739 286 147.739C286.96 147.739 287.739 148.518 287.739 149.478V152.261C287.739 153.221 286.96 154 286 154C285.04 154 284.261 153.221 284.261 152.261V149.478Z" fill="url(#paint547_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 139.739C308.261 138.779 309.04 138 310 138C310.96 138 311.739 138.779 311.739 139.739V142.522C311.739 143.482 310.96 144.261 310 144.261C309.04 144.261 308.261 143.482 308.261 142.522V139.739Z" fill="url(#paint548_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M313.478 147.739C312.518 147.739 311.739 146.96 311.739 146C311.739 145.04 312.518 144.261 313.478 144.261H316.261C317.221 144.261 318 145.04 318 146C318 146.96 317.221 147.739 316.261 147.739H313.478Z" fill="url(#paint549_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M303.739 147.739C302.779 147.739 302 146.96 302 146C302 145.04 302.779 144.261 303.739 144.261H306.522C307.482 144.261 308.261 145.04 308.261 146C308.261 146.96 307.482 147.739 306.522 147.739H303.739Z" fill="url(#paint550_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M308.261 149.478C308.261 148.518 309.04 147.739 310 147.739C310.96 147.739 311.739 148.518 311.739 149.478V152.261C311.739 153.221 310.96 154 310 154C309.04 154 308.261 153.221 308.261 152.261V149.478Z" fill="url(#paint551_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 139.739C332.261 138.779 333.04 138 334 138C334.96 138 335.739 138.779 335.739 139.739V142.522C335.739 143.482 334.96 144.261 334 144.261C333.04 144.261 332.261 143.482 332.261 142.522V139.739Z" fill="url(#paint552_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M337.478 147.739C336.518 147.739 335.739 146.96 335.739 146C335.739 145.04 336.518 144.261 337.478 144.261H340.261C341.221 144.261 342 145.04 342 146C342 146.96 341.221 147.739 340.261 147.739H337.478Z" fill="url(#paint553_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M327.739 147.739C326.779 147.739 326 146.96 326 146C326 145.04 326.779 144.261 327.739 144.261H330.522C331.482 144.261 332.261 145.04 332.261 146C332.261 146.96 331.482 147.739 330.522 147.739H327.739Z" fill="url(#paint554_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M332.261 149.478C332.261 148.518 333.04 147.739 334 147.739C334.96 147.739 335.739 148.518 335.739 149.478V152.261C335.739 153.221 334.96 154 334 154C333.04 154 332.261 153.221 332.261 152.261V149.478Z" fill="url(#paint555_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 139.739C356.261 138.779 357.04 138 358 138C358.96 138 359.739 138.779 359.739 139.739V142.522C359.739 143.482 358.96 144.261 358 144.261C357.04 144.261 356.261 143.482 356.261 142.522V139.739Z" fill="url(#paint556_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M361.478 147.739C360.518 147.739 359.739 146.96 359.739 146C359.739 145.04 360.518 144.261 361.478 144.261H364.261C365.221 144.261 366 145.04 366 146C366 146.96 365.221 147.739 364.261 147.739H361.478Z" fill="url(#paint557_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M351.739 147.739C350.779 147.739 350 146.96 350 146C350 145.04 350.779 144.261 351.739 144.261H354.522C355.482 144.261 356.261 145.04 356.261 146C356.261 146.96 355.482 147.739 354.522 147.739H351.739Z" fill="url(#paint558_radial_5025_1103)" fill-opacity="0.25"/>
+<path d="M356.261 149.478C356.261 148.518 357.04 147.739 358 147.739C358.96 147.739 359.739 148.518 359.739 149.478V152.261C359.739 153.221 358.96 154 358 154C357.04 154 356.261 153.221 356.261 152.261V149.478Z" fill="url(#paint559_radial_5025_1103)" fill-opacity="0.25"/>
+</g>
+</g>
+<defs>
+<radialGradient id="paint0_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint1_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint2_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint3_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint4_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint5_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint6_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint7_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint8_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint9_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint10_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint11_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint12_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint13_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint14_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint15_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint16_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint17_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint18_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint19_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint20_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint21_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint22_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint23_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint24_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint25_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint26_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint27_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint28_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint29_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint30_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint31_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint32_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint33_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint34_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint35_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint36_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint37_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint38_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint39_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint40_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint41_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint42_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint43_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint44_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint45_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint46_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint47_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint48_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint49_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint50_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint51_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint52_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint53_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint54_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint55_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint56_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint57_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint58_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint59_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint60_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint61_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint62_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint63_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint64_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint65_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint66_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint67_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint68_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint69_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint70_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint71_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint72_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint73_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint74_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint75_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint76_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint77_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint78_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint79_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint80_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint81_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint82_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint83_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint84_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint85_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint86_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint87_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint88_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint89_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint90_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint91_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint92_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint93_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint94_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint95_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint96_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint97_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint98_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint99_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint100_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint101_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint102_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint103_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint104_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint105_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint106_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint107_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint108_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint109_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint110_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint111_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint112_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint113_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint114_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint115_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint116_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint117_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint118_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint119_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint120_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint121_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint122_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint123_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint124_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint125_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint126_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint127_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint128_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint129_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint130_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint131_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint132_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint133_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint134_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint135_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint136_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint137_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint138_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint139_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint140_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint141_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint142_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint143_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint144_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint145_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint146_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint147_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint148_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint149_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint150_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint151_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint152_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint153_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint154_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint155_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint156_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint157_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint158_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint159_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint160_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint161_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint162_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint163_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint164_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint165_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint166_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint167_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint168_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint169_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint170_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint171_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint172_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint173_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint174_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint175_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint176_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint177_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint178_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint179_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint180_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint181_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint182_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint183_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint184_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint185_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint186_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint187_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint188_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint189_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint190_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint191_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint192_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint193_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint194_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint195_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint196_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint197_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint198_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint199_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint200_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint201_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint202_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint203_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint204_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint205_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint206_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint207_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint208_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint209_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint210_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint211_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint212_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint213_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint214_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint215_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint216_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint217_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint218_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint219_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint220_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint221_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint222_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint223_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint224_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint225_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint226_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint227_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint228_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint229_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint230_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint231_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint232_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint233_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint234_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint235_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint236_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint237_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint238_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint239_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint240_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint241_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint242_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint243_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint244_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint245_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint246_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint247_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint248_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint249_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint250_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint251_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint252_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint253_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint254_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint255_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint256_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint257_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint258_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint259_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint260_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint261_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint262_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint263_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint264_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint265_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint266_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint267_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint268_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint269_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint270_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint271_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint272_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint273_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint274_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint275_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint276_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint277_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint278_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint279_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint280_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint281_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint282_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint283_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint284_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint285_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint286_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint287_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint288_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint289_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint290_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint291_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint292_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint293_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint294_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint295_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint296_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint297_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint298_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint299_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint300_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint301_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint302_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint303_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint304_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint305_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint306_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint307_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint308_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint309_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint310_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint311_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint312_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint313_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint314_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint315_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint316_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint317_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint318_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint319_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint320_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint321_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint322_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint323_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint324_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint325_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint326_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint327_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint328_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint329_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint330_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint331_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint332_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint333_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint334_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint335_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint336_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint337_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint338_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint339_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint340_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint341_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint342_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint343_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint344_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint345_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint346_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint347_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint348_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint349_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint350_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint351_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint352_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint353_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint354_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint355_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint356_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint357_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint358_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint359_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint360_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint361_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint362_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint363_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint364_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint365_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint366_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint367_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint368_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint369_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint370_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint371_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint372_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint373_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint374_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint375_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint376_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint377_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint378_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint379_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint380_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint381_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint382_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint383_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint384_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint385_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint386_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint387_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint388_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint389_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint390_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint391_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint392_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint393_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint394_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint395_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint396_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint397_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint398_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint399_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint400_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint401_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint402_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint403_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint404_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint405_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint406_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint407_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint408_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint409_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint410_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint411_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint412_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint413_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint414_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint415_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint416_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint417_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint418_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint419_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint420_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint421_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint422_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint423_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint424_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint425_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint426_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint427_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint428_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint429_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint430_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint431_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint432_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint433_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint434_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint435_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint436_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint437_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint438_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint439_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint440_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint441_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint442_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint443_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint444_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint445_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint446_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint447_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint448_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint449_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint450_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint451_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint452_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint453_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint454_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint455_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint456_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint457_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint458_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint459_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint460_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint461_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint462_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint463_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint464_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint465_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint466_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint467_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint468_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint469_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint470_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint471_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint472_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint473_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint474_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint475_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint476_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint477_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint478_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint479_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint480_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint481_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint482_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint483_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint484_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint485_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint486_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint487_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint488_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint489_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint490_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint491_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint492_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint493_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint494_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint495_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint496_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint497_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint498_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint499_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint500_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint501_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint502_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint503_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint504_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint505_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint506_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint507_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint508_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint509_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint510_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint511_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint512_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint513_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint514_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint515_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint516_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint517_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint518_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint519_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint520_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint521_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint522_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint523_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint524_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint525_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint526_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint527_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint528_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint529_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint530_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint531_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint532_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint533_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint534_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint535_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint536_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint537_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint538_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint539_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint540_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint541_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint542_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint543_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint544_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint545_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint546_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint547_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint548_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint549_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint550_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint551_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint552_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint553_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint554_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint555_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint556_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint557_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint558_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint559_radial_5025_1103" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(202 27) rotate(90) scale(52 189.207)">
+<stop stop-color="#AF895C"/>
+<stop offset="1" stop-color="#493926" stop-opacity="0"/>
+</radialGradient>
+<clipPath id="clip0_5025_1103">
+<rect width="404" height="300" rx="12" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/app/assets/images/maybe-plus-logo.png b/app/assets/images/maybe-plus-logo.png
new file mode 100644
index 00000000..38cb47f0
Binary files /dev/null and b/app/assets/images/maybe-plus-logo.png differ
diff --git a/app/assets/images/placeholder-graph.svg b/app/assets/images/placeholder-graph.svg
new file mode 100644
index 00000000..e868dbff
--- /dev/null
+++ b/app/assets/images/placeholder-graph.svg
@@ -0,0 +1,10 @@
+<svg width="944" height="201" viewBox="0 0 944 201" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 56.5502L14.4845 52.101L28.9689 50.1276L43.4534 51.7926L57.9379 40.2042L72.4224 35.6995L86.9068 35.0612L101.391 51.2218L115.876 73.6398L130.36 65.7562L144.845 64.7572L159.329 78.5795L173.814 81.9833L188.298 71.3186L202.783 80.5112L217.267 86L231.752 84.5697L246.236 83.0772L260.721 78.4002L275.205 77.343L289.689 71.8152L304.174 52.25L318.658 51.5349L333.143 48.185L347.627 47.2522L362.112 45.4586L376.596 49.2356L391.081 47.5566L405.565 31.0549L420.05 28.5641L434.534 36.6352H449.019L463.503 42.7572L477.988 37.7564L492.472 42.3467L506.957 49.3852L521.441 59.4839L535.925 52.7514L550.41 47.1535L564.894 58.6703L579.379 49.8343L593.863 50.5123H608.348L622.832 54.192L637.317 58.4763L651.801 57.2522L666.286 59.3943L677.01 62.8533L688.553 59.3943L709.129 67.4827L724.224 60.8386L738.708 52.27L753.193 58.6965L767.677 37.887L782.162 28.3178L796.646 16.383L811.13 20.9733L825.615 10.2626L840.099 11.7927L854.584 6.59032L869.068 15.771L883.553 8.12043L898.037 6.59032L912.522 2L927.006 14.8529L944 15.771" stroke="#0B0B0B" stroke-opacity="0.25" stroke-width="2" stroke-miterlimit="16"/>
+<path d="M14.4845 52.5538L0 57.0432V201H944V15.8954L927.006 14.9691L912.522 2L898.037 6.63181L883.553 8.17575L869.068 15.8954L854.584 6.63181L840.099 11.8812L825.615 10.3373L811.13 21.1448L796.646 16.513L782.161 28.5557L767.677 38.2114L753.193 59.2089L738.708 52.7244L724.224 61.3704L709.129 68.0745L688.553 59.9131L677.01 63.4034L666.286 59.9131L651.801 57.7516L637.317 58.9868L622.832 54.6637L608.348 50.9508H593.863L579.379 50.2667L564.894 59.1826L550.41 47.5616L535.925 53.2102L521.441 60.0035L506.957 49.8135L492.472 42.7114L477.988 38.0796L463.503 43.1256L449.019 36.9483H434.534L420.05 28.8042L405.565 31.3175L391.081 47.9684L376.596 49.6626L362.112 45.8514L347.627 47.6612L333.143 48.6024L318.658 51.9826L304.174 52.7042L289.689 72.4463L275.205 78.024L260.721 79.0908L246.236 83.8101L231.752 85.3161L217.267 86.7593L202.783 81.2209L188.298 71.9451L173.814 82.7063L159.329 79.2716L144.845 65.3245L130.36 66.3325L115.876 74.2874L101.391 51.6667L86.9068 35.3601L72.4224 36.0041L57.9379 40.5496L43.4534 52.2427L28.9689 50.5627L14.4845 52.5538Z" fill="url(#paint0_linear_4023_1299)" fill-opacity="0.5"/>
+<defs>
+<linearGradient id="paint0_linear_4023_1299" x1="445.5" y1="174.496" x2="445.5" y2="51.9672" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#E5E5E5" stop-opacity="0.6"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/app/assets/images/stripe-logo.svg b/app/assets/images/stripe-logo.svg
new file mode 100644
index 00000000..d95ded83
--- /dev/null
+++ b/app/assets/images/stripe-logo.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 1321315963">
+<rect width="20" height="20" rx="10" fill="#635BFF"/>
+<path id="Vector" fill-rule="evenodd" clip-rule="evenodd" d="M9.35663 7.69056C9.35663 7.20077 9.75747 7.01238 10.4214 7.01238C11.3734 7.01238 12.5759 7.30124 13.5279 7.81615V4.86482C12.4882 4.45037 11.461 4.28711 10.4214 4.28711C7.87854 4.28711 6.1875 5.61835 6.1875 7.84127C6.1875 11.3075 10.9475 10.7549 10.9475 12.2494C10.9475 12.8271 10.4464 13.0155 9.74495 13.0155C8.70527 13.0155 7.37749 12.5885 6.32529 12.0108V14.9998C7.49023 15.5022 8.66769 15.7157 9.74495 15.7157C12.3504 15.7157 14.1416 14.4221 14.1416 12.1741C14.1291 8.43154 9.35663 9.09716 9.35663 7.69056Z" fill="white"/>
+</g>
+</svg>
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
deleted file mode 100644
index dcd72732..00000000
--- a/app/assets/stylesheets/application.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Application styles */
diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css
deleted file mode 100644
index 33711536..00000000
--- a/app/assets/stylesheets/application.tailwind.css
+++ /dev/null
@@ -1,137 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-/* Reset rules, default styles applied to plain HTML */
-@layer base {
-  details>summary::-webkit-details-marker {
-    @apply hidden;
-  }
-
-  details>summary {
-    @apply list-none;
-  }
-}
-
-@layer components {
-  .form-field {
-    @apply flex flex-col gap-1 relative px-3 py-2 rounded-md border bg-white border-alpha-black-100 shadow-xs w-full;
-    @apply focus-within:border-gray-900 focus-within:shadow-none focus-within:ring-4 focus-within:ring-gray-100;
-  }
-
-  .form-field__label {
-    @apply block text-xs text-gray-500 peer-disabled:text-gray-400;
-  }
-
-  .form-field__input {
-    @apply border-none bg-transparent text-sm opacity-100 w-full p-0;
-    @apply focus:opacity-100 focus:outline-none focus:ring-0;
-    @apply placeholder-shown:opacity-50;
-    @apply disabled:text-gray-400;
-  }
-
-  .form-field__radio {
-    @apply text-gray-900;
-  }
-
-  .form-field__submit {
-    @apply cursor-pointer rounded-lg bg-black p-3 text-center text-white hover:bg-gray-700;
-  }
-
-  input:checked+label+.toggle-switch-dot {
-    transform: translateX(100%);
-  }
-
-  [type='checkbox'].maybe-checkbox {
-    @apply rounded-sm;
-  }
-
-  [type='checkbox'].maybe-checkbox--light {
-    @apply border-alpha-black-200 checked:bg-gray-900 checked:ring-gray-900 focus:ring-gray-900 focus-visible:ring-gray-900 checked:hover:bg-gray-500;
-  }
-
-  [type='checkbox'].maybe-checkbox--dark {
-    @apply ring-gray-900 checked:text-white;
-  }
-
-  [type='checkbox'].maybe-checkbox--dark:checked {
-    background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='111827' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e");
-  }
-
-  select[multiple="multiple"] {
-    @apply py-2 pr-2 space-y-0.5;
-  }
-
-  select[multiple="multiple"] option {
-    @apply py-2 rounded-md;
-  }
-
-  select[multiple="multiple"] option:checked {
-    @apply after:content-['\2713'] bg-white after:text-gray-500 after:ml-2;
-  }
-
-  select[multiple="multiple"] option:active,
-  select[multiple="multiple"] option:focus {
-    @apply bg-white;
-  }
-
-  .maybe-switch {
-    @apply block bg-gray-100 w-9 h-5 rounded-full cursor-pointer;
-    @apply after:content-[''] after:block after:absolute after:top-0.5 after:left-0.5 after:bg-white after:w-4 after:h-4 after:rounded-full after:transition-transform after:duration-300 after:ease-in-out;
-    @apply peer-checked:bg-green-600 peer-checked:after:translate-x-4;
-  }
-
-  .prose--github-release-notes {
-    .octicon {
-      @apply inline-block overflow-visible align-text-bottom fill-current;
-    }
-
-    .dropdown-caret {
-      @apply content-none border-4 border-b-0 border-transparent border-t-gray-500 size-0 inline-block;
-    }
-
-    .user-mention {
-      @apply font-bold;
-    }
-  }
-
-  .tooltip {
-    @apply hidden absolute;
-  }
-
-  .btn {
-    @apply px-3 py-2 rounded-lg text-sm font-medium cursor-pointer;
-  }
-
-  .btn--primary {
-    @apply bg-gray-900 text-white hover:bg-gray-700 disabled:bg-gray-50 disabled:hover:bg-gray-50 disabled:text-gray-400;
-  }
-
-  .btn--secondary {
-    @apply bg-gray-50 hover:bg-gray-100 text-gray-900;
-  }
-
-  .btn--outline {
-    @apply border border-alpha-black-200 text-gray-900 hover:bg-gray-50;
-  }
-
-  .btn--ghost {
-    @apply border border-transparent text-gray-900 hover:bg-gray-50;
-  }
-}
-
-/* Small, single purpose classes that should take precedence over other styles */
-@layer utilities {
-  .scrollbar::-webkit-scrollbar {
-    width: 4px;
-  }
-
-  .scrollbar::-webkit-scrollbar-thumb {
-    background: #d6d6d6;
-    border-radius: 10px;
-  }
-
-  .scrollbar::-webkit-scrollbar-thumb:hover {
-    background: #a6a6a6;
-  }
-}
\ No newline at end of file
diff --git a/app/assets/tailwind/application.css b/app/assets/tailwind/application.css
new file mode 100644
index 00000000..bab9ea57
--- /dev/null
+++ b/app/assets/tailwind/application.css
@@ -0,0 +1,175 @@
+@import 'tailwindcss';
+
+@import "./maybe-design-system.css";
+
+@import "./geist-font.css";
+@import "./geist-mono-font.css";
+
+@plugin "@tailwindcss/typography";
+@plugin "@tailwindcss/forms";
+
+@import "./simonweb_pickr.css";
+
+@layer components {
+  .pcr-app{
+    position: static !important;
+    background: none !important;
+    box-shadow: none !important;
+    padding: 0 !important;
+    width: 100% !important;
+  }
+  .pcr-color-palette{
+      height: 12em !important;
+  }
+  .pcr-palette{
+      border-radius: 10px !important;
+  }
+  .pcr-palette:before{
+      border-radius: 10px !important;
+  }
+  .pcr-color-chooser{
+      height: 1.5em !important;
+  }
+  .pcr-picker{
+      height: 20px !important;
+      width: 20px !important;
+  }
+}
+
+.combobox {
+  .hw-combobox__main__wrapper,
+  .hw-combobox__input {
+    @apply bg-container text-primary w-full;
+  }
+
+  .hw-combobox__main__wrapper {
+    @apply border-0 p-0 focus:border-0 ring-0 focus:ring-0 shadow-none focus:shadow-none focus-within:shadow-none;
+  }
+
+  .hw-combobox__listbox {
+    @apply absolute top-[160%] right-0 w-full bg-transparent rounded z-30;
+  }
+
+  .hw-combobox__label {
+    @apply block text-xs text-gray-500 peer-disabled:text-gray-400;
+  }
+  
+  .hw-combobox__option {
+    @apply bg-container hover:bg-container-hover;
+  }
+
+  .hw_combobox__pagination__wrapper {
+    @apply h-px;
+
+    &:only-child {
+      @apply bg-transparent;
+    }
+  }
+
+  --hw-border-color: rgba(0, 0, 0, 0.2);
+  --hw-handle-width: 20px;
+  --hw-handle-height: 20px;
+  --hw-handle-offset-right: 0px;
+}
+
+/* Typography */
+.prose {
+  @apply max-w-none text-primary; 
+
+  a {
+    @apply text-link;
+  }
+
+  h2 {
+    @apply text-xl font-medium text-primary;
+  }
+
+  h3 {
+    @apply text-lg font-medium text-primary;
+  }
+
+  li {
+    @apply m-0 text-primary;
+  }
+
+  details {
+    @apply mb-4 rounded-xl mt-3.5;
+  }
+
+  summary {
+    @apply flex items-center gap-1;
+  }
+
+  video {
+    @apply m-0 rounded-b-xl;
+  }
+}
+
+.prose--github-release-notes {
+  .octicon {
+    @apply inline-block overflow-visible align-text-bottom fill-current;
+  }
+
+  .dropdown-caret {
+    @apply content-none border-4 border-b-0 border-transparent border-t-gray-500 size-0 inline-block;
+  }
+
+  .user-mention {
+    @apply font-bold;
+  }
+}
+
+.prose--ai-chat {
+  @apply break-words;
+
+  p, li {
+    @apply text-sm text-primary;
+  }
+
+  scrollbar-width: thin;
+  scrollbar-color: rgba(156, 163, 175, 0.5) transparent;
+
+  ::-webkit-scrollbar {
+    width: 6px;
+  }
+
+  ::-webkit-scrollbar-track {
+    background: transparent;
+  }
+
+  ::-webkit-scrollbar-thumb {
+    background-color: rgba(156, 163, 175, 0.5);
+    border-radius: 3px; 
+  }
+}
+
+/* Custom scrollbar implementation for Windows browsers */
+.windows {
+  ::-webkit-scrollbar {
+    width: 4px;
+  }
+
+  ::-webkit-scrollbar-thumb {
+    background: #d6d6d6;
+    border-radius: 10px;
+  }
+
+  ::-webkit-scrollbar-thumb:hover {
+    background: #a6a6a6;
+  }  
+}
+
+.scrollbar {
+  &::-webkit-scrollbar {
+    width: 4px;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background: #d6d6d6;
+    border-radius: 10px;
+  }
+
+  &::-webkit-scrollbar-thumb:hover {
+    background: #a6a6a6;
+  }
+}
\ No newline at end of file
diff --git a/app/assets/tailwind/geist-font.css b/app/assets/tailwind/geist-font.css
new file mode 100644
index 00000000..415cb7a7
--- /dev/null
+++ b/app/assets/tailwind/geist-font.css
@@ -0,0 +1,85 @@
+
+
+/* Variable font */
+@font-face {
+  font-family: 'Geist';
+  src: url('./geist/Geist[wght].woff2') format('woff2-variations');
+  font-weight: 100 900;
+  font-style: normal;
+  font-display: swap;
+}
+
+/* Static fonts (fallback) */
+@supports not (font-variation-settings: normal) {
+  @font-face {
+    font-family: 'Geist';
+    src: url('./geist/Geist-Thin.woff2') format('woff2');
+    font-weight: 100;
+    font-style: normal;
+    font-display: swap;
+  }
+
+  @font-face {
+    font-family: 'Geist';
+    src: url('./geist/Geist-ExtraLight.woff2') format('woff2');
+    font-weight: 200;
+    font-style: normal;
+    font-display: swap;
+  }
+
+  @font-face {
+    font-family: 'Geist';
+    src: url('./geist/Geist-Light.woff2') format('woff2');
+    font-weight: 300;
+    font-style: normal;
+    font-display: swap;
+  }
+
+  @font-face {
+    font-family: 'Geist';
+    src: url('./geist/Geist-Regular.woff2') format('woff2');
+    font-weight: 400;
+    font-style: normal;
+    font-display: swap;
+  }
+
+  @font-face {
+    font-family: 'Geist';
+    src: url('./geist/Geist-Medium.woff2') format('woff2');
+    font-weight: 500;
+    font-style: normal;
+    font-display: swap;
+  }
+
+  @font-face {
+    font-family: 'Geist';
+    src: url('./geist/Geist-SemiBold.woff2') format('woff2');
+    font-weight: 600;
+    font-style: normal;
+    font-display: swap;
+  }
+
+  @font-face {
+    font-family: 'Geist';
+    src: url('./geist/Geist-Bold.woff2') format('woff2');
+    font-weight: 700;
+    font-style: normal;
+    font-display: swap;
+  }
+
+  @font-face {
+    font-family: 'Geist';
+    src: url('./geist/Geist-ExtraBold.woff2') format('woff2');
+    font-weight: 800;
+    font-style: normal;
+    font-display: swap;
+  }
+
+  @font-face {
+    font-family: 'Geist';
+    src: url('./geist/Geist-Black.woff2') format('woff2');
+    font-weight: 900;
+    font-style: normal;
+    font-display: swap;
+  }
+}
diff --git a/app/assets/tailwind/geist-mono-font.css b/app/assets/tailwind/geist-mono-font.css
new file mode 100644
index 00000000..ecf39e2b
--- /dev/null
+++ b/app/assets/tailwind/geist-mono-font.css
@@ -0,0 +1,83 @@
+/* Variable font */
+@font-face {
+  font-family: 'Geist Mono';
+  src: url('./geist_mono/GeistMono[wght].woff2') format('woff2-variations');
+  font-weight: 100 950;
+  font-style: normal;
+  font-display: swap;
+}
+
+/* Static fonts (fallback) */
+@supports not (font-variation-settings: normal) {
+  @font-face {
+    font-family: 'Geist Mono';
+    src: url('./geist_mono/GeistMono-Thin.woff2') format('woff2');
+    font-weight: 100;
+    font-style: normal;
+    font-display: swap;
+  }
+
+  @font-face {
+    font-family: 'Geist Mono';
+    src: url('./geist_mono/GeistMono-UltraLight.woff2') format('woff2');
+    font-weight: 200;
+    font-style: normal;
+    font-display: swap;
+  }
+
+  @font-face {
+    font-family: 'Geist Mono';
+    src: url('./geist_mono/GeistMono-Light.woff2') format('woff2');
+    font-weight: 300;
+    font-style: normal;
+    font-display: swap;
+  }
+
+  @font-face {
+    font-family: 'Geist Mono';
+    src: url('./geist_mono/GeistMono-Regular.woff2') format('woff2');
+    font-weight: 400;
+    font-style: normal;
+    font-display: swap;
+  }
+
+  @font-face {
+    font-family: 'Geist Mono';
+    src: url('./geist_mono/GeistMono-Medium.woff2') format('woff2');
+    font-weight: 500;
+    font-style: normal;
+    font-display: swap;
+  }
+
+  @font-face {
+    font-family: 'Geist Mono';
+    src: url('./geist_mono/GeistMono-SemiBold.woff2') format('woff2');
+    font-weight: 600;
+    font-style: normal;
+    font-display: swap;
+  }
+
+  @font-face {
+    font-family: 'Geist Mono';
+    src: url('./geist_mono/GeistMono-Bold.woff2') format('woff2');
+    font-weight: 700;
+    font-style: normal;
+    font-display: swap;
+  }
+
+  @font-face {
+    font-family: 'Geist Mono';
+    src: url('./geist_mono/GeistMono-Black.woff2') format('woff2');
+    font-weight: 900;
+    font-style: normal;
+    font-display: swap;
+  }
+
+  @font-face {
+    font-family: 'Geist Mono';
+    src: url('./geist_mono/GeistMono-UltraBlack.woff2') format('woff2');
+    font-weight: 950;
+    font-style: normal;
+    font-display: swap;
+  }
+}
diff --git a/app/assets/tailwind/maybe-design-system.css b/app/assets/tailwind/maybe-design-system.css
new file mode 100644
index 00000000..9bb3046d
--- /dev/null
+++ b/app/assets/tailwind/maybe-design-system.css
@@ -0,0 +1,446 @@
+/* 
+  This file contains all of the Figma design tokens, components, etc. that 
+  are used globally across the app. 
+
+  One-off styling (3rd party overrides, etc.) should be done in the application.css file.
+*/
+
+@import './maybe-design-system/background-utils.css';
+@import './maybe-design-system/foreground-utils.css';
+@import './maybe-design-system/text-utils.css';
+@import './maybe-design-system/border-utils.css';
+@import './maybe-design-system/component-utils.css';
+
+@custom-variant theme-dark (&:where([data-theme=dark], [data-theme=dark] *));
+
+@theme {
+  /* Font families */
+  --font-sans: 'Geist', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+  --font-mono: 'Geist Mono', ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
+
+  /* Base colors */
+  --color-white: #ffffff;
+  --color-black: #0B0B0B;
+  --color-success: var(--color-green-600);
+  --color-warning: var(--color-yellow-600);
+  --color-destructive: var(--color-red-600);
+  --color-shadow: --alpha(var(--color-black) / 6%);
+
+  /* Colors used in Stimulus controllers with SVGs (easier to define light/dark mode here than toggle within the controllers) */
+  /* See @layer base block below for dark mode overrides */
+  --budget-unused-fill: var(--color-gray-200);
+  --budget-unallocated-fill: var(--color-gray-50);
+
+  /* Gray scale */
+  --color-gray-25: #FAFAFA;
+  --color-gray-50: #F7F7F7;
+  --color-gray-100: #F0F0F0;
+  --color-gray-200: #E7E7E7;
+  --color-gray-300: #CFCFCF;
+  --color-gray-400: #9E9E9E;
+  --color-gray-500: #737373;
+  --color-gray-600: #5C5C5C;
+  --color-gray-700: #363636;
+  --color-gray-800: #242424;
+  --color-gray-900: #171717;
+  --color-gray: var(--color-gray-500);
+  --color-gray-tint-5: --alpha(var(--color-gray-500) / 5%);
+  --color-gray-tint-10: --alpha(var(--color-gray-500) / 10%);
+
+  /* Alpha colors */
+  --color-alpha-white-25: --alpha(var(--color-white) / 3%);
+  --color-alpha-white-50: --alpha(var(--color-white) / 5%);
+  --color-alpha-white-100: --alpha(var(--color-white) / 8%);
+  --color-alpha-white-200: --alpha(var(--color-white) / 10%);
+  --color-alpha-white-300: --alpha(var(--color-white) / 15%);
+  --color-alpha-white-400: --alpha(var(--color-white) / 20%);
+  --color-alpha-white-500: --alpha(var(--color-white) / 30%);
+  --color-alpha-white-600: --alpha(var(--color-white) / 40%);
+  --color-alpha-white-700: --alpha(var(--color-white) / 50%);
+  --color-alpha-white-800: --alpha(var(--color-white) / 70%);
+  --color-alpha-white-900: --alpha(var(--color-white) / 85%);
+
+  --color-alpha-black-25: --alpha(var(--color-black) / 3%);
+  --color-alpha-black-50: --alpha(var(--color-black) / 5%);
+  --color-alpha-black-100: --alpha(var(--color-black) / 8%);
+  --color-alpha-black-200: --alpha(var(--color-black) / 10%);
+  --color-alpha-black-300: --alpha(var(--color-black) / 15%);
+  --color-alpha-black-400: --alpha(var(--color-black) / 20%);
+  --color-alpha-black-500: --alpha(var(--color-black) / 30%);
+  --color-alpha-black-600: --alpha(var(--color-black) / 40%);
+  --color-alpha-black-700: --alpha(var(--color-black) / 50%);
+  --color-alpha-black-800: --alpha(var(--color-black) / 70%);
+  --color-alpha-black-900: --alpha(var(--color-black) / 85%);
+
+  /* Red scale */
+  --color-red-25: #FFFBFB;
+  --color-red-50: #FFF1F0;
+  --color-red-100: #FFDEDB;
+  --color-red-200: #FEB9B3;
+  --color-red-300: #F88C86;
+  --color-red-400: #ED4E4E;
+  --color-red-500: #F13636;
+  --color-red-600: #EC2222;
+  --color-red-700: #C91313;
+  --color-red-800: #A40E0E;
+  --color-red-900: #7E0707;
+  --color-red-tint-5: --alpha(var(--color-red-500) / 5%);
+  --color-red-tint-10: --alpha(var(--color-red-500) / 10%);
+
+  /* Green scale */
+  --color-green-25: #F6FEF9;
+  --color-green-50: #ECFDF3;
+  --color-green-100: #D1FADF;
+  --color-green-200: #A6F4C5;
+  --color-green-300: #6CE9A6;
+  --color-green-400: #32D583;
+  --color-green-500: #12B76A;
+  --color-green-600: #10A861;
+  --color-green-700: #078C52;
+  --color-green-800: #05603A;
+  --color-green-900: #054F31;
+  --color-green-tint-5: --alpha(var(--color-green-500) / 5%);
+  --color-green-tint-10: --alpha(var(--color-green-500) / 10%);
+
+  /* Yellow scale */
+  --color-yellow-25: #FFFCF5;
+  --color-yellow-50: #FFFAEB;
+  --color-yellow-100: #FEF0C7;
+  --color-yellow-200: #FEDF89;
+  --color-yellow-300: #FEC84B;
+  --color-yellow-400: #FDB022;
+  --color-yellow-500: #F79009;
+  --color-yellow-600: #DC6803;
+  --color-yellow-700: #B54708;
+  --color-yellow-800: #93370D;
+  --color-yellow-900: #7A2E0E;
+  --color-yellow-tint-5: --alpha(var(--color-yellow-500) / 5%);
+  --color-yellow-tint-10: --alpha(var(--color-yellow-500) / 10%);
+
+  /* Cyan scale */
+  --color-cyan-25: #F5FEFF;
+  --color-cyan-50: #ECFDFF;
+  --color-cyan-100: #CFF9FE;
+  --color-cyan-200: #A5F0FC;
+  --color-cyan-300: #67E3F9;
+  --color-cyan-400: #22CCEE;
+  --color-cyan-500: #06AED4;
+  --color-cyan-600: #088AB2;
+  --color-cyan-700: #0E7090;
+  --color-cyan-800: #155B75;
+  --color-cyan-900: #155B75;
+  --color-cyan-tint-5: --alpha(var(--color-cyan-500) / 5%);
+  --color-cyan-tint-10: --alpha(var(--color-cyan-500) / 10%);
+
+  /* Blue scale */
+  --color-blue-25: #F5FAFF;
+  --color-blue-50: #EFF8FF;
+  --color-blue-100: #D1E9FF;
+  --color-blue-200: #B2DDFF;
+  --color-blue-300: #84CAFF;
+  --color-blue-400: #53B1FD;
+  --color-blue-500: #2E90FA;
+  --color-blue-600: #1570EF;
+  --color-blue-700: #175CD3;
+  --color-blue-800: #1849A9;
+  --color-blue-900: #194185;
+  --color-blue-tint-5: --alpha(var(--color-blue-500) / 5%);
+  --color-blue-tint-10: --alpha(var(--color-blue-500) / 10%);
+
+  /* Indigo scale */
+  --color-indigo-25: #F5F8FF;
+  --color-indigo-50: #EFF4FF;
+  --color-indigo-100: #E0EAFF;
+  --color-indigo-200: #C7D7FE;
+  --color-indigo-300: #A4BCFD;
+  --color-indigo-400: #8098F9;
+  --color-indigo-500: #6172F3;
+  --color-indigo-600: #444CE7;
+  --color-indigo-700: #3538CD;
+  --color-indigo-800: #2D31A6;
+  --color-indigo-900: #2D3282;
+  --color-indigo-tint-5: --alpha(var(--color-indigo-500) / 5%);
+  --color-indigo-tint-10: --alpha(var(--color-indigo-500) / 10%);
+
+  /* Violet scale */
+  --color-violet-25: #FBFAFF;
+  --color-violet-50: #F5F3FF;
+  --color-violet-100: #ECE9FE;
+  --color-violet-200: #DDD6FE;
+  --color-violet-300: #C3B5FD;
+  --color-violet-400: #A48AFB;
+  --color-violet-500: #875BF7;
+  --color-violet-600: #7839EE;
+  --color-violet-700: #6927DA;
+  --color-violet-tint-5: --alpha(var(--color-violet-500) / 5%);
+  --color-violet-tint-10: --alpha(var(--color-violet-500) / 10%);
+
+  /* Fuchsia scale */
+  --color-fuchsia-25: #FEFAFF;
+  --color-fuchsia-50: #FDF4FF;
+  --color-fuchsia-100: #FBE8FF;
+  --color-fuchsia-200: #F6D0FE;
+  --color-fuchsia-300: #EEAAFD;
+  --color-fuchsia-400: #E478FA;
+  --color-fuchsia-500: #D444F1;
+  --color-fuchsia-600: #BA24D5;
+  --color-fuchsia-700: #9F1AB1;
+  --color-fuchsia-800: #821890;
+  --color-fuchsia-900: #6F1877;
+  --color-fuchsia-tint-5: --alpha(var(--color-fuchsia-500) / 5%);
+  --color-fuchsia-tint-10: --alpha(var(--color-fuchsia-500) / 10%);
+
+  /* Pink scale */
+  --color-pink-25: #FFFAFC;
+  --color-pink-50: #FEF0F7;
+  --color-pink-100: #FFD1E2;
+  --color-pink-200: #FFB1CE;
+  --color-pink-300: #FD8FBA;
+  --color-pink-400: #F86BA7;
+  --color-pink-500: #F23E94;
+  --color-pink-600: #D5327F;
+  --color-pink-700: #BA256B;
+  --color-pink-800: #9E1958;
+  --color-pink-900: #840B45;
+  --color-pink-tint-5: --alpha(var(--color-pink-500) / 5%);
+  --color-pink-tint-10: --alpha(var(--color-pink-500) / 10%);
+
+  /* Orange scale */
+  --color-orange-25: #FFF9F5;
+  --color-orange-50: #FFF4ED;
+  --color-orange-100: #FFE6D5;
+  --color-orange-200: #FFD6AE;
+  --color-orange-300: #FF9C66;
+  --color-orange-400: #FF692E;
+  --color-orange-500: #FF4405;
+  --color-orange-600: #E62E05;
+  --color-orange-700: #BC1B06;
+  --color-orange-800: #97180C;
+  --color-orange-900: #771A0D;
+  --color-orange-tint-5: --alpha(var(--color-orange-500) / 5%);
+  --color-orange-tint-10: --alpha(var(--color-orange-500) / 10%);
+
+  /* Border radius overrides */
+  --border-radius-md: 8px;
+  --border-radius-lg: 10px;
+
+  --shadow-xs: 0px 1px 2px 0px --alpha(var(--color-black) / 6%);
+  --shadow-sm: 0px 1px 6px 0px --alpha(var(--color-black) / 6%);
+  --shadow-md: 0px 4px 8px -2px --alpha(var(--color-black) / 6%);
+  --shadow-lg: 0px 12px 16px -4px --alpha(var(--color-black) / 6%);
+  --shadow-xl: 0px 20px 24px -4px --alpha(var(--color-black) / 6%);
+
+  --animate-stroke-fill: stroke-fill 3s 300ms forwards;
+
+  @keyframes stroke-fill {
+    0% {
+      stroke-dashoffset: 43.9822971503;
+    }
+
+    100% {
+      stroke-dashoffset: 0;
+    }
+  } 
+}
+
+/* Specific override for strong tags in prose under dark mode */
+.prose:where([data-theme=dark], [data-theme=dark] *) strong {
+  color: theme(colors.white) !important;
+}
+
+@layer base {
+  [data-theme="dark"] { 
+    --color-success: var(--color-green-500);
+    --color-warning: var(--color-yellow-400);
+    --color-destructive: var(--color-red-400);
+    --color-shadow: --alpha(var(--color-white) / 8%);
+
+    /* Dark mode overrides for colors used in Stimulus controllers with SVGs */
+    --budget-unused-fill: var(--color-gray-500);
+    --budget-unallocated-fill: var(--color-gray-700);
+
+    --shadow-xs: 0px 1px 2px 0px --alpha(var(--color-white) / 8%);
+    --shadow-sm: 0px 1px 6px 0px --alpha(var(--color-white) / 8%);
+    --shadow-md: 0px 4px 8px -2px --alpha(var(--color-white) / 8%);
+    --shadow-lg: 0px 12px 16px -4px --alpha(var(--color-white) / 8%);
+    --shadow-xl: 0px 20px 24px -4px --alpha(var(--color-white) / 8%);
+  }
+
+  html {
+    padding-top: env(safe-area-inset-top);
+    padding-bottom: env(safe-area-inset-bottom);
+  }
+
+  button {
+    @apply cursor-pointer focus-visible:outline-gray-900;
+  }
+
+  hr {
+    @apply text-gray-200;
+  }
+
+  /* We control the sizing through DialogComponent, so reset this value */
+  dialog:modal {
+    max-width: 100dvw;
+    max-height: 100dvh;
+  }
+
+  details>summary::-webkit-details-marker {
+    @apply hidden;
+  }
+
+  details>summary {
+    @apply list-none;
+  }
+
+  input[type='radio'] {
+    @apply border-gray-300 text-indigo-600 focus:ring-indigo-600;
+    /* Default light mode */
+
+    @variant theme-dark {
+      /* Dark mode radio button base and checked styles */
+      @apply border-gray-600 bg-gray-700 checked:bg-blue-500 focus:ring-blue-500 focus:ring-offset-gray-800;
+    }
+  }
+}
+
+@layer components {
+  /* Forms */
+  .form-field {
+    @apply flex flex-col gap-1 relative px-3 py-2 rounded-md border bg-container border-secondary shadow-xs w-full;
+    @apply focus-within:border-secondary focus-within:shadow-none focus-within:ring-4 focus-within:ring-alpha-black-200;
+    @apply transition-all duration-300;
+
+    @variant theme-dark {
+      @apply focus-within:ring-alpha-white-300;
+    }
+
+    /* Add styles for multiple select within form fields */
+    select[multiple] {
+      @apply py-2 pr-2 space-y-0.5 overflow-y-auto;
+
+      option {
+        @apply py-2 rounded-md;
+      }
+
+      option:checked {
+        @apply after:content-['\2713'] bg-container-inset after:text-gray-500 after:ml-2;
+      }
+
+      option:active,
+      option:focus {
+        @apply bg-container-inset;
+      }
+    }
+  }
+
+  /* New form field structure components */
+  .form-field__header {
+    @apply flex items-center justify-between gap-2;
+  }
+
+  .form-field__body {
+    @apply flex flex-col gap-1;
+  }
+
+  .form-field__actions {
+    @apply flex items-center gap-1;
+  }
+
+  .form-field__label {
+    @apply block text-xs text-secondary peer-disabled:text-subdued;
+  }
+
+  .form-field__input {
+    @apply text-primary border-none bg-container text-sm opacity-100 w-full p-0;
+    @apply focus:opacity-100 focus:outline-hidden focus:ring-0;
+    @apply placeholder-shown:opacity-50;
+    @apply disabled:text-subdued;
+    @apply text-ellipsis overflow-hidden whitespace-nowrap;
+    @apply transition-opacity duration-300;
+    @apply placeholder:text-subdued;
+
+    @variant theme-dark {
+      &::-webkit-calendar-picker-indicator {
+        filter: invert(1);
+        cursor: pointer;
+      }
+    }
+  }
+  
+  select.form-field__input {
+    @apply pr-10 appearance-none;
+    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%236b7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='M6 8l4 4 4-4'/%3e%3c/svg%3e");
+    background-position: right -0.15rem center;
+    background-repeat: no-repeat;
+    background-size: 1.25rem 1.25rem;
+  }
+
+  .form-field__radio {
+    @apply text-primary;
+  }
+
+  .form-field__submit {
+    @apply cursor-pointer rounded-lg bg-surface p-3 text-center text-white hover:bg-surface-hover;
+  }
+
+  /* Checkboxes */
+  .checkbox {
+    &[type='checkbox'] {
+      @apply rounded-sm;
+      @apply transition-colors duration-300;
+    }
+  }
+
+  .checkbox--light {
+    &[type='checkbox'] {
+      @apply border-alpha-black-200 checked:bg-gray-900 checked:ring-gray-900 focus:ring-gray-900 focus-visible:ring-gray-900 checked:hover:bg-gray-500;
+    }
+
+    &[type='checkbox']:disabled {
+      @apply cursor-not-allowed opacity-80 bg-gray-50 border-gray-200 checked:bg-gray-400 checked:ring-gray-400;
+    }
+
+    @variant theme-dark {
+      &[type='checkbox'] {
+        @apply ring-gray-900 checked:text-white;
+        background-color: var(--color-gray-600);
+      }
+  
+      &[type='checkbox']:disabled {
+        @apply cursor-not-allowed opacity-80 ring-gray-600;
+      }
+  
+      &[type='checkbox']:checked {
+        background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e");
+        background-color: var(--color-gray-600);
+      }
+    }
+  }
+
+  .checkbox--dark {
+    &[type='checkbox'] {
+      @apply ring-gray-900 checked:text-white;
+    }
+
+    &[type='checkbox']:disabled {
+      @apply cursor-not-allowed opacity-80 ring-gray-600;
+    }
+
+    &[type='checkbox']:checked {
+      background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='111827' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e");
+    }
+  }
+
+  /* Tooltips */
+  .tooltip {
+    @apply hidden absolute;
+  }
+
+  .qrcode svg path {
+    fill: var(--color-black);
+    @variant theme-dark {
+      fill: var(--color-white);
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/assets/tailwind/maybe-design-system/background-utils.css b/app/assets/tailwind/maybe-design-system/background-utils.css
new file mode 100644
index 00000000..2c57f18f
--- /dev/null
+++ b/app/assets/tailwind/maybe-design-system/background-utils.css
@@ -0,0 +1,91 @@
+@utility bg-surface {
+  @apply bg-gray-50;
+
+  @variant theme-dark {
+    @apply bg-black;
+  }
+}
+
+@utility bg-surface-hover {
+  @apply bg-gray-100;
+
+  @variant theme-dark {
+    @apply bg-gray-900;
+  }
+}
+
+@utility bg-surface-inset {
+  @apply bg-gray-100;
+
+  @variant theme-dark {
+    @apply bg-gray-800;
+  }
+}
+
+@utility bg-surface-inset-hover {
+  @apply bg-gray-200;
+
+  @variant theme-dark {
+    @apply bg-gray-800;
+  }
+}
+
+@utility bg-container {
+  @apply bg-white;
+
+  @variant theme-dark {
+    @apply bg-gray-900;
+  }
+}
+
+@utility bg-container-hover {
+  @apply bg-gray-50;
+
+  @variant theme-dark {
+    @apply bg-gray-800;
+  }
+}
+
+@utility bg-container-inset {
+  @apply bg-gray-50;
+
+  @variant theme-dark {
+    @apply bg-gray-800;
+  }
+}
+
+@utility bg-container-inset-hover {
+  @apply bg-gray-100;
+
+  @variant theme-dark {
+    @apply bg-gray-700;
+  }
+}
+
+@utility bg-inverse {
+  @apply bg-gray-800;
+
+  @variant theme-dark {
+    @apply bg-white;
+  }
+}
+
+@utility bg-inverse-hover {
+  @apply bg-gray-700;
+
+  @variant theme-dark {
+    @apply bg-gray-100;
+  }
+}
+
+@utility bg-overlay {
+  background-color: --alpha(var(--color-gray-100) / 50%);
+
+  @variant theme-dark {
+    background-color: var(--color-alpha-black-900);
+  }
+}
+
+@utility bg-loader {
+  @apply bg-surface-inset animate-pulse;
+}
diff --git a/app/assets/tailwind/maybe-design-system/border-utils.css b/app/assets/tailwind/maybe-design-system/border-utils.css
new file mode 100644
index 00000000..8fcc1c9c
--- /dev/null
+++ b/app/assets/tailwind/maybe-design-system/border-utils.css
@@ -0,0 +1,92 @@
+/* Custom shadow borders used for surfaces / containers  */
+@utility shadow-border-xs {
+  box-shadow: var(--shadow-xs), 0px 0px 0px 1px var(--color-alpha-black-50);
+
+  @variant theme-dark {
+    box-shadow: var(--shadow-xs), 0px 0px 0px 1px var(--color-alpha-white-50);
+  }
+}
+
+@utility shadow-border-sm {
+  box-shadow: var(--shadow-sm), 0px 0px 0px 1px var(--color-alpha-black-50);
+
+  @variant theme-dark {
+    box-shadow: var(--shadow-sm), 0px 0px 0px 1px var(--color-alpha-white-50);
+  }
+}
+
+@utility shadow-border-md {
+  box-shadow: var(--shadow-md), 0px 0px 0px 1px var(--color-alpha-black-50);
+
+  @variant theme-dark {
+    box-shadow: var(--shadow-md), 0px 0px 0px 1px var(--color-alpha-white-50);
+  }
+}
+
+@utility shadow-border-lg {
+  box-shadow: var(--shadow-lg), 0px 0px 0px 1px var(--color-alpha-black-50);
+
+  @variant theme-dark {
+    box-shadow: var(--shadow-lg), 0px 0px 0px 1px var(--color-alpha-white-50);
+  }
+}
+
+@utility shadow-border-xl {
+  box-shadow: var(--shadow-xl), 0px 0px 0px 1px var(--color-alpha-black-50);
+
+  @variant theme-dark {
+    box-shadow: var(--shadow-xl), 0px 0px 0px 1px var(--color-alpha-white-50);
+  }
+}
+
+@utility border-primary {
+  @apply border-alpha-black-300;
+
+  @variant theme-dark {
+    @apply border-alpha-white-400;
+  }
+}
+
+@utility border-secondary {
+  @apply border-alpha-black-200;
+
+  @variant theme-dark {
+    @apply border-alpha-white-300;
+  }
+}
+
+@utility border-tertiary {
+  @apply border-alpha-black-100;
+
+  @variant theme-dark {
+    @apply border-alpha-white-200;
+  }
+}
+
+@utility border-divider {
+  @apply border-tertiary;
+}
+
+@utility border-subdued {
+  @apply border-alpha-black-50;
+
+  @variant theme-dark {
+    @apply border-alpha-white-100;
+  }
+}
+
+@utility border-solid {
+  @apply border-black;
+
+  @variant theme-dark {
+    @apply border-white;
+  }
+}
+
+@utility border-destructive {
+  @apply border-red-500;
+
+  @variant theme-dark {
+    @apply border-red-400;
+  }
+}
diff --git a/app/assets/tailwind/maybe-design-system/component-utils.css b/app/assets/tailwind/maybe-design-system/component-utils.css
new file mode 100644
index 00000000..597b5092
--- /dev/null
+++ b/app/assets/tailwind/maybe-design-system/component-utils.css
@@ -0,0 +1,109 @@
+/* Button Backgrounds */
+@utility button-bg-primary {
+  @apply bg-gray-900;
+  /* Maps to fg-primary light */
+
+  @variant theme-dark {
+    @apply bg-white;
+    /* Maps to fg-primary dark */
+  }
+}
+
+@utility button-bg-primary-hover {
+  @apply bg-gray-800;
+  /* Maps to fg-primary-variant light */
+
+  @variant theme-dark {
+    @apply bg-gray-50;
+    /* Maps to fg-primary-variant dark */
+  }
+}
+
+@utility button-bg-secondary {
+  @apply bg-gray-50; /* Maps to fg-secondary light */
+
+  @variant theme-dark {
+    @apply bg-gray-700; /* Maps to fg-secondary dark */
+  }
+}
+
+@utility button-bg-secondary-hover {
+  @apply bg-gray-100; /* Maps to fg-secondary-variant light */
+
+  @variant theme-dark {
+    @apply bg-gray-600; /* Maps to fg-secondary-variant dark */
+  }
+}
+
+@utility button-bg-disabled {
+  @apply bg-gray-50;
+
+  @variant theme-dark {
+    @apply bg-gray-700;
+  }
+}
+
+@utility button-bg-destructive {
+  @apply bg-red-500;
+
+  @variant theme-dark {
+    @apply bg-red-400;
+  }
+}
+
+@utility button-bg-destructive-hover {
+  @apply bg-red-600;
+
+  @variant theme-dark {
+    @apply bg-red-500;
+  }
+}
+
+@utility button-bg-ghost-hover {
+  @apply bg-gray-50;
+
+  @variant theme-dark {
+    @apply bg-gray-800 fg-inverse;
+  }
+}
+
+@utility button-bg-outline-hover {
+  @apply bg-gray-100;
+
+  @variant theme-dark {
+    @apply bg-gray-700;
+  }
+}
+
+/* Tab Styles */
+@utility tab-item-active {
+  @apply bg-white;
+
+  @variant theme-dark {
+    @apply bg-gray-700;
+  }
+}
+
+@utility tab-item-hover {
+  @apply bg-gray-200;
+
+  @variant theme-dark {
+    @apply bg-gray-800;
+  }
+}
+
+@utility tab-bg-group {
+  @apply bg-gray-50;
+
+  @variant theme-dark {
+    @apply bg-alpha-black-700;
+  }
+}
+
+@utility bg-nav-indicator {
+  @apply bg-black;
+
+  @variant theme-dark {
+    @apply bg-white;
+  }
+}
\ No newline at end of file
diff --git a/app/assets/tailwind/maybe-design-system/foreground-utils.css b/app/assets/tailwind/maybe-design-system/foreground-utils.css
new file mode 100644
index 00000000..6bc76aa1
--- /dev/null
+++ b/app/assets/tailwind/maybe-design-system/foreground-utils.css
@@ -0,0 +1,63 @@
+@utility fg-gray {
+  @apply text-gray-500;
+
+  @variant theme-dark {
+    @apply text-gray-400;
+  }
+}
+
+@utility fg-contrast {
+  @apply text-gray-400;
+
+  @variant theme-dark {
+    @apply text-gray-500;
+  }
+}
+
+@utility fg-inverse {
+  @apply text-white;
+
+  @variant theme-dark {
+    @apply text-gray-900;
+  }
+}
+
+@utility fg-primary {
+  @apply text-gray-900;
+
+  @variant theme-dark {
+    @apply text-white;
+  }
+}
+
+@utility fg-primary-variant {
+  @apply text-gray-800;
+
+  @variant theme-dark {
+    @apply text-gray-50;
+  }
+}
+
+@utility fg-secondary {
+  @apply text-gray-50;
+
+  @variant theme-dark {
+    @apply text-gray-700;
+  }
+}
+
+@utility fg-secondary-variant {
+  @apply text-gray-100;
+
+  @variant theme-dark {
+    @apply text-gray-600;
+  }
+}
+
+@utility fg-subdued {
+  @apply text-gray-400;
+
+  @variant theme-dark {
+    @apply text-gray-500;
+  }
+}
\ No newline at end of file
diff --git a/app/assets/tailwind/maybe-design-system/text-utils.css b/app/assets/tailwind/maybe-design-system/text-utils.css
new file mode 100644
index 00000000..1a35dfff
--- /dev/null
+++ b/app/assets/tailwind/maybe-design-system/text-utils.css
@@ -0,0 +1,39 @@
+@utility text-primary {
+  @apply text-gray-900;
+
+  @variant theme-dark {
+   @apply text-white;
+  }
+}
+
+@utility text-inverse {
+  @apply text-white;
+
+  @variant theme-dark {
+    @apply text-gray-900;
+  }
+}
+
+@utility text-secondary {
+  @apply text-gray-500;
+
+  @variant theme-dark {
+    @apply text-gray-400;
+  }
+}
+
+@utility text-subdued {
+  @apply text-gray-400;
+
+  @variant theme-dark {
+    @apply text-gray-600;
+  }
+}
+
+@utility text-link {
+  @apply text-blue-600;
+
+  @variant theme-dark {
+    @apply text-blue-500;
+  }
+}
\ No newline at end of file
diff --git a/app/assets/tailwind/simonweb_pickr.css b/app/assets/tailwind/simonweb_pickr.css
new file mode 100644
index 00000000..c99ab696
--- /dev/null
+++ b/app/assets/tailwind/simonweb_pickr.css
@@ -0,0 +1,2 @@
+/*! Pickr 1.9.1 MIT | https://github.com/Simonwep/pickr */
+.pickr{position:relative;overflow:visible;transform:translateY(0)}.pickr *{box-sizing:border-box;outline:none;border:none;-webkit-appearance:none}.pickr .pcr-button{position:relative;height:2em;width:2em;padding:.5em;cursor:pointer;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI","Roboto","Helvetica Neue",Arial,sans-serif;border-radius:.15em;background:url("data:image/svg+xml;utf8, <svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\" stroke=\"%2342445A\" stroke-width=\"5px\" stroke-linecap=\"round\"><path d=\"M45,45L5,5\"></path><path d=\"M45,5L5,45\"></path></svg>") no-repeat center;background-size:0;transition:all .3s}.pickr .pcr-button::before{position:absolute;content:"";top:0;left:0;width:100%;height:100%;background:url("data:image/svg+xml;utf8, <svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 2 2\"><path fill=\"white\" d=\"M1,0H2V1H1V0ZM0,1H1V2H0V1Z\"/><path fill=\"gray\" d=\"M0,0H1V1H0V0ZM1,1H2V2H1V1Z\"/></svg>");background-size:.5em;border-radius:.15em;z-index:-1}.pickr .pcr-button::before{z-index:initial}.pickr .pcr-button::after{position:absolute;content:"";top:0;left:0;height:100%;width:100%;transition:background .3s;background:var(--pcr-color);border-radius:.15em}.pickr .pcr-button.clear{background-size:70%}.pickr .pcr-button.clear::before{opacity:0}.pickr .pcr-button.clear:focus{box-shadow:0 0 0 1px rgba(255,255,255,.85),0 0 0 3px var(--pcr-color)}.pickr .pcr-button.disabled{cursor:not-allowed}.pickr *,.pcr-app *{box-sizing:border-box;outline:none;border:none;-webkit-appearance:none}.pickr input:focus,.pickr input.pcr-active,.pickr button:focus,.pickr button.pcr-active,.pcr-app input:focus,.pcr-app input.pcr-active,.pcr-app button:focus,.pcr-app button.pcr-active{box-shadow:0 0 0 1px rgba(255,255,255,.85),0 0 0 3px var(--pcr-color)}.pickr .pcr-palette,.pickr .pcr-slider,.pcr-app .pcr-palette,.pcr-app .pcr-slider{transition:box-shadow .3s}.pickr .pcr-palette:focus,.pickr .pcr-slider:focus,.pcr-app .pcr-palette:focus,.pcr-app .pcr-slider:focus{box-shadow:0 0 0 1px rgba(255,255,255,.85),0 0 0 3px rgba(0,0,0,.25)}.pcr-app{position:fixed;display:flex;flex-direction:column;z-index:10000;border-radius:.1em;background:#fff;opacity:0;visibility:hidden;transition:opacity .3s,visibility 0s .3s;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI","Roboto","Helvetica Neue",Arial,sans-serif;box-shadow:0 .15em 1.5em 0 rgba(0,0,0,.1),0 0 1em 0 rgba(0,0,0,.03);left:0;top:0}.pcr-app.visible{transition:opacity .3s;visibility:visible;opacity:1}.pcr-app .pcr-swatches{display:flex;flex-wrap:wrap;margin-top:.75em}.pcr-app .pcr-swatches.pcr-last{margin:0}@supports(display: grid){.pcr-app .pcr-swatches{display:grid;align-items:center;grid-template-columns:repeat(auto-fit, 1.75em)}}.pcr-app .pcr-swatches>button{font-size:1em;position:relative;width:calc(1.75em - 5px);height:calc(1.75em - 5px);border-radius:.15em;cursor:pointer;margin:2.5px;flex-shrink:0;justify-self:center;transition:all .15s;overflow:hidden;background:rgba(0,0,0,0);z-index:1}.pcr-app .pcr-swatches>button::before{position:absolute;content:"";top:0;left:0;width:100%;height:100%;background:url("data:image/svg+xml;utf8, <svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 2 2\"><path fill=\"white\" d=\"M1,0H2V1H1V0ZM0,1H1V2H0V1Z\"/><path fill=\"gray\" d=\"M0,0H1V1H0V0ZM1,1H2V2H1V1Z\"/></svg>");background-size:6px;border-radius:.15em;z-index:-1}.pcr-app .pcr-swatches>button::after{content:"";position:absolute;top:0;left:0;width:100%;height:100%;background:var(--pcr-color);border:1px solid rgba(0,0,0,.05);border-radius:.15em;box-sizing:border-box}.pcr-app .pcr-swatches>button:hover{filter:brightness(1.05)}.pcr-app .pcr-swatches>button:not(.pcr-active){box-shadow:none}.pcr-app .pcr-interaction{display:flex;flex-wrap:wrap;align-items:center;margin:0 -0.2em 0 -0.2em}.pcr-app .pcr-interaction>*{margin:0 .2em}.pcr-app .pcr-interaction input{letter-spacing:.07em;font-size:.75em;text-align:center;cursor:pointer;color:#75797e;background:#f1f3f4;border-radius:.15em;transition:all .15s;padding:.45em .5em;margin-top:.75em}.pcr-app .pcr-interaction input:hover{filter:brightness(0.975)}.pcr-app .pcr-interaction input:focus{box-shadow:0 0 0 1px rgba(255,255,255,.85),0 0 0 3px rgba(66,133,244,.75)}.pcr-app .pcr-interaction .pcr-result{color:#75797e;text-align:left;flex:1 1 8em;min-width:8em;transition:all .2s;border-radius:.15em;background:#f1f3f4;cursor:text}.pcr-app .pcr-interaction .pcr-result::-moz-selection{background:#4285f4;color:#fff}.pcr-app .pcr-interaction .pcr-result::selection{background:#4285f4;color:#fff}.pcr-app .pcr-interaction .pcr-type.active{color:#fff;background:#4285f4}.pcr-app .pcr-interaction .pcr-save,.pcr-app .pcr-interaction .pcr-cancel,.pcr-app .pcr-interaction .pcr-clear{color:#fff;width:auto}.pcr-app .pcr-interaction .pcr-save,.pcr-app .pcr-interaction .pcr-cancel,.pcr-app .pcr-interaction .pcr-clear{color:#fff}.pcr-app .pcr-interaction .pcr-save:hover,.pcr-app .pcr-interaction .pcr-cancel:hover,.pcr-app .pcr-interaction .pcr-clear:hover{filter:brightness(0.925)}.pcr-app .pcr-interaction .pcr-save{background:#4285f4}.pcr-app .pcr-interaction .pcr-clear,.pcr-app .pcr-interaction .pcr-cancel{background:#f44250}.pcr-app .pcr-interaction .pcr-clear:focus,.pcr-app .pcr-interaction .pcr-cancel:focus{box-shadow:0 0 0 1px rgba(255,255,255,.85),0 0 0 3px rgba(244,66,80,.75)}.pcr-app .pcr-selection .pcr-picker{position:absolute;height:18px;width:18px;border:2px solid #fff;border-radius:100%;-webkit-user-select:none;-moz-user-select:none;user-select:none}.pcr-app .pcr-selection .pcr-color-palette,.pcr-app .pcr-selection .pcr-color-chooser,.pcr-app .pcr-selection .pcr-color-opacity{position:relative;-webkit-user-select:none;-moz-user-select:none;user-select:none;display:flex;flex-direction:column;cursor:grab;cursor:-webkit-grab}.pcr-app .pcr-selection .pcr-color-palette:active,.pcr-app .pcr-selection .pcr-color-chooser:active,.pcr-app .pcr-selection .pcr-color-opacity:active{cursor:grabbing;cursor:-webkit-grabbing}.pcr-app[data-theme=monolith]{width:14.25em;max-width:95vw;padding:.8em}.pcr-app[data-theme=monolith] .pcr-selection{display:flex;flex-direction:column;justify-content:space-between;flex-grow:1}.pcr-app[data-theme=monolith] .pcr-selection .pcr-color-preview{position:relative;z-index:1;width:100%;height:1em;display:flex;flex-direction:row;justify-content:space-between;margin-bottom:.5em}.pcr-app[data-theme=monolith] .pcr-selection .pcr-color-preview::before{position:absolute;content:"";top:0;left:0;width:100%;height:100%;background:url("data:image/svg+xml;utf8, <svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 2 2\"><path fill=\"white\" d=\"M1,0H2V1H1V0ZM0,1H1V2H0V1Z\"/><path fill=\"gray\" d=\"M0,0H1V1H0V0ZM1,1H2V2H1V1Z\"/></svg>");background-size:.5em;border-radius:.15em;z-index:-1}.pcr-app[data-theme=monolith] .pcr-selection .pcr-color-preview .pcr-last-color{cursor:pointer;transition:background-color .3s,box-shadow .3s;border-radius:.15em 0 0 .15em;z-index:2}.pcr-app[data-theme=monolith] .pcr-selection .pcr-color-preview .pcr-current-color{border-radius:0 .15em .15em 0}.pcr-app[data-theme=monolith] .pcr-selection .pcr-color-preview .pcr-last-color,.pcr-app[data-theme=monolith] .pcr-selection .pcr-color-preview .pcr-current-color{background:var(--pcr-color);width:50%;height:100%}.pcr-app[data-theme=monolith] .pcr-selection .pcr-color-palette{width:100%;height:8em;z-index:1}.pcr-app[data-theme=monolith] .pcr-selection .pcr-color-palette .pcr-palette{border-radius:.15em;width:100%;height:100%}.pcr-app[data-theme=monolith] .pcr-selection .pcr-color-palette .pcr-palette::before{position:absolute;content:"";top:0;left:0;width:100%;height:100%;background:url("data:image/svg+xml;utf8, <svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 2 2\"><path fill=\"white\" d=\"M1,0H2V1H1V0ZM0,1H1V2H0V1Z\"/><path fill=\"gray\" d=\"M0,0H1V1H0V0ZM1,1H2V2H1V1Z\"/></svg>");background-size:.5em;border-radius:.15em;z-index:-1}.pcr-app[data-theme=monolith] .pcr-selection .pcr-color-chooser,.pcr-app[data-theme=monolith] .pcr-selection .pcr-color-opacity{height:.5em;margin-top:.75em}.pcr-app[data-theme=monolith] .pcr-selection .pcr-color-chooser .pcr-picker,.pcr-app[data-theme=monolith] .pcr-selection .pcr-color-opacity .pcr-picker{top:50%;transform:translateY(-50%)}.pcr-app[data-theme=monolith] .pcr-selection .pcr-color-chooser .pcr-slider,.pcr-app[data-theme=monolith] .pcr-selection .pcr-color-opacity .pcr-slider{flex-grow:1;border-radius:50em}.pcr-app[data-theme=monolith] .pcr-selection .pcr-color-chooser .pcr-slider{background:linear-gradient(to right, hsl(0, 100%, 50%), hsl(60, 100%, 50%), hsl(120, 100%, 50%), hsl(180, 100%, 50%), hsl(240, 100%, 50%), hsl(300, 100%, 50%), hsl(0, 100%, 50%))}.pcr-app[data-theme=monolith] .pcr-selection .pcr-color-opacity .pcr-slider{background:linear-gradient(to right, transparent, black),url("data:image/svg+xml;utf8, <svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 2 2\"><path fill=\"white\" d=\"M1,0H2V1H1V0ZM0,1H1V2H0V1Z\"/><path fill=\"gray\" d=\"M0,0H1V1H0V0ZM1,1H2V2H1V1Z\"/></svg>");background-size:100%,.25em}
\ No newline at end of file
diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb
index 0ff5442f..8415947f 100644
--- a/app/channels/application_cable/connection.rb
+++ b/app/channels/application_cable/connection.rb
@@ -1,4 +1,10 @@
 module ApplicationCable
   class Connection < ActionCable::Connection::Base
+    rescue_from StandardError, with: :report_error
+
+    private
+      def report_error(e)
+        Sentry.capture_exception(e)
+      end
   end
 end
diff --git a/app/components/DS/alert.html.erb b/app/components/DS/alert.html.erb
new file mode 100644
index 00000000..e56c9fc4
--- /dev/null
+++ b/app/components/DS/alert.html.erb
@@ -0,0 +1,7 @@
+<div class="<%= container_classes %>">
+  <%= helpers.icon icon_name, size: "sm", color: icon_color, class: "shrink-0" %>
+
+  <div class="flex-1 text-sm">
+    <%= message %>
+  </div>
+</div>
diff --git a/app/components/DS/alert.rb b/app/components/DS/alert.rb
new file mode 100644
index 00000000..22241133
--- /dev/null
+++ b/app/components/DS/alert.rb
@@ -0,0 +1,52 @@
+class DS::Alert < DesignSystemComponent
+  def initialize(message:, variant: :info)
+    @message = message
+    @variant = variant
+  end
+
+  private
+    attr_reader :message, :variant
+
+    def container_classes
+      base_classes = "flex items-start gap-3 p-4 rounded-lg border"
+
+      variant_classes = case variant
+      when :info
+        "bg-blue-50 text-blue-700 border-blue-200 theme-dark:bg-blue-900/20 theme-dark:text-blue-400 theme-dark:border-blue-800"
+      when :success
+        "bg-green-50 text-green-700 border-green-200 theme-dark:bg-green-900/20 theme-dark:text-green-400 theme-dark:border-green-800"
+      when :warning
+        "bg-yellow-50 text-yellow-700 border-yellow-200 theme-dark:bg-yellow-900/20 theme-dark:text-yellow-400 theme-dark:border-yellow-800"
+      when :error, :destructive
+        "bg-red-50 text-red-700 border-red-200 theme-dark:bg-red-900/20 theme-dark:text-red-400 theme-dark:border-red-800"
+      end
+
+      "#{base_classes} #{variant_classes}"
+    end
+
+    def icon_name
+      case variant
+      when :info
+        "info"
+      when :success
+        "check-circle"
+      when :warning
+        "alert-triangle"
+      when :error, :destructive
+        "x-circle"
+      end
+    end
+
+    def icon_color
+      case variant
+      when :success
+        "success"
+      when :warning
+        "warning"
+      when :error, :destructive
+        "destructive"
+      else
+        "blue-600"
+      end
+    end
+end
diff --git a/app/components/DS/button.html.erb b/app/components/DS/button.html.erb
new file mode 100644
index 00000000..0b69c464
--- /dev/null
+++ b/app/components/DS/button.html.erb
@@ -0,0 +1,13 @@
+<%= container do %>
+  <% if icon && (icon_position != :right) %>
+    <%= helpers.icon(icon, size: size, color: icon_color, class: icon_classes) %>
+  <% end %>
+
+  <% unless icon_only? %>
+    <%= text %>
+  <% end %>
+
+  <% if icon && icon_position == :right %>
+    <%= helpers.icon(icon, size: size, color: icon_color) %>
+  <% end %>
+<% end %>
diff --git a/app/components/DS/button.rb b/app/components/DS/button.rb
new file mode 100644
index 00000000..a253c04c
--- /dev/null
+++ b/app/components/DS/button.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# An extension to `button_to` helper.  All options are passed through to the `button_to` helper with some additional
+# options available.
+class DS::Button < DS::Buttonish
+  attr_reader :confirm
+
+  def initialize(confirm: nil, **opts)
+    super(**opts)
+    @confirm = confirm
+  end
+
+  def container(&block)
+    if href.present?
+      button_to(href, **merged_opts, &block)
+    else
+      content_tag(:button, **merged_opts, &block)
+    end
+  end
+
+  private
+    def merged_opts
+      merged_opts = opts.dup || {}
+      extra_classes = merged_opts.delete(:class)
+      href = merged_opts.delete(:href)
+      data = merged_opts.delete(:data) || {}
+
+      if confirm.present?
+        data = data.merge(turbo_confirm: confirm.to_data_attribute)
+      end
+
+      if frame.present?
+        data = data.merge(turbo_frame: frame)
+      end
+
+      merged_opts.merge(
+        class: class_names(container_classes, extra_classes),
+        data: data
+      )
+    end
+end
diff --git a/app/components/DS/buttonish.rb b/app/components/DS/buttonish.rb
new file mode 100644
index 00000000..b83557b1
--- /dev/null
+++ b/app/components/DS/buttonish.rb
@@ -0,0 +1,156 @@
+class DS::Buttonish < DesignSystemComponent
+  VARIANTS = {
+    primary: {
+      container_classes: "text-inverse bg-inverse hover:bg-inverse-hover disabled:bg-gray-500 theme-dark:disabled:bg-gray-400",
+      icon_classes: "fg-inverse"
+    },
+    secondary: {
+      container_classes: "text-primary bg-gray-50 theme-dark:bg-gray-700 hover:bg-gray-100 theme-dark:hover:bg-gray-600 disabled:bg-gray-200 theme-dark:disabled:bg-gray-600",
+      icon_classes: "fg-primary"
+    },
+    destructive: {
+      container_classes: "text-inverse bg-red-500 theme-dark:bg-red-400 hover:bg-red-600 theme-dark:hover:bg-red-500 disabled:bg-red-200 theme-dark:disabled:bg-red-600",
+      icon_classes: "fg-white"
+    },
+    outline: {
+      container_classes: "text-primary border border-secondary bg-transparent hover:bg-surface-hover",
+      icon_classes: "fg-gray"
+    },
+    outline_destructive: {
+      container_classes: "text-destructive border border-secondary bg-transparent hover:bg-gray-100 theme-dark:hover:bg-gray-700",
+      icon_classes: "fg-gray"
+    },
+    ghost: {
+      container_classes: "text-primary bg-transparent hover:bg-gray-100 theme-dark:hover:bg-gray-700",
+      icon_classes: "fg-gray"
+    },
+    icon: {
+      container_classes: "hover:bg-gray-100 theme-dark:hover:bg-gray-700",
+      icon_classes: "fg-gray"
+    },
+    icon_inverse: {
+      container_classes: "bg-inverse hover:bg-inverse-hover",
+      icon_classes: "fg-inverse"
+    }
+  }.freeze
+
+  SIZES = {
+    sm: {
+      container_classes: "px-2 py-1",
+      icon_container_classes: "inline-flex items-center justify-center w-8 h-8",
+      radius_classes: "rounded-md",
+      text_classes: "text-sm"
+    },
+    md: {
+      container_classes: "px-3 py-2",
+      icon_container_classes: "inline-flex items-center justify-center w-9 h-9",
+      radius_classes: "rounded-lg",
+      text_classes: "text-sm"
+    },
+    lg: {
+      container_classes: "px-4 py-3",
+      icon_container_classes: "inline-flex items-center justify-center w-10 h-10",
+      radius_classes: "rounded-xl",
+      text_classes: "text-base"
+    }
+  }.freeze
+
+  attr_reader :variant, :size, :href, :icon, :icon_position, :text, :full_width, :extra_classes, :frame, :opts
+
+  def initialize(variant: :primary, size: :md, href: nil, text: nil, icon: nil, icon_position: :left, full_width: false, frame: nil, **opts)
+    @variant = variant.to_s.underscore.to_sym
+    @size = size.to_sym
+    @href = href
+    @icon = icon
+    @icon_position = icon_position.to_sym
+    @text = text
+    @full_width = full_width
+    @extra_classes = opts.delete(:class)
+    @frame = frame
+    @opts = opts
+  end
+
+  def call
+    raise NotImplementedError, "Buttonish is an abstract class and cannot be instantiated directly."
+  end
+
+  def container_classes(override_classes = nil)
+    class_names(
+      "font-medium whitespace-nowrap",
+      merged_base_classes,
+      full_width ? "w-full justify-center" : nil,
+      container_size_classes,
+      size_data.dig(:text_classes),
+      variant_data.dig(:container_classes)
+    )
+  end
+
+  def container_size_classes
+    icon_only? ? size_data.dig(:icon_container_classes) : size_data.dig(:container_classes)
+  end
+
+  def icon_color
+    # Map variant to icon color for the icon helper
+    case variant
+    when :primary, :icon_inverse
+      :white
+    when :destructive, :outline_destructive
+      :destructive
+    else
+      :default
+    end
+  end
+
+  def icon_classes
+    class_names(
+      variant_data.dig(:icon_classes)
+    )
+  end
+
+  def icon_only?
+    variant.in?([ :icon, :icon_inverse ])
+  end
+
+  private
+    def variant_data
+      self.class::VARIANTS.dig(variant)
+    end
+
+    def size_data
+      self.class::SIZES.dig(size)
+    end
+
+    # Make sure that user can override common classes like `hidden`
+    def merged_base_classes
+      base_display_classes = "inline-flex items-center gap-1"
+      base_radius_classes = size_data.dig(:radius_classes)
+
+      extra_classes_list = (extra_classes || "").split
+
+      has_display_override = extra_classes_list.any? { |c| permitted_display_override_classes.include?(c) }
+      has_radius_override = extra_classes_list.any? { |c| permitted_radius_override_classes.include?(c) }
+
+      base_classes = []
+
+      unless has_display_override
+        base_classes << base_display_classes
+      end
+
+      unless has_radius_override
+        base_classes << base_radius_classes
+      end
+
+      class_names(
+        base_classes,
+        extra_classes
+      )
+    end
+
+    def permitted_radius_override_classes
+      [ "rounded-full" ]
+    end
+
+    def permitted_display_override_classes
+      [ "hidden", "flex" ]
+    end
+end
diff --git a/app/components/DS/dialog.html.erb b/app/components/DS/dialog.html.erb
new file mode 100644
index 00000000..ca8f86b7
--- /dev/null
+++ b/app/components/DS/dialog.html.erb
@@ -0,0 +1,38 @@
+<%= wrapper_element do %>
+  <%= tag.dialog class: "w-full h-full bg-transparent theme-dark:backdrop:bg-alpha-black-900 backdrop:bg-overlay #{drawer? ? "lg:p-3" : "lg:p-1"}", **merged_opts do %>
+    <%= tag.div class: dialog_outer_classes do %>
+      <%= tag.div class: dialog_inner_classes, data: { DS__dialog_target: "content" } do %>
+        <div class="grow overflow-y-auto py-4 space-y-4 flex flex-col">
+          <% if header? %>
+            <%= header %>
+          <% end %>
+
+          <% if body? %>
+            <div class="px-4 grow">
+              <%= body %>
+
+              <% if sections.any? %>
+                <div class="space-y-4">
+                  <% sections.each do |section| %>
+                    <%= section %>
+                  <% end %>
+                </div>
+              <% end %>
+            </div>
+          <% end %>
+
+          <%# Optional, for customizing dialogs %>
+          <%= content %>
+        </div>
+
+        <% if actions? %>
+          <div class="flex items-center gap-2 justify-end p-4">
+            <% actions.each do |action| %>
+              <%= action %>
+            <% end %>
+          </div>
+        <% end %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/components/DS/dialog.rb b/app/components/DS/dialog.rb
new file mode 100644
index 00000000..3385003c
--- /dev/null
+++ b/app/components/DS/dialog.rb
@@ -0,0 +1,115 @@
+class DS::Dialog < DesignSystemComponent
+  renders_one :header, ->(title: nil, subtitle: nil, hide_close_icon: false, **opts, &block) do
+    content_tag(:header, class: "px-4 flex flex-col gap-2", **opts) do
+      title_div = content_tag(:div, class: "flex items-center justify-between gap-2") do
+        title = content_tag(:h2, title, class: class_names("font-medium text-primary", drawer? ? "text-lg" : "")) if title
+        close_icon = render DS::Button.new(variant: "icon", class: "ml-auto", icon: "x", tabindex: "-1", data: { action: "DS--dialog#close" }) unless hide_close_icon
+        safe_join([ title, close_icon ].compact)
+      end
+
+      subtitle = content_tag(:p, subtitle, class: "text-sm text-secondary") if subtitle
+
+      block_content = capture(&block) if block
+
+      safe_join([ title_div, subtitle, block_content ].compact)
+    end
+  end
+
+  renders_one :body
+
+  renders_many :actions, ->(cancel_action: false, **button_opts) do
+    merged_opts = if cancel_action
+      button_opts.merge(type: "button", data: { action: "DS--dialog#close" })
+    else
+      button_opts
+    end
+
+    render DS::Button.new(**merged_opts)
+  end
+
+  renders_many :sections, ->(title:, **disclosure_opts, &block) do
+    render DS::Disclosure.new(title: title, align: :right, **disclosure_opts) do
+      block.call
+    end
+  end
+
+  attr_reader :variant, :auto_open, :reload_on_close, :width, :disable_frame, :opts
+
+  VARIANTS = %w[modal drawer].freeze
+  WIDTHS = {
+    sm: "lg:max-w-[300px]",
+    md: "lg:max-w-[550px]",
+    lg: "lg:max-w-[700px]",
+    full: "lg:max-w-full"
+  }.freeze
+
+  def initialize(variant: "modal", auto_open: true, reload_on_close: false, width: "md", frame: nil, disable_frame: false, **opts)
+    @variant = variant.to_sym
+    @auto_open = auto_open
+    @reload_on_close = reload_on_close
+    @width = width.to_sym
+    @frame = frame
+    @disable_frame = disable_frame
+    @opts = opts
+  end
+
+  def frame
+    @frame || variant
+  end
+
+  # Caller must "opt-out" of using the default turbo-frame based on the variant
+  def wrapper_element(&block)
+    if disable_frame
+      content_tag(:div, &block)
+    else
+      content_tag("turbo-frame", id: frame, &block)
+    end
+  end
+
+  def dialog_outer_classes
+    variant_classes = if drawer?
+      "items-end justify-end"
+    else
+      "items-center justify-center"
+    end
+
+    class_names(
+      "flex h-full w-full",
+      variant_classes
+    )
+  end
+
+  def dialog_inner_classes
+    variant_classes = if drawer?
+      "lg:w-[550px] h-full"
+    else
+      class_names(
+        "max-h-full",
+        WIDTHS[width]
+      )
+    end
+
+    class_names(
+      "flex flex-col bg-container rounded-xl shadow-border-xs mx-3 lg:mx-0 w-full overflow-hidden",
+      variant_classes
+    )
+  end
+
+  def merged_opts
+    merged_opts = opts.dup
+    data = merged_opts.delete(:data) || {}
+
+    data[:controller] = [ "DS--dialog", "hotkey", data[:controller] ].compact.join(" ")
+    data[:DS__dialog_auto_open_value] = auto_open
+    data[:DS__dialog_reload_on_close_value] = reload_on_close
+    data[:action] = [ "mousedown->DS--dialog#clickOutside", data[:action] ].compact.join(" ")
+    data[:hotkey] = "esc:DS--dialog#close"
+    merged_opts[:data] = data
+
+    merged_opts
+  end
+
+  def drawer?
+    variant == :drawer
+  end
+end
diff --git a/app/components/DS/dialog_controller.js b/app/components/DS/dialog_controller.js
new file mode 100644
index 00000000..8d746ad9
--- /dev/null
+++ b/app/components/DS/dialog_controller.js
@@ -0,0 +1,33 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="dialog"
+export default class extends Controller {
+  static targets = ["content"]
+
+  static values = {
+    autoOpen: { type: Boolean, default: false },
+    reloadOnClose: { type: Boolean, default: false },
+  };
+
+  connect() {
+    if (this.element.open) return;
+    if (this.autoOpenValue) {
+      this.element.showModal();
+    }
+  }
+  
+  // If the user clicks anywhere outside of the visible content, close the dialog
+  clickOutside(e) {
+    if (!this.contentTarget.contains(e.target)) {
+      this.close();
+    }
+  }
+
+  close() {
+    this.element.close();
+
+    if (this.reloadOnCloseValue) {
+      Turbo.visit(window.location.href);
+    }
+  }
+}
diff --git a/app/components/DS/disclosure.html.erb b/app/components/DS/disclosure.html.erb
new file mode 100644
index 00000000..bf6f61d1
--- /dev/null
+++ b/app/components/DS/disclosure.html.erb
@@ -0,0 +1,27 @@
+<details class="group" <%= "open" if open %>>
+  <%= tag.summary class: class_names(
+    "px-3 py-2 rounded-xl cursor-pointer flex items-center justify-between bg-surface"
+  ) do %>
+    <% if summary_content? %>
+      <%= summary_content %>
+    <% else %>
+      <div class="flex items-center gap-3">
+        <% if align == :left %>
+          <%= helpers.icon "chevron-right", class: "group-open:transform group-open:rotate-90" %>
+        <% end %>
+
+        <%= tag.span class: class_names("font-medium", align == :left ? "text-sm text-primary" : "text-xs uppercase text-secondary") do %>
+          <%= title %>
+        <% end %>
+      </div>
+
+      <% if align == :right %>
+        <%= helpers.icon "chevron-down", class: "group-open:transform group-open:rotate-180" %>
+      <% end %>
+    <% end %>
+  <% end %>
+
+  <div class="mt-2">
+    <%= content %>
+  </div>
+</details>
diff --git a/app/components/DS/disclosure.rb b/app/components/DS/disclosure.rb
new file mode 100644
index 00000000..d301d671
--- /dev/null
+++ b/app/components/DS/disclosure.rb
@@ -0,0 +1,12 @@
+class DS::Disclosure < DesignSystemComponent
+  renders_one :summary_content
+
+  attr_reader :title, :align, :open, :opts
+
+  def initialize(title: nil, align: "right", open: false, **opts)
+    @title = title
+    @align = align.to_sym
+    @open = open
+    @opts = opts
+  end
+end
diff --git a/app/components/DS/filled_icon.html.erb b/app/components/DS/filled_icon.html.erb
new file mode 100644
index 00000000..49adba9e
--- /dev/null
+++ b/app/components/DS/filled_icon.html.erb
@@ -0,0 +1,8 @@
+<%= tag.div style: transparent? ? container_styles : nil,
+            class: container_classes do %>
+  <% if icon %>
+    <%= helpers.icon(icon, size: icon_size, color: "current") %>
+  <% elsif text %>
+    <%= tag.span text.first, class: text_classes %>
+  <% end %>
+<% end %>
diff --git a/app/components/DS/filled_icon.rb b/app/components/DS/filled_icon.rb
new file mode 100644
index 00000000..73113a0b
--- /dev/null
+++ b/app/components/DS/filled_icon.rb
@@ -0,0 +1,99 @@
+class DS::FilledIcon < DesignSystemComponent
+  attr_reader :icon, :text, :hex_color, :size, :rounded, :variant
+
+  VARIANTS = %i[default text surface container inverse].freeze
+
+  SIZES = {
+    sm: {
+      container_size: "w-6 h-6",
+      container_radius: "rounded-md",
+      icon_size: "sm",
+      text_size: "text-xs"
+    },
+    md: {
+      container_size: "w-8 h-8",
+      container_radius: "rounded-lg",
+      icon_size: "md",
+      text_size: "text-xs"
+    },
+    lg: {
+      container_size: "w-9 h-9",
+      container_radius: "rounded-xl",
+      icon_size: "lg",
+      text_size: "text-sm"
+    }
+  }.freeze
+
+  def initialize(variant: :default, icon: nil, text: nil, hex_color: nil, size: "md", rounded: false)
+    @variant = variant.to_sym
+    @icon = icon
+    @text = text
+    @hex_color = hex_color
+    @size = size.to_sym
+    @rounded = rounded
+  end
+
+  def container_classes
+    class_names(
+      "flex justify-center items-center shrink-0",
+      size_classes,
+      radius_classes,
+      transparent? ? "border" : solid_bg_class
+    )
+  end
+
+  def icon_size
+    SIZES[size][:icon_size]
+  end
+
+  def text_classes
+    class_names(
+      "text-center font-medium uppercase",
+      SIZES[size][:text_size]
+    )
+  end
+
+  def container_styles
+    <<~STYLE.strip
+      background-color: #{transparent_bg_color};
+      border-color: #{transparent_border_color};
+      color: #{custom_fg_color};
+    STYLE
+  end
+
+  def transparent?
+    variant.in?(%i[default text])
+  end
+
+  private
+    def solid_bg_class
+      case variant
+      when :surface
+        "bg-surface-inset"
+      when :container
+        "bg-container-inset"
+      when :inverse
+        "bg-container"
+      end
+    end
+
+    def size_classes
+      SIZES[size][:container_size]
+    end
+
+    def radius_classes
+      rounded ? "rounded-full" : SIZES[size][:container_radius]
+    end
+
+    def custom_fg_color
+      hex_color || "var(--color-gray-500)"
+    end
+
+    def transparent_bg_color
+      "color-mix(in oklab, #{custom_fg_color} 10%, transparent)"
+    end
+
+    def transparent_border_color
+      "color-mix(in oklab, #{custom_fg_color} 10%, transparent)"
+    end
+end
diff --git a/app/components/DS/link.html.erb b/app/components/DS/link.html.erb
new file mode 100644
index 00000000..dae100ea
--- /dev/null
+++ b/app/components/DS/link.html.erb
@@ -0,0 +1,13 @@
+<%= link_to href, **merged_opts do %>
+  <% if icon && (icon_position != "right") %>
+    <%= helpers.icon(icon, size: size, color: icon_color) %>
+  <% end %>
+
+  <% unless icon_only? %>
+    <%= text %>
+  <% end %>
+
+  <% if icon && icon_position == "right" %>
+    <%= helpers.icon(icon, size: size, color: icon_color) %>
+  <% end %>
+<% end %>
diff --git a/app/components/DS/link.rb b/app/components/DS/link.rb
new file mode 100644
index 00000000..209f86b0
--- /dev/null
+++ b/app/components/DS/link.rb
@@ -0,0 +1,31 @@
+# An extension to `link_to` helper.  All options are passed through to the `link_to` helper with some additional
+# options available.
+class DS::Link < DS::Buttonish
+  attr_reader :frame
+
+  VARIANTS = VARIANTS.reverse_merge(
+    default: {
+      container_classes: "",
+      icon_classes: "fg-gray"
+    }
+  ).freeze
+
+  def merged_opts
+    merged_opts = opts.dup || {}
+    data = merged_opts.delete(:data) || {}
+
+    if frame
+      data = data.merge(turbo_frame: frame)
+    end
+
+    merged_opts.merge(
+      class: class_names(container_classes, extra_classes),
+      data: data
+    )
+  end
+
+  private
+    def container_size_classes
+      super unless variant == :default
+    end
+end
diff --git a/app/components/DS/menu.html.erb b/app/components/DS/menu.html.erb
new file mode 100644
index 00000000..d4f0ea8d
--- /dev/null
+++ b/app/components/DS/menu.html.erb
@@ -0,0 +1,27 @@
+<%= tag.div data: { controller: "DS--menu", DS__menu_placement_value: placement, DS__menu_offset_value: offset, testid: testid } do %>
+  <% if variant == :icon %>
+    <%= render DS::Button.new(variant: "icon", icon: icon_vertical ? "more-vertical" : "more-horizontal", data: { DS__menu_target: "button" }) %>
+  <% elsif variant == :button %>
+    <%= button %>
+  <% elsif variant == :avatar %>
+    <button data-DS--menu-target="button">
+      <div class="w-9 h-9 cursor-pointer">
+        <%= render "settings/user_avatar", avatar_url: avatar_url, initials: initials %>
+      </div>
+    </button>
+  <% end %>
+
+  <div data-DS--menu-target="content" class="px-2 lg:px-0 max-w-full hidden z-50">
+    <div class="mx-auto min-w-[200px] shadow-border-xs bg-container rounded-lg">
+      <%= header %>
+
+      <%= tag.div class: class_names("py-1" => !no_padding) do %>
+        <% items.each do |item| %>
+          <%= item %>
+        <% end %>
+
+        <%= custom_content %>
+      <% end %>
+    </div>
+  </div>
+<% end %>
diff --git a/app/components/DS/menu.rb b/app/components/DS/menu.rb
new file mode 100644
index 00000000..39ef35e9
--- /dev/null
+++ b/app/components/DS/menu.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+class DS::Menu < DesignSystemComponent
+  attr_reader :variant, :avatar_url, :initials, :placement, :offset, :icon_vertical, :no_padding, :testid
+
+  renders_one :button, ->(**button_options, &block) do
+    options_with_target = button_options.merge(data: { DS__menu_target: "button" })
+
+    if block
+      content_tag(:button, **options_with_target, &block)
+    else
+      DS::Button.new(**options_with_target)
+    end
+  end
+
+  renders_one :header, ->(&block) do
+    content_tag(:div, class: "border-b border-tertiary", &block)
+  end
+
+  renders_one :custom_content
+
+  renders_many :items, DS::MenuItem
+
+  VARIANTS = %i[icon button avatar].freeze
+
+  def initialize(variant: "icon", avatar_url: nil, initials: nil, placement: "bottom-end", offset: 12, icon_vertical: false, no_padding: false, testid: nil)
+    @variant = variant.to_sym
+    @avatar_url = avatar_url
+    @initials = initials
+    @placement = placement
+    @offset = offset
+    @icon_vertical = icon_vertical
+    @no_padding = no_padding
+    @testid = testid
+
+    raise ArgumentError, "Invalid variant: #{@variant}" unless VARIANTS.include?(@variant)
+  end
+end
diff --git a/app/javascript/controllers/menu_controller.js b/app/components/DS/menu_controller.js
similarity index 81%
rename from app/javascript/controllers/menu_controller.js
rename to app/components/DS/menu_controller.js
index 3107a206..d5cfec2b 100644
--- a/app/javascript/controllers/menu_controller.js
+++ b/app/components/DS/menu_controller.js
@@ -1,5 +1,11 @@
+import {
+  autoUpdate,
+  computePosition,
+  flip,
+  offset,
+  shift,
+} from "@floating-ui/dom";
 import { Controller } from "@hotwired/stimulus";
-import { computePosition, flip, shift, offset, autoUpdate } from '@floating-ui/dom';
 
 /**
  * A "menu" can contain arbitrary content including non-clickable items, links, buttons, and forms.
@@ -70,8 +76,10 @@ export default class extends Controller {
   }
 
   focusFirstElement() {
-    const focusableElements = 'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])';
-    const firstFocusableElement = this.contentTarget.querySelectorAll(focusableElements)[0];
+    const focusableElements =
+      'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])';
+    const firstFocusableElement =
+      this.contentTarget.querySelectorAll(focusableElements)[0];
     if (firstFocusableElement) {
       firstFocusableElement.focus();
     }
@@ -79,7 +87,11 @@ export default class extends Controller {
 
   startAutoUpdate() {
     if (!this._cleanup) {
-      this._cleanup = autoUpdate(this.buttonTarget, this.contentTarget, this.boundUpdate);
+      this._cleanup = autoUpdate(
+        this.buttonTarget,
+        this.contentTarget,
+        this.boundUpdate,
+      );
     }
   }
 
@@ -93,14 +105,10 @@ export default class extends Controller {
   update() {
     computePosition(this.buttonTarget, this.contentTarget, {
       placement: this.placementValue,
-      middleware: [
-        offset(this.offsetValue),
-        flip(),
-        shift({ padding: 5 })
-      ],
+      middleware: [offset(this.offsetValue), flip(), shift({ padding: 5 })],
     }).then(({ x, y }) => {
       Object.assign(this.contentTarget.style, {
-        position: 'fixed',
+        position: "fixed",
         left: `${x}px`,
         top: `${y}px`,
       });
diff --git a/app/components/DS/menu_item.html.erb b/app/components/DS/menu_item.html.erb
new file mode 100644
index 00000000..cb71dc6d
--- /dev/null
+++ b/app/components/DS/menu_item.html.erb
@@ -0,0 +1,12 @@
+<% if variant == :divider %>
+  <%= render "shared/ruler", classes: "my-1" %>
+<% else %>
+  <div class="px-1">
+    <%= wrapper do %>
+      <% if icon %>
+        <%= helpers.icon(icon, color: destructive? ? :destructive : :default) %>
+      <% end %>
+      <%= tag.span(text, class: text_classes) %>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/components/DS/menu_item.rb b/app/components/DS/menu_item.rb
new file mode 100644
index 00000000..5b099e7a
--- /dev/null
+++ b/app/components/DS/menu_item.rb
@@ -0,0 +1,62 @@
+class DS::MenuItem < DesignSystemComponent
+  VARIANTS = %i[link button divider].freeze
+
+  attr_reader :variant, :text, :icon, :href, :method, :destructive, :confirm, :frame, :opts
+
+  def initialize(variant:, text: nil, icon: nil, href: nil, method: :post, destructive: false, confirm: nil, frame: nil, **opts)
+    @variant = variant.to_sym
+    @text = text
+    @icon = icon
+    @href = href
+    @method = method.to_sym
+    @destructive = destructive
+    @confirm = confirm
+    @frame = frame
+    @opts = opts
+    raise ArgumentError, "Invalid variant: #{@variant}" unless VARIANTS.include?(@variant)
+  end
+
+  def wrapper(&block)
+    if variant == :button
+      button_to href, method: method, class: container_classes, **merged_opts, &block
+    elsif variant == :link
+      link_to href, class: container_classes, **merged_opts, &block
+    else
+      nil
+    end
+  end
+
+  def text_classes
+    [
+      "text-sm",
+      destructive? ? "text-destructive" : "text-primary"
+    ].join(" ")
+  end
+
+  def destructive?
+    method == :delete || destructive
+  end
+
+  private
+    def container_classes
+      [
+        "flex items-center gap-2 p-2 rounded-md w-full",
+        destructive? ? "hover:bg-red-tint-5 theme-dark:hover:bg-red-tint-10" : "hover:bg-container-hover"
+      ].join(" ")
+    end
+
+    def merged_opts
+      merged_opts = opts.dup || {}
+      data = merged_opts.delete(:data) || {}
+
+      if confirm.present?
+        data = data.merge(turbo_confirm: confirm.to_data_attribute)
+      end
+
+      if frame.present?
+        data = data.merge(turbo_frame: frame)
+      end
+
+      merged_opts.merge(data: data)
+    end
+end
diff --git a/app/components/DS/tab.rb b/app/components/DS/tab.rb
new file mode 100644
index 00000000..d1e7e7a9
--- /dev/null
+++ b/app/components/DS/tab.rb
@@ -0,0 +1,12 @@
+class DS::Tab < DesignSystemComponent
+  attr_reader :id, :label
+
+  def initialize(id:, label:)
+    @id = id
+    @label = label
+  end
+
+  def call
+    content
+  end
+end
diff --git a/app/components/DS/tabs.html.erb b/app/components/DS/tabs.html.erb
new file mode 100644
index 00000000..78ca02dd
--- /dev/null
+++ b/app/components/DS/tabs.html.erb
@@ -0,0 +1,18 @@
+<%= tag.div data: {
+  controller: "DS--tabs",
+  testid: testid,
+  DS__tabs_session_key_value: session_key,
+  DS__tabs_url_param_key_value: url_param_key,
+  DS__tabs_nav_btn_active_class: active_btn_classes,
+  DS__tabs_nav_btn_inactive_class: inactive_btn_classes
+} do %>
+  <% if unstyled? %>
+    <%= content %>
+  <% else %>
+    <%= nav %>
+
+    <% panels.each do |panel| %>
+      <%= panel %>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/components/DS/tabs.rb b/app/components/DS/tabs.rb
new file mode 100644
index 00000000..a2c0ff95
--- /dev/null
+++ b/app/components/DS/tabs.rb
@@ -0,0 +1,66 @@
+class DS::Tabs < DesignSystemComponent
+  renders_one :nav, ->(classes: nil) do
+    DS::Tabs::Nav.new(
+      active_tab: active_tab,
+      active_btn_classes: active_btn_classes,
+      inactive_btn_classes: inactive_btn_classes,
+      btn_classes: base_btn_classes,
+      classes: unstyled? ? classes : class_names(nav_container_classes, classes)
+    )
+  end
+
+  renders_many :panels, ->(tab_id:, &block) do
+    content_tag(
+      :div,
+      class: ("hidden" unless tab_id == active_tab),
+      data: { id: tab_id, DS__tabs_target: "panel" },
+      &block
+    )
+  end
+
+  VARIANTS = {
+    default: {
+      active_btn_classes: "bg-white theme-dark:bg-gray-700 text-primary shadow-sm",
+      inactive_btn_classes: "text-secondary hover:bg-surface-inset-hover",
+      base_btn_classes: "w-full inline-flex justify-center items-center text-sm font-medium px-2 py-1 rounded-md transition-colors duration-200",
+      nav_container_classes: "flex bg-surface-inset p-1 rounded-lg mb-4"
+    }
+  }
+
+  attr_reader :active_tab, :url_param_key, :session_key, :variant, :testid
+
+  def initialize(active_tab:, url_param_key: nil, session_key: nil, variant: :default, active_btn_classes: "", inactive_btn_classes: "", testid: nil)
+    @active_tab = active_tab
+    @url_param_key = url_param_key
+    @session_key = session_key
+    @variant = variant.to_sym
+    @active_btn_classes = active_btn_classes
+    @inactive_btn_classes = inactive_btn_classes
+    @testid = testid
+  end
+
+  def active_btn_classes
+    unstyled? ? @active_btn_classes : VARIANTS.dig(variant, :active_btn_classes)
+  end
+
+  def inactive_btn_classes
+    unstyled? ? @inactive_btn_classes : VARIANTS.dig(variant, :inactive_btn_classes)
+  end
+
+  private
+    def unstyled?
+      variant == :unstyled
+    end
+
+    def base_btn_classes
+      unless unstyled?
+        VARIANTS.dig(variant, :base_btn_classes)
+      end
+    end
+
+    def nav_container_classes
+      unless unstyled?
+        VARIANTS.dig(variant, :nav_container_classes)
+      end
+    end
+end
diff --git a/app/components/DS/tabs/nav.rb b/app/components/DS/tabs/nav.rb
new file mode 100644
index 00000000..8e795588
--- /dev/null
+++ b/app/components/DS/tabs/nav.rb
@@ -0,0 +1,29 @@
+class DS::Tabs::Nav < DesignSystemComponent
+  erb_template <<~ERB
+    <%= tag.nav class: classes do %>
+      <% btns.each do |btn| %>
+        <%= btn %>
+      <% end %>
+    <% end %>
+  ERB
+
+  renders_many :btns, ->(id:, label:, classes: nil, &block) do
+    content_tag(
+      :button, label, id: id,
+      type: "button",
+      class: class_names(btn_classes, id == active_tab ? active_btn_classes : inactive_btn_classes, classes),
+      data: { id: id, action: "DS--tabs#show", DS__tabs_target: "navBtn" },
+      &block
+    )
+  end
+
+  attr_reader :active_tab, :classes, :active_btn_classes, :inactive_btn_classes, :btn_classes
+
+  def initialize(active_tab:, classes: nil, active_btn_classes: nil, inactive_btn_classes: nil, btn_classes: nil)
+    @active_tab = active_tab
+    @classes = classes
+    @active_btn_classes = active_btn_classes
+    @inactive_btn_classes = inactive_btn_classes
+    @btn_classes = btn_classes
+  end
+end
diff --git a/app/components/DS/tabs/panel.rb b/app/components/DS/tabs/panel.rb
new file mode 100644
index 00000000..f354e312
--- /dev/null
+++ b/app/components/DS/tabs/panel.rb
@@ -0,0 +1,11 @@
+class DS::Tabs::Panel < DesignSystemComponent
+  attr_reader :tab_id
+
+  def initialize(tab_id:)
+    @tab_id = tab_id
+  end
+
+  def call
+    content
+  end
+end
diff --git a/app/components/DS/tabs_controller.js b/app/components/DS/tabs_controller.js
new file mode 100644
index 00000000..259765aa
--- /dev/null
+++ b/app/components/DS/tabs_controller.js
@@ -0,0 +1,57 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="tabs--components"
+export default class extends Controller {
+  static classes = ["navBtnActive", "navBtnInactive"];
+  static targets = ["panel", "navBtn"];
+  static values = { sessionKey: String, urlParamKey: String };
+
+  show(e) {
+    const btn = e.target.closest("button");
+    const selectedTabId = btn.dataset.id;
+
+    this.navBtnTargets.forEach((navBtn) => {
+      if (navBtn.dataset.id === selectedTabId) {
+        navBtn.classList.add(...this.navBtnActiveClasses);
+        navBtn.classList.remove(...this.navBtnInactiveClasses);
+      } else {
+        navBtn.classList.add(...this.navBtnInactiveClasses);
+        navBtn.classList.remove(...this.navBtnActiveClasses);
+      }
+    });
+
+    this.panelTargets.forEach((panel) => {
+      if (panel.dataset.id === selectedTabId) {
+        panel.classList.remove("hidden");
+      } else {
+        panel.classList.add("hidden");
+      }
+    });
+
+    if (this.urlParamKeyValue) {
+      const url = new URL(window.location.href);
+      url.searchParams.set(this.urlParamKeyValue, selectedTabId);
+      window.history.replaceState({}, "", url);
+    }
+
+    // Update URL with the selected tab
+    if (this.sessionKeyValue) {
+      this.#updateSessionPreference(selectedTabId);
+    }
+  } 
+
+  #updateSessionPreference(selectedTabId) {
+    fetch("/current_session", {
+      method: "PUT",
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded",
+        "X-CSRF-Token": document.querySelector('[name="csrf-token"]').content,
+        Accept: "application/json",
+      },
+      body: new URLSearchParams({
+        "current_session[tab_key]": this.sessionKeyValue,
+        "current_session[tab_value]": selectedTabId,
+      }).toString(),
+    });
+  }
+}
diff --git a/app/components/DS/toggle.html.erb b/app/components/DS/toggle.html.erb
new file mode 100644
index 00000000..6845686c
--- /dev/null
+++ b/app/components/DS/toggle.html.erb
@@ -0,0 +1,5 @@
+<div class="relative inline-block select-none">
+  <%= hidden_field_tag name, unchecked_value, id: nil %>
+  <%= check_box_tag name, checked_value, checked, class: "sr-only peer", disabled: disabled, id: id, **opts %>
+  <%= label_tag name, "&nbsp;".html_safe, class: label_classes, for: id %>
+</div>
diff --git a/app/components/DS/toggle.rb b/app/components/DS/toggle.rb
new file mode 100644
index 00000000..c384a296
--- /dev/null
+++ b/app/components/DS/toggle.rb
@@ -0,0 +1,26 @@
+class DS::Toggle < DesignSystemComponent
+  attr_reader :id, :name, :checked, :disabled, :checked_value, :unchecked_value, :opts
+
+  def initialize(id:, name: nil, checked: false, disabled: false, checked_value: "1", unchecked_value: "0", **opts)
+    @id = id
+    @name = name
+    @checked = checked
+    @disabled = disabled
+    @checked_value = checked_value
+    @unchecked_value = unchecked_value
+    @opts = opts
+  end
+
+  def label_classes
+    class_names(
+       "block w-9 h-5 cursor-pointer",
+       "rounded-full bg-gray-100 theme-dark:bg-gray-700",
+       "transition-colors duration-300",
+       "after:content-[''] after:block after:bg-white after:absolute after:rounded-full",
+       "after:top-0.5 after:left-0.5 after:w-4 after:h-4",
+       "after:transition-transform after:duration-300 after:ease-in-out",
+       "peer-checked:bg-green-600 peer-checked:after:translate-x-4",
+       "peer-disabled:opacity-70 peer-disabled:cursor-not-allowed"
+    )
+  end
+end
diff --git a/app/components/DS/tooltip.html.erb b/app/components/DS/tooltip.html.erb
new file mode 100644
index 00000000..3bd7a1ba
--- /dev/null
+++ b/app/components/DS/tooltip.html.erb
@@ -0,0 +1,9 @@
+<span data-controller="DS--tooltip" data-DS--tooltip-placement-value="<%= placement %>" data-DS--tooltip-offset-value="<%= offset %>" data-DS--tooltip-cross-axis-value="<%= cross_axis %>" class="inline-flex">
+  <%= helpers.icon icon_name, size: size, color: color %>
+
+  <div role="tooltip" data-DS--tooltip-target="tooltip" class="hidden absolute z-50 bg-gray-700 text-sm px-1.5 py-1 rounded-md">
+    <div class="fg-inverse font-normal max-w-[200px]">
+      <%= tooltip_content %>
+    </div>
+  </div>
+</span>
diff --git a/app/components/DS/tooltip.rb b/app/components/DS/tooltip.rb
new file mode 100644
index 00000000..7189c4f3
--- /dev/null
+++ b/app/components/DS/tooltip.rb
@@ -0,0 +1,17 @@
+class DS::Tooltip < ApplicationComponent
+  attr_reader :placement, :offset, :cross_axis, :icon_name, :size, :color
+
+  def initialize(text: nil, placement: "top", offset: 10, cross_axis: 0, icon: "info", size: "sm", color: "default")
+    @text = text
+    @placement = placement
+    @offset = offset
+    @cross_axis = cross_axis
+    @icon_name = icon
+    @size = size
+    @color = color
+  end
+
+  def tooltip_content
+    content? ? content : @text
+  end
+end
diff --git a/app/components/DS/tooltip_controller.js b/app/components/DS/tooltip_controller.js
new file mode 100644
index 00000000..8f198bae
--- /dev/null
+++ b/app/components/DS/tooltip_controller.js
@@ -0,0 +1,87 @@
+import {
+  autoUpdate,
+  computePosition,
+  flip,
+  offset,
+  shift,
+} from "@floating-ui/dom";
+import { Controller } from "@hotwired/stimulus";
+
+export default class extends Controller {
+  static targets = ["tooltip"];
+  static values = {
+    placement: { type: String, default: "top" },
+    offset: { type: Number, default: 10 },
+    crossAxis: { type: Number, default: 0 },
+  };
+
+  connect() {
+    this._cleanup = null;
+    this.boundUpdate = this.update.bind(this);
+    this.addEventListeners();
+  }
+
+  disconnect() {
+    this.removeEventListeners();
+    this.stopAutoUpdate();
+  }
+
+  addEventListeners() {
+    this.element.addEventListener("mouseenter", this.show);
+    this.element.addEventListener("mouseleave", this.hide);
+  }
+
+  removeEventListeners() {
+    this.element.removeEventListener("mouseenter", this.show);
+    this.element.removeEventListener("mouseleave", this.hide);
+  }
+
+  show = () => {
+    this.tooltipTarget.classList.remove("hidden");
+    this.startAutoUpdate();
+    this.update();
+  };
+
+  hide = () => {
+    this.tooltipTarget.classList.add("hidden");
+    this.stopAutoUpdate();
+  };
+
+  startAutoUpdate() {
+    if (!this._cleanup) {
+      const reference = this.element.querySelector("[data-icon]");
+      this._cleanup = autoUpdate(
+        reference || this.element,
+        this.tooltipTarget,
+        this.boundUpdate
+      );
+    }
+  }
+
+  stopAutoUpdate() {
+    if (this._cleanup) {
+      this._cleanup();
+      this._cleanup = null;
+    }
+  }
+
+  update() {
+    const reference = this.element.querySelector("[data-icon]");
+    computePosition(reference || this.element, this.tooltipTarget, {
+      placement: this.placementValue,
+      middleware: [
+        offset({
+          mainAxis: this.offsetValue,
+          crossAxis: this.crossAxisValue,
+        }),
+        flip(),
+        shift({ padding: 5 }),
+      ],
+    }).then(({ x, y }) => {
+      Object.assign(this.tooltipTarget.style, {
+        left: `${x}px`,
+        top: `${y}px`,
+      });
+    });
+  }
+}
\ No newline at end of file
diff --git a/app/components/UI/account/activity_date.html.erb b/app/components/UI/account/activity_date.html.erb
new file mode 100644
index 00000000..0d7f5057
--- /dev/null
+++ b/app/components/UI/account/activity_date.html.erb
@@ -0,0 +1,103 @@
+<%= tag.div id: id, data: { bulk_select_target: "group" }, class: "bg-container-inset rounded-xl p-1 w-full" do %>
+  <details class="group">
+    <summary>
+      <div class="py-2 px-4 flex items-center justify-between font-medium text-xs text-secondary">
+        <div class="flex pl-0.5 items-center gap-4">
+          <%= check_box_tag "#{date}_entries_selection",
+                          class: ["checkbox checkbox--light", "hidden": entries.size == 0],
+                          id: "selection_entry_#{date}",
+                          data: { action: "bulk-select#toggleGroupSelection" } %>
+
+          <p class="uppercase space-x-1.5">
+            <%= tag.span I18n.l(date, format: :long) %>
+            <span>&middot;</span>
+            <%= tag.span entries.size %>
+          </p>
+        </div>
+
+        <div class="flex items-center gap-4">
+          <div class="flex items-center gap-2">
+            <span class="font-medium"><%= balance_trend.current.format %></span>
+            <%= render DS::Tooltip.new(text: "The end of day balance, after all transactions and adjustments", placement: "left", size: "sm") %>
+          </div>
+          <%= helpers.icon "chevron-down", class: "group-open:rotate-180" %>
+        </div>
+      </div>
+    </summary>
+
+    <div class="p-4 space-y-3">
+      <dl class="flex gap-4 items-center text-sm text-primary">
+        <dt class="flex items-center gap-2">
+          Start of day balance
+          <%= render DS::Tooltip.new(text: "The account balance at the beginning of this day, before any transactions or value changes", placement: "left", size: "sm") %>
+        </dt>
+        <hr class="grow border-dashed border-secondary">
+        <dd class="font-bold"><%= start_balance_money.format %></dd>
+      </dl>
+
+      <% if account.balance_type == :investment %>
+        <dl class="flex gap-4 items-center text-sm text-primary">
+          <dt class="flex items-center gap-2">
+            &#916; Cash
+            <%= render DS::Tooltip.new(text: "Net change in cash from deposits, withdrawals, and other cash transactions during the day", placement: "left", size: "sm") %>
+          </dt>
+          <hr class="grow border-dashed border-secondary">
+          <dd><%= cash_change_money.format %></dd>
+        </dl>
+
+        <dl class="flex gap-4 items-center text-sm text-primary">
+          <dt class="flex items-center gap-2">
+            &#916; Holdings
+            <%= render DS::Tooltip.new(text: "Net change in investment holdings value from buying, selling, or market price movements", placement: "left", size: "sm") %>
+          </dt>
+          <hr class="grow border-dashed border-secondary">
+          <dd><%= holdings_change_money.format %></dd>
+        </dl>
+      <% else %>
+        <dl class="flex gap-4 items-center text-sm text-primary">
+          <dt class="flex items-center gap-2">
+            &#916; Cash
+            <%= render DS::Tooltip.new(text: "Net change in cash balance from all transactions during the day", placement: "left", size: "sm") %>
+          </dt>
+          <hr class="grow border-dashed border-secondary">
+          <dd><%= cash_change_money.format %></dd>
+        </dl>
+      <% end %>
+
+      <dl class="flex gap-4 items-center text-sm text-primary">
+        <dt class="flex items-center gap-2">
+          End of day balance
+          <%= render DS::Tooltip.new(text: "The calculated balance after all transactions but before any manual adjustments or reconciliations", placement: "left", size: "sm") %>
+        </dt>
+        <hr class="grow border-dashed border-secondary">
+        <dd class="font-medium"><%= end_balance_before_adjustments_money.format %></dd>
+      </dl>
+
+      <hr class="border border-primary">
+
+      <dl class="flex gap-4 items-center text-sm text-primary">
+        <dt class="flex items-center gap-2">
+          &#916; Value adjustments
+          <%= render DS::Tooltip.new(text: "Adjustments are either manual reconciliations made by the user or adjustments due to market price changes throughout the day", placement: "left", size: "sm") %>
+        </dt>
+        <hr class="grow border-dashed border-secondary">
+        <dd><%= adjustments_money.format %></dd>
+      </dl>
+
+      <dl class="flex gap-4 items-center text-sm text-primary">
+        <dt class="flex items-center gap-2">
+          Closing balance
+          <%= render DS::Tooltip.new(text: "The final account balance for the day, after all transactions and adjustments have been applied", placement: "left", size: "sm") %>
+        </dt>
+        <hr class="grow border-dashed border-primary">
+        <dd class="font-bold"><%= end_balance_money.format %></dd>
+      </dl>
+    </div>
+  </details>
+
+  <div class="bg-container shadow-border-xs rounded-lg">
+    <% entries.each do |entry| %>
+      <%= render entry, view_ctx: "account" %>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/components/UI/account/activity_date.rb b/app/components/UI/account/activity_date.rb
new file mode 100644
index 00000000..17fa2255
--- /dev/null
+++ b/app/components/UI/account/activity_date.rb
@@ -0,0 +1,51 @@
+class UI::Account::ActivityDate < ApplicationComponent
+  attr_reader :account, :data
+
+  delegate :date, :entries, :balance_trend, :cash_balance_trend, :holdings_value_trend, :transfers, to: :data
+
+  def initialize(account:, data:)
+    @account = account
+    @data = data
+  end
+
+  def id
+    dom_id(account, "entries_#{date}")
+  end
+
+  def broadcast_channel
+    account
+  end
+
+  def start_balance_money
+    balance_trend.previous
+  end
+
+  def cash_change_money
+    cash_balance_trend.value
+  end
+
+  def holdings_change_money
+    holdings_value_trend.value
+  end
+
+  def end_balance_before_adjustments_money
+    balance_trend.previous + cash_change_money + holdings_change_money
+  end
+
+  def adjustments_money
+    end_balance_money - end_balance_before_adjustments_money
+  end
+
+  def end_balance_money
+    balance_trend.current
+  end
+
+  def broadcast_refresh!
+    Turbo::StreamsChannel.broadcast_replace_to(
+      broadcast_channel,
+      target: id,
+      renderable: self,
+      layout: false
+    )
+  end
+end
diff --git a/app/components/UI/account/activity_feed.html.erb b/app/components/UI/account/activity_feed.html.erb
new file mode 100644
index 00000000..c6740a0a
--- /dev/null
+++ b/app/components/UI/account/activity_feed.html.erb
@@ -0,0 +1,94 @@
+<%= turbo_frame_tag dom_id(account, "entries") do %>
+  <div class="bg-container p-5 shadow-border-xs rounded-xl">
+    <div class="flex items-center justify-between mb-4" data-testid="activity-menu">
+      <%= tag.h2 t(".title"), class: "font-medium text-lg" %>
+
+      <% if account.manual? %>
+        <%= render DS::Menu.new(variant: "button") do |menu| %>
+          <% menu.with_button(text: "New", variant: "secondary", icon: "plus") %>
+
+          <% menu.with_item(
+              variant: "link",
+              text: "New balance",
+              icon: "circle-dollar-sign",
+              href: new_valuation_path(account_id: account.id),
+              data: { turbo_frame: :modal }) %>
+
+          <% unless account.crypto? %>
+            <% menu.with_item(
+                variant: "link",
+                text: "New transaction",
+                icon: "credit-card",
+                href: account.investment? ? new_trade_path(account_id: account.id) : new_transaction_path(account_id: account.id),
+                data: { turbo_frame: :modal }) %>
+          <% end %>
+        <% end %>
+      <% end %>
+    </div>
+
+    <div>
+      <%= form_with url: account_path(account),
+              id: "entries-search",
+              scope: :q,
+              method: :get,
+              data: { controller: "auto-submit-form" } do |form| %>
+        <div class="flex gap-2 mb-4">
+          <div class="grow">
+            <div class="flex items-center px-3 py-2 gap-2 border border-secondary rounded-lg focus-within:ring-gray-100 focus-within:border-gray-900">
+              <%= helpers.icon("search") %>
+
+              <%= hidden_field_tag :account_id, account.id %>
+
+              <%= form.search_field :search,
+                            placeholder: "Search entries by name",
+                            value: search,
+                            class: "form-field__input placeholder:text-sm placeholder:text-secondary",
+                            "data-auto-submit-form-target": "auto" %>
+            </div>
+          </div>
+        </div>
+      <% end %>
+    </div>
+
+    <% if activity_dates.empty? %>
+      <p class="text-secondary text-sm p-4">No entries yet</p>
+    <% else %>
+      <%= tag.div id: dom_id(account, "entries_bulk_select"),
+                data: {
+                  controller: "bulk-select",
+                  bulk_select_singular_label_value: "entry",
+                  bulk_select_plural_label_value: "entries"
+                } do %>
+        <div id="entry-selection-bar" data-bulk-select-target="selectionBar" class="flex justify-center hidden">
+          <%= render "entries/selection_bar" %>
+        </div>
+
+        <div class="grid bg-container-inset rounded-xl grid-cols-12 items-center uppercase text-xs font-medium text-secondary px-5 py-3 mb-4">
+          <div class="pl-0.5 col-span-8 flex items-center gap-4">
+            <%= check_box_tag "selection_entry",
+                              class: "checkbox checkbox--light",
+                              data: { action: "bulk-select#togglePageSelection" } %>
+            <p>Date</p>
+          </div>
+
+          <%= tag.p "Amount", class: "col-span-4 justify-self-end" %>
+        </div>
+
+        <div>
+          <div class="space-y-4">
+            <% activity_dates.each do |activity_date_data| %>
+              <%= render UI::Account::ActivityDate.new(
+                    account: account,
+                    data: activity_date_data
+                  ) %>
+            <% end %>
+          </div>
+
+          <div class="p-4 bg-container rounded-bl-lg rounded-br-lg">
+            <%= render "shared/pagination", pagy: pagy %>
+          </div>
+        </div>
+      <% end %>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/components/UI/account/activity_feed.rb b/app/components/UI/account/activity_feed.rb
new file mode 100644
index 00000000..bb7fa3a1
--- /dev/null
+++ b/app/components/UI/account/activity_feed.rb
@@ -0,0 +1,35 @@
+class UI::Account::ActivityFeed < ApplicationComponent
+  attr_reader :feed_data, :pagy, :search
+
+  def initialize(feed_data:, pagy:, search: nil)
+    @feed_data = feed_data
+    @pagy = pagy
+    @search = search
+  end
+
+  def id
+    dom_id(account, :activity_feed)
+  end
+
+  def broadcast_channel
+    account
+  end
+
+  def broadcast_refresh!
+    Turbo::StreamsChannel.broadcast_replace_to(
+      broadcast_channel,
+      target: id,
+      renderable: self,
+      layout: false
+    )
+  end
+
+  def activity_dates
+    feed_data.entries_by_date
+  end
+
+  private
+    def account
+      feed_data.account
+    end
+end
diff --git a/app/components/UI/account/chart.html.erb b/app/components/UI/account/chart.html.erb
new file mode 100644
index 00000000..ff54a578
--- /dev/null
+++ b/app/components/UI/account/chart.html.erb
@@ -0,0 +1,58 @@
+<div id="<%= dom_id(account, :chart) %>" class="bg-container shadow-border-xs rounded-xl space-y-2">
+  <div class="flex justify-between flex-col-reverse lg:flex-row gap-2 px-4 pt-4 mb-2">
+    <div class="space-y-2 w-full">
+      <div class="flex items-center gap-1">
+        <%= tag.p title, class: "text-sm font-medium text-secondary" %>
+
+        <% if account.investment? %>
+          <%= render "investments/value_tooltip", balance: account.balance_money, holdings: holdings_value_money, cash: account.cash_balance_money %>
+        <% end %>
+      </div>
+      <div class="flex flex-row gap-2 items-baseline">
+        <%= tag.p view_balance_money.format, class: "text-primary text-3xl font-medium truncate" %>
+
+        <% if converted_balance_money %>
+          <%= tag.p converted_balance_money.format, class: "text-sm font-medium text-secondary" %>
+        <% end %>
+      </div>
+    </div>
+
+    <%= form_with url: account_path(account), method: :get, data: { controller: "auto-submit-form" } do |form| %>
+      <div class="flex items-center gap-2">
+        <% if account.investment? %>
+          <%= form.select :chart_view,
+            [["Total value", "balance"], ["Holdings", "holdings_balance"], ["Cash", "cash_balance"]],
+            { selected: view },
+            class: "bg-container border border-secondary rounded-lg text-sm pr-7 cursor-pointer text-primary focus:outline-hidden focus:ring-0",
+            data: { "auto-submit-form-target": "auto" } %>
+        <% end %>
+
+        <%= form.select :period,
+                    Period.as_options,
+                    { selected: period.key },
+                    data: { "auto-submit-form-target": "auto" },
+                    class: "bg-container border border-secondary rounded-lg px-3 py-2 text-sm pr-7 cursor-pointer text-primary focus:outline-hidden focus:ring-0" %>
+      </div>
+    <% end %>
+  </div>
+
+  <%= turbo_frame_tag dom_id(@account, :chart_details) do %>
+    <div class="px-4">
+      <%= render partial: "shared/trend_change", locals: { trend: trend, comparison_label: period.comparison_label } %>
+    </div>
+
+    <div class="h-64 pb-4">
+      <% if series.any? %>
+        <div
+        id="lineChart"
+        class="w-full h-full"
+        data-controller="time-series-chart"
+        data-time-series-chart-data-value="<%= series.to_json %>"></div>
+      <% else %>
+        <div class="w-full h-full flex items-center justify-center">
+          <p class="text-secondary text-sm">No data available</p>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+</div>
diff --git a/app/components/UI/account/chart.rb b/app/components/UI/account/chart.rb
new file mode 100644
index 00000000..1e58529a
--- /dev/null
+++ b/app/components/UI/account/chart.rb
@@ -0,0 +1,72 @@
+class UI::Account::Chart < ApplicationComponent
+  attr_reader :account
+
+  def initialize(account:, period: nil, view: nil)
+    @account = account
+    @period = period
+    @view = view
+  end
+
+  def period
+    @period ||= Period.last_30_days
+  end
+
+  def holdings_value_money
+    account.balance_money - account.cash_balance_money
+  end
+
+  def view_balance_money
+    case view
+    when "balance"
+      account.balance_money
+    when "holdings_balance"
+      holdings_value_money
+    when "cash_balance"
+      account.cash_balance_money
+    end
+  end
+
+  def title
+    case account.accountable_type
+    when "Investment", "Crypto"
+      case view
+      when "balance"
+        "Total account value"
+      when "holdings_balance"
+        "Holdings value"
+      when "cash_balance"
+        "Cash value"
+      end
+    when "Property", "Vehicle"
+      "Estimated #{account.accountable_type.humanize.downcase} value"
+    when "CreditCard", "OtherLiability"
+      "Debt balance"
+    when "Loan"
+      "Remaining principal balance"
+    else
+      "Balance"
+    end
+  end
+
+  def foreign_currency?
+    account.currency != account.family.currency
+  end
+
+  def converted_balance_money
+    return nil unless foreign_currency?
+
+    account.balance_money.exchange_to(account.family.currency, fallback_rate: 1)
+  end
+
+  def view
+    @view ||= "balance"
+  end
+
+  def series
+    account.balance_series(period: period, view: view)
+  end
+
+  def trend
+    series.trend
+  end
+end
diff --git a/app/components/UI/account_page.html.erb b/app/components/UI/account_page.html.erb
new file mode 100644
index 00000000..37d3bd41
--- /dev/null
+++ b/app/components/UI/account_page.html.erb
@@ -0,0 +1,29 @@
+<%= turbo_stream_from account %>
+
+<%= turbo_frame_tag id do %>
+  <%= tag.div class: "space-y-4 pb-32" do %>
+    <%= render "accounts/show/header", account: account, title: title, subtitle: subtitle %>
+
+    <%= render UI::Account::Chart.new(account: account, period: chart_period, view: chart_view) %>
+
+    <div class="min-h-[800px]" data-testid="account-details">
+      <% if tabs.count > 1 %>
+        <%= render DS::Tabs.new(active_tab: active_tab, url_param_key: "tab") do |tabs_container| %>
+          <% tabs_container.with_nav(classes: "max-w-fit") do |nav| %>
+            <% tabs.each do |tab| %>
+              <% nav.with_btn(id: tab, label: tab.to_s.humanize, classes: "px-6") %>
+            <% end %>
+          <% end %>
+
+          <% tabs.each do |tab| %>
+            <% tabs_container.with_panel(tab_id: tab) do %>
+              <%= tab_content_for(tab) %>
+            <% end %>
+          <% end %>
+        <% end %>
+      <% else %>
+        <%= tab_content_for(tabs.first) %>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/components/UI/account_page.rb b/app/components/UI/account_page.rb
new file mode 100644
index 00000000..5d3dd54a
--- /dev/null
+++ b/app/components/UI/account_page.rb
@@ -0,0 +1,59 @@
+class UI::AccountPage < ApplicationComponent
+  attr_reader :account, :chart_view, :chart_period
+
+  renders_one :activity_feed, ->(feed_data:, pagy:, search:) { UI::Account::ActivityFeed.new(feed_data: feed_data, pagy: pagy, search: search) }
+
+  def initialize(account:, chart_view: nil, chart_period: nil, active_tab: nil)
+    @account = account
+    @chart_view = chart_view
+    @chart_period = chart_period
+    @active_tab = active_tab
+  end
+
+  def id
+    dom_id(account, :container)
+  end
+
+  def broadcast_channel
+    account
+  end
+
+  def broadcast_refresh!
+    Turbo::StreamsChannel.broadcast_replace_to(broadcast_channel, target: id, renderable: self, layout: false)
+  end
+
+  def title
+    account.name
+  end
+
+  def subtitle
+    return nil unless account.property?
+
+    account.property.address
+  end
+
+  def active_tab
+    tabs.find { |tab| tab == @active_tab&.to_sym } || tabs.first
+  end
+
+  def tabs
+    case account.accountable_type
+    when "Investment"
+      [ :activity, :holdings ]
+    when "Property", "Vehicle", "Loan"
+      [ :activity, :overview ]
+    else
+      [ :activity ]
+    end
+  end
+
+  def tab_content_for(tab)
+    case tab
+    when :activity
+      activity_feed
+    when :holdings, :overview
+      # Accountable is responsible for implementing the partial in the correct folder
+      render "#{account.accountable_type.downcase.pluralize}/tabs/#{tab}", account: account
+    end
+  end
+end
diff --git a/app/components/application_component.rb b/app/components/application_component.rb
new file mode 100644
index 00000000..37cb953d
--- /dev/null
+++ b/app/components/application_component.rb
@@ -0,0 +1,4 @@
+class ApplicationComponent < ViewComponent::Base
+  # These don't work as expected with helpers.turbo_frame_tag, etc., so we include them here
+  include Turbo::FramesHelper, Turbo::StreamsHelper
+end
diff --git a/app/components/design_system_component.rb b/app/components/design_system_component.rb
new file mode 100644
index 00000000..35d21681
--- /dev/null
+++ b/app/components/design_system_component.rb
@@ -0,0 +1,2 @@
+class DesignSystemComponent < ViewComponent::Base
+end
diff --git a/app/controllers/account/cashes_controller.rb b/app/controllers/account/cashes_controller.rb
deleted file mode 100644
index 6afa3241..00000000
--- a/app/controllers/account/cashes_controller.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class Account::CashesController < ApplicationController
-  layout :with_sidebar
-
-  before_action :set_account
-
-  def index
-  end
-
-  private
-
-    def set_account
-      @account = Current.family.accounts.find(params[:account_id])
-    end
-end
diff --git a/app/controllers/account/entries_controller.rb b/app/controllers/account/entries_controller.rb
deleted file mode 100644
index fb394f2d..00000000
--- a/app/controllers/account/entries_controller.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-class Account::EntriesController < ApplicationController
-  layout :with_sidebar
-
-  before_action :set_account
-  before_action :set_entry, only: %i[edit update show destroy]
-
-  def edit
-    render entryable_view_path(:edit)
-  end
-
-  def update
-    @entry.update!(entry_params)
-    @entry.sync_account_later
-
-    respond_to do |format|
-      format.html { redirect_to account_entry_path(@account, @entry), notice: t(".success") }
-      format.turbo_stream { render turbo_stream: turbo_stream.replace(@entry) }
-    end
-  end
-
-  def show
-    render entryable_view_path(:show)
-  end
-
-  def destroy
-    @entry.destroy!
-    @entry.sync_account_later
-    redirect_to account_url(@entry.account), notice: t(".success")
-  end
-
-  private
-
-    def entryable_view_path(action)
-      @entry.entryable_type.underscore.pluralize + "/" + action.to_s
-    end
-
-    def set_account
-      @account = Current.family.accounts.find(params[:account_id])
-    end
-
-    def set_entry
-      @entry = @account.entries.find(params[:id])
-    end
-
-    def entry_params
-      params.require(:account_entry).permit(:name, :date, :amount, :currency)
-    end
-end
diff --git a/app/controllers/account/holdings_controller.rb b/app/controllers/account/holdings_controller.rb
deleted file mode 100644
index af0d3e6a..00000000
--- a/app/controllers/account/holdings_controller.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-class Account::HoldingsController < ApplicationController
-  layout :with_sidebar
-
-  before_action :set_account
-  before_action :set_holding, only: %i[show destroy]
-
-  def index
-    @holdings = @account.holdings.current
-  end
-
-  def show
-  end
-
-  def destroy
-    @holding.destroy_holding_and_entries!
-    redirect_back_or_to account_holdings_path(@account)
-  end
-
-  private
-
-    def set_account
-      @account = Current.family.accounts.find(params[:account_id])
-    end
-
-    def set_holding
-      @holding = @account.holdings.current.find(params[:id])
-    end
-end
diff --git a/app/controllers/account/logos_controller.rb b/app/controllers/account/logos_controller.rb
deleted file mode 100644
index dd56e665..00000000
--- a/app/controllers/account/logos_controller.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class Account::LogosController < ApplicationController
-  def show
-    @account = Current.family.accounts.find(params[:account_id])
-    render_placeholder
-  end
-
-  def render_placeholder
-    render formats: :svg
-  end
-end
diff --git a/app/controllers/account/trades_controller.rb b/app/controllers/account/trades_controller.rb
deleted file mode 100644
index b5b6092a..00000000
--- a/app/controllers/account/trades_controller.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-class Account::TradesController < ApplicationController
-  layout :with_sidebar
-
-  before_action :set_account
-  before_action :set_entry, only: :update
-
-  def new
-    @entry = @account.entries.account_trades.new(entryable_attributes: {})
-  end
-
-  def index
-    @entries = @account.entries.reverse_chronological.where(entryable_type: %w[Account::Trade Account::Transaction])
-  end
-
-  def create
-    @builder = Account::EntryBuilder.new(entry_params)
-
-    if entry = @builder.save
-      entry.sync_account_later
-      redirect_to account_path(@account), notice: t(".success")
-    else
-      flash[:alert] = t(".failure")
-      redirect_back_or_to account_path(@account)
-    end
-  end
-
-  def update
-    @entry.update!(entry_params)
-
-    respond_to do |format|
-      format.html { redirect_to account_entry_path(@account, @entry), notice: t(".success") }
-      format.turbo_stream { render turbo_stream: turbo_stream.replace(@entry) }
-    end
-  end
-
-  private
-
-    def set_account
-      @account = Current.family.accounts.find(params[:account_id])
-    end
-
-    def set_entry
-      @entry = @account.entries.find(params[:id])
-    end
-
-    def entry_params
-      params.require(:account_entry)
-            .permit(
-              :type, :date, :qty, :ticker, :price, :amount, :notes, :excluded, :currency, :transfer_account_id, :entryable_type,
-              entryable_attributes: [
-                :id,
-                :qty,
-                :ticker,
-                :price
-              ]
-            )
-            .merge(account: @account)
-    end
-end
diff --git a/app/controllers/account/transactions_controller.rb b/app/controllers/account/transactions_controller.rb
deleted file mode 100644
index 2e3073e6..00000000
--- a/app/controllers/account/transactions_controller.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-class Account::TransactionsController < ApplicationController
-  layout :with_sidebar
-
-  before_action :set_account
-  before_action :set_entry, only: :update
-
-  def index
-    @pagy, @entries = pagy(
-      @account.entries.account_transactions.reverse_chronological,
-      limit: params[:per_page] || "10"
-    )
-  end
-
-  def update
-    @entry.update!(entry_params)
-
-    respond_to do |format|
-      format.html { redirect_to account_entry_path(@account, @entry), notice: t(".success") }
-      format.turbo_stream { render turbo_stream: turbo_stream.replace(@entry) }
-    end
-  end
-
-  private
-
-    def set_account
-      @account = Current.family.accounts.find(params[:account_id])
-    end
-
-    def set_entry
-      @entry = @account.entries.find(params[:id])
-    end
-
-    def entry_params
-      params.require(:account_entry)
-            .permit(
-              :name, :date, :amount, :currency, :excluded, :notes, :entryable_type, :nature,
-              entryable_attributes: [
-                :id,
-                :category_id,
-                :merchant_id,
-                { tag_ids: [] }
-              ]
-            ).tap do |permitted_params|
-              nature = permitted_params.delete(:nature)
-
-              if permitted_params[:amount]
-                amount_value = permitted_params[:amount].to_d
-
-                if nature == "income"
-                  amount_value *= -1
-                end
-
-                permitted_params[:amount] = amount_value
-              end
-            end
-    end
-end
diff --git a/app/controllers/account/transfers_controller.rb b/app/controllers/account/transfers_controller.rb
deleted file mode 100644
index c8fd4877..00000000
--- a/app/controllers/account/transfers_controller.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-class Account::TransfersController < ApplicationController
-  layout :with_sidebar
-
-  before_action :set_transfer, only: :destroy
-
-  def new
-    @transfer = Account::Transfer.new
-  end
-
-  def create
-    from_account = Current.family.accounts.find(transfer_params[:from_account_id])
-    to_account = Current.family.accounts.find(transfer_params[:to_account_id])
-
-    @transfer = Account::Transfer.build_from_accounts from_account, to_account, \
-                                             date: transfer_params[:date],
-                                             amount: transfer_params[:amount].to_d,
-                                             currency: transfer_params[:currency],
-                                             name: transfer_params[:name]
-
-    if @transfer.save
-      @transfer.entries.each(&:sync_account_later)
-      redirect_to transactions_path, notice: t(".success")
-    else
-      # TODO: this is not an ideal way to handle errors and should eventually be improved.
-      # See: https://github.com/hotwired/turbo-rails/pull/367
-      flash[:alert] = @transfer.errors.full_messages.to_sentence
-      redirect_to transactions_path
-    end
-  end
-
-  def destroy
-    @transfer.destroy_and_remove_marks!
-    redirect_back_or_to transactions_url, notice: t(".success")
-  end
-
-  private
-
-    def set_transfer
-      @transfer = Account::Transfer.find(params[:id])
-    end
-
-    def transfer_params
-      params.require(:account_transfer).permit(:from_account_id, :to_account_id, :amount, :date, :name)
-    end
-end
diff --git a/app/controllers/account/valuations_controller.rb b/app/controllers/account/valuations_controller.rb
deleted file mode 100644
index e3015bde..00000000
--- a/app/controllers/account/valuations_controller.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-class Account::ValuationsController < ApplicationController
-  layout :with_sidebar
-
-  before_action :set_account
-
-  def new
-    @entry = @account.entries.account_valuations.new(entryable_attributes: {})
-  end
-
-  def create
-    @entry = @account.entries.account_valuations.new(entry_params.merge(entryable_attributes: {}))
-
-    if @entry.save
-      @entry.sync_account_later
-      redirect_back_or_to account_valuations_path(@account), notice: t(".success")
-    else
-      flash[:alert] = @entry.errors.full_messages.to_sentence
-      redirect_to account_path(@account)
-    end
-  end
-
-  def index
-    @entries = @account.entries.account_valuations.reverse_chronological
-  end
-
-  private
-
-    def set_account
-      @account = Current.family.accounts.find(params[:account_id])
-    end
-
-    def entry_params
-      params.require(:account_entry).permit(:name, :date, :amount, :currency)
-    end
-end
diff --git a/app/controllers/accountable_sparklines_controller.rb b/app/controllers/accountable_sparklines_controller.rb
new file mode 100644
index 00000000..45f01a2c
--- /dev/null
+++ b/app/controllers/accountable_sparklines_controller.rb
@@ -0,0 +1,41 @@
+class AccountableSparklinesController < ApplicationController
+  def show
+    @accountable = Accountable.from_type(params[:accountable_type]&.classify)
+
+    etag_key = cache_key
+
+    # Use HTTP conditional GET so the client receives 304 Not Modified when possible.
+    if stale?(etag: etag_key, last_modified: family.latest_sync_completed_at)
+      @series = Rails.cache.fetch(etag_key, expires_in: 24.hours) do
+        builder = Balance::ChartSeriesBuilder.new(
+          account_ids: account_ids,
+          currency: family.currency,
+          period: Period.last_30_days,
+          favorable_direction: @accountable.favorable_direction,
+          interval: "1 day"
+        )
+
+        builder.balance_series
+      end
+
+      render layout: false
+    end
+  end
+
+  private
+    def family
+      Current.family
+    end
+
+    def accountable
+      Accountable.from_type(params[:accountable_type]&.classify)
+    end
+
+    def account_ids
+      family.accounts.visible.where(accountable_type: accountable.name).pluck(:id)
+    end
+
+    def cache_key
+      family.build_cache_key("#{@accountable.name}_sparkline", invalidate_on_data_updates: true)
+    end
+end
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 4dcbbb27..0b2252d7 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -1,88 +1,68 @@
 class AccountsController < ApplicationController
-  layout :with_sidebar
-
-  include Filterable
-  before_action :set_account, only: %i[edit show destroy sync update]
+  before_action :set_account, only: %i[sync sparkline toggle_active show destroy]
+  include Periodable
 
   def index
-    @institutions = Current.family.institutions
-    @accounts = Current.family.accounts.ungrouped.alphabetically
-  end
+    @manual_accounts = family.accounts.manual.alphabetically
+    @plaid_items = family.plaid_items.ordered
 
-  def summary
-    snapshot = Current.family.snapshot(@period)
-    @net_worth_series = snapshot[:net_worth_series]
-    @asset_series = snapshot[:asset_series]
-    @liability_series = snapshot[:liability_series]
-    @accounts = Current.family.accounts
-    @account_groups = @accounts.by_group(period: @period, currency: Current.family.currency)
-  end
-
-  def list
-    render layout: false
-  end
-
-  def new
-    @account = Account.new(
-      accountable: Accountable.from_type(params[:type])&.new,
-      currency: Current.family.currency
-    )
-
-    @account.accountable.address = Address.new if @account.accountable.is_a?(Property)
-
-    if params[:institution_id]
-      @account.institution = Current.family.institutions.find_by(id: params[:institution_id])
-    end
+    render layout: "settings"
   end
 
   def show
-    @series = @account.series(period: @period)
-    @trend = @series.trend
-  end
+    @chart_view = params[:chart_view] || "balance"
+    @tab = params[:tab]
+    @q = params.fetch(:q, {}).permit(:search)
+    entries = @account.entries.search(@q).reverse_chronological
 
-  def edit
-    @account.accountable.build_address if @account.accountable.is_a?(Property) && @account.accountable.address.blank?
-  end
+    @pagy, @entries = pagy(entries, limit: params[:per_page] || "10")
 
-  def update
-    @account.update_with_sync!(account_params)
-    redirect_back_or_to account_path(@account), notice: t(".success")
-  end
-
-  def create
-    @account = Current.family
-                      .accounts
-                      .create_with_optional_start_balance! \
-                        attributes: account_params.except(:start_date, :start_balance),
-                        start_date: account_params[:start_date],
-                        start_balance: account_params[:start_balance]
-    @account.sync_later
-    redirect_back_or_to account_path(@account), notice: t(".success")
-  end
-
-  def destroy
-    @account.destroy!
-    redirect_to accounts_path, notice: t(".success")
+    @activity_feed_data = Account::ActivityFeedData.new(@account, @entries)
   end
 
   def sync
     unless @account.syncing?
       @account.sync_later
     end
+
+    redirect_to account_path(@account)
   end
 
-  def sync_all
-    Current.family.accounts.active.sync
-    redirect_back_or_to accounts_path, notice: t(".success")
+  def sparkline
+    etag_key = @account.family.build_cache_key("#{@account.id}_sparkline", invalidate_on_data_updates: true)
+
+    # Short-circuit with 304 Not Modified when the client already has the latest version.
+    # We defer the expensive series computation until we know the content is stale.
+    if stale?(etag: etag_key, last_modified: @account.family.latest_sync_completed_at)
+      @sparkline_series = @account.sparkline_series
+      render layout: false
+    end
+  end
+
+  def toggle_active
+    if @account.active?
+      @account.disable!
+    elsif @account.disabled?
+      @account.enable!
+    end
+    redirect_to accounts_path
+  end
+
+  def destroy
+    if @account.linked?
+      redirect_to account_path(@account), alert: "Cannot delete a linked account"
+    else
+      @account.destroy_later
+      redirect_to accounts_path, notice: "Account scheduled for deletion"
+    end
   end
 
   private
+    def family
+      Current.family
+    end
 
     def set_account
-      @account = Current.family.accounts.find(params[:id])
-    end
-
-    def account_params
-      params.require(:account).permit(:name, :accountable_type, :balance, :start_date, :start_balance, :currency, :subtype, :is_active, :institution_id)
+      @account = family.accounts.find(params[:id])
     end
 end
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
new file mode 100644
index 00000000..dea9cbe6
--- /dev/null
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+class Api::V1::AccountsController < Api::V1::BaseController
+  include Pagy::Backend
+
+  # Ensure proper scope authorization for read access
+  before_action :ensure_read_scope
+
+  def index
+    # Test with Pagy pagination
+    family = current_resource_owner.family
+    accounts_query = family.accounts.visible.alphabetically
+
+    # Handle pagination with Pagy
+    @pagy, @accounts = pagy(
+      accounts_query,
+      page: safe_page_param,
+      limit: safe_per_page_param
+    )
+
+    @per_page = safe_per_page_param
+
+    # Rails will automatically use app/views/api/v1/accounts/index.json.jbuilder
+    render :index
+  rescue => e
+    Rails.logger.error "AccountsController error: #{e.message}"
+    Rails.logger.error e.backtrace.join("\n")
+
+    render json: {
+      error: "internal_server_error",
+      message: "Error: #{e.message}"
+    }, status: :internal_server_error
+end
+
+    private
+
+      def ensure_read_scope
+        authorize_scope!(:read)
+      end
+
+
+
+      def safe_page_param
+        page = params[:page].to_i
+        page > 0 ? page : 1
+      end
+
+      def safe_per_page_param
+        per_page = params[:per_page].to_i
+
+        # Default to 25, max 100
+        case per_page
+        when 1..100
+          per_page
+        else
+          25
+        end
+      end
+end
diff --git a/app/controllers/api/v1/auth_controller.rb b/app/controllers/api/v1/auth_controller.rb
new file mode 100644
index 00000000..4f20b934
--- /dev/null
+++ b/app/controllers/api/v1/auth_controller.rb
@@ -0,0 +1,210 @@
+module Api
+  module V1
+    class AuthController < BaseController
+      include Invitable
+
+      skip_before_action :authenticate_request!
+      skip_before_action :check_api_key_rate_limit
+      skip_before_action :log_api_access
+
+      def signup
+        # Check if invite code is required
+        if invite_code_required? && params[:invite_code].blank?
+          render json: { error: "Invite code is required" }, status: :forbidden
+          return
+        end
+
+        # Validate invite code if provided
+        if params[:invite_code].present? && !InviteCode.exists?(token: params[:invite_code]&.downcase)
+          render json: { error: "Invalid invite code" }, status: :forbidden
+          return
+        end
+
+        # Validate password
+        password_errors = validate_password(params[:user][:password])
+        if password_errors.any?
+          render json: { errors: password_errors }, status: :unprocessable_entity
+          return
+        end
+
+        # Validate device info
+        unless valid_device_info?
+          render json: { error: "Device information is required" }, status: :bad_request
+          return
+        end
+
+        user = User.new(user_signup_params)
+
+        # Create family for new user
+        family = Family.new
+        user.family = family
+        user.role = :admin
+
+        if user.save
+          # Claim invite code if provided
+          InviteCode.claim!(params[:invite_code]) if params[:invite_code].present?
+
+          # Create device and OAuth token
+          device = create_or_update_device(user)
+          token_response = create_oauth_token_for_device(user, device)
+
+          render json: token_response.merge(
+            user: {
+              id: user.id,
+              email: user.email,
+              first_name: user.first_name,
+              last_name: user.last_name
+            }
+          ), status: :created
+        else
+          render json: { errors: user.errors.full_messages }, status: :unprocessable_entity
+        end
+      end
+
+      def login
+        user = User.find_by(email: params[:email])
+
+        if user&.authenticate(params[:password])
+          # Check MFA if enabled
+          if user.otp_required?
+            unless params[:otp_code].present? && user.verify_otp?(params[:otp_code])
+              render json: {
+                error: "Two-factor authentication required",
+                mfa_required: true
+              }, status: :unauthorized
+              return
+            end
+          end
+
+          # Validate device info
+          unless valid_device_info?
+            render json: { error: "Device information is required" }, status: :bad_request
+            return
+          end
+
+          # Create device and OAuth token
+          device = create_or_update_device(user)
+          token_response = create_oauth_token_for_device(user, device)
+
+          render json: token_response.merge(
+            user: {
+              id: user.id,
+              email: user.email,
+              first_name: user.first_name,
+              last_name: user.last_name
+            }
+          )
+        else
+          render json: { error: "Invalid email or password" }, status: :unauthorized
+        end
+      end
+
+      def refresh
+        # Find the refresh token
+        refresh_token = params[:refresh_token]
+
+        unless refresh_token.present?
+          render json: { error: "Refresh token is required" }, status: :bad_request
+          return
+        end
+
+        # Find the access token associated with this refresh token
+        access_token = Doorkeeper::AccessToken.by_refresh_token(refresh_token)
+
+        if access_token.nil? || access_token.revoked?
+          render json: { error: "Invalid refresh token" }, status: :unauthorized
+          return
+        end
+
+        # Create new access token
+        new_token = Doorkeeper::AccessToken.create!(
+          application: access_token.application,
+          resource_owner_id: access_token.resource_owner_id,
+          expires_in: 30.days.to_i,
+          scopes: access_token.scopes,
+          use_refresh_token: true
+        )
+
+        # Revoke old access token
+        access_token.revoke
+
+        # Update device last seen
+        user = User.find(access_token.resource_owner_id)
+        device = user.mobile_devices.find_by(device_id: params[:device][:device_id])
+        device&.update_last_seen!
+
+        render json: {
+          access_token: new_token.plaintext_token,
+          refresh_token: new_token.plaintext_refresh_token,
+          token_type: "Bearer",
+          expires_in: new_token.expires_in,
+          created_at: new_token.created_at.to_i
+        }
+      end
+
+      private
+
+        def user_signup_params
+          params.require(:user).permit(:email, :password, :first_name, :last_name)
+        end
+
+        def validate_password(password)
+          errors = []
+
+          if password.blank?
+            errors << "Password can't be blank"
+            return errors
+          end
+
+          errors << "Password must be at least 8 characters" if password.length < 8
+          errors << "Password must include both uppercase and lowercase letters" unless password.match?(/[A-Z]/) && password.match?(/[a-z]/)
+          errors << "Password must include at least one number" unless password.match?(/\d/)
+          errors << "Password must include at least one special character" unless password.match?(/[!@#$%^&*(),.?":{}|<>]/)
+
+          errors
+        end
+
+        def valid_device_info?
+          device = params[:device]
+          return false if device.nil?
+
+          required_fields = %w[device_id device_name device_type os_version app_version]
+          required_fields.all? { |field| device[field].present? }
+        end
+
+        def create_or_update_device(user)
+          # Handle both string and symbol keys
+          device_data = params[:device].permit(:device_id, :device_name, :device_type, :os_version, :app_version)
+
+          device = user.mobile_devices.find_or_initialize_by(device_id: device_data[:device_id])
+          device.update!(device_data.merge(last_seen_at: Time.current))
+          device
+        end
+
+        def create_oauth_token_for_device(user, device)
+          # Create OAuth application for this device if needed
+          oauth_app = device.create_oauth_application!
+
+          # Revoke any existing tokens for this device
+          device.revoke_all_tokens!
+
+          # Create new access token with 30-day expiration
+          access_token = Doorkeeper::AccessToken.create!(
+            application: oauth_app,
+            resource_owner_id: user.id,
+            expires_in: 30.days.to_i,
+            scopes: "read_write",
+            use_refresh_token: true
+          )
+
+          {
+            access_token: access_token.plaintext_token,
+            refresh_token: access_token.plaintext_refresh_token,
+            token_type: "Bearer",
+            expires_in: access_token.expires_in,
+            created_at: access_token.created_at.to_i
+          }
+        end
+    end
+  end
+end
diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb
new file mode 100644
index 00000000..a9b577d1
--- /dev/null
+++ b/app/controllers/api/v1/base_controller.rb
@@ -0,0 +1,279 @@
+# frozen_string_literal: true
+
+class Api::V1::BaseController < ApplicationController
+  include Doorkeeper::Rails::Helpers
+
+  # Skip regular session-based authentication for API
+  skip_authentication
+
+  # Skip CSRF protection for API endpoints
+  skip_before_action :verify_authenticity_token
+
+  # Skip onboarding requirements for API endpoints
+  skip_before_action :require_onboarding_and_upgrade
+
+  # Force JSON format for all API requests
+  before_action :force_json_format
+  # Use our custom authentication that supports both OAuth and API keys
+  before_action :authenticate_request!
+  before_action :check_api_key_rate_limit
+  before_action :log_api_access
+
+
+
+  # Override Doorkeeper's default behavior to return JSON instead of redirecting
+  def doorkeeper_unauthorized_render_options(error: nil)
+    { json: { error: "unauthorized", message: "Access token is invalid, expired, or missing" } }
+  end
+
+  # Error handling for common API errors
+  rescue_from ActiveRecord::RecordNotFound, with: :handle_not_found
+  rescue_from Doorkeeper::Errors::DoorkeeperError, with: :handle_unauthorized
+  rescue_from ActionController::ParameterMissing, with: :handle_bad_request
+
+  private
+
+    # Force JSON format for all API requests
+    def force_json_format
+      request.format = :json
+    end
+
+    # Authenticate using either OAuth or API key
+    def authenticate_request!
+      return if authenticate_oauth
+      return if authenticate_api_key
+      render_unauthorized unless performed?
+    end
+
+    # Try OAuth authentication first
+    def authenticate_oauth
+      return false unless request.headers["Authorization"].present?
+
+      # Manually verify the token (bypassing doorkeeper_authorize! which had scope issues)
+      token_string = request.authorization&.split(" ")&.last
+      access_token = Doorkeeper::AccessToken.by_token(token_string)
+
+      # Check token validity and scope (read_write includes read access)
+      has_sufficient_scope = access_token&.scopes&.include?("read") || access_token&.scopes&.include?("read_write")
+
+      unless access_token && !access_token.expired? && has_sufficient_scope
+        render_json({ error: "unauthorized", message: "Access token is invalid, expired, or missing required scope" }, status: :unauthorized)
+        return false
+      end
+
+      # Set the doorkeeper_token for compatibility
+      @_doorkeeper_token = access_token
+
+      if doorkeeper_token&.resource_owner_id
+        @current_user = User.find_by(id: doorkeeper_token.resource_owner_id)
+
+        # If user doesn't exist, the token is invalid (user was deleted)
+        unless @current_user
+          Rails.logger.warn "API OAuth Token Invalid: Access token resource_owner_id #{doorkeeper_token.resource_owner_id} does not exist"
+          render_json({ error: "unauthorized", message: "Access token is invalid - user not found" }, status: :unauthorized)
+          return false
+        end
+      else
+        Rails.logger.warn "API OAuth Token Invalid: Access token missing resource_owner_id"
+        render_json({ error: "unauthorized", message: "Access token is invalid - missing resource owner" }, status: :unauthorized)
+        return false
+      end
+
+      @authentication_method = :oauth
+      setup_current_context_for_api
+      true
+    rescue Doorkeeper::Errors::DoorkeeperError => e
+      Rails.logger.warn "API OAuth Error: #{e.message}"
+      false
+    end
+
+    # Try API key authentication
+    def authenticate_api_key
+      api_key_value = request.headers["X-Api-Key"]
+      return false unless api_key_value
+
+      @api_key = ApiKey.find_by_value(api_key_value)
+      return false unless @api_key && @api_key.active?
+
+      @current_user = @api_key.user
+      @api_key.update_last_used!
+      @authentication_method = :api_key
+      @rate_limiter = ApiRateLimiter.new(@api_key)
+      setup_current_context_for_api
+      true
+    end
+
+    # Check rate limits for API key authentication
+    def check_api_key_rate_limit
+      return unless @authentication_method == :api_key && @rate_limiter
+
+      if @rate_limiter.rate_limit_exceeded?
+        usage_info = @rate_limiter.usage_info
+        render_rate_limit_exceeded(usage_info)
+        return false
+      end
+
+      # Increment request count for successful API key requests
+      @rate_limiter.increment_request_count!
+
+      # Add rate limit headers to response
+      add_rate_limit_headers(@rate_limiter.usage_info)
+    end
+
+    # Render rate limit exceeded response
+    def render_rate_limit_exceeded(usage_info)
+      response.headers["X-RateLimit-Limit"] = usage_info[:rate_limit].to_s
+      response.headers["X-RateLimit-Remaining"] = "0"
+      response.headers["X-RateLimit-Reset"] = usage_info[:reset_time].to_s
+      response.headers["Retry-After"] = usage_info[:reset_time].to_s
+
+      Rails.logger.warn "API Rate Limit Exceeded: API Key #{@api_key.name} (User: #{@current_user.email}) - #{usage_info[:current_count]}/#{usage_info[:rate_limit]} requests"
+
+      render_json({
+        error: "rate_limit_exceeded",
+        message: "Rate limit exceeded. Try again in #{usage_info[:reset_time]} seconds.",
+        details: {
+          limit: usage_info[:rate_limit],
+          current: usage_info[:current_count],
+          reset_in_seconds: usage_info[:reset_time]
+        }
+      }, status: :too_many_requests)
+    end
+
+    # Add rate limit headers to successful responses
+    def add_rate_limit_headers(usage_info)
+      response.headers["X-RateLimit-Limit"] = usage_info[:rate_limit].to_s
+      response.headers["X-RateLimit-Remaining"] = usage_info[:remaining].to_s
+      response.headers["X-RateLimit-Reset"] = usage_info[:reset_time].to_s
+    end
+
+    # Render unauthorized response
+    def render_unauthorized
+      render_json({ error: "unauthorized", message: "Access token or API key is invalid, expired, or missing" }, status: :unauthorized)
+    end
+
+    # Returns the user that owns the access token or API key
+    def current_resource_owner
+      @current_user
+    end
+
+    # Get current scopes from either authentication method
+    def current_scopes
+      case @authentication_method
+      when :oauth
+        doorkeeper_token&.scopes&.to_a || []
+      when :api_key
+        @api_key&.scopes || []
+      else
+        []
+      end
+    end
+
+    # Check if the current authentication has the required scope
+    # Implements hierarchical scope checking where read_write includes read access
+    def authorize_scope!(required_scope)
+      scopes = current_scopes
+
+      case required_scope.to_s
+      when "read"
+        # Read access requires either "read" or "read_write" scope
+        has_access = scopes.include?("read") || scopes.include?("read_write")
+      when "write"
+        # Write access requires "read_write" scope
+        has_access = scopes.include?("read_write")
+      else
+        # For any other scope, check exact match (backward compatibility)
+        has_access = scopes.include?(required_scope.to_s)
+      end
+
+      unless has_access
+        Rails.logger.warn "API Insufficient Scope: User #{current_resource_owner&.email} attempted to access #{required_scope} but only has #{scopes}"
+        render_json({ error: "insufficient_scope", message: "This action requires the '#{required_scope}' scope" }, status: :forbidden)
+        return false
+      end
+      true
+    end
+
+    # Consistent JSON response method
+    def render_json(data, status: :ok)
+      render json: data, status: status
+    end
+
+    # Error handlers
+    def handle_not_found(exception)
+      Rails.logger.warn "API Record Not Found: #{exception.message}"
+      render_json({ error: "record_not_found", message: "The requested resource was not found" }, status: :not_found)
+    end
+
+    def handle_unauthorized(exception)
+      Rails.logger.warn "API Unauthorized: #{exception.message}"
+      render_json({ error: "unauthorized", message: "Access token is invalid or expired" }, status: :unauthorized)
+    end
+
+    def handle_bad_request(exception)
+      Rails.logger.warn "API Bad Request: #{exception.message}"
+      render_json({ error: "bad_request", message: "Required parameters are missing or invalid" }, status: :bad_request)
+    end
+
+    # Log API access for monitoring and debugging
+    def log_api_access
+      return unless current_resource_owner
+
+      auth_info = case @authentication_method
+      when :oauth
+        "OAuth Token"
+      when :api_key
+        "API Key: #{@api_key.name}"
+      else
+        "Unknown"
+      end
+
+      Rails.logger.info "API Request: #{request.method} #{request.path} - User: #{current_resource_owner.email} (Family: #{current_resource_owner.family_id}) - Auth: #{auth_info}"
+    end
+
+    # Family-based access control helper (to be used by subcontrollers)
+    def ensure_current_family_access(resource)
+      return unless resource.respond_to?(:family_id)
+
+      unless resource.family_id == current_resource_owner.family_id
+        Rails.logger.warn "API Forbidden: User #{current_resource_owner.email} attempted to access resource from family #{resource.family_id}"
+        render_json({ error: "forbidden", message: "Access denied to this resource" }, status: :forbidden)
+        return false
+      end
+
+      true
+    end
+
+    # Manual doorkeeper_token accessor for compatibility with manual token verification
+    def doorkeeper_token
+      @_doorkeeper_token
+    end
+
+    # Set up Current context for API requests since we don't use session-based auth
+    def setup_current_context_for_api
+      # For API requests, we need to create a minimal session-like object
+      # or find/create an actual session for this user to make Current.user work
+      if @current_user
+        # Try to find an existing session for this user, or create a temporary one
+        session = @current_user.sessions.first
+        if session
+          Current.session = session
+        else
+          # Create a temporary session for this API request
+          # This won't be persisted but will allow Current.user to work
+          session = @current_user.sessions.build(
+            user_agent: request.user_agent,
+            ip_address: request.ip
+          )
+          Current.session = session
+        end
+      end
+    end
+
+    # Check if AI features are enabled for the current user
+    def require_ai_enabled
+      unless current_resource_owner&.ai_enabled?
+        render_json({ error: "feature_disabled", message: "AI features are not enabled for this user" }, status: :forbidden)
+      end
+    end
+end
diff --git a/app/controllers/api/v1/chats_controller.rb b/app/controllers/api/v1/chats_controller.rb
new file mode 100644
index 00000000..65a2a344
--- /dev/null
+++ b/app/controllers/api/v1/chats_controller.rb
@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+class Api::V1::ChatsController < Api::V1::BaseController
+  include Pagy::Backend
+  before_action :require_ai_enabled
+  before_action :ensure_read_scope, only: [ :index, :show ]
+  before_action :ensure_write_scope, only: [ :create, :update, :destroy ]
+  before_action :set_chat, only: [ :show, :update, :destroy ]
+
+  def index
+    @pagy, @chats = pagy(Current.user.chats.ordered, items: 20)
+  end
+
+  def show
+    return unless @chat
+    @pagy, @messages = pagy(@chat.messages.ordered, items: 50)
+  end
+
+  def create
+    @chat = Current.user.chats.build(title: chat_params[:title])
+
+    if @chat.save
+      if chat_params[:message].present?
+        @message = @chat.messages.build(
+          content: chat_params[:message],
+          type: "UserMessage",
+          ai_model: chat_params[:model] || "gpt-4"
+        )
+
+        if @message.save
+          AssistantResponseJob.perform_later(@message)
+          render :show, status: :created
+        else
+          @chat.destroy
+          render json: { error: "Failed to create initial message", details: @message.errors.full_messages }, status: :unprocessable_entity
+        end
+      else
+        render :show, status: :created
+      end
+    else
+      render json: { error: "Failed to create chat", details: @chat.errors.full_messages }, status: :unprocessable_entity
+    end
+  end
+
+  def update
+    return unless @chat
+
+    if @chat.update(update_chat_params)
+      render :show
+    else
+      render json: { error: "Failed to update chat", details: @chat.errors.full_messages }, status: :unprocessable_entity
+    end
+  end
+
+  def destroy
+    return unless @chat
+    @chat.destroy
+    head :no_content
+  end
+
+  private
+
+    def ensure_read_scope
+      authorize_scope!(:read)
+    end
+
+    def ensure_write_scope
+      authorize_scope!(:write)
+    end
+
+    def set_chat
+      @chat = Current.user.chats.find(params[:id])
+    rescue ActiveRecord::RecordNotFound
+      render json: { error: "Chat not found" }, status: :not_found
+    end
+
+    def chat_params
+      params.permit(:title, :message, :model)
+    end
+
+    def update_chat_params
+      params.permit(:title)
+    end
+end
diff --git a/app/controllers/api/v1/messages_controller.rb b/app/controllers/api/v1/messages_controller.rb
new file mode 100644
index 00000000..f0b3f67e
--- /dev/null
+++ b/app/controllers/api/v1/messages_controller.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+class Api::V1::MessagesController < Api::V1::BaseController
+  before_action :require_ai_enabled
+  before_action :ensure_write_scope, only: [ :create, :retry ]
+  before_action :set_chat
+
+  def create
+    @message = @chat.messages.build(
+      content: message_params[:content],
+      type: "UserMessage",
+      ai_model: message_params[:model] || "gpt-4"
+    )
+
+    if @message.save
+      AssistantResponseJob.perform_later(@message)
+      render :show, status: :created
+    else
+      render json: { error: "Failed to create message", details: @message.errors.full_messages }, status: :unprocessable_entity
+    end
+  end
+
+  def retry
+    last_message = @chat.messages.ordered.last
+
+    if last_message&.type == "AssistantMessage"
+      new_message = @chat.messages.create!(
+        type: "AssistantMessage",
+        content: "",
+        ai_model: last_message.ai_model
+      )
+
+      AssistantResponseJob.perform_later(new_message)
+      render json: { message: "Retry initiated", message_id: new_message.id }, status: :accepted
+    else
+      render json: { error: "No assistant message to retry" }, status: :unprocessable_entity
+    end
+  end
+
+  private
+
+    def ensure_write_scope
+      authorize_scope!(:write)
+    end
+
+    def set_chat
+      @chat = Current.user.chats.find(params[:chat_id])
+    rescue ActiveRecord::RecordNotFound
+      render json: { error: "Chat not found" }, status: :not_found
+    end
+
+    def message_params
+      params.permit(:content, :model)
+    end
+end
diff --git a/app/controllers/api/v1/test_controller.rb b/app/controllers/api/v1/test_controller.rb
new file mode 100644
index 00000000..fec05837
--- /dev/null
+++ b/app/controllers/api/v1/test_controller.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+# Test controller for API V1 Base Controller functionality
+# This controller is only used for testing the base controller behavior
+class Api::V1::TestController < Api::V1::BaseController
+  def index
+    render_json({ message: "test_success", user: current_resource_owner&.email })
+  end
+
+  def not_found
+    # Trigger RecordNotFound error for testing error handling
+    raise ActiveRecord::RecordNotFound, "Test record not found"
+  end
+
+  def family_access
+    # Test family-based access control
+    # Create a mock resource that belongs to a different family
+    mock_resource = OpenStruct.new(family_id: 999)  # Different family ID
+
+    # Check family access - if it returns false, it already rendered the error
+    if ensure_current_family_access(mock_resource)
+      # If we get here, access was allowed
+      render_json({ family_id: current_resource_owner.family_id })
+    end
+  end
+
+  def scope_required
+    # Test scope authorization - require write scope
+    return unless authorize_scope!("write")
+
+    render_json({
+      message: "scope_authorized",
+      scopes: current_scopes,
+      required_scope: "write"
+    })
+  end
+
+  def multiple_scopes_required
+    # Test read scope requirement
+    return unless authorize_scope!("read")
+
+    render_json({
+      message: "read_scope_authorized",
+      scopes: current_scopes
+    })
+  end
+end
diff --git a/app/controllers/api/v1/transactions_controller.rb b/app/controllers/api/v1/transactions_controller.rb
new file mode 100644
index 00000000..299ff274
--- /dev/null
+++ b/app/controllers/api/v1/transactions_controller.rb
@@ -0,0 +1,327 @@
+# frozen_string_literal: true
+
+class Api::V1::TransactionsController < Api::V1::BaseController
+  include Pagy::Backend
+
+  # Ensure proper scope authorization for read vs write access
+  before_action :ensure_read_scope, only: [ :index, :show ]
+  before_action :ensure_write_scope, only: [ :create, :update, :destroy ]
+  before_action :set_transaction, only: [ :show, :update, :destroy ]
+
+  def index
+    family = current_resource_owner.family
+    transactions_query = family.transactions.visible
+
+    # Apply filters
+    transactions_query = apply_filters(transactions_query)
+
+    # Apply search
+    transactions_query = apply_search(transactions_query) if params[:search].present?
+
+    # Include necessary associations for efficient queries
+    transactions_query = transactions_query.includes(
+      { entry: :account },
+      :category, :merchant, :tags,
+      transfer_as_outflow: { inflow_transaction: { entry: :account } },
+      transfer_as_inflow: { outflow_transaction: { entry: :account } }
+    ).reverse_chronological
+
+    # Handle pagination with Pagy
+    @pagy, @transactions = pagy(
+      transactions_query,
+      page: safe_page_param,
+      limit: safe_per_page_param
+    )
+
+    # Make per_page available to the template
+    @per_page = safe_per_page_param
+
+    # Rails will automatically use app/views/api/v1/transactions/index.json.jbuilder
+    render :index
+
+  rescue => e
+    Rails.logger.error "TransactionsController#index error: #{e.message}"
+    Rails.logger.error e.backtrace.join("\n")
+
+    render json: {
+      error: "internal_server_error",
+      message: "Error: #{e.message}"
+    }, status: :internal_server_error
+  end
+
+  def show
+    # Rails will automatically use app/views/api/v1/transactions/show.json.jbuilder
+    render :show
+
+  rescue => e
+    Rails.logger.error "TransactionsController#show error: #{e.message}"
+    Rails.logger.error e.backtrace.join("\n")
+
+    render json: {
+      error: "internal_server_error",
+      message: "Error: #{e.message}"
+    }, status: :internal_server_error
+  end
+
+  def create
+    family = current_resource_owner.family
+
+    # Validate account_id is present
+    unless transaction_params[:account_id].present?
+      render json: {
+        error: "validation_failed",
+        message: "Account ID is required",
+        errors: [ "Account ID is required" ]
+      }, status: :unprocessable_entity
+      return
+    end
+
+    account = family.accounts.find(transaction_params[:account_id])
+    @entry = account.entries.new(entry_params_for_create)
+
+    if @entry.save
+      @entry.sync_account_later
+      @entry.lock_saved_attributes!
+      @entry.transaction.lock_attr!(:tag_ids) if @entry.transaction.tags.any?
+
+      @transaction = @entry.transaction
+      render :show, status: :created
+    else
+      render json: {
+        error: "validation_failed",
+        message: "Transaction could not be created",
+        errors: @entry.errors.full_messages
+      }, status: :unprocessable_entity
+    end
+
+  rescue => e
+    Rails.logger.error "TransactionsController#create error: #{e.message}"
+    Rails.logger.error e.backtrace.join("\n")
+
+    render json: {
+      error: "internal_server_error",
+      message: "Error: #{e.message}"
+    }, status: :internal_server_error
+end
+
+  def update
+    if @entry.update(entry_params_for_update)
+      @entry.sync_account_later
+      @entry.lock_saved_attributes!
+      @entry.transaction.lock_attr!(:tag_ids) if @entry.transaction.tags.any?
+
+      @transaction = @entry.transaction
+      render :show
+    else
+      render json: {
+        error: "validation_failed",
+        message: "Transaction could not be updated",
+        errors: @entry.errors.full_messages
+      }, status: :unprocessable_entity
+    end
+
+  rescue => e
+    Rails.logger.error "TransactionsController#update error: #{e.message}"
+    Rails.logger.error e.backtrace.join("\n")
+
+    render json: {
+      error: "internal_server_error",
+      message: "Error: #{e.message}"
+    }, status: :internal_server_error
+  end
+
+  def destroy
+    @entry.destroy!
+    @entry.sync_account_later
+
+    render json: {
+      message: "Transaction deleted successfully"
+    }, status: :ok
+
+  rescue => e
+    Rails.logger.error "TransactionsController#destroy error: #{e.message}"
+    Rails.logger.error e.backtrace.join("\n")
+
+    render json: {
+      error: "internal_server_error",
+      message: "Error: #{e.message}"
+    }, status: :internal_server_error
+  end
+
+  private
+
+    def set_transaction
+      family = current_resource_owner.family
+      @transaction = family.transactions.find(params[:id])
+      @entry = @transaction.entry
+    rescue ActiveRecord::RecordNotFound
+      render json: {
+        error: "not_found",
+        message: "Transaction not found"
+      }, status: :not_found
+    end
+
+    def ensure_read_scope
+      authorize_scope!(:read)
+    end
+
+    def ensure_write_scope
+      authorize_scope!(:write)
+    end
+
+    def apply_filters(query)
+      # Account filtering
+      if params[:account_id].present?
+        query = query.joins(:entry).where(entries: { account_id: params[:account_id] })
+      end
+
+      if params[:account_ids].present?
+        account_ids = Array(params[:account_ids])
+        query = query.joins(:entry).where(entries: { account_id: account_ids })
+      end
+
+      # Category filtering
+      if params[:category_id].present?
+        query = query.where(category_id: params[:category_id])
+      end
+
+      if params[:category_ids].present?
+        category_ids = Array(params[:category_ids])
+        query = query.where(category_id: category_ids)
+      end
+
+      # Merchant filtering
+      if params[:merchant_id].present?
+        query = query.where(merchant_id: params[:merchant_id])
+      end
+
+      if params[:merchant_ids].present?
+        merchant_ids = Array(params[:merchant_ids])
+        query = query.where(merchant_id: merchant_ids)
+      end
+
+      # Date range filtering
+      if params[:start_date].present?
+        query = query.joins(:entry).where("entries.date >= ?", Date.parse(params[:start_date]))
+      end
+
+      if params[:end_date].present?
+        query = query.joins(:entry).where("entries.date <= ?", Date.parse(params[:end_date]))
+      end
+
+      # Amount filtering
+      if params[:min_amount].present?
+        min_amount = params[:min_amount].to_f
+        query = query.joins(:entry).where("entries.amount >= ?", min_amount)
+      end
+
+      if params[:max_amount].present?
+        max_amount = params[:max_amount].to_f
+        query = query.joins(:entry).where("entries.amount <= ?", max_amount)
+      end
+
+      # Tag filtering
+      if params[:tag_ids].present?
+        tag_ids = Array(params[:tag_ids])
+        query = query.joins(:tags).where(tags: { id: tag_ids })
+      end
+
+      # Transaction type filtering (income/expense)
+      if params[:type].present?
+        case params[:type].downcase
+        when "income"
+          query = query.joins(:entry).where("entries.amount < 0")
+        when "expense"
+          query = query.joins(:entry).where("entries.amount > 0")
+        end
+      end
+
+      query
+    end
+
+    def apply_search(query)
+      search_term = "%#{params[:search]}%"
+
+      query.joins(:entry)
+           .left_joins(:merchant)
+           .where(
+             "entries.name ILIKE ? OR entries.notes ILIKE ? OR merchants.name ILIKE ?",
+             search_term, search_term, search_term
+           )
+end
+
+    def transaction_params
+      params.require(:transaction).permit(
+        :account_id, :date, :amount, :name, :description, :notes, :currency,
+        :category_id, :merchant_id, :nature, tag_ids: []
+      )
+    end
+
+    def entry_params_for_create
+      entry_params = {
+        name: transaction_params[:name] || transaction_params[:description],
+        date: transaction_params[:date],
+        amount: calculate_signed_amount,
+        currency: transaction_params[:currency] || current_resource_owner.family.currency,
+        notes: transaction_params[:notes],
+        entryable_type: "Transaction",
+        entryable_attributes: {
+          category_id: transaction_params[:category_id],
+          merchant_id: transaction_params[:merchant_id],
+          tag_ids: transaction_params[:tag_ids] || []
+        }
+      }
+
+      entry_params.compact
+    end
+
+    def entry_params_for_update
+      entry_params = {
+        name: transaction_params[:name] || transaction_params[:description],
+        date: transaction_params[:date],
+        notes: transaction_params[:notes],
+        entryable_attributes: {
+          id: @entry.entryable_id,
+          category_id: transaction_params[:category_id],
+          merchant_id: transaction_params[:merchant_id],
+          tag_ids: transaction_params[:tag_ids]
+        }.compact_blank
+      }
+
+      # Only update amount if provided
+      if transaction_params[:amount].present?
+        entry_params[:amount] = calculate_signed_amount
+      end
+
+      entry_params.compact
+    end
+
+    def calculate_signed_amount
+      amount = transaction_params[:amount].to_f
+      nature = transaction_params[:nature]
+
+      case nature&.downcase
+      when "income", "inflow"
+        -amount.abs  # Income is negative
+      when "expense", "outflow"
+        amount.abs   # Expense is positive
+      else
+        amount       # Use as provided
+      end
+    end
+
+    def safe_page_param
+      page = params[:page].to_i
+      page > 0 ? page : 1
+    end
+
+    def safe_per_page_param
+      per_page = params[:per_page].to_i
+      case per_page
+      when 1..100
+        per_page
+      else
+        25  # Default
+      end
+    end
+end
diff --git a/app/controllers/api/v1/usage_controller.rb b/app/controllers/api/v1/usage_controller.rb
new file mode 100644
index 00000000..b2a57df9
--- /dev/null
+++ b/app/controllers/api/v1/usage_controller.rb
@@ -0,0 +1,38 @@
+class Api::V1::UsageController < Api::V1::BaseController
+  # GET /api/v1/usage
+  def show
+    return unless authorize_scope!(:read)
+
+    case @authentication_method
+    when :api_key
+      usage_info = @rate_limiter.usage_info
+      render_json({
+        api_key: {
+          name: @api_key.name,
+          scopes: @api_key.scopes,
+          last_used_at: @api_key.last_used_at,
+          created_at: @api_key.created_at
+        },
+        rate_limit: {
+          tier: usage_info[:tier],
+          limit: usage_info[:rate_limit],
+          current_count: usage_info[:current_count],
+          remaining: usage_info[:remaining],
+          reset_in_seconds: usage_info[:reset_time],
+          reset_at: Time.current + usage_info[:reset_time].seconds
+        }
+      })
+    when :oauth
+      # For OAuth, we don't track detailed usage yet, but we can return basic info
+      render_json({
+        authentication_method: "oauth",
+        message: "Detailed usage tracking is available for API key authentication"
+      })
+    else
+      render_json({
+        error: "invalid_authentication_method",
+        message: "Unable to determine usage information"
+      }, status: :bad_request)
+    end
+  end
+end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c5145b17..260579d1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,12 +1,38 @@
 class ApplicationController < ActionController::Base
-  include Localize, AutoSync, Authentication, Invitable, SelfHostable, StoreLocation
+  include RestoreLayoutPreferences, Onboardable, Localize, AutoSync, Authentication, Invitable,
+          SelfHostable, StoreLocation, Impersonatable, Breadcrumbable,
+          FeatureGuardable, Notifiable
+
   include Pagy::Backend
 
+  before_action :detect_os
+  before_action :set_default_chat
+  before_action :set_active_storage_url_options
+
   private
+    def detect_os
+      user_agent = request.user_agent
+      @os = case user_agent
+      when /Windows/i then "windows"
+      when /Macintosh/i then "mac"
+      when /Linux/i then "linux"
+      when /Android/i then "android"
+      when /iPhone|iPad/i then "ios"
+      else ""
+      end
+    end
 
-    def with_sidebar
-      return "turbo_rails/frame" if turbo_frame_request?
+    # By default, we show the user the last chat they interacted with
+    def set_default_chat
+      @last_viewed_chat = Current.user&.last_viewed_chat
+      @chat = @last_viewed_chat
+    end
 
-      "with_sidebar"
+    def set_active_storage_url_options
+      ActiveStorage::Current.url_options = {
+        protocol: request.protocol,
+        host: request.host,
+        port: request.optional_port
+      }
     end
 end
diff --git a/app/controllers/budget_categories_controller.rb b/app/controllers/budget_categories_controller.rb
new file mode 100644
index 00000000..e8cc83e6
--- /dev/null
+++ b/app/controllers/budget_categories_controller.rb
@@ -0,0 +1,48 @@
+class BudgetCategoriesController < ApplicationController
+  before_action :set_budget
+
+  def index
+    @budget_categories = @budget.budget_categories.includes(:category)
+    render layout: "wizard"
+  end
+
+  def show
+    @recent_transactions = @budget.transactions
+
+    if params[:id] == BudgetCategory.uncategorized.id
+      @budget_category = @budget.uncategorized_budget_category
+      @recent_transactions = @recent_transactions.where(transactions: { category_id: nil })
+    else
+      @budget_category = Current.family.budget_categories.find(params[:id])
+      @recent_transactions = @recent_transactions.joins("LEFT JOIN categories ON categories.id = transactions.category_id")
+                                                 .where("categories.id = ? OR categories.parent_id = ?", @budget_category.category.id, @budget_category.category.id)
+    end
+
+    @recent_transactions = @recent_transactions.order("entries.date DESC, ABS(entries.amount) DESC").take(3)
+  end
+
+  def update
+    @budget_category = Current.family.budget_categories.find(params[:id])
+
+    if @budget_category.update(budget_category_params)
+      respond_to do |format|
+        format.turbo_stream
+        format.html { redirect_to budget_budget_categories_path(@budget) }
+      end
+    else
+      render :index, status: :unprocessable_entity
+    end
+  end
+
+  private
+    def budget_category_params
+      params.require(:budget_category).permit(:budgeted_spending).tap do |params|
+        params[:budgeted_spending] = params[:budgeted_spending].presence || 0
+      end
+    end
+
+    def set_budget
+      start_date = Budget.param_to_date(params[:budget_month_year])
+      @budget = Current.family.budgets.find_by(start_date: start_date)
+    end
+end
diff --git a/app/controllers/budgets_controller.rb b/app/controllers/budgets_controller.rb
new file mode 100644
index 00000000..9ec26e83
--- /dev/null
+++ b/app/controllers/budgets_controller.rb
@@ -0,0 +1,47 @@
+class BudgetsController < ApplicationController
+  before_action :set_budget, only: %i[show edit update]
+
+  def index
+    redirect_to_current_month_budget
+  end
+
+  def show
+  end
+
+  def edit
+    render layout: "wizard"
+  end
+
+  def update
+    @budget.update!(budget_params)
+    redirect_to budget_budget_categories_path(@budget)
+  end
+
+  def picker
+    render partial: "budgets/picker", locals: {
+      family: Current.family,
+      year: params[:year].to_i || Date.current.year
+    }
+  end
+
+  private
+
+    def budget_create_params
+      params.require(:budget).permit(:start_date)
+    end
+
+    def budget_params
+      params.require(:budget).permit(:budgeted_spending, :expected_income)
+    end
+
+    def set_budget
+      start_date = Budget.param_to_date(params[:month_year])
+      @budget = Budget.find_or_bootstrap(Current.family, start_date: start_date)
+      raise ActiveRecord::RecordNotFound unless @budget
+    end
+
+    def redirect_to_current_month_budget
+      current_budget = Budget.find_or_bootstrap(Current.family, start_date: Date.current)
+      redirect_to budget_path(current_budget)
+    end
+end
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 443770fe..b1516f86 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -1,33 +1,70 @@
 class CategoriesController < ApplicationController
-  layout :with_sidebar
-
-  before_action :set_category, only: %i[edit update]
+  before_action :set_category, only: %i[edit update destroy]
+  before_action :set_categories, only: %i[update edit]
   before_action :set_transaction, only: :create
 
   def index
     @categories = Current.family.categories.alphabetically
+
+    render layout: "settings"
   end
 
   def new
     @category = Current.family.categories.new color: Category::COLORS.sample
+    set_categories
   end
 
   def create
-    Category.transaction do
-      category = Current.family.categories.create!(category_params)
-      @transaction.update!(category_id: category.id) if @transaction
-    end
+    @category = Current.family.categories.new(category_params)
 
-    redirect_back_or_to transactions_path, notice: t(".success")
+    if @category.save
+      @transaction.update(category_id: @category.id) if @transaction
+
+      flash[:notice] = t(".success")
+
+      redirect_target_url = request.referer || categories_path
+      respond_to do |format|
+        format.html { redirect_back_or_to categories_path, notice: t(".success") }
+        format.turbo_stream { render turbo_stream: turbo_stream.action(:redirect, redirect_target_url) }
+      end
+    else
+      set_categories
+      render :new, status: :unprocessable_entity
+    end
   end
 
   def edit
   end
 
   def update
-    @category.update! category_params
+    if @category.update(category_params)
+      flash[:notice] = t(".success")
 
-    redirect_back_or_to transactions_path, notice: t(".success")
+      redirect_target_url = request.referer || categories_path
+      respond_to do |format|
+        format.html { redirect_back_or_to categories_path, notice: t(".success") }
+        format.turbo_stream { render turbo_stream: turbo_stream.action(:redirect, redirect_target_url) }
+      end
+    else
+      render :edit, status: :unprocessable_entity
+    end
+  end
+
+  def destroy
+    @category.destroy
+
+    redirect_back_or_to categories_path, notice: t(".success")
+  end
+
+  def destroy_all
+    Current.family.categories.destroy_all
+    redirect_back_or_to categories_path, notice: "All categories deleted"
+  end
+
+  def bootstrap
+    Current.family.categories.bootstrap!
+
+    redirect_back_or_to categories_path, notice: t(".success")
   end
 
   private
@@ -35,6 +72,14 @@ class CategoriesController < ApplicationController
       @category = Current.family.categories.find(params[:id])
     end
 
+    def set_categories
+      @categories = unless @category.parent?
+        Current.family.categories.alphabetically.roots.where.not(id: @category.id)
+      else
+        []
+      end
+    end
+
     def set_transaction
       if params[:transaction_id].present?
         @transaction = Current.family.transactions.find(params[:transaction_id])
@@ -42,6 +87,6 @@ class CategoriesController < ApplicationController
     end
 
     def category_params
-      params.require(:category).permit(:name, :color)
+      params.require(:category).permit(:name, :color, :parent_id, :classification, :lucide_icon)
     end
 end
diff --git a/app/controllers/category/deletions_controller.rb b/app/controllers/category/deletions_controller.rb
index 57f8ee5f..e11777ab 100644
--- a/app/controllers/category/deletions_controller.rb
+++ b/app/controllers/category/deletions_controller.rb
@@ -1,6 +1,4 @@
 class Category::DeletionsController < ApplicationController
-  layout :with_sidebar
-
   before_action :set_category
   before_action :set_replacement_category, only: :create
 
diff --git a/app/controllers/chats_controller.rb b/app/controllers/chats_controller.rb
new file mode 100644
index 00000000..6b8b494a
--- /dev/null
+++ b/app/controllers/chats_controller.rb
@@ -0,0 +1,65 @@
+class ChatsController < ApplicationController
+  include ActionView::RecordIdentifier
+
+  before_action :set_chat, only: [ :show, :edit, :update, :destroy ]
+
+  def index
+    @chat = nil # override application_controller default behavior of setting @chat to last viewed chat
+    @chats = Current.user.chats.order(created_at: :desc)
+  end
+
+  def show
+    set_last_viewed_chat(@chat)
+  end
+
+  def new
+    @chat = Current.user.chats.new(title: "New chat #{Time.current.strftime("%Y-%m-%d %H:%M")}")
+  end
+
+  def create
+    @chat = Current.user.chats.start!(chat_params[:content], model: chat_params[:ai_model])
+    set_last_viewed_chat(@chat)
+    redirect_to chat_path(@chat, thinking: true)
+  end
+
+  def edit
+  end
+
+  def update
+    @chat.update!(chat_params)
+
+    respond_to do |format|
+      format.html { redirect_back_or_to chat_path(@chat), notice: "Chat updated" }
+      format.turbo_stream { render turbo_stream: turbo_stream.replace(dom_id(@chat, :title), partial: "chats/chat_title", locals: { chat: @chat }) }
+    end
+  end
+
+  def destroy
+    @chat.destroy
+    clear_last_viewed_chat
+
+    redirect_to chats_path, notice: "Chat was successfully deleted"
+  end
+
+  def retry
+    @chat.retry_last_message!
+    redirect_to chat_path(@chat, thinking: true)
+  end
+
+  private
+    def set_chat
+      @chat = Current.user.chats.find(params[:id])
+    end
+
+    def set_last_viewed_chat(chat)
+      Current.user.update!(last_viewed_chat: chat)
+    end
+
+    def clear_last_viewed_chat
+      Current.user.update!(last_viewed_chat: nil)
+    end
+
+    def chat_params
+      params.require(:chat).permit(:title, :content, :ai_model)
+    end
+end
diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/controllers/concerns/accountable_resource.rb b/app/controllers/concerns/accountable_resource.rb
new file mode 100644
index 00000000..3b06ff16
--- /dev/null
+++ b/app/controllers/concerns/accountable_resource.rb
@@ -0,0 +1,87 @@
+module AccountableResource
+  extend ActiveSupport::Concern
+
+  included do
+    include Periodable
+
+    before_action :set_account, only: [ :show, :edit, :update ]
+    before_action :set_link_options, only: :new
+  end
+
+  class_methods do
+    def permitted_accountable_attributes(*attrs)
+      @permitted_accountable_attributes = attrs if attrs.any?
+      @permitted_accountable_attributes ||= [ :id ]
+    end
+  end
+
+  def new
+    @account = Current.family.accounts.build(
+      currency: Current.family.currency,
+      accountable: accountable_type.new
+    )
+  end
+
+  def show
+    @chart_view = params[:chart_view] || "balance"
+    @q = params.fetch(:q, {}).permit(:search)
+    entries = @account.entries.search(@q).reverse_chronological
+
+    @pagy, @entries = pagy(entries, limit: params[:per_page] || "10")
+  end
+
+  def edit
+  end
+
+  def create
+    @account = Current.family.accounts.create_and_sync(account_params.except(:return_to))
+    @account.lock_saved_attributes!
+
+    redirect_to account_params[:return_to].presence || @account, notice: t("accounts.create.success", type: accountable_type.name.underscore.humanize)
+  end
+
+  def update
+    # Handle balance update if provided
+    if account_params[:balance].present?
+      result = @account.set_current_balance(account_params[:balance].to_d)
+      unless result.success?
+        @error_message = result.error_message
+        render :edit, status: :unprocessable_entity
+        return
+      end
+      @account.sync_later
+    end
+
+    # Update remaining account attributes
+    update_params = account_params.except(:return_to, :balance, :currency)
+    unless @account.update(update_params)
+      @error_message = @account.errors.full_messages.join(", ")
+      render :edit, status: :unprocessable_entity
+      return
+    end
+
+    @account.lock_saved_attributes!
+    redirect_back_or_to account_path(@account), notice: t("accounts.update.success", type: accountable_type.name.underscore.humanize)
+  end
+
+  private
+    def set_link_options
+      @show_us_link = Current.family.can_connect_plaid_us?
+      @show_eu_link = Current.family.can_connect_plaid_eu?
+    end
+
+    def accountable_type
+      controller_name.classify.constantize
+    end
+
+    def set_account
+      @account = Current.family.accounts.find(params[:id])
+    end
+
+    def account_params
+      params.require(:account).permit(
+        :name, :balance, :subtype, :currency, :accountable_type, :return_to,
+        accountable_attributes: self.class.permitted_accountable_attributes
+      )
+    end
+end
diff --git a/app/controllers/concerns/authentication.rb b/app/controllers/concerns/authentication.rb
index cd210cca..28758d9d 100644
--- a/app/controllers/concerns/authentication.rb
+++ b/app/controllers/concerns/authentication.rb
@@ -4,17 +4,19 @@ module Authentication
   included do
     before_action :set_request_details
     before_action :authenticate_user!
+    before_action :set_sentry_user
   end
 
   class_methods do
     def skip_authentication(**options)
       skip_before_action :authenticate_user!, **options
+      skip_before_action :set_sentry_user, **options
     end
   end
 
   private
     def authenticate_user!
-      if session_record = Session.find_by_id(cookies.signed[:session_token])
+      if session_record = find_session_by_cookie
         Current.session = session_record
       else
         if self_hosted_first_login?
@@ -25,6 +27,16 @@ module Authentication
       end
     end
 
+    def find_session_by_cookie
+      cookie_value = cookies.signed[:session_token]
+
+      if cookie_value.present?
+        Session.find_by(id: cookie_value)
+      else
+        nil
+      end
+    end
+
     def create_session_for(user)
       session = user.sessions.create!
       cookies.signed.permanent[:session_token] = { value: session.id, httponly: true }
@@ -39,4 +51,17 @@ module Authentication
       Current.user_agent = request.user_agent
       Current.ip_address = request.ip
     end
+
+    def set_sentry_user
+      return unless defined?(Sentry) && ENV["SENTRY_DSN"].present?
+
+      if Current.user
+        Sentry.set_user(
+          id: Current.user.id,
+          email: Current.user.email,
+          username: Current.user.display_name,
+          ip_address: Current.ip_address
+        )
+      end
+    end
 end
diff --git a/app/controllers/concerns/auto_sync.rb b/app/controllers/concerns/auto_sync.rb
index 122710a6..705e69e9 100644
--- a/app/controllers/concerns/auto_sync.rb
+++ b/app/controllers/concerns/auto_sync.rb
@@ -1,13 +1,22 @@
 module AutoSync
   extend ActiveSupport::Concern
 
-  included do
-    before_action :sync_family, if: -> { Current.family.present? && Current.family.needs_sync? }
-  end
+  # included do
+  #   before_action :sync_family, if: :family_needs_auto_sync?
+  # end
 
   private
-
     def sync_family
-      Current.family.sync
+      Current.family.sync_later
+    end
+
+    def family_needs_auto_sync?
+      return false unless Current.family&.accounts&.active&.any?
+      return false if (Current.family.last_sync_created_at&.to_date || 1.day.ago) >= Date.current
+      return false unless Current.family.auto_sync_on_login
+
+      Rails.logger.info "Auto-syncing family #{Current.family.id}, last sync was #{Current.family.last_sync_created_at}"
+
+      true
     end
 end
diff --git a/app/controllers/concerns/breadcrumbable.rb b/app/controllers/concerns/breadcrumbable.rb
new file mode 100644
index 00000000..38ebd889
--- /dev/null
+++ b/app/controllers/concerns/breadcrumbable.rb
@@ -0,0 +1,13 @@
+module Breadcrumbable
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :set_breadcrumbs
+  end
+
+  private
+    # The default, unless specific controller or action explicitly overrides
+    def set_breadcrumbs
+      @breadcrumbs = [ [ "Home", root_path ], [ controller_name.titleize, nil ] ]
+    end
+end
diff --git a/app/controllers/concerns/entryable_resource.rb b/app/controllers/concerns/entryable_resource.rb
new file mode 100644
index 00000000..443b0483
--- /dev/null
+++ b/app/controllers/concerns/entryable_resource.rb
@@ -0,0 +1,47 @@
+module EntryableResource
+  extend ActiveSupport::Concern
+
+  included do
+    include StreamExtensions, ActionView::RecordIdentifier
+
+    before_action :set_entry, only: %i[show update destroy]
+  end
+
+  def show
+  end
+
+  def new
+    account = Current.family.accounts.find_by(id: params[:account_id])
+
+    @entry = Current.family.entries.new(
+      account: account,
+      currency: account ? account.currency : Current.family.currency,
+      entryable: entryable
+    )
+  end
+
+  def create
+    raise NotImplementedError, "Entryable resources must implement #create"
+  end
+
+  def update
+    raise NotImplementedError, "Entryable resources must implement #update"
+  end
+
+  def destroy
+    account = @entry.account
+    @entry.destroy!
+    @entry.sync_account_later
+
+    redirect_back_or_to account_path(account), notice: t("account.entries.destroy.success")
+  end
+
+  private
+    def entryable
+      controller_name.classify.constantize.new
+    end
+
+    def set_entry
+      @entry = Current.family.entries.find(params[:id])
+    end
+end
diff --git a/app/controllers/concerns/feature_guardable.rb b/app/controllers/concerns/feature_guardable.rb
new file mode 100644
index 00000000..d08f957d
--- /dev/null
+++ b/app/controllers/concerns/feature_guardable.rb
@@ -0,0 +1,23 @@
+# Simple feature guard that renders a 403 Forbidden status with a message
+# when the feature is disabled.
+#
+# Example:
+#
+# class MessagesController < ApplicationController
+#   guard_feature unless: -> { Current.user.ai_enabled? }
+# end
+#
+module FeatureGuardable
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def guard_feature(**options)
+      before_action :guard_feature, **options
+    end
+  end
+
+  private
+    def guard_feature
+      render plain: "Feature disabled: #{controller_name}##{action_name}", status: :forbidden
+    end
+end
diff --git a/app/controllers/concerns/filterable.rb b/app/controllers/concerns/filterable.rb
deleted file mode 100644
index 4fe42f45..00000000
--- a/app/controllers/concerns/filterable.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-module Filterable
-  extend ActiveSupport::Concern
-
-  included do
-    before_action :set_period
-  end
-
-    private
-
-      def set_period
-        @period = Period.find_by_name(params[:period])
-        if @period.nil?
-          start_date = params[:start_date].presence&.to_date
-          end_date = params[:end_date].presence&.to_date
-          if start_date.is_a?(Date) && end_date.is_a?(Date) && start_date <= end_date
-            @period = Period.new(name: "custom", date_range: start_date..end_date)
-          else
-            params[:period] = "last_30_days"
-            @period = Period.find_by_name(params[:period])
-          end
-        end
-      end
-end
diff --git a/app/controllers/concerns/impersonatable.rb b/app/controllers/concerns/impersonatable.rb
new file mode 100644
index 00000000..857b68c4
--- /dev/null
+++ b/app/controllers/concerns/impersonatable.rb
@@ -0,0 +1,21 @@
+module Impersonatable
+  extend ActiveSupport::Concern
+
+  included do
+    after_action :create_impersonation_session_log
+  end
+
+  private
+    def create_impersonation_session_log
+      return unless Current.session&.active_impersonator_session.present?
+
+      Current.session.active_impersonator_session.logs.create!(
+        controller: controller_name,
+        action: action_name,
+        path: request.fullpath,
+        method: request.method,
+        ip_address: request.ip,
+        user_agent: request.user_agent
+      )
+    end
+end
diff --git a/app/controllers/concerns/invitable.rb b/app/controllers/concerns/invitable.rb
index 1e0dfed8..5e12d2df 100644
--- a/app/controllers/concerns/invitable.rb
+++ b/app/controllers/concerns/invitable.rb
@@ -7,6 +7,7 @@ module Invitable
 
   private
     def invite_code_required?
+      return false if @invitation.present?
       self_hosted? ? Setting.require_invite_for_signup : ENV["REQUIRE_INVITE_CODE"] == "true"
     end
 
diff --git a/app/controllers/concerns/localize.rb b/app/controllers/concerns/localize.rb
index 5a549347..f3b558c1 100644
--- a/app/controllers/concerns/localize.rb
+++ b/app/controllers/concerns/localize.rb
@@ -3,6 +3,7 @@ module Localize
 
   included do
     around_action :switch_locale
+    around_action :switch_timezone
   end
 
   private
@@ -10,4 +11,9 @@ module Localize
       locale = Current.family.try(:locale) || I18n.default_locale
       I18n.with_locale(locale, &action)
     end
+
+    def switch_timezone(&action)
+      timezone = Current.family.try(:timezone) || Time.zone
+      Time.use_zone(timezone, &action)
+    end
 end
diff --git a/app/controllers/concerns/notifiable.rb b/app/controllers/concerns/notifiable.rb
new file mode 100644
index 00000000..b1689f67
--- /dev/null
+++ b/app/controllers/concerns/notifiable.rb
@@ -0,0 +1,56 @@
+module Notifiable
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :render_flash_notifications
+    helper_method :flash_notification_stream_items
+  end
+
+  private
+    def render_flash_notifications
+      notifications = flash.flat_map { |type, data| resolve_notifications(type, data) }.compact
+
+      view_context.safe_join(
+        notifications.map { |notification| view_context.render(**notification) }
+      )
+    end
+
+    def flash_notification_stream_items
+      items = flash.flat_map do |type, data|
+        notifications = resolve_notifications(type, data)
+
+        if type == "cta"
+          notifications.map { |notification| turbo_stream.replace("cta", **notification) }
+        else
+          notifications.map { |notification| turbo_stream.append("notification-tray", **notification) }
+        end
+      end.compact
+
+      # If rendering flash notifications via stream, we mark them as used to avoid
+      # them being rendered again on the next page load
+      flash.clear
+
+      items
+    end
+
+    def resolve_cta(cta)
+      case cta[:type]
+      when "category_rule"
+        { partial: "rules/category_rule_cta", locals: { cta: } }
+      end
+    end
+
+    def resolve_notifications(type, data)
+      case type
+      when "alert"
+        [ { partial: "shared/notifications/alert", locals: { message: data } } ]
+      when "cta"
+        [ resolve_cta(data) ]
+      when "notice"
+        messages = Array(data)
+        messages.map { |message| { partial: "shared/notifications/notice", locals: { message: message } } }
+      else
+        []
+      end
+    end
+end
diff --git a/app/controllers/concerns/onboardable.rb b/app/controllers/concerns/onboardable.rb
new file mode 100644
index 00000000..60655094
--- /dev/null
+++ b/app/controllers/concerns/onboardable.rb
@@ -0,0 +1,37 @@
+module Onboardable
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :require_onboarding_and_upgrade
+  end
+
+  private
+    # First, we require onboarding, then once that's complete, we require an upgrade for non-subscribed users.
+    def require_onboarding_and_upgrade
+      return unless Current.user
+      return unless redirectable_path?(request.path)
+
+      if Current.user.needs_onboarding?
+        redirect_to onboarding_path
+      elsif Current.family.needs_subscription?
+        redirect_to trial_onboarding_path
+      elsif Current.family.upgrade_required?
+        redirect_to upgrade_subscription_path
+      end
+    end
+
+    def redirectable_path?(path)
+      return false if path.starts_with?("/settings")
+      return false if path.starts_with?("/subscription")
+      return false if path.starts_with?("/onboarding")
+      return false if path.starts_with?("/users")
+      return false if path.starts_with?("/api")  # Exclude API endpoints from onboarding redirects
+
+      [
+        new_registration_path,
+        new_session_path,
+        new_password_reset_path,
+        new_email_confirmation_path
+      ].exclude?(path)
+    end
+end
diff --git a/app/controllers/concerns/periodable.rb b/app/controllers/concerns/periodable.rb
new file mode 100644
index 00000000..8cf02395
--- /dev/null
+++ b/app/controllers/concerns/periodable.rb
@@ -0,0 +1,14 @@
+module Periodable
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :set_period
+  end
+
+  private
+    def set_period
+      @period = Period.from_key(params[:period] || Current.user&.default_period)
+    rescue Period::InvalidKeyError
+      @period = Period.last_30_days
+    end
+end
diff --git a/app/controllers/concerns/restore_layout_preferences.rb b/app/controllers/concerns/restore_layout_preferences.rb
new file mode 100644
index 00000000..284df4cc
--- /dev/null
+++ b/app/controllers/concerns/restore_layout_preferences.rb
@@ -0,0 +1,24 @@
+module RestoreLayoutPreferences
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :restore_active_tabs
+  end
+
+  private
+    def restore_active_tabs
+      last_selected_tab = Current.session&.get_preferred_tab("account_sidebar_tab") || "asset"
+
+      @account_group_tab = account_group_tab_param || last_selected_tab
+    end
+
+    def valid_account_group_tabs
+      %w[asset liability all]
+    end
+
+    def account_group_tab_param
+      param_value = params[:account_sidebar_tab]
+      return nil unless param_value.in?(valid_account_group_tabs)
+      param_value
+    end
+end
diff --git a/app/controllers/concerns/self_hostable.rb b/app/controllers/concerns/self_hostable.rb
index a863f170..4208e03a 100644
--- a/app/controllers/concerns/self_hostable.rb
+++ b/app/controllers/concerns/self_hostable.rb
@@ -3,6 +3,8 @@ module SelfHostable
 
   included do
     helper_method :self_hosted?, :self_hosted_first_login?
+
+    prepend_before_action :verify_self_host_config
   end
 
   private
@@ -13,4 +15,29 @@ module SelfHostable
     def self_hosted_first_login?
       self_hosted? && User.count.zero?
     end
+
+    def verify_self_host_config
+      return unless self_hosted?
+
+      # Special handling for Redis configuration error page
+      if controller_name == "pages" && action_name == "redis_configuration_error"
+        # If Redis is now working, redirect to home
+        if redis_connected?
+          redirect_to root_path, notice: "Redis is now configured properly! You can now setup your Maybe application."
+        end
+
+        return
+      end
+
+      unless redis_connected?
+        redirect_to redis_configuration_error_path
+      end
+    end
+
+    def redis_connected?
+      Redis.new.ping
+      true
+    rescue Redis::CannotConnectError
+      false
+    end
 end
diff --git a/app/controllers/concerns/store_location.rb b/app/controllers/concerns/store_location.rb
index 2bf87a64..e2e8d318 100644
--- a/app/controllers/concerns/store_location.rb
+++ b/app/controllers/concerns/store_location.rb
@@ -5,6 +5,8 @@ module StoreLocation
     helper_method :previous_path
     before_action :store_return_to
     after_action :clear_previous_path
+
+    rescue_from ActiveRecord::RecordNotFound, with: :handle_not_found
   end
 
   def previous_path
@@ -12,6 +14,14 @@ module StoreLocation
   end
 
 private
+  def handle_not_found
+    if request.fullpath == session[:return_to]
+      session.delete(:return_to)
+      redirect_to fallback_path
+    else
+      head :not_found
+    end
+  end
 
   def store_return_to
     if params[:return_to].present?
diff --git a/app/controllers/concerns/stream_extensions.rb b/app/controllers/concerns/stream_extensions.rb
new file mode 100644
index 00000000..978d5bfb
--- /dev/null
+++ b/app/controllers/concerns/stream_extensions.rb
@@ -0,0 +1,20 @@
+module StreamExtensions
+  extend ActiveSupport::Concern
+
+  def stream_redirect_to(path, notice: nil, alert: nil)
+    custom_stream_redirect(path, notice: notice, alert: alert)
+  end
+
+  def stream_redirect_back_or_to(path, notice: nil, alert: nil)
+    custom_stream_redirect(path, redirect_back: true, notice: notice, alert: alert)
+  end
+
+  private
+    def custom_stream_redirect(path, redirect_back: false, notice: nil, alert: nil)
+      flash[:notice] = notice if notice.present?
+      flash[:alert] = alert if alert.present?
+
+      redirect_target_url = redirect_back ? request.referer : path
+      render turbo_stream: turbo_stream.action(:redirect, redirect_target_url)
+    end
+end
diff --git a/app/controllers/cookie_sessions_controller.rb b/app/controllers/cookie_sessions_controller.rb
new file mode 100644
index 00000000..7e76636f
--- /dev/null
+++ b/app/controllers/cookie_sessions_controller.rb
@@ -0,0 +1,22 @@
+class CookieSessionsController < ApplicationController
+  def update
+    save_kv_to_session(
+      cookie_session_params[:tab_key],
+      cookie_session_params[:tab_value]
+    )
+
+    redirect_back_or_to root_path
+  end
+
+  private
+    def cookie_session_params
+      params.require(:cookie_session).permit(:tab_key, :tab_value)
+    end
+
+    def save_kv_to_session(key, value)
+      raise "Key must be a string" unless key.is_a?(String)
+      raise "Value must be a string" unless value.is_a?(String)
+
+      session["custom_#{key}"] = value
+    end
+end
diff --git a/app/controllers/credit_cards_controller.rb b/app/controllers/credit_cards_controller.rb
index 5854c9fa..4d0f5659 100644
--- a/app/controllers/credit_cards_controller.rb
+++ b/app/controllers/credit_cards_controller.rb
@@ -1,41 +1,12 @@
 class CreditCardsController < ApplicationController
-  before_action :set_account, only: :update
+  include AccountableResource
 
-  def create
-    account = Current.family
-                     .accounts
-                     .create_with_optional_start_balance! \
-                       attributes: account_params.except(:start_date, :start_balance),
-                       start_date: account_params[:start_date],
-                       start_balance: account_params[:start_balance]
-
-    account.sync_later
-    redirect_to account, notice: t(".success")
-  end
-
-  def update
-    @account.update_with_sync!(account_params)
-    redirect_to @account, notice: t(".success")
-  end
-
-  private
-
-    def set_account
-      @account = Current.family.accounts.find(params[:id])
-    end
-
-    def account_params
-      params.require(:account)
-        .permit(
-          :name, :balance, :institution_id, :start_date, :start_balance, :currency, :accountable_type,
-          accountable_attributes: [
-            :id,
-            :available_credit,
-            :minimum_payment,
-            :apr,
-            :annual_fee,
-            :expiration_date
-          ]
-        )
-    end
+  permitted_accountable_attributes(
+    :id,
+    :available_credit,
+    :minimum_payment,
+    :apr,
+    :annual_fee,
+    :expiration_date
+  )
 end
diff --git a/app/controllers/cryptos_controller.rb b/app/controllers/cryptos_controller.rb
new file mode 100644
index 00000000..2df7d041
--- /dev/null
+++ b/app/controllers/cryptos_controller.rb
@@ -0,0 +1,3 @@
+class CryptosController < ApplicationController
+  include AccountableResource
+end
diff --git a/app/controllers/current_sessions_controller.rb b/app/controllers/current_sessions_controller.rb
new file mode 100644
index 00000000..303b51f0
--- /dev/null
+++ b/app/controllers/current_sessions_controller.rb
@@ -0,0 +1,14 @@
+class CurrentSessionsController < ApplicationController
+  def update
+    if session_params[:tab_key].present? && session_params[:tab_value].present?
+      Current.session.set_preferred_tab(session_params[:tab_key], session_params[:tab_value])
+    end
+
+    head :ok
+  end
+
+  private
+    def session_params
+      params.require(:current_session).permit(:tab_key, :tab_value)
+    end
+end
diff --git a/app/controllers/depositories_controller.rb b/app/controllers/depositories_controller.rb
new file mode 100644
index 00000000..34a2842d
--- /dev/null
+++ b/app/controllers/depositories_controller.rb
@@ -0,0 +1,3 @@
+class DepositoriesController <  ApplicationController
+  include AccountableResource
+end
diff --git a/app/controllers/email_confirmations_controller.rb b/app/controllers/email_confirmations_controller.rb
new file mode 100644
index 00000000..eb5c3755
--- /dev/null
+++ b/app/controllers/email_confirmations_controller.rb
@@ -0,0 +1,18 @@
+class EmailConfirmationsController < ApplicationController
+  skip_before_action :set_request_details, only: :new
+  skip_authentication only: :new
+
+  def new
+    # Returns nil if the token is invalid OR expired
+    @user = User.find_by_token_for(:email_confirmation, params[:token])
+
+    if @user&.unconfirmed_email && @user&.update(
+      email: @user.unconfirmed_email,
+      unconfirmed_email: nil
+    )
+      redirect_to new_session_path, notice: t(".success_login")
+    else
+      redirect_to root_path, alert: t(".invalid_token")
+    end
+  end
+end
diff --git a/app/controllers/family_merchants_controller.rb b/app/controllers/family_merchants_controller.rb
new file mode 100644
index 00000000..1798056f
--- /dev/null
+++ b/app/controllers/family_merchants_controller.rb
@@ -0,0 +1,53 @@
+class FamilyMerchantsController < ApplicationController
+  before_action :set_merchant, only: %i[edit update destroy]
+
+  def index
+    @breadcrumbs = [ [ "Home", root_path ], [ "Merchants", nil ] ]
+
+    @family_merchants = Current.family.merchants.alphabetically
+
+    render layout: "settings"
+  end
+
+  def new
+    @family_merchant = FamilyMerchant.new(family: Current.family)
+  end
+
+  def create
+    @family_merchant = FamilyMerchant.new(merchant_params.merge(family: Current.family))
+
+    if @family_merchant.save
+      respond_to do |format|
+        format.html { redirect_to family_merchants_path, notice: t(".success") }
+        format.turbo_stream { render turbo_stream: turbo_stream.action(:redirect, family_merchants_path) }
+      end
+    else
+      render :new, status: :unprocessable_entity
+    end
+  end
+
+  def edit
+  end
+
+  def update
+    @family_merchant.update!(merchant_params)
+    respond_to do |format|
+      format.html { redirect_to family_merchants_path, notice: t(".success") }
+      format.turbo_stream { render turbo_stream: turbo_stream.action(:redirect, family_merchants_path) }
+    end
+  end
+
+  def destroy
+    @family_merchant.destroy!
+    redirect_to family_merchants_path, notice: t(".success")
+  end
+
+  private
+    def set_merchant
+      @family_merchant = Current.family.merchants.find(params[:id])
+    end
+
+    def merchant_params
+      params.require(:family_merchant).permit(:name, :color)
+    end
+end
diff --git a/app/controllers/help/articles_controller.rb b/app/controllers/help/articles_controller.rb
deleted file mode 100644
index e5b19ff3..00000000
--- a/app/controllers/help/articles_controller.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class Help::ArticlesController < ApplicationController
-  layout :with_sidebar
-
-  def show
-    @article = Help::Article.find(params[:id])
-
-    unless @article
-      head :not_found
-    end
-  end
-end
diff --git a/app/controllers/holdings_controller.rb b/app/controllers/holdings_controller.rb
new file mode 100644
index 00000000..db9d59b4
--- /dev/null
+++ b/app/controllers/holdings_controller.rb
@@ -0,0 +1,29 @@
+class HoldingsController < ApplicationController
+  before_action :set_holding, only: %i[show destroy]
+
+  def index
+    @account = Current.family.accounts.find(params[:account_id])
+  end
+
+  def show
+  end
+
+  def destroy
+    if @holding.account.plaid_account_id.present?
+      flash[:alert] = "You cannot delete this holding"
+    else
+      @holding.destroy_holding_and_entries!
+      flash[:notice] = t(".success")
+    end
+
+    respond_to do |format|
+      format.html { redirect_back_or_to account_path(@holding.account) }
+      format.turbo_stream { render turbo_stream: turbo_stream.action(:redirect, account_path(@holding.account)) }
+    end
+  end
+
+  private
+    def set_holding
+      @holding = Current.family.holdings.find(params[:id])
+    end
+end
diff --git a/app/controllers/impersonation_sessions_controller.rb b/app/controllers/impersonation_sessions_controller.rb
new file mode 100644
index 00000000..1a8c5db7
--- /dev/null
+++ b/app/controllers/impersonation_sessions_controller.rb
@@ -0,0 +1,58 @@
+class ImpersonationSessionsController < ApplicationController
+  before_action :require_super_admin!, only: [ :create, :join, :leave ]
+  before_action :set_impersonation_session, only: [ :approve, :reject, :complete ]
+
+  def create
+    Current.true_user.request_impersonation_for(session_params[:impersonated_id])
+    redirect_to root_path, notice: t(".success")
+  end
+
+  def join
+    @impersonation_session = Current.true_user.impersonator_support_sessions.find_by(id: params[:impersonation_session_id])
+    Current.session.update!(active_impersonator_session: @impersonation_session)
+    redirect_to root_path, notice: t(".success")
+  end
+
+  def leave
+    Current.session.update!(active_impersonator_session: nil)
+    redirect_to root_path, notice: t(".success")
+  end
+
+  def approve
+    raise_unauthorized! unless @impersonation_session.impersonated == Current.true_user
+
+    @impersonation_session.approve!
+    redirect_to root_path, notice: t(".success")
+  end
+
+  def reject
+    raise_unauthorized! unless @impersonation_session.impersonated == Current.true_user
+
+    @impersonation_session.reject!
+    redirect_to root_path, notice: t(".success")
+  end
+
+  def complete
+    @impersonation_session.complete!
+    redirect_to root_path, notice: t(".success")
+  end
+
+  private
+    def session_params
+      params.require(:impersonation_session).permit(:impersonated_id)
+    end
+
+    def set_impersonation_session
+      @impersonation_session =
+        Current.true_user.impersonated_support_sessions.find_by(id: params[:id]) ||
+        Current.true_user.impersonator_support_sessions.find_by(id: params[:id])
+    end
+
+    def require_super_admin!
+      raise_unauthorized! unless Current.true_user&.super_admin?
+    end
+
+    def raise_unauthorized!
+      raise ActionController::RoutingError.new("Not Found")
+    end
+end
diff --git a/app/controllers/import/configurations_controller.rb b/app/controllers/import/configurations_controller.rb
index b399f683..f723c63e 100644
--- a/app/controllers/import/configurations_controller.rb
+++ b/app/controllers/import/configurations_controller.rb
@@ -20,6 +20,25 @@ class Import::ConfigurationsController < ApplicationController
     end
 
     def import_params
-      params.require(:import).permit(:date_col_label, :date_format, :name_col_label, :category_col_label, :tags_col_label, :amount_col_label, :signage_convention, :account_col_label, :notes_col_label, :entity_type_col_label)
+      params.require(:import).permit(
+        :date_col_label,
+        :amount_col_label,
+        :name_col_label,
+        :category_col_label,
+        :tags_col_label,
+        :account_col_label,
+        :qty_col_label,
+        :ticker_col_label,
+        :exchange_operating_mic_col_label,
+        :price_col_label,
+        :entity_type_col_label,
+        :notes_col_label,
+        :currency_col_label,
+        :date_format,
+        :number_format,
+        :signage_convention,
+        :amount_type_strategy,
+        :amount_type_inflow_value,
+      )
     end
 end
diff --git a/app/controllers/import/confirms_controller.rb b/app/controllers/import/confirms_controller.rb
index 0c1a8872..1a687d4b 100644
--- a/app/controllers/import/confirms_controller.rb
+++ b/app/controllers/import/confirms_controller.rb
@@ -4,6 +4,10 @@ class Import::ConfirmsController < ApplicationController
   before_action :set_import
 
   def show
+    if @import.mapping_steps.empty?
+      return redirect_to import_path(@import)
+    end
+
     redirect_to import_clean_path(@import), alert: "You have invalid data, please edit until all errors are resolved" unless @import.cleaned?
   end
 
diff --git a/app/controllers/import/rows_controller.rb b/app/controllers/import/rows_controller.rb
index b5b9092c..a3905b14 100644
--- a/app/controllers/import/rows_controller.rb
+++ b/app/controllers/import/rows_controller.rb
@@ -2,9 +2,7 @@ class Import::RowsController < ApplicationController
   before_action :set_import_row
 
   def update
-    @row.assign_attributes(row_params)
-    @row.save!(validate: false)
-    @row.sync_mappings
+    @row.update_and_sync(row_params)
 
     redirect_to import_row_path(@row.import, @row)
   end
diff --git a/app/controllers/import/uploads_controller.rb b/app/controllers/import/uploads_controller.rb
index e89988ac..e51b5278 100644
--- a/app/controllers/import/uploads_controller.rb
+++ b/app/controllers/import/uploads_controller.rb
@@ -6,12 +6,20 @@ class Import::UploadsController < ApplicationController
   def show
   end
 
+  def sample_csv
+    send_data @import.csv_template.to_csv,
+      filename: "#{@import.type.underscore.split('_').first}_sample.csv",
+      type: "text/csv",
+      disposition: "attachment"
+  end
+
   def update
     if csv_valid?(csv_str)
+      @import.account = Current.family.accounts.find_by(id: params.dig(:import, :account_id))
       @import.assign_attributes(raw_file_str: csv_str, col_sep: upload_params[:col_sep])
       @import.save!(validate: false)
 
-      redirect_to import_configuration_path(@import), notice: "CSV uploaded successfully."
+      redirect_to import_configuration_path(@import, template_hint: true), notice: "CSV uploaded successfully."
     else
       flash.now[:alert] = "Must be valid CSV with headers and at least one row of data"
 
@@ -29,10 +37,8 @@ class Import::UploadsController < ApplicationController
     end
 
     def csv_valid?(str)
-      require "csv"
-
       begin
-        csv = CSV.parse(str || "", headers: true)
+        csv = Import.parse_csv_str(str, col_sep: upload_params[:col_sep])
         return false if csv.headers.empty?
         return false if csv.count == 0
         true
diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb
index ef374f6c..20e5f9c4 100644
--- a/app/controllers/imports_controller.rb
+++ b/app/controllers/imports_controller.rb
@@ -1,16 +1,18 @@
 class ImportsController < ApplicationController
-  before_action :set_import, only: %i[show publish destroy]
+  before_action :set_import, only: %i[show publish destroy revert apply_template]
 
   def publish
     @import.publish_later
 
     redirect_to import_path(@import), notice: "Your import has started in the background."
+  rescue Import::MaxRowCountExceededError
+    redirect_back_or_to import_path(@import), alert: "Your import exceeds the maximum row count of #{@import.max_row_count}."
   end
 
   def index
     @imports = Current.family.imports
 
-    render layout: with_sidebar
+    render layout: "settings"
   end
 
   def new
@@ -18,13 +20,36 @@ class ImportsController < ApplicationController
   end
 
   def create
-    import = Current.family.imports.create! import_params
+    account = Current.family.accounts.find_by(id: params.dig(:import, :account_id))
+    import = Current.family.imports.create!(
+      type: import_params[:type],
+      account: account,
+      date_format: Current.family.date_format,
+    )
 
     redirect_to import_upload_path(import)
   end
 
   def show
-    redirect_to import_confirm_path(@import), alert: "Please finalize your mappings before proceeding." unless @import.publishable?
+    if !@import.uploaded?
+      redirect_to import_upload_path(@import), alert: "Please finalize your file upload."
+    elsif !@import.publishable?
+      redirect_to import_confirm_path(@import), alert: "Please finalize your mappings before proceeding."
+    end
+  end
+
+  def revert
+    @import.revert_later
+    redirect_to imports_path, notice: "Import is reverting in the background."
+  end
+
+  def apply_template
+    if @import.suggested_template
+      @import.apply_template!(@import.suggested_template)
+      redirect_to import_configuration_path(@import), notice: "Template applied."
+    else
+      redirect_to import_configuration_path(@import), alert: "No template found, please manually configure your import."
+    end
   end
 
   def destroy
diff --git a/app/controllers/institutions_controller.rb b/app/controllers/institutions_controller.rb
deleted file mode 100644
index ba5f719d..00000000
--- a/app/controllers/institutions_controller.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-class InstitutionsController < ApplicationController
-  before_action :set_institution, except: %i[new create]
-
-  def new
-    @institution = Institution.new
-  end
-
-  def create
-    Current.family.institutions.create!(institution_params)
-    redirect_to accounts_path, notice: t(".success")
-  end
-
-  def edit
-  end
-
-  def update
-    @institution.update!(institution_params)
-    redirect_to accounts_path, notice: t(".success")
-  end
-
-  def destroy
-    @institution.destroy!
-    redirect_to accounts_path, notice: t(".success")
-  end
-
-  def sync
-    @institution.sync
-    redirect_back_or_to accounts_path, notice: t(".success")
-  end
-
-  private
-
-    def institution_params
-      params.require(:institution).permit(:name, :logo)
-    end
-
-    def set_institution
-      @institution = Current.family.institutions.find(params[:id])
-    end
-end
diff --git a/app/controllers/investments_controller.rb b/app/controllers/investments_controller.rb
new file mode 100644
index 00000000..1ef7d144
--- /dev/null
+++ b/app/controllers/investments_controller.rb
@@ -0,0 +1,3 @@
+class InvestmentsController < ApplicationController
+  include AccountableResource
+end
diff --git a/app/controllers/invitations_controller.rb b/app/controllers/invitations_controller.rb
new file mode 100644
index 00000000..ca37435a
--- /dev/null
+++ b/app/controllers/invitations_controller.rb
@@ -0,0 +1,60 @@
+class InvitationsController < ApplicationController
+  skip_authentication only: :accept
+  def new
+    @invitation = Invitation.new
+  end
+
+  def create
+    unless Current.user.admin?
+      flash[:alert] = t(".failure")
+      redirect_to settings_profile_path
+      return
+    end
+
+    @invitation = Current.family.invitations.build(invitation_params)
+    @invitation.inviter = Current.user
+
+    if @invitation.save
+      InvitationMailer.invite_email(@invitation).deliver_later unless self_hosted?
+      flash[:notice] = t(".success")
+    else
+      flash[:alert] = t(".failure")
+    end
+
+    redirect_to settings_profile_path
+  end
+
+  def accept
+    @invitation = Invitation.find_by!(token: params[:id])
+
+    if @invitation.pending?
+      redirect_to new_registration_path(invitation: @invitation.token)
+    else
+      raise ActiveRecord::RecordNotFound
+    end
+  end
+
+  def destroy
+    unless Current.user.admin?
+      flash[:alert] = t("invitations.destroy.not_authorized")
+      redirect_to settings_profile_path
+      return
+    end
+
+    @invitation = Current.family.invitations.find(params[:id])
+
+    if @invitation.destroy
+      flash[:notice] = t("invitations.destroy.success")
+    else
+      flash[:alert] = t("invitations.destroy.failure")
+    end
+
+    redirect_to settings_profile_path
+  end
+
+  private
+
+    def invitation_params
+      params.require(:invitation).permit(:email, :role)
+    end
+end
diff --git a/app/controllers/invite_codes_controller.rb b/app/controllers/invite_codes_controller.rb
index f636a65a..fa8aa97c 100644
--- a/app/controllers/invite_codes_controller.rb
+++ b/app/controllers/invite_codes_controller.rb
@@ -6,6 +6,7 @@ class InviteCodesController < ApplicationController
   end
 
   def create
+    raise StandardError, "You are not allowed to generate invite codes" unless Current.user.admin?
     InviteCode.generate!
     redirect_back_or_to invite_codes_path, notice: "Code generated"
   end
diff --git a/app/controllers/issue/exchange_rate_provider_missings_controller.rb b/app/controllers/issue/exchange_rate_provider_missings_controller.rb
deleted file mode 100644
index 91cac7f5..00000000
--- a/app/controllers/issue/exchange_rate_provider_missings_controller.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class Issue::ExchangeRateProviderMissingsController < ApplicationController
-  before_action :set_issue, only: :update
-
-  def update
-    Setting.synth_api_key = exchange_rate_params[:synth_api_key]
-    @issue.issuable.sync_later
-    redirect_back_or_to account_path(@issue.issuable)
-  end
-
-  private
-
-    def set_issue
-      @issue = Current.family.issues.find(params[:id])
-    end
-
-    def exchange_rate_params
-      params.require(:issue_exchange_rate_provider_missing).permit(:synth_api_key)
-    end
-end
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
deleted file mode 100644
index 0585446d..00000000
--- a/app/controllers/issues_controller.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class IssuesController < ApplicationController
-  before_action :set_issue, only: :show
-
-  def show
-    render template: "#{@issue.class.name.underscore.pluralize}/show", layout: "issues"
-  end
-
-  private
-
-    def set_issue
-      @issue = Current.family.issues.find(params[:id])
-    end
-end
diff --git a/app/controllers/loans_controller.rb b/app/controllers/loans_controller.rb
index b084e566..961c5acf 100644
--- a/app/controllers/loans_controller.rb
+++ b/app/controllers/loans_controller.rb
@@ -1,39 +1,7 @@
 class LoansController < ApplicationController
-  before_action :set_account, only: :update
+  include AccountableResource
 
-  def create
-    account = Current.family
-                     .accounts
-                     .create_with_optional_start_balance! \
-                       attributes: account_params.except(:start_date, :start_balance),
-                       start_date: account_params[:start_date],
-                       start_balance: account_params[:start_balance]
-
-    account.sync_later
-    redirect_to account, notice: t(".success")
-  end
-
-  def update
-    @account.update_with_sync!(account_params)
-    redirect_to @account, notice: t(".success")
-  end
-
-  private
-
-    def set_account
-      @account = Current.family.accounts.find(params[:id])
-    end
-
-    def account_params
-      params.require(:account)
-        .permit(
-          :name, :balance, :institution_id, :start_date, :start_balance, :currency, :accountable_type,
-          accountable_attributes: [
-            :id,
-            :rate_type,
-            :interest_rate,
-            :term_months
-          ]
-        )
-    end
+  permitted_accountable_attributes(
+    :id, :rate_type, :interest_rate, :term_months, :initial_balance
+  )
 end
diff --git a/app/controllers/lookbooks_controller.rb b/app/controllers/lookbooks_controller.rb
new file mode 100644
index 00000000..6dc06d7e
--- /dev/null
+++ b/app/controllers/lookbooks_controller.rb
@@ -0,0 +1,3 @@
+class LookbooksController < Lookbook::PreviewController
+  layout "lookbooks"
+end
diff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rb
deleted file mode 100644
index 33fe156c..00000000
--- a/app/controllers/merchants_controller.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-class MerchantsController < ApplicationController
-  layout :with_sidebar
-
-  before_action :set_merchant, only: %i[edit update destroy]
-
-  def index
-    @merchants = Current.family.merchants.alphabetically
-  end
-
-  def new
-    @merchant = Merchant.new
-  end
-
-  def create
-    Current.family.merchants.create!(merchant_params)
-    redirect_to merchants_path, notice: t(".success")
-  end
-
-  def edit
-  end
-
-  def update
-    @merchant.update!(merchant_params)
-    redirect_to merchants_path, notice: t(".success")
-  end
-
-  def destroy
-    @merchant.destroy!
-    redirect_to merchants_path, notice: t(".success")
-  end
-
-  private
-
-    def set_merchant
-      @merchant = Current.family.merchants.find(params[:id])
-    end
-
-    def merchant_params
-      params.require(:merchant).permit(:name, :color)
-    end
-end
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
new file mode 100644
index 00000000..7a7777be
--- /dev/null
+++ b/app/controllers/messages_controller.rb
@@ -0,0 +1,24 @@
+class MessagesController < ApplicationController
+  guard_feature unless: -> { Current.user.ai_enabled? }
+
+  before_action :set_chat
+
+  def create
+    @message = UserMessage.create!(
+      chat: @chat,
+      content: message_params[:content],
+      ai_model: message_params[:ai_model]
+    )
+
+    redirect_to chat_path(@chat, thinking: true)
+  end
+
+  private
+    def set_chat
+      @chat = Current.user.chats.find(params[:chat_id])
+    end
+
+    def message_params
+      params.require(:message).permit(:content, :ai_model)
+    end
+end
diff --git a/app/controllers/mfa_controller.rb b/app/controllers/mfa_controller.rb
new file mode 100644
index 00000000..5d1fef0b
--- /dev/null
+++ b/app/controllers/mfa_controller.rb
@@ -0,0 +1,56 @@
+class MfaController < ApplicationController
+  layout :determine_layout
+  skip_authentication only: [ :verify, :verify_code ]
+
+  def new
+    redirect_to root_path if Current.user.otp_required?
+    Current.user.setup_mfa! unless Current.user.otp_secret.present?
+  end
+
+  def create
+    if Current.user.verify_otp?(params[:code])
+      Current.user.enable_mfa!
+      @backup_codes = Current.user.otp_backup_codes
+      render :backup_codes
+    else
+      Current.user.disable_mfa!
+      redirect_to new_mfa_path, alert: t(".invalid_code")
+    end
+  end
+
+  def verify
+    @user = User.find_by(id: session[:mfa_user_id])
+
+    if @user.nil?
+      redirect_to new_session_path
+    end
+  end
+
+  def verify_code
+    @user = User.find_by(id: session[:mfa_user_id])
+
+    if @user&.verify_otp?(params[:code])
+      session.delete(:mfa_user_id)
+      @session = create_session_for(@user)
+      redirect_to root_path
+    else
+      flash.now[:alert] = t(".invalid_code")
+      render :verify, status: :unprocessable_entity
+    end
+  end
+
+  def disable
+    Current.user.disable_mfa!
+    redirect_to settings_security_path, notice: t(".success")
+  end
+
+  private
+
+    def determine_layout
+      if action_name.in?(%w[verify verify_code])
+        "auth"
+      else
+        "settings"
+      end
+    end
+end
diff --git a/app/controllers/onboardings_controller.rb b/app/controllers/onboardings_controller.rb
new file mode 100644
index 00000000..0f616ce4
--- /dev/null
+++ b/app/controllers/onboardings_controller.rb
@@ -0,0 +1,24 @@
+class OnboardingsController < ApplicationController
+  layout "wizard"
+
+  before_action :set_user
+  before_action :load_invitation
+
+  def show
+  end
+
+  def preferences
+  end
+
+  def trial
+  end
+
+  private
+    def set_user
+      @user = Current.user
+    end
+
+    def load_invitation
+      @invitation = Current.family.invitations.accepted.find_by(email: Current.user.email)
+    end
+end
diff --git a/app/controllers/other_assets_controller.rb b/app/controllers/other_assets_controller.rb
new file mode 100644
index 00000000..409cca27
--- /dev/null
+++ b/app/controllers/other_assets_controller.rb
@@ -0,0 +1,3 @@
+class OtherAssetsController < ApplicationController
+  include AccountableResource
+end
diff --git a/app/controllers/other_liabilities_controller.rb b/app/controllers/other_liabilities_controller.rb
new file mode 100644
index 00000000..a5054172
--- /dev/null
+++ b/app/controllers/other_liabilities_controller.rb
@@ -0,0 +1,3 @@
+class OtherLiabilitiesController < ApplicationController
+  include AccountableResource
+end
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index f495d465..1fe96e27 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -1,48 +1,155 @@
 class PagesController < ApplicationController
-  skip_before_action :authenticate_user!, only: %i[early_access]
-  layout :with_sidebar, except: %i[early_access]
+  include Periodable
 
-  include Filterable
+  skip_authentication only: :redis_configuration_error
 
   def dashboard
-    snapshot = Current.family.snapshot(@period)
-    @net_worth_series = snapshot[:net_worth_series]
-    @asset_series = snapshot[:asset_series]
-    @liability_series = snapshot[:liability_series]
+    @balance_sheet = Current.family.balance_sheet
+    @accounts = Current.family.accounts.visible.with_attached_logo
 
-    snapshot_transactions = Current.family.snapshot_transactions
-    @income_series = snapshot_transactions[:income_series]
-    @spending_series = snapshot_transactions[:spending_series]
-    @savings_rate_series = snapshot_transactions[:savings_rate_series]
-
-    snapshot_account_transactions = Current.family.snapshot_account_transactions
-    @top_spenders = snapshot_account_transactions[:top_spenders]
-    @top_earners = snapshot_account_transactions[:top_earners]
-    @top_savers = snapshot_account_transactions[:top_savers]
-
-    @accounts = Current.family.accounts
-    @account_groups = @accounts.by_group(period: @period, currency: Current.family.currency)
-    @transaction_entries = Current.family.entries.account_transactions.limit(6).reverse_chronological
-
-    # TODO: Placeholders for trendlines
-    placeholder_series_data = 10.times.map do |i|
-      { date: Date.current - i.days, value: Money.new(0, Current.family.currency) }
+    period_param = params[:cashflow_period]
+    @cashflow_period = if period_param.present?
+      begin
+        Period.from_key(period_param)
+      rescue Period::InvalidKeyError
+        Period.last_30_days
+      end
+    else
+      Period.last_30_days
     end
-    @investing_series = TimeSeries.new(placeholder_series_data)
+
+    family_currency = Current.family.currency
+    income_totals = Current.family.income_statement.income_totals(period: @cashflow_period)
+    expense_totals = Current.family.income_statement.expense_totals(period: @cashflow_period)
+
+    @cashflow_sankey_data = build_cashflow_sankey_data(income_totals, expense_totals, family_currency)
+
+    @breadcrumbs = [ [ "Home", root_path ], [ "Dashboard", nil ] ]
   end
 
   def changelog
-    @release_notes = Provider::Github.new.fetch_latest_release_notes
+    @release_notes = github_provider.fetch_latest_release_notes
+
+    # Fallback if no release notes are available
+    if @release_notes.nil?
+      @release_notes = {
+        avatar: "https://github.com/maybe-finance.png",
+        username: "maybe-finance",
+        name: "Release notes unavailable",
+        published_at: Date.current,
+        body: "<p>Unable to fetch the latest release notes at this time. Please check back later or visit our <a href='https://github.com/maybe-finance/maybe/releases' target='_blank'>GitHub releases page</a> directly.</p>"
+      }
+    end
+
+    render layout: "settings"
   end
 
   def feedback
+    render layout: "settings"
   end
 
-  def early_access
-    redirect_to root_path if self_hosted?
-
-    @invite_codes_count = InviteCode.count
-    @invite_code = InviteCode.order("RANDOM()").limit(1).first
-    render layout: false
+  def redis_configuration_error
+    render layout: "blank"
   end
+
+  private
+    def github_provider
+      Provider::Registry.get_provider(:github)
+    end
+
+    def build_cashflow_sankey_data(income_totals, expense_totals, currency_symbol)
+      nodes = []
+      links = []
+      node_indices = {} # Memoize node indices by a unique key: "type_categoryid"
+
+      # Helper to add/find node and return its index
+      add_node = ->(unique_key, display_name, value, percentage, color) {
+        node_indices[unique_key] ||= begin
+          nodes << { name: display_name, value: value.to_f.round(2), percentage: percentage.to_f.round(1), color: color }
+          nodes.size - 1
+        end
+      }
+
+      total_income_val = income_totals.total.to_f.round(2)
+      total_expense_val = expense_totals.total.to_f.round(2)
+
+      # --- Create Central Cash Flow Node ---
+      cash_flow_idx = add_node.call("cash_flow_node", "Cash Flow", total_income_val, 0, "var(--color-success)")
+
+      # --- Process Income Side (Top-level categories only) ---
+      income_totals.category_totals.each do |ct|
+        # Skip subcategories – only include root income categories
+        next if ct.category.parent_id.present?
+
+        val = ct.total.to_f.round(2)
+        next if val.zero?
+
+        percentage_of_total_income = total_income_val.zero? ? 0 : (val / total_income_val * 100).round(1)
+
+        node_display_name = ct.category.name
+        node_color = ct.category.color.presence || Category::COLORS.sample
+
+        current_cat_idx = add_node.call(
+          "income_#{ct.category.id}",
+          node_display_name,
+          val,
+          percentage_of_total_income,
+          node_color
+        )
+
+        links << {
+          source: current_cat_idx,
+          target: cash_flow_idx,
+          value: val,
+          color: node_color,
+          percentage: percentage_of_total_income
+        }
+      end
+
+      # --- Process Expense Side (Top-level categories only) ---
+      expense_totals.category_totals.each do |ct|
+        # Skip subcategories – only include root expense categories to keep Sankey shallow
+        next if ct.category.parent_id.present?
+
+        val = ct.total.to_f.round(2)
+        next if val.zero?
+
+        percentage_of_total_expense = total_expense_val.zero? ? 0 : (val / total_expense_val * 100).round(1)
+
+        node_display_name = ct.category.name
+        node_color = ct.category.color.presence || Category::UNCATEGORIZED_COLOR
+
+        current_cat_idx = add_node.call(
+          "expense_#{ct.category.id}",
+          node_display_name,
+          val,
+          percentage_of_total_expense,
+          node_color
+        )
+
+        links << {
+          source: cash_flow_idx,
+          target: current_cat_idx,
+          value: val,
+          color: node_color,
+          percentage: percentage_of_total_expense
+        }
+      end
+
+      # --- Process Surplus ---
+      leftover = (total_income_val - total_expense_val).round(2)
+      if leftover.positive?
+        percentage_of_total_income_for_surplus = total_income_val.zero? ? 0 : (leftover / total_income_val * 100).round(1)
+        surplus_idx = add_node.call("surplus_node", "Surplus", leftover, percentage_of_total_income_for_surplus, "var(--color-success)")
+        links << { source: cash_flow_idx, target: surplus_idx, value: leftover, color: "var(--color-success)", percentage: percentage_of_total_income_for_surplus }
+      end
+
+      # Update Cash Flow and Income node percentages (relative to total income)
+      if node_indices["cash_flow_node"]
+        nodes[node_indices["cash_flow_node"]][:percentage] = 100.0
+      end
+      # No primary income node anymore, percentages are on individual income cats relative to total_income_val
+
+      { nodes: nodes, links: links, currency_symbol: Money::Currency.new(currency_symbol).symbol }
+    end
 end
diff --git a/app/controllers/password_resets_controller.rb b/app/controllers/password_resets_controller.rb
index 9185d6bf..41e5eecd 100644
--- a/app/controllers/password_resets_controller.rb
+++ b/app/controllers/password_resets_controller.rb
@@ -16,7 +16,7 @@ class PasswordResetsController < ApplicationController
       ).password_reset.deliver_later
     end
 
-    redirect_to root_path, notice: t(".requested")
+    redirect_to new_password_reset_path(step: "pending")
   end
 
   def edit
diff --git a/app/controllers/plaid_items_controller.rb b/app/controllers/plaid_items_controller.rb
new file mode 100644
index 00000000..8f32084f
--- /dev/null
+++ b/app/controllers/plaid_items_controller.rb
@@ -0,0 +1,75 @@
+class PlaidItemsController < ApplicationController
+  before_action :set_plaid_item, only: %i[edit destroy sync]
+
+  def new
+    region = params[:region] == "eu" ? :eu : :us
+    webhooks_url = region == :eu ? plaid_eu_webhooks_url : plaid_us_webhooks_url
+
+    @link_token = Current.family.get_link_token(
+      webhooks_url: webhooks_url,
+      redirect_url: accounts_url,
+      accountable_type: params[:accountable_type] || "Depository",
+      region: region
+    )
+  end
+
+  def edit
+    webhooks_url = @plaid_item.plaid_region == "eu" ? plaid_eu_webhooks_url : plaid_us_webhooks_url
+
+    @link_token = @plaid_item.get_update_link_token(
+      webhooks_url: webhooks_url,
+      redirect_url: accounts_url,
+    )
+  end
+
+  def create
+    Current.family.create_plaid_item!(
+      public_token: plaid_item_params[:public_token],
+      item_name: item_name,
+      region: plaid_item_params[:region]
+    )
+
+    redirect_to accounts_path, notice: t(".success")
+  end
+
+  def destroy
+    @plaid_item.destroy_later
+    redirect_to accounts_path, notice: t(".success")
+  end
+
+  def sync
+    unless @plaid_item.syncing?
+      @plaid_item.sync_later
+    end
+
+    respond_to do |format|
+      format.html { redirect_back_or_to accounts_path }
+      format.json { head :ok }
+    end
+  end
+
+  private
+    def set_plaid_item
+      @plaid_item = Current.family.plaid_items.find(params[:id])
+    end
+
+    def plaid_item_params
+      params.require(:plaid_item).permit(:public_token, :region, metadata: {})
+    end
+
+    def item_name
+      plaid_item_params.dig(:metadata, :institution, :name)
+    end
+
+    def plaid_us_webhooks_url
+      return webhooks_plaid_url if Rails.env.production?
+
+      ENV.fetch("DEV_WEBHOOKS_URL", root_url.chomp("/")) + "/webhooks/plaid"
+    end
+
+    def plaid_eu_webhooks_url
+      return webhooks_plaid_eu_url if Rails.env.production?
+
+      ENV.fetch("DEV_WEBHOOKS_URL", root_url.chomp("/")) + "/webhooks/plaid_eu"
+    end
+end
diff --git a/app/controllers/properties_controller.rb b/app/controllers/properties_controller.rb
index 71d46f0e..7a1db5de 100644
--- a/app/controllers/properties_controller.rb
+++ b/app/controllers/properties_controller.rb
@@ -1,40 +1,99 @@
 class PropertiesController < ApplicationController
-  before_action :set_account, only: :update
+  include AccountableResource, StreamExtensions
+
+  before_action :set_property, only: [ :balances, :address, :update_balances, :update_address ]
+
+  def new
+    @account = Current.family.accounts.build(accountable: Property.new)
+  end
 
   def create
-    account = Current.family
-                     .accounts
-                     .create_with_optional_start_balance! \
-                       attributes: account_params.except(:start_date, :start_balance),
-                       start_date: account_params[:start_date],
-                       start_balance: account_params[:start_balance]
+    @account = Current.family.accounts.create!(
+      property_params.merge(currency: Current.family.currency, balance: 0, status: "draft")
+    )
 
-    account.sync_later
-    redirect_to account, notice: t(".success")
+    redirect_to balances_property_path(@account)
   end
 
   def update
-    @account.update_with_sync!(account_params)
-    redirect_to @account, notice: t(".success")
+    if @account.update(property_params)
+      @success_message = "Property details updated successfully."
+
+      if @account.active?
+        render :edit
+      else
+        redirect_to balances_property_path(@account)
+      end
+    else
+      @error_message = "Unable to update property details."
+      render :edit, status: :unprocessable_entity
+    end
+  end
+
+  def edit
+  end
+
+  def balances
+  end
+
+  def update_balances
+    result = @account.set_current_balance(balance_params[:balance].to_d)
+
+    if result.success?
+      @success_message = "Balance updated successfully."
+
+      if @account.active?
+        render :balances
+      else
+        redirect_to address_property_path(@account)
+      end
+    else
+      @error_message = result.error_message
+      render :balances, status: :unprocessable_entity
+    end
+  end
+
+  def address
+    @property = @account.property
+    @property.address ||= Address.new
+  end
+
+  def update_address
+    if @account.property.update(address_params)
+      if @account.draft?
+        @account.activate!
+
+        respond_to do |format|
+          format.html { redirect_to account_path(@account) }
+          format.turbo_stream { stream_redirect_to account_path(@account) }
+        end
+      else
+        @success_message = "Address updated successfully."
+        render :address
+      end
+    else
+      @error_message = "Unable to update address. Please check the required fields."
+      render :address, status: :unprocessable_entity
+    end
   end
 
   private
-
-    def set_account
-      @account = Current.family.accounts.find(params[:id])
+    def balance_params
+      params.require(:account).permit(:balance, :currency)
     end
 
-    def account_params
+    def address_params
+      params.require(:property)
+            .permit(address_attributes: [ :line1, :line2, :locality, :region, :country, :postal_code ])
+    end
+
+    def property_params
       params.require(:account)
-        .permit(
-          :name, :balance, :institution_id, :start_date, :start_balance, :currency, :accountable_type,
-          accountable_attributes: [
-            :id,
-            :year_built,
-            :area_unit,
-            :area_value,
-            address_attributes: [ :line1, :line2, :locality, :region, :country, :postal_code ]
-          ]
-        )
+            .permit(:name, :subtype, :accountable_type, accountable_attributes: [ :id, :year_built, :area_unit, :area_value ])
+    end
+
+    def set_property
+      @account = Current.family.accounts.find(params[:id])
+      @property = @account.property
     end
 end
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 8c55e58d..b57b508d 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -4,36 +4,49 @@ class RegistrationsController < ApplicationController
   layout "auth"
 
   before_action :set_user, only: :create
+  before_action :set_invitation
   before_action :claim_invite_code, only: :create, if: :invite_code_required?
+  before_action :validate_password_requirements, only: :create
 
   def new
-    @user = User.new
+    @user = User.new(email: @invitation&.email)
   end
 
   def create
-    family = Family.new
-    @user.family = family
-    @user.role = :admin
+    if @invitation
+      @user.family = @invitation.family
+      @user.role = @invitation.role
+      @user.email = @invitation.email
+    else
+      family = Family.new
+      @user.family = family
+      @user.role = :admin
+    end
 
     if @user.save
-      Category.create_default_categories(@user.family)
+      @invitation&.update!(accepted_at: Time.current)
       @session = create_session_for(@user)
-      flash[:notice] = t(".success")
-      redirect_to root_path
+      redirect_to root_path, notice: t(".success")
     else
-      flash[:alert] = t(".failure")
-      render :new, status: :unprocessable_entity
+      render :new, status: :unprocessable_entity, alert: t(".failure")
     end
   end
 
   private
 
-    def set_user
-      @user = User.new user_params.except(:invite_code)
+    def set_invitation
+      token = params[:invitation]
+      token ||= params[:user][:invitation] if params[:user].present?
+      @invitation = Invitation.pending.find_by(token: token)
     end
 
-    def user_params
-      params.require(:user).permit(:name, :email, :password, :password_confirmation, :invite_code)
+    def set_user
+      @user = User.new user_params.except(:invite_code, :invitation)
+    end
+
+    def user_params(specific_param = nil)
+      params = self.params.require(:user).permit(:name, :email, :password, :password_confirmation, :invite_code, :invitation)
+      specific_param ? params[specific_param] : params
     end
 
     def claim_invite_code
@@ -41,4 +54,29 @@ class RegistrationsController < ApplicationController
         redirect_to new_registration_path, alert: t("registrations.create.invalid_invite_code")
       end
     end
+
+    def validate_password_requirements
+      password = user_params[:password]
+      return if password.blank? # Let Rails built-in validations handle blank passwords
+
+      if password.length < 8
+        @user.errors.add(:password, "must be at least 8 characters")
+      end
+
+      unless password.match?(/[A-Z]/) && password.match?(/[a-z]/)
+        @user.errors.add(:password, "must include both uppercase and lowercase letters")
+      end
+
+      unless password.match?(/\d/)
+        @user.errors.add(:password, "must include at least one number")
+      end
+
+      unless password.match?(/[!@#$%^&*(),.?":{}|<>]/)
+        @user.errors.add(:password, "must include at least one special character")
+      end
+
+      if @user.errors.present?
+        render :new, status: :unprocessable_entity
+      end
+    end
 end
diff --git a/app/controllers/rules_controller.rb b/app/controllers/rules_controller.rb
new file mode 100644
index 00000000..a63f30ee
--- /dev/null
+++ b/app/controllers/rules_controller.rb
@@ -0,0 +1,84 @@
+class RulesController < ApplicationController
+  include StreamExtensions
+
+  before_action :set_rule, only: [  :edit, :update, :destroy, :apply, :confirm ]
+
+  def index
+    @sort_by = params[:sort_by] || "name"
+    @direction = params[:direction] || "asc"
+
+    allowed_columns = [ "name", "updated_at" ]
+    @sort_by = "name" unless allowed_columns.include?(@sort_by)
+    @direction = "asc" unless [ "asc", "desc" ].include?(@direction)
+
+    @rules = Current.family.rules.order(@sort_by => @direction)
+    render layout: "settings"
+  end
+
+  def new
+    @rule = Current.family.rules.build(
+      resource_type: params[:resource_type] || "transaction",
+    )
+  end
+
+  def create
+    @rule = Current.family.rules.build(rule_params)
+
+    if @rule.save
+      redirect_to confirm_rule_path(@rule)
+    else
+      render :new, status: :unprocessable_entity
+    end
+  end
+
+  def apply
+    @rule.update!(active: true)
+    @rule.apply_later(ignore_attribute_locks: true)
+    redirect_back_or_to rules_path, notice: "#{@rule.resource_type.humanize} rule activated"
+  end
+
+  def confirm
+  end
+
+  def edit
+  end
+
+  def update
+    if @rule.update(rule_params)
+      respond_to do |format|
+        format.html { redirect_back_or_to rules_path, notice: "Rule updated" }
+        format.turbo_stream { stream_redirect_back_or_to rules_path, notice: "Rule updated" }
+      end
+    else
+      render :edit, status: :unprocessable_entity
+    end
+  end
+
+  def destroy
+    @rule.destroy
+    redirect_to rules_path, notice: "Rule deleted"
+  end
+
+  def destroy_all
+    Current.family.rules.destroy_all
+    redirect_to rules_path, notice: "All rules deleted"
+  end
+
+  private
+    def set_rule
+      @rule = Current.family.rules.find(params[:id])
+    end
+
+    def rule_params
+      params.require(:rule).permit(
+        :resource_type, :effective_date, :active, :name,
+        conditions_attributes: [
+          :id, :condition_type, :operator, :value, :_destroy,
+          sub_conditions_attributes: [ :id, :condition_type, :operator, :value, :_destroy ]
+        ],
+        actions_attributes: [
+          :id, :action_type, :value, :_destroy
+        ]
+      )
+    end
+end
diff --git a/app/controllers/securities_controller.rb b/app/controllers/securities_controller.rb
new file mode 100644
index 00000000..f2e1b1b7
--- /dev/null
+++ b/app/controllers/securities_controller.rb
@@ -0,0 +1,8 @@
+class SecuritiesController < ApplicationController
+  def index
+    @securities = Security.search_provider(
+      params[:q],
+      country_code: params[:country_code] == "US" ? "US" : nil
+    )
+  end
+end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index b6a23195..3b7357f8 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -9,8 +9,13 @@ class SessionsController < ApplicationController
 
   def create
     if user = User.authenticate_by(email: params[:email], password: params[:password])
-      @session = create_session_for(user)
-      redirect_to root_path
+      if user.otp_required?
+        session[:mfa_user_id] = user.id
+        redirect_to verify_mfa_path
+      else
+        @session = create_session_for(user)
+        redirect_to root_path
+      end
     else
       flash.now[:alert] = t(".invalid_credentials")
       render :new, status: :unprocessable_entity
@@ -19,7 +24,7 @@ class SessionsController < ApplicationController
 
   def destroy
     @session.destroy
-    redirect_to root_path, notice: t(".logout_successful")
+    redirect_to new_session_path, notice: t(".logout_successful")
   end
 
   private
diff --git a/app/controllers/settings/api_keys_controller.rb b/app/controllers/settings/api_keys_controller.rb
new file mode 100644
index 00000000..4804cdf5
--- /dev/null
+++ b/app/controllers/settings/api_keys_controller.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+class Settings::ApiKeysController < ApplicationController
+  layout "settings"
+
+  before_action :set_api_key, only: [ :show, :destroy ]
+
+  def show
+    @current_api_key = @api_key
+  end
+
+  def new
+    # Allow regeneration by not redirecting if user explicitly wants to create a new key
+    # Only redirect if user stumbles onto new page without explicit intent
+    redirect_to settings_api_key_path if Current.user.api_keys.active.exists? && !params[:regenerate]
+    @api_key = ApiKey.new
+  end
+
+  def create
+    @plain_key = ApiKey.generate_secure_key
+    @api_key = Current.user.api_keys.build(api_key_params)
+    @api_key.key = @plain_key
+
+    # Temporarily revoke existing keys for validation to pass
+    existing_keys = Current.user.api_keys.active
+    existing_keys.each { |key| key.update_column(:revoked_at, Time.current) }
+
+    if @api_key.save
+      flash[:notice] = "Your API key has been created successfully"
+      redirect_to settings_api_key_path
+    else
+      # Restore existing keys if new key creation failed
+      existing_keys.each { |key| key.update_column(:revoked_at, nil) }
+      render :new, status: :unprocessable_entity
+    end
+  end
+
+  def destroy
+    if @api_key&.revoke!
+      flash[:notice] = "API key has been revoked successfully"
+    else
+      flash[:alert] = "Failed to revoke API key"
+    end
+    redirect_to settings_api_key_path
+  end
+
+  private
+
+    def set_api_key
+      @api_key = Current.user.api_keys.active.first
+    end
+
+    def api_key_params
+      # Convert single scope value to array for storage
+      permitted_params = params.require(:api_key).permit(:name, :scopes)
+      if permitted_params[:scopes].present?
+        permitted_params[:scopes] = [ permitted_params[:scopes] ]
+      end
+      permitted_params
+    end
+end
diff --git a/app/controllers/settings/billings_controller.rb b/app/controllers/settings/billings_controller.rb
index d6dc4053..5d69d632 100644
--- a/app/controllers/settings/billings_controller.rb
+++ b/app/controllers/settings/billings_controller.rb
@@ -1,2 +1,7 @@
-class Settings::BillingsController < SettingsController
+class Settings::BillingsController < ApplicationController
+  layout "settings"
+
+  def show
+    @family = Current.family
+  end
 end
diff --git a/app/controllers/settings/hostings_controller.rb b/app/controllers/settings/hostings_controller.rb
index 222ae018..6eea6ecc 100644
--- a/app/controllers/settings/hostings_controller.rb
+++ b/app/controllers/settings/hostings_controller.rb
@@ -1,27 +1,24 @@
-class Settings::HostingsController < SettingsController
-  before_action :raise_if_not_self_hosted
+class Settings::HostingsController < ApplicationController
+  layout "settings"
+
+  guard_feature unless: -> { self_hosted? }
+
+  before_action :ensure_admin, only: :clear_cache
 
   def show
-    @synth_usage = Current.family.synth_usage
+    synth_provider = Provider::Registry.get_provider(:synth)
+    @synth_usage = synth_provider&.usage
   end
 
   def update
-    if hosting_params[:upgrades_setting].present?
-      mode = hosting_params[:upgrades_setting] == "manual" ? "manual" : "auto"
-      target = hosting_params[:upgrades_setting] == "commit" ? "commit" : "release"
-
-      Setting.upgrades_mode = mode
-      Setting.upgrades_target = target
-    end
-
-    if hosting_params.key?(:render_deploy_hook)
-      Setting.render_deploy_hook = hosting_params[:render_deploy_hook]
-    end
-
     if hosting_params.key?(:require_invite_for_signup)
       Setting.require_invite_for_signup = hosting_params[:require_invite_for_signup]
     end
 
+    if hosting_params.key?(:require_email_confirmation)
+      Setting.require_email_confirmation = hosting_params[:require_email_confirmation]
+    end
+
     if hosting_params.key?(:synth_api_key)
       Setting.synth_api_key = hosting_params[:synth_api_key]
     end
@@ -32,12 +29,17 @@ class Settings::HostingsController < SettingsController
     render :show, status: :unprocessable_entity
   end
 
+  def clear_cache
+    DataCacheClearJob.perform_later(Current.family)
+    redirect_to settings_hosting_path, notice: t(".cache_cleared")
+  end
+
   private
     def hosting_params
-      params.require(:setting).permit(:render_deploy_hook, :upgrades_setting, :require_invite_for_signup, :synth_api_key)
+      params.require(:setting).permit(:require_invite_for_signup, :require_email_confirmation, :synth_api_key)
     end
 
-    def raise_if_not_self_hosted
-      raise "Settings not available on non-self-hosted instance" unless self_hosted?
+    def ensure_admin
+      redirect_to settings_hosting_path, alert: t(".not_authorized") unless Current.user.admin?
     end
 end
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index 6389d9a3..83f9e2e4 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -1,26 +1,7 @@
-class Settings::PreferencesController < SettingsController
-  def edit
+class Settings::PreferencesController < ApplicationController
+  layout "settings"
+
+  def show
+    @user = Current.user
   end
-
-  def update
-    preference_params_with_family = preference_params
-
-    if Current.family && preference_params[:family_attributes]
-      family_attributes = preference_params[:family_attributes].merge({ id: Current.family.id })
-      preference_params_with_family[:family_attributes] = family_attributes
-    end
-
-    if Current.user.update(preference_params_with_family)
-      redirect_to settings_preferences_path, notice: t(".success")
-    else
-      redirect_to settings_preferences_path, notice: t(".success")
-      render :show, status: :unprocessable_entity
-    end
-  end
-
-  private
-
-    def preference_params
-      params.require(:user).permit(family_attributes: [ :id, :currency, :locale ])
-    end
 end
diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb
index c6b93c2c..a5631da4 100644
--- a/app/controllers/settings/profiles_controller.rb
+++ b/app/controllers/settings/profiles_controller.rb
@@ -1,38 +1,35 @@
-class Settings::ProfilesController < SettingsController
+class Settings::ProfilesController < ApplicationController
+  layout "settings"
+
   def show
-  end
-
-  def update
-    user_params_with_family = user_params
-
-    if params[:user][:delete_profile_image] == "true"
-      Current.user.profile_image.purge
-    end
-
-    if Current.family && user_params_with_family[:family_attributes]
-      family_attributes = user_params_with_family[:family_attributes].merge({ id: Current.family.id })
-      user_params_with_family[:family_attributes] = family_attributes
-    end
-
-    if Current.user.update(user_params_with_family)
-      redirect_to settings_profile_path, notice: t(".success")
-    else
-      redirect_to settings_profile_path, alert: Current.user.errors.full_messages.to_sentence
-    end
+    @user = Current.user
+    @users = Current.family.users.order(:created_at)
+    @pending_invitations = Current.family.invitations.pending
   end
 
   def destroy
-    if Current.user.deactivate
-      Current.session.destroy
-      redirect_to root_path, notice: t(".success")
-    else
-      redirect_to settings_profile_path, alert: Current.user.errors.full_messages.to_sentence
+    unless Current.user.admin?
+      flash[:alert] = t("settings.profiles.destroy.not_authorized")
+      redirect_to settings_profile_path
+      return
     end
-  end
 
-  private
-    def user_params
-      params.require(:user).permit(:first_name, :last_name, :profile_image,
-                                   family_attributes: [ :name, :id ])
+    @user = Current.family.users.find(params[:user_id])
+
+    if @user == Current.user
+      flash[:alert] = t("settings.profiles.destroy.cannot_remove_self")
+      redirect_to settings_profile_path
+      return
     end
+
+    if @user.destroy
+      # Also destroy the invitation associated with this user for this family
+      Current.family.invitations.find_by(email: @user.email)&.destroy
+      flash[:notice] = "Member removed successfully."
+    else
+      flash[:alert] = "Failed to remove member."
+    end
+
+    redirect_to settings_profile_path
+  end
 end
diff --git a/app/controllers/settings/securities_controller.rb b/app/controllers/settings/securities_controller.rb
new file mode 100644
index 00000000..9f8eac1c
--- /dev/null
+++ b/app/controllers/settings/securities_controller.rb
@@ -0,0 +1,6 @@
+class Settings::SecuritiesController < ApplicationController
+  layout "settings"
+
+  def show
+  end
+end
diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
deleted file mode 100644
index e0fcac5e..00000000
--- a/app/controllers/settings_controller.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class SettingsController < ApplicationController
-  layout :with_sidebar
-end
diff --git a/app/controllers/subscriptions_controller.rb b/app/controllers/subscriptions_controller.rb
index ef634b83..541d3dd9 100644
--- a/app/controllers/subscriptions_controller.rb
+++ b/app/controllers/subscriptions_controller.rb
@@ -1,37 +1,64 @@
 class SubscriptionsController < ApplicationController
-  def new
-    client = Stripe::StripeClient.new(ENV["STRIPE_SECRET_KEY"])
+  # Disables subscriptions for self hosted instances
+  guard_feature if: -> { self_hosted? }
 
-    if Current.family.stripe_customer_id.blank?
-      customer = client.v1.customers.create(
-        email: Current.family.primary_user.email,
-        metadata: { family_id: Current.family.id }
-      )
-      Current.family.update(stripe_customer_id: customer.id)
+  # Upgrade page for unsubscribed users
+  def upgrade
+    if Current.family.subscription&.active?
+      redirect_to root_path, notice: "You are already subscribed."
+    else
+      @plan = params[:plan] || "annual"
+      render layout: "onboardings"
     end
+  end
 
-    session = client.v1.checkout.sessions.create({
-      customer: Current.family.stripe_customer_id,
-      line_items: [ {
-        price: ENV["STRIPE_PLAN_ID"],
-        quantity: 1
-      } ],
-      mode: "subscription",
-      allow_promotion_codes: true,
-      success_url: settings_billing_url,
-      cancel_url: settings_billing_url
-    })
+  def new
+    checkout_session = stripe.create_checkout_session(
+      plan: params[:plan],
+      family_id: Current.family.id,
+      family_email: Current.family.billing_email,
+      success_url: success_subscription_url + "?session_id={CHECKOUT_SESSION_ID}",
+      cancel_url: upgrade_subscription_url
+    )
 
-    redirect_to session.url, allow_other_host: true, status: :see_other
+    Current.family.update!(stripe_customer_id: checkout_session.customer_id)
+
+    redirect_to checkout_session.url, allow_other_host: true, status: :see_other
+  end
+
+  # Only used for managing our "offline" trials.  Paid subscriptions are handled in success callback of checkout session
+  def create
+    if Current.family.can_start_trial?
+      Current.family.start_trial_subscription!
+      redirect_to root_path, notice: "Welcome to Maybe!"
+    else
+      redirect_to root_path, alert: "You have already started or completed a trial. Please upgrade to continue."
+    end
   end
 
   def show
-    client = Stripe::StripeClient.new(ENV["STRIPE_SECRET_KEY"])
-
-    portal_session = client.v1.billing_portal.sessions.create(
-      customer: Current.family.stripe_customer_id,
+    portal_session_url = stripe.create_billing_portal_session_url(
+      customer_id: Current.family.stripe_customer_id,
       return_url: settings_billing_url
     )
-    redirect_to portal_session.url, allow_other_host: true, status: :see_other
+
+    redirect_to portal_session_url, allow_other_host: true, status: :see_other
   end
+
+  # Stripe redirects here after a successful checkout session and passes the session ID in the URL
+  def success
+    checkout_result = stripe.get_checkout_result(params[:session_id])
+
+    if checkout_result.success?
+      Current.family.start_subscription!(checkout_result.subscription_id)
+      redirect_to root_path, notice: "Welcome to Maybe!  Your subscription has been created."
+    else
+      redirect_to root_path, alert: "Something went wrong processing your subscription. Please contact us to get this fixed."
+    end
+  end
+
+  private
+    def stripe
+      @stripe ||= Provider::Registry.get_provider(:stripe)
+    end
 end
diff --git a/app/controllers/tag/deletions_controller.rb b/app/controllers/tag/deletions_controller.rb
index a5b14f7c..5ec31a3d 100644
--- a/app/controllers/tag/deletions_controller.rb
+++ b/app/controllers/tag/deletions_controller.rb
@@ -1,6 +1,4 @@
 class Tag::DeletionsController < ApplicationController
-  layout :with_sidebar
-
   before_action :set_tag
   before_action :set_replacement_tag, only: :create
 
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index c2feb537..1c286290 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -1,10 +1,10 @@
 class TagsController < ApplicationController
-  layout :with_sidebar
-
-  before_action :set_tag, only: %i[edit update]
+  before_action :set_tag, only: %i[edit update destroy]
 
   def index
     @tags = Current.family.tags.alphabetically
+
+    render layout: "settings"
   end
 
   def new
@@ -12,8 +12,13 @@ class TagsController < ApplicationController
   end
 
   def create
-    Current.family.tags.create!(tag_params)
-    redirect_to tags_path, notice: t(".created")
+    @tag = Current.family.tags.new(tag_params)
+
+    if @tag.save
+      redirect_to tags_path, notice: t(".created")
+    else
+      redirect_to tags_path, alert: t(".error", error: @tag.errors.full_messages.to_sentence)
+    end
   end
 
   def edit
@@ -24,6 +29,16 @@ class TagsController < ApplicationController
     redirect_to tags_path, notice: t(".updated")
   end
 
+  def destroy
+    @tag.destroy!
+    redirect_to tags_path, notice: t(".deleted")
+  end
+
+  def destroy_all
+    Current.family.tags.destroy_all
+    redirect_back_or_to tags_path, notice: "All tags deleted"
+  end
+
   private
 
     def set_tag
diff --git a/app/controllers/trades_controller.rb b/app/controllers/trades_controller.rb
new file mode 100644
index 00000000..beb8fe5e
--- /dev/null
+++ b/app/controllers/trades_controller.rb
@@ -0,0 +1,84 @@
+class TradesController < ApplicationController
+  include EntryableResource
+
+  # Defaults to a buy trade
+  def new
+    @account = Current.family.accounts.find_by(id: params[:account_id])
+    @model = Current.family.entries.new(
+      account: @account,
+      currency: @account ? @account.currency : Current.family.currency,
+      entryable: Trade.new
+    )
+  end
+
+  # Can create a trade, transaction (e.g. "fees"), or transfer (e.g. "withdrawal")
+  def create
+    @account = Current.family.accounts.find(params[:account_id])
+    @model = Trade::CreateForm.new(create_params.merge(account: @account)).create
+
+    if @model.persisted?
+      flash[:notice] = t("entries.create.success")
+
+      respond_to do |format|
+        format.html { redirect_back_or_to account_path(@account) }
+        format.turbo_stream { stream_redirect_back_or_to account_path(@account) }
+      end
+    else
+      render :new, status: :unprocessable_entity
+    end
+  end
+
+  def update
+    if @entry.update(update_entry_params)
+      @entry.sync_account_later
+
+      respond_to do |format|
+        format.html { redirect_back_or_to account_path(@entry.account), notice: t("entries.update.success") }
+        format.turbo_stream do
+          render turbo_stream: [
+            turbo_stream.replace(
+              "header_entry_#{@entry.id}",
+              partial: "trades/header",
+              locals: { entry: @entry }
+            ),
+            turbo_stream.replace("entry_#{@entry.id}", partial: "entries/entry", locals: { entry: @entry })
+          ]
+        end
+      end
+    else
+      render :show, status: :unprocessable_entity
+    end
+  end
+
+  private
+    def entry_params
+      params.require(:entry).permit(
+        :name, :date, :amount, :currency, :excluded, :notes, :nature,
+        entryable_attributes: [ :id, :qty, :price ]
+      )
+    end
+
+    def create_params
+      params.require(:model).permit(
+        :date, :amount, :currency, :qty, :price, :ticker, :manual_ticker, :type, :transfer_account_id
+      )
+    end
+
+    def update_entry_params
+      return entry_params unless entry_params[:entryable_attributes].present?
+
+      update_params = entry_params
+      update_params = update_params.merge(entryable_type: "Trade")
+
+      qty = update_params[:entryable_attributes][:qty]
+      price = update_params[:entryable_attributes][:price]
+
+      if qty.present? && price.present?
+        qty = update_params[:nature] == "inflow" ? -qty.to_d : qty.to_d
+        update_params[:entryable_attributes][:qty] = qty
+        update_params[:amount] = qty * price.to_d
+      end
+
+      update_params.except(:nature)
+    end
+end
diff --git a/app/controllers/transaction_categories_controller.rb b/app/controllers/transaction_categories_controller.rb
new file mode 100644
index 00000000..dac6b5be
--- /dev/null
+++ b/app/controllers/transaction_categories_controller.rb
@@ -0,0 +1,52 @@
+class TransactionCategoriesController < ApplicationController
+  include ActionView::RecordIdentifier
+
+  def update
+    @entry = Current.family.entries.transactions.find(params[:transaction_id])
+    @entry.update!(entry_params)
+
+    transaction = @entry.transaction
+
+    if needs_rule_notification?(transaction)
+      flash[:cta] = {
+        type: "category_rule",
+        category_id: transaction.category_id,
+        category_name: transaction.category.name
+      }
+    end
+
+    transaction.lock_saved_attributes!
+    @entry.lock_saved_attributes!
+
+    respond_to do |format|
+      format.html { redirect_back_or_to transaction_path(@entry) }
+      format.turbo_stream do
+        render turbo_stream: [
+          turbo_stream.replace(
+            dom_id(transaction, :category_menu),
+            partial: "categories/menu",
+            locals: { transaction: transaction }
+          ),
+          *flash_notification_stream_items
+        ]
+      end
+    end
+  end
+
+  private
+    def entry_params
+      params.require(:entry).permit(:entryable_type, entryable_attributes: [ :id, :category_id ])
+    end
+
+    def needs_rule_notification?(transaction)
+      return false if Current.user.rule_prompts_disabled
+
+      if Current.user.rule_prompt_dismissed_at.present?
+        time_since_last_rule_prompt = Time.current - Current.user.rule_prompt_dismissed_at
+        return false if time_since_last_rule_prompt < 1.day
+      end
+
+      transaction.saved_change_to_category_id? &&
+      transaction.eligible_for_category_rule?
+    end
+end
diff --git a/app/controllers/transactions/bulk_deletions_controller.rb b/app/controllers/transactions/bulk_deletions_controller.rb
new file mode 100644
index 00000000..fefaf389
--- /dev/null
+++ b/app/controllers/transactions/bulk_deletions_controller.rb
@@ -0,0 +1,12 @@
+class Transactions::BulkDeletionsController < ApplicationController
+  def create
+    destroyed = Current.family.entries.destroy_by(id: bulk_delete_params[:entry_ids])
+    destroyed.map(&:account).uniq.each(&:sync_later)
+    redirect_back_or_to transactions_url, notice: "#{destroyed.count} transaction#{destroyed.count == 1 ? "" : "s"} deleted"
+  end
+
+  private
+    def bulk_delete_params
+      params.require(:bulk_delete).permit(entry_ids: [])
+    end
+end
diff --git a/app/controllers/transactions/bulk_updates_controller.rb b/app/controllers/transactions/bulk_updates_controller.rb
new file mode 100644
index 00000000..08c4befe
--- /dev/null
+++ b/app/controllers/transactions/bulk_updates_controller.rb
@@ -0,0 +1,19 @@
+class Transactions::BulkUpdatesController < ApplicationController
+  def new
+  end
+
+  def create
+    updated = Current.family
+                     .entries
+                     .where(id: bulk_update_params[:entry_ids])
+                     .bulk_update!(bulk_update_params)
+
+    redirect_back_or_to transactions_path, notice: "#{updated} transactions updated"
+  end
+
+  private
+    def bulk_update_params
+      params.require(:bulk_update)
+            .permit(:date, :notes, :category_id, :merchant_id, entry_ids: [], tag_ids: [])
+    end
+end
diff --git a/app/controllers/transactions_controller.rb b/app/controllers/transactions_controller.rb
index ed8f579d..9243df84 100644
--- a/app/controllers/transactions_controller.rb
+++ b/app/controllers/transactions_controller.rb
@@ -1,105 +1,192 @@
 class TransactionsController < ApplicationController
-  layout :with_sidebar
+  include EntryableResource
+
+  before_action :store_params!, only: :index
+
+  def new
+    super
+    @income_categories = Current.family.categories.incomes.alphabetically
+    @expense_categories = Current.family.categories.expenses.alphabetically
+  end
 
   def index
     @q = search_params
-    result = Current.family.entries.account_transactions.search(@q).reverse_chronological
-    @pagy, @transaction_entries = pagy(result, limit: params[:per_page] || "50")
+    @search = Transaction::Search.new(Current.family, filters: @q)
 
-    @totals = {
-      count: result.select { |t| t.currency == Current.family.currency }.count,
-      income: result.income_total(Current.family.currency).abs,
-      expense: result.expense_total(Current.family.currency)
-    }
+    base_scope = @search.transactions_scope
+                       .reverse_chronological
+                       .includes(
+                         { entry: :account },
+                         :category, :merchant, :tags,
+                         :transfer_as_inflow, :transfer_as_outflow
+                       )
+
+    @pagy, @transactions = pagy(base_scope, limit: per_page)
   end
 
-  def new
-    @entry = Current.family.entries.new(entryable: Account::Transaction.new).tap do |e|
-      if params[:account_id]
-        e.account = Current.family.accounts.find(params[:account_id])
-        e.currency = e.account.currency
-      else
-        e.currency = Current.family.currency
-      end
+  def clear_filter
+    updated_params = {
+      "q" => search_params,
+      "page" => params[:page],
+      "per_page" => params[:per_page]
+    }
+
+    q_params = updated_params["q"] || {}
+
+    param_key = params[:param_key]
+    param_value = params[:param_value]
+
+    if q_params[param_key].is_a?(Array)
+      q_params[param_key].delete(param_value)
+      q_params.delete(param_key) if q_params[param_key].empty?
+    else
+      q_params.delete(param_key)
     end
+
+    updated_params["q"] = q_params.presence
+
+    # Add flag to indicate filters were explicitly cleared
+    updated_params["filter_cleared"] = "1" if updated_params["q"].blank?
+
+    Current.session.update!(prev_transaction_page_params: updated_params)
+
+    redirect_to transactions_path(updated_params)
   end
 
   def create
-    @entry = Current.family
-                    .accounts
-                    .find(params[:account_entry][:account_id])
-                    .entries
-                    .create!(transaction_entry_params.merge(amount: amount))
+    account = Current.family.accounts.find(params.dig(:entry, :account_id))
+    @entry = account.entries.new(entry_params)
 
-    @entry.sync_account_later
-    redirect_back_or_to account_path(@entry.account), notice: t(".success")
+    if @entry.save
+      @entry.sync_account_later
+      @entry.lock_saved_attributes!
+      @entry.transaction.lock_attr!(:tag_ids) if @entry.transaction.tags.any?
+
+      flash[:notice] = "Transaction created"
+
+      respond_to do |format|
+        format.html { redirect_back_or_to account_path(@entry.account) }
+        format.turbo_stream { stream_redirect_back_or_to(account_path(@entry.account)) }
+      end
+    else
+      render :new, status: :unprocessable_entity
+    end
   end
 
-  def bulk_delete
-    destroyed = Current.family.entries.destroy_by(id: bulk_delete_params[:entry_ids])
-    redirect_back_or_to transactions_url, notice: t(".success", count: destroyed.count)
-  end
+  def update
+    if @entry.update(entry_params)
+      transaction = @entry.transaction
 
-  def bulk_edit
-  end
+      if needs_rule_notification?(transaction)
+        flash[:cta] = {
+          type: "category_rule",
+          category_id: transaction.category_id,
+          category_name: transaction.category.name
+        }
+      end
 
-  def bulk_update
-    updated = Current.family
-                     .entries
-                     .where(id: bulk_update_params[:entry_ids])
-                     .bulk_update!(bulk_update_params)
+      @entry.sync_account_later
+      @entry.lock_saved_attributes!
+      @entry.transaction.lock_attr!(:tag_ids) if @entry.transaction.tags.any?
 
-    redirect_back_or_to transactions_url, notice: t(".success", count: updated)
-  end
-
-  def mark_transfers
-    Current.family
-      .entries
-      .where(id: bulk_update_params[:entry_ids])
-           .mark_transfers!
-
-    redirect_back_or_to transactions_url, notice: t(".success")
-  end
-
-  def unmark_transfers
-    Current.family
-      .entries
-      .where(id: bulk_update_params[:entry_ids])
-           .update_all marked_as_transfer: false
-
-    redirect_back_or_to transactions_url, notice: t(".success")
+      respond_to do |format|
+        format.html { redirect_back_or_to account_path(@entry.account), notice: "Transaction updated" }
+        format.turbo_stream do
+          render turbo_stream: [
+            turbo_stream.replace(
+              dom_id(@entry, :header),
+              partial: "transactions/header",
+              locals: { entry: @entry }
+            ),
+            turbo_stream.replace(@entry),
+            *flash_notification_stream_items
+          ]
+        end
+      end
+    else
+      render :show, status: :unprocessable_entity
+    end
   end
 
   private
+    def per_page
+      params[:per_page].to_i.positive? ? params[:per_page].to_i : 50
+    end
 
-    def amount
-      if nature.income?
-        transaction_entry_params[:amount].to_d * -1
-      else
-        transaction_entry_params[:amount].to_d
+    def needs_rule_notification?(transaction)
+      return false if Current.user.rule_prompts_disabled
+
+      if Current.user.rule_prompt_dismissed_at.present?
+        time_since_last_rule_prompt = Time.current - Current.user.rule_prompt_dismissed_at
+        return false if time_since_last_rule_prompt < 1.day
       end
+
+      transaction.saved_change_to_category_id? && transaction.category_id.present? &&
+      transaction.eligible_for_category_rule?
     end
 
-    def nature
-      params[:account_entry][:nature].to_s.inquiry
-    end
+    def entry_params
+      entry_params = params.require(:entry).permit(
+        :name, :date, :amount, :currency, :excluded, :notes, :nature, :entryable_type,
+        entryable_attributes: [ :id, :category_id, :merchant_id, :kind, { tag_ids: [] } ]
+      )
 
-    def bulk_delete_params
-      params.require(:bulk_delete).permit(entry_ids: [])
-    end
+      nature = entry_params.delete(:nature)
 
-    def bulk_update_params
-      params.require(:bulk_update).permit(:date, :notes, :category_id, :merchant_id, entry_ids: [])
+      if nature.present? && entry_params[:amount].present?
+        signed_amount = nature == "inflow" ? -entry_params[:amount].to_d : entry_params[:amount].to_d
+        entry_params = entry_params.merge(amount: signed_amount)
+      end
+
+      entry_params
     end
 
     def search_params
-      params.fetch(:q, {})
-            .permit(:start_date, :end_date, :search, :amount, :amount_operator, accounts: [], account_ids: [], categories: [], merchants: [], types: [], tags: [])
+      cleaned_params = params.fetch(:q, {})
+              .permit(
+                :start_date, :end_date, :search, :amount,
+                :amount_operator, :active_accounts_only,
+                accounts: [], account_ids: [],
+                categories: [], merchants: [], types: [], tags: []
+              )
+              .to_h
+              .compact_blank
+
+      cleaned_params.delete(:amount_operator) unless cleaned_params[:amount].present?
+
+      # Only add default start_date if params are blank AND filters weren't explicitly cleared
+      if cleaned_params.blank? && params[:filter_cleared].blank?
+        cleaned_params[:start_date] = 30.days.ago.to_date
+      end
+
+      cleaned_params
     end
 
-    def transaction_entry_params
-      params.require(:account_entry)
-            .permit(:name, :date, :amount, :currency, :entryable_type, entryable_attributes: [ :category_id ])
-            .with_defaults(entryable_type: "Account::Transaction", entryable_attributes: {})
+    def store_params!
+      if should_restore_params?
+        params_to_restore = {}
+
+        params_to_restore[:q] = stored_params["q"].presence || {}
+        params_to_restore[:page] = stored_params["page"].presence || 1
+        params_to_restore[:per_page] = stored_params["per_page"].presence || 50
+
+        redirect_to transactions_path(params_to_restore)
+      else
+        Current.session.update!(
+          prev_transaction_page_params: {
+            q: search_params,
+            page: params[:page],
+            per_page: params[:per_page]
+          }
+        )
+      end
+    end
+
+    def should_restore_params?
+      request.query_parameters.blank? && (stored_params["q"].present? || stored_params["page"].present? || stored_params["per_page"].present?)
+    end
+
+    def stored_params
+      Current.session.prev_transaction_page_params
     end
 end
diff --git a/app/controllers/transfer_matches_controller.rb b/app/controllers/transfer_matches_controller.rb
new file mode 100644
index 00000000..37dbc9d7
--- /dev/null
+++ b/app/controllers/transfer_matches_controller.rb
@@ -0,0 +1,61 @@
+class TransferMatchesController < ApplicationController
+  before_action :set_entry
+
+  def new
+    @accounts = Current.family.accounts.visible.alphabetically.where.not(id: @entry.account_id)
+    @transfer_match_candidates = @entry.transaction.transfer_match_candidates
+  end
+
+  def create
+    @transfer = build_transfer
+    Transfer.transaction do
+      @transfer.save!
+      @transfer.outflow_transaction.update!(kind: Transfer.kind_for_account(@transfer.outflow_transaction.entry.account))
+      @transfer.inflow_transaction.update!(kind: "funds_movement")
+    end
+
+    @transfer.sync_account_later
+
+    redirect_back_or_to transactions_path, notice: "Transfer created"
+  end
+
+  private
+    def set_entry
+      @entry = Current.family.entries.find(params[:transaction_id])
+    end
+
+    def transfer_match_params
+      params.require(:transfer_match).permit(:method, :matched_entry_id, :target_account_id)
+    end
+
+    def build_transfer
+      if transfer_match_params[:method] == "new"
+        target_account = Current.family.accounts.find(transfer_match_params[:target_account_id])
+
+        missing_transaction = Transaction.new(
+          entry: target_account.entries.build(
+            amount: @entry.amount * -1,
+            currency: @entry.currency,
+            date: @entry.date,
+            name: "Transfer to #{@entry.amount.negative? ? @entry.account.name : target_account.name}",
+          )
+        )
+
+        transfer = Transfer.find_or_initialize_by(
+          inflow_transaction: @entry.amount.positive? ? missing_transaction : @entry.transaction,
+          outflow_transaction: @entry.amount.positive? ? @entry.transaction : missing_transaction
+        )
+        transfer.status = "confirmed"
+        transfer
+      else
+        target_transaction = Current.family.entries.find(transfer_match_params[:matched_entry_id])
+
+        transfer = Transfer.find_or_initialize_by(
+          inflow_transaction: @entry.amount.negative? ? @entry.transaction : target_transaction.transaction,
+          outflow_transaction: @entry.amount.negative? ? target_transaction.transaction : @entry.transaction
+        )
+        transfer.status = "confirmed"
+        transfer
+      end
+    end
+end
diff --git a/app/controllers/transfers_controller.rb b/app/controllers/transfers_controller.rb
new file mode 100644
index 00000000..7342414b
--- /dev/null
+++ b/app/controllers/transfers_controller.rb
@@ -0,0 +1,80 @@
+class TransfersController < ApplicationController
+  include StreamExtensions
+
+  before_action :set_transfer, only: %i[show destroy update]
+
+  def new
+    @transfer = Transfer.new
+  end
+
+  def show
+    @categories = Current.family.categories.expenses
+  end
+
+  def create
+    @transfer = Transfer::Creator.new(
+      family: Current.family,
+      source_account_id: transfer_params[:from_account_id],
+      destination_account_id: transfer_params[:to_account_id],
+      date: transfer_params[:date],
+      amount: transfer_params[:amount].to_d
+    ).create
+
+    if @transfer.persisted?
+      success_message = "Transfer created"
+      respond_to do |format|
+        format.html { redirect_back_or_to transactions_path, notice: success_message }
+        format.turbo_stream { stream_redirect_back_or_to transactions_path, notice: success_message }
+      end
+    else
+      render :new, status: :unprocessable_entity
+    end
+  end
+
+  def update
+    Transfer.transaction do
+      update_transfer_status
+      update_transfer_details unless transfer_update_params[:status] == "rejected"
+    end
+
+    respond_to do |format|
+      format.html { redirect_back_or_to transactions_url, notice: t(".success") }
+      format.turbo_stream
+    end
+  end
+
+  def destroy
+    @transfer.destroy!
+    redirect_back_or_to transactions_url, notice: t(".success")
+  end
+
+  private
+    def set_transfer
+      # Finds the transfer and ensures the family owns it
+      @transfer = Transfer
+                    .where(id: params[:id])
+                    .where(inflow_transaction_id: Current.family.transactions.select(:id))
+                    .first
+    end
+
+    def transfer_params
+      params.require(:transfer).permit(:from_account_id, :to_account_id, :amount, :date, :name, :excluded)
+    end
+
+    def transfer_update_params
+      params.require(:transfer).permit(:notes, :status, :category_id)
+    end
+
+    def update_transfer_status
+      if transfer_update_params[:status] == "rejected"
+        @transfer.reject!
+      elsif transfer_update_params[:status] == "confirmed"
+        @transfer.confirm!
+      end
+    end
+
+    def update_transfer_details
+      @transfer.outflow_transaction.update!(category_id: transfer_update_params[:category_id])
+      @transfer.update!(notes: transfer_update_params[:notes])
+    end
+end
diff --git a/app/controllers/upgrades_controller.rb b/app/controllers/upgrades_controller.rb
deleted file mode 100644
index baf4cd8d..00000000
--- a/app/controllers/upgrades_controller.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-class UpgradesController < ApplicationController
-  before_action :verify_upgrades_enabled
-
-  def acknowledge
-    commit_sha = params[:id]
-    upgrade = Upgrader.find_upgrade(commit_sha)
-
-    if upgrade
-      if upgrade.available?
-        Current.user.acknowledge_upgrade_prompt(upgrade.commit_sha)
-        flash[:notice] = t(".upgrade_dismissed")
-      elsif upgrade.complete?
-        Current.user.acknowledge_upgrade_alert(upgrade.commit_sha)
-        flash[:notice] = t(".upgrade_complete_dismiss")
-      else
-        flash[:alert] = t(".upgrade_not_available")
-      end
-    else
-      flash[:alert] = t(".upgrade_not_found")
-    end
-
-    redirect_back(fallback_location: root_path)
-  end
-
-  def deploy
-    commit_sha = params[:id]
-    upgrade = Upgrader.find_upgrade(commit_sha)
-
-    unless upgrade
-      flash[:alert] = t(".upgrade_not_found")
-      return redirect_back(fallback_location: root_path)
-    end
-
-    prior_acknowledged_upgrade_commit_sha = Current.user.last_prompted_upgrade_commit_sha
-
-    # Optimistically acknowledge the upgrade prompt
-    Current.user.acknowledge_upgrade_prompt(upgrade.commit_sha)
-
-    upgrade_result = Upgrader.upgrade_to(upgrade)
-
-    if upgrade_result[:success]
-      flash[:notice] = upgrade_result[:message]
-    else
-      # If the upgrade fails, revert to the prior acknowledged upgrade
-      Current.user.acknowledge_upgrade_prompt(prior_acknowledged_upgrade_commit_sha)
-      flash[:alert] = upgrade_result[:message]
-    end
-
-    redirect_back(fallback_location: root_path)
-  end
-
-  private
-    def verify_upgrades_enabled
-      head :not_found unless ENV["UPGRADES_ENABLED"] == "true"
-    end
-end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
new file mode 100644
index 00000000..2b3c0866
--- /dev/null
+++ b/app/controllers/users_controller.rb
@@ -0,0 +1,104 @@
+class UsersController < ApplicationController
+  before_action :set_user
+  before_action :ensure_admin, only: :reset
+
+  def update
+    @user = Current.user
+
+    if email_changed?
+      if @user.initiate_email_change(user_params[:email])
+        if Rails.application.config.app_mode.self_hosted? && !Setting.require_email_confirmation
+          handle_redirect(t(".success"))
+        else
+          redirect_to settings_profile_path, notice: t(".email_change_initiated")
+        end
+      else
+        error_message = @user.errors.any? ? @user.errors.full_messages.to_sentence : t(".email_change_failed")
+        redirect_to settings_profile_path, alert: error_message
+      end
+    else
+      was_ai_enabled = @user.ai_enabled
+      @user.update!(user_params.except(:redirect_to, :delete_profile_image))
+      @user.profile_image.purge if should_purge_profile_image?
+
+      # Add a special notice if AI was just enabled
+      notice = if !was_ai_enabled && @user.ai_enabled
+        "AI Assistant has been enabled successfully."
+      else
+        t(".success")
+      end
+
+      respond_to do |format|
+        format.html { handle_redirect(notice) }
+        format.json { head :ok }
+      end
+    end
+  end
+
+  def reset
+    FamilyResetJob.perform_later(Current.family)
+    redirect_to settings_profile_path, notice: t(".success")
+  end
+
+  def destroy
+    if @user.deactivate
+      Current.session.destroy
+      redirect_to root_path, notice: t(".success")
+    else
+      redirect_to settings_profile_path, alert: @user.errors.full_messages.to_sentence
+    end
+  end
+
+  def rule_prompt_settings
+    @user.update!(rule_prompt_settings_params)
+    redirect_back_or_to settings_profile_path
+  end
+
+  private
+    def handle_redirect(notice)
+      case user_params[:redirect_to]
+      when "onboarding_preferences"
+        redirect_to preferences_onboarding_path
+      when "home"
+        redirect_to root_path
+      when "preferences"
+        redirect_to settings_preferences_path, notice: notice
+      when "goals"
+        redirect_to goals_onboarding_path
+      when "trial"
+        redirect_to trial_onboarding_path
+      else
+        redirect_to settings_profile_path, notice: notice
+      end
+    end
+
+    def should_purge_profile_image?
+      user_params[:delete_profile_image] == "1" &&
+        user_params[:profile_image].blank?
+    end
+
+    def email_changed?
+      user_params[:email].present? && user_params[:email] != @user.email
+    end
+
+    def rule_prompt_settings_params
+      params.require(:user).permit(:rule_prompt_dismissed_at, :rule_prompts_disabled)
+    end
+
+    def user_params
+      params.require(:user).permit(
+        :first_name, :last_name, :email, :profile_image, :redirect_to, :delete_profile_image, :onboarded_at,
+        :show_sidebar, :default_period, :show_ai_sidebar, :ai_enabled, :theme, :set_onboarding_preferences_at, :set_onboarding_goals_at,
+        family_attributes: [ :name, :currency, :country, :locale, :date_format, :timezone, :id ],
+        goals: []
+      )
+    end
+
+    def set_user
+      @user = Current.user
+    end
+
+    def ensure_admin
+      redirect_to settings_profile_path, alert: I18n.t("users.reset.unauthorized") unless Current.user.admin?
+    end
+end
diff --git a/app/controllers/valuations_controller.rb b/app/controllers/valuations_controller.rb
new file mode 100644
index 00000000..5234c0be
--- /dev/null
+++ b/app/controllers/valuations_controller.rb
@@ -0,0 +1,89 @@
+class ValuationsController < ApplicationController
+  include EntryableResource, StreamExtensions
+
+  def confirm_create
+    @account = Current.family.accounts.find(params.dig(:entry, :account_id))
+    @entry = @account.entries.build(entry_params.merge(currency: @account.currency))
+
+    @reconciliation_dry_run = @entry.account.create_reconciliation(
+      balance: entry_params[:amount],
+      date: entry_params[:date],
+      dry_run: true
+    )
+
+    render :confirm_create
+  end
+
+  def confirm_update
+    @entry = Current.family.entries.find(params[:id])
+    @account = @entry.account
+    @entry.assign_attributes(entry_params.merge(currency: @account.currency))
+
+    @reconciliation_dry_run = @entry.account.update_reconciliation(
+      @entry,
+      balance: entry_params[:amount],
+      date: entry_params[:date],
+      dry_run: true
+    )
+
+    render :confirm_update
+  end
+
+  def create
+    account = Current.family.accounts.find(params.dig(:entry, :account_id))
+
+    result = account.create_reconciliation(
+      balance: entry_params[:amount],
+      date: entry_params[:date],
+    )
+
+    if result.success?
+      respond_to do |format|
+        format.html { redirect_back_or_to account_path(account), notice: "Account updated" }
+        format.turbo_stream { stream_redirect_back_or_to(account_path(account), notice: "Account updated") }
+      end
+    else
+      @error_message = result.error_message
+      render :new, status: :unprocessable_entity
+    end
+  end
+
+  def update
+    # Notes updating is independent of reconciliation, just a simple CRUD operation
+    @entry.update!(notes: entry_params[:notes]) if entry_params[:notes].present?
+
+    if entry_params[:date].present? && entry_params[:amount].present?
+      result = @entry.account.update_reconciliation(
+        @entry,
+        balance: entry_params[:amount],
+        date: entry_params[:date],
+      )
+    end
+
+    if result.nil? || result.success?
+      @entry.reload
+
+      respond_to do |format|
+        format.html { redirect_back_or_to account_path(@entry.account), notice: "Entry updated" }
+        format.turbo_stream do
+          render turbo_stream: [
+            turbo_stream.replace(
+              dom_id(@entry, :header),
+              partial: "valuations/header",
+              locals: { entry: @entry }
+            ),
+            turbo_stream.replace(@entry)
+          ]
+        end
+      end
+    else
+      @error_message = result.error_message
+      render :show, status: :unprocessable_entity
+    end
+  end
+
+  private
+    def entry_params
+      params.require(:entry).permit(:date, :amount, :notes)
+    end
+end
diff --git a/app/controllers/vehicles_controller.rb b/app/controllers/vehicles_controller.rb
index e9822b9b..487f1439 100644
--- a/app/controllers/vehicles_controller.rb
+++ b/app/controllers/vehicles_controller.rb
@@ -1,41 +1,7 @@
 class VehiclesController < ApplicationController
-  before_action :set_account, only: :update
+  include AccountableResource
 
-  def create
-    account = Current.family
-                     .accounts
-                     .create_with_optional_start_balance! \
-                       attributes: account_params.except(:start_date, :start_balance),
-                       start_date: account_params[:start_date],
-                       start_balance: account_params[:start_balance]
-
-    account.sync_later
-    redirect_to account, notice: t(".success")
-  end
-
-  def update
-    @account.update_with_sync!(account_params)
-    redirect_to @account, notice: t(".success")
-  end
-
-  private
-
-    def set_account
-      @account = Current.family.accounts.find(params[:id])
-    end
-
-    def account_params
-      params.require(:account)
-        .permit(
-          :name, :balance, :institution_id, :start_date, :start_balance, :currency, :accountable_type,
-          accountable_attributes: [
-            :id,
-            :make,
-            :model,
-            :year,
-            :mileage_value,
-            :mileage_unit
-          ]
-        )
-    end
+  permitted_accountable_attributes(
+    :id, :make, :model, :year, :mileage_value, :mileage_unit
+  )
 end
diff --git a/app/controllers/webhooks_controller.rb b/app/controllers/webhooks_controller.rb
index 23e431f7..54cf8331 100644
--- a/app/controllers/webhooks_controller.rb
+++ b/app/controllers/webhooks_controller.rb
@@ -1,61 +1,57 @@
 class WebhooksController < ApplicationController
-  skip_before_action :verify_authenticity_token, only: [ :stripe ]
+  skip_before_action :verify_authenticity_token
   skip_authentication
 
-  def stripe
+  def plaid
     webhook_body = request.body.read
-    sig_header = request.env["HTTP_STRIPE_SIGNATURE"]
-    client = Stripe::StripeClient.new(ENV["STRIPE_SECRET_KEY"])
+    plaid_verification_header = request.headers["Plaid-Verification"]
 
-    begin
-      thin_event = client.parse_thin_event(webhook_body, sig_header, ENV["STRIPE_WEBHOOK_SECRET"])
+    client = Provider::Registry.plaid_provider_for_region(:us)
 
-      event = client.v1.events.retrieve(thin_event.id)
+    client.validate_webhook!(plaid_verification_header, webhook_body)
 
-      case event.type
-      when /^customer\.subscription\./
-        handle_subscription_event(event)
-      when "customer.created", "customer.updated", "customer.deleted"
-        handle_customer_event(event)
-      else
-        Rails.logger.info "Unhandled event type: #{event.type}"
-      end
-
-    rescue JSON::ParserError
-      render json: { error: "Invalid payload" }, status: :bad_request
-      return
-    rescue Stripe::SignatureVerificationError
-      render json: { error: "Invalid signature" }, status: :bad_request
-      return
-    end
+    PlaidItem::WebhookProcessor.new(webhook_body).process
 
     render json: { received: true }, status: :ok
+  rescue => error
+    Sentry.capture_exception(error)
+    render json: { error: "Invalid webhook: #{error.message}" }, status: :bad_request
   end
 
-  private
+  def plaid_eu
+    webhook_body = request.body.read
+    plaid_verification_header = request.headers["Plaid-Verification"]
 
-    def handle_subscription_event(event)
-      subscription = event.data.object
-      family = Family.find_by(stripe_customer_id: subscription.customer)
+    client = Provider::Registry.plaid_provider_for_region(:eu)
 
-      if family
-        family.update(
-          stripe_plan_id: subscription.plan.id,
-          stripe_subscription_status: subscription.status
-        )
-      else
-        Rails.logger.error "Family not found for Stripe customer ID: #{subscription.customer}"
-      end
-    end
-
-    def handle_customer_event(event)
-      customer = event.data.object
-      family = Family.find_by(stripe_customer_id: customer.id)
-
-      if family
-        family.update(stripe_customer_id: customer.id)
-      else
-        Rails.logger.error "Family not found for Stripe customer ID: #{customer.id}"
-      end
+    client.validate_webhook!(plaid_verification_header, webhook_body)
+
+    PlaidItem::WebhookProcessor.new(webhook_body).process
+
+    render json: { received: true }, status: :ok
+  rescue => error
+    Sentry.capture_exception(error)
+    render json: { error: "Invalid webhook: #{error.message}" }, status: :bad_request
+  end
+
+  def stripe
+    stripe_provider = Provider::Registry.get_provider(:stripe)
+
+    begin
+      webhook_body = request.body.read
+      sig_header = request.env["HTTP_STRIPE_SIGNATURE"]
+
+      stripe_provider.process_webhook_later(webhook_body, sig_header)
+
+      head :ok
+    rescue JSON::ParserError => error
+      Sentry.capture_exception(error)
+      Rails.logger.error "JSON parser error: #{error.message}"
+      head :bad_request
+    rescue Stripe::SignatureVerificationError => error
+      Sentry.capture_exception(error)
+      Rails.logger.error "Stripe signature verification error: #{error.message}"
+      head :bad_request
     end
+  end
 end
diff --git a/app/helpers/account/cashes_helper.rb b/app/helpers/account/cashes_helper.rb
deleted file mode 100644
index ed8c2dfc..00000000
--- a/app/helpers/account/cashes_helper.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module Account::CashesHelper
-  def brokerage_cash(account)
-    currency = Money::Currency.new(account.currency)
-
-    account.holdings.build \
-      date: Date.current,
-      qty: account.balance,
-      price: 1,
-      amount: account.balance,
-      currency: account.currency,
-      security: Security.new(ticker: currency.iso_code, name: currency.name)
-  end
-end
diff --git a/app/helpers/account/entries_helper.rb b/app/helpers/account/entries_helper.rb
deleted file mode 100644
index 0f2aff52..00000000
--- a/app/helpers/account/entries_helper.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-module Account::EntriesHelper
-  def permitted_entryable_partial_path(entry, relative_partial_path)
-    "account/entries/entryables/#{permitted_entryable_key(entry)}/#{relative_partial_path}"
-  end
-
-  def unconfirmed_transfer?(entry)
-    entry.marked_as_transfer? && entry.transfer.nil?
-  end
-
-  def transfer_entries(entries)
-    transfers = entries.select { |e| e.transfer_id.present? }
-    transfers.map(&:transfer).uniq
-  end
-
-  def entry_icon(entry, is_oldest: false)
-    if is_oldest
-      "keyboard"
-    elsif entry.trend.direction.up?
-      "arrow-up"
-    elsif entry.trend.direction.down?
-      "arrow-down"
-    else
-      "minus"
-    end
-  end
-
-  def entry_style(entry, is_oldest: false)
-    color = is_oldest ? "#D444F1" : entry.trend.color
-
-    mixed_hex_styles(color)
-  end
-
-  def entry_name(entry)
-    if entry.account_trade?
-      trade     = entry.account_trade
-      prefix    = trade.sell? ? "Sell " : "Buy "
-      generated = prefix + "#{trade.qty.abs} shares of #{trade.security.ticker}"
-      name      = entry.name || generated
-      name
-    else
-      entry.name || "Transaction"
-    end
-  end
-
-  def entries_by_date(entries, selectable: true)
-    entries.group_by(&:date).map do |date, grouped_entries|
-      content = capture do
-        yield grouped_entries
-      end
-
-      render partial: "account/entries/entry_group", locals: { date:, entries: grouped_entries, content:, selectable: }
-    end.join.html_safe
-  end
-
-  private
-
-    def permitted_entryable_key(entry)
-      permitted_entryable_paths = %w[transaction valuation trade]
-      entry.entryable_name_short.presence_in(permitted_entryable_paths)
-    end
-end
diff --git a/app/helpers/account/transfers_helper.rb b/app/helpers/account/transfers_helper.rb
deleted file mode 100644
index ba7a95ae..00000000
--- a/app/helpers/account/transfers_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module Account::TransfersHelper
-end
diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb
index 0bb56ff2..eedb86c3 100644
--- a/app/helpers/accounts_helper.rb
+++ b/app/helpers/accounts_helper.rb
@@ -3,104 +3,4 @@ module AccountsHelper
     content = capture(&block)
     render "accounts/summary_card", title: title, content: content
   end
-
-  def to_accountable_title(accountable)
-    accountable.model_name.human
-  end
-
-  def accountable_text_class(accountable_type)
-    class_mapping(accountable_type)[:text]
-  end
-
-  def accountable_fill_class(accountable_type)
-    class_mapping(accountable_type)[:fill]
-  end
-
-  def accountable_bg_class(accountable_type)
-    class_mapping(accountable_type)[:bg]
-  end
-
-  def accountable_bg_transparent_class(accountable_type)
-    class_mapping(accountable_type)[:bg_transparent]
-  end
-
-  def accountable_color(accountable_type)
-    class_mapping(accountable_type)[:hex]
-  end
-
-  # Eventually, we'll have an accountable form for each type of accountable, so
-  # this helper is a convenience for now to reuse common logic in the accounts controller
-  def new_account_form_url(account)
-    case account.accountable_type
-    when "Property"
-      properties_path
-    when "Vehicle"
-      vehicles_path
-    when "Loan"
-      loans_path
-    when "CreditCard"
-      credit_cards_path
-    else
-      accounts_path
-    end
-  end
-
-  def edit_account_form_url(account)
-    case account.accountable_type
-    when "Property"
-      property_path(account)
-    when "Vehicle"
-      vehicle_path(account)
-    when "Loan"
-      loan_path(account)
-    when "CreditCard"
-      credit_card_path(account)
-    else
-      account_path(account)
-    end
-  end
-
-  def account_tabs(account)
-    overview_tab = { key: "overview", label: t("accounts.show.overview"), path: account_path(account, tab: "overview"), partial_path: "accounts/overview" }
-    holdings_tab = { key: "holdings", label: t("accounts.show.holdings"), path: account_path(account, tab: "holdings"), route: account_holdings_path(account) }
-    cash_tab = { key: "cash", label: t("accounts.show.cash"), path: account_path(account, tab: "cash"), route: account_cashes_path(account) }
-    value_tab        = { key: "valuations", label: t("accounts.show.value"), path: account_path(account, tab: "valuations"), route: account_valuations_path(account) }
-    transactions_tab = { key: "transactions", label: t("accounts.show.transactions"), path: account_path(account, tab: "transactions"), route: account_transactions_path(account) }
-    trades_tab       = { key: "trades", label: t("accounts.show.trades"), path: account_path(account, tab: "trades"), route: account_trades_path(account) }
-
-    return [ value_tab ] if account.other_asset? || account.other_liability?
-    return [ overview_tab, value_tab ] if account.property? || account.vehicle?
-    return [ holdings_tab, cash_tab, trades_tab, value_tab ] if account.investment?
-    return [ overview_tab, value_tab, transactions_tab ] if account.loan? || account.credit_card?
-
-    [ value_tab, transactions_tab ]
-  end
-
-  def selected_account_tab(account)
-    available_tabs = account_tabs(account)
-
-    tab = available_tabs.find { |tab| tab[:key] == params[:tab] }
-
-    tab || available_tabs.first
-  end
-
-  def account_groups(period: nil)
-    assets, liabilities = Current.family.accounts.by_group(currency: Current.family.currency, period: period || Period.last_30_days).values_at(:assets, :liabilities)
-    [ assets.children, liabilities.children ].flatten
-  end
-
-  private
-
-    def class_mapping(accountable_type)
-      {
-        "CreditCard" => { text: "text-red-500", bg: "bg-red-500", bg_transparent: "bg-red-500/10", fill: "fill-red-500", hex: "#F13636" },
-        "Loan" => { text: "text-fuchsia-500", bg: "bg-fuchsia-500", bg_transparent: "bg-fuchsia-500/10", fill: "fill-fuchsia-500", hex: "#D444F1" },
-        "OtherLiability" => { text: "text-gray-500", bg: "bg-gray-500", bg_transparent: "bg-gray-500/10", fill: "fill-gray-500", hex: "#737373" },
-        "Depository" => { text: "text-violet-500", bg: "bg-violet-500", bg_transparent: "bg-violet-500/10", fill: "fill-violet-500", hex: "#875BF7" },
-        "Investment" => { text: "text-blue-600", bg: "bg-blue-600", bg_transparent: "bg-blue-600/10", fill: "fill-blue-600", hex: "#1570EF" },
-        "OtherAsset" => { text: "text-green-500", bg: "bg-green-500", bg_transparent: "bg-green-500/10", fill: "fill-green-500", hex: "#12B76A" },
-        "Property" => { text: "text-cyan-500", bg: "bg-cyan-500", bg_transparent: "bg-cyan-500/10", fill: "fill-cyan-500", hex: "#06AED4" },
-        "Vehicle" => { text: "text-pink-500", bg: "bg-pink-500", bg_transparent: "bg-pink-500/10", fill: "fill-pink-500", hex: "#F23E94" }
-      }.fetch(accountable_type, { text: "text-gray-500", bg: "bg-gray-500", bg_transparent: "bg-gray-500/10", fill: "fill-gray-500", hex: "#737373" })
-    end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8cbbcf21..3ec81e82 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,6 +1,38 @@
 module ApplicationHelper
   include Pagy::Frontend
 
+  def styled_form_with(**options, &block)
+    options[:builder] = StyledFormBuilder
+    form_with(**options, &block)
+  end
+
+  def icon(key, size: "md", color: "default", custom: false, as_button: false, **opts)
+    extra_classes = opts.delete(:class)
+    sizes = { xs: "w-3 h-3", sm: "w-4 h-4", md: "w-5 h-5", lg: "w-6 h-6", xl: "w-7 h-7", "2xl": "w-8 h-8" }
+    colors = { default: "fg-gray", white: "fg-inverse", success: "text-success", warning: "text-warning", destructive: "text-destructive", current: "text-current" }
+
+    icon_classes = class_names(
+      "shrink-0",
+      sizes[size.to_sym],
+      colors[color.to_sym],
+      extra_classes
+    )
+
+    if custom
+      inline_svg_tag("#{key}.svg", class: icon_classes, **opts)
+    elsif as_button
+      render DS::Button.new(variant: "icon", class: extra_classes, icon: key, size: size, type: "button", **opts)
+    else
+      lucide_icon(key, class: icon_classes, **opts)
+    end
+  end
+
+  # Convert alpha (0-1) to 8-digit hex (00-FF)
+  def hex_with_alpha(hex, alpha)
+    alpha_hex = (alpha * 255).round.to_s(16).rjust(2, "0")
+    "#{hex}#{alpha_hex}"
+  end
+
   def title(page_title)
     content_for(:title) { page_title }
   end
@@ -9,153 +41,83 @@ module ApplicationHelper
     content_for(:header_title) { page_title }
   end
 
-  def permitted_accountable_partial(name)
-    name.underscore
+  def header_description(page_description)
+    content_for(:header_description) { page_description }
   end
 
-  def family_notifications_stream
-    turbo_stream_from [ Current.family, :notifications ] if Current.family
+  def page_active?(path)
+    current_page?(path) || (request.path.start_with?(path) && path != "/")
   end
 
-  def family_stream
-    turbo_stream_from Current.family if Current.family
-  end
+  # Wrapper around I18n.l to support custom date formats
+  def format_date(object, format = :default, options = {})
+    date = object.to_date
 
-  def render_flash_notifications
-    notifications = flash.flat_map do |type, message_or_messages|
-      Array(message_or_messages).map do |message|
-        render partial: "shared/notification", locals: { type: type, message: message }
-      end
-    end
+    format_code = options[:format_code] || Current.family&.date_format
 
-    safe_join(notifications)
-  end
-
-  ##
-  # Helper to open a centered and overlayed modal with custom contents
-  #
-  # @example Basic usage
-  #   <%= modal classes: "custom-class" do %>
-  #     <div>Content here</div>
-  #   <% end %>
-  #
-  def modal(options = {}, &block)
-    content = capture &block
-    render partial: "shared/modal", locals: { content:, classes: options[:classes] }
-  end
-
-  ##
-  # Helper to open a drawer on the right side of the screen with custom contents
-  #
-  # @example Basic usage
-  #   <%= drawer do %>
-  #     <div>Content here</div>
-  #   <% end %>
-  #
-  def drawer(&block)
-    content = capture &block
-    render partial: "shared/drawer", locals: { content: content }
-  end
-
-  def disclosure(title, &block)
-    content = capture &block
-    render partial: "shared/disclosure", locals: { title: title, content: content }
-  end
-
-  def sidebar_link_to(name, path, options = {})
-    is_current = current_page?(path) || (request.path.start_with?(path) && path != "/")
-
-    classes = [
-      "flex items-center gap-2 px-3 py-2 rounded-xl border text-sm font-medium text-gray-500",
-      (is_current ? "bg-white text-gray-900 shadow-xs border-alpha-black-50" : "hover:bg-gray-100 border-transparent")
-    ].compact.join(" ")
-
-    link_to path, **options.merge(class: classes), aria: { current: ("page" if current_page?(path)) } do
-      concat(lucide_icon(options[:icon], class: "w-5 h-5")) if options[:icon]
-      concat(name)
-    end
-  end
-
-  def mixed_hex_styles(hex)
-    color = hex || "#1570EF" # blue-600
-
-    <<-STYLE.strip
-      background-color: color-mix(in srgb, #{color} 5%, white);
-      border-color: color-mix(in srgb, #{color} 10%, white);
-      color: #{color};
-    STYLE
-  end
-
-  def circle_logo(name, hex: nil, size: "md")
-    render partial: "shared/circle_logo", locals: { name: name, hex: hex, size: size }
-  end
-
-  def return_to_path(params, fallback = root_path)
-    uri = URI.parse(params[:return_to] || fallback)
-    uri.relative? ? uri.path : root_path
-  end
-
-  def trend_styles(trend)
-    fallback = { bg_class: "bg-gray-500/5", text_class: "text-gray-500", symbol: "", icon: "minus" }
-    return fallback if trend.nil? || trend.direction.flat?
-
-    bg_class, text_class, symbol, icon = case trend.direction
-    when "up"
-      trend.favorable_direction.down? ? [ "bg-red-500/5", "text-red-500", "+", "arrow-up" ] : [ "bg-green-500/5", "text-green-500", "+", "arrow-up" ]
-    when "down"
-      trend.favorable_direction.down? ? [ "bg-green-500/5", "text-green-500", "-", "arrow-down" ] : [ "bg-red-500/5", "text-red-500", "-", "arrow-down" ]
-    when "flat"
-      [ "bg-gray-500/5", "text-gray-500", "", "minus" ]
+    if format_code.present?
+      date.strftime(format_code)
     else
-      raise ArgumentError, "Invalid trend direction: #{trend.direction}"
-    end
-
-    { bg_class: bg_class, text_class: text_class, symbol: symbol, icon: icon }
-  end
-
-  def period_label(period)
-    return "since account creation" if period.date_range.begin.nil?
-    start_date, end_date = period.date_range.first, period.date_range.last
-
-    return "Starting from #{start_date.strftime('%b %d, %Y')}" if end_date.nil?
-    return "Ending at #{end_date.strftime('%b %d, %Y')}" if start_date.nil?
-
-    days_apart = (end_date - start_date).to_i
-
-    case days_apart
-    when 1
-      "vs. yesterday"
-    when 7
-      "vs. last week"
-    when 30, 31
-      "vs. last month"
-    when 365, 366
-      "vs. last year"
-    else
-      "from #{start_date.strftime('%b %d, %Y')} to #{end_date.strftime('%b %d, %Y')}"
+      I18n.l(date, format: format, **options)
     end
   end
 
   def format_money(number_or_money, options = {})
     return nil unless number_or_money
 
-    money = Money.new(number_or_money)
-    options.reverse_merge!(money.format_options(I18n.locale))
-    number_to_currency(money.amount, options)
-  end
-
-  def format_money_without_symbol(number_or_money, options = {})
-    return nil unless number_or_money
-
-    money = Money.new(number_or_money)
-    options.reverse_merge!(money.format_options(I18n.locale))
-    ActiveSupport::NumberHelper.number_to_delimited(money.amount.round(options[:precision] || 0), { delimiter: options[:delimiter], separator: options[:separator] })
+    Money.new(number_or_money).format(options)
   end
 
   def totals_by_currency(collection:, money_method:, separator: " | ", negate: false)
     collection.group_by(&:currency)
-              .transform_values { |item| negate ? item.sum(&money_method) * -1 : item.sum(&money_method) }
+              .transform_values { |item| calculate_total(item, money_method, negate) }
               .map { |_currency, money| format_money(money) }
               .join(separator)
   end
+
+  def show_super_admin_bar?
+    if params[:admin].present?
+      cookies.permanent[:admin] = params[:admin]
+    end
+
+    cookies[:admin] == "true"
+  end
+
+  # Renders Markdown text using Redcarpet
+  def markdown(text)
+    return "" if text.blank?
+
+    renderer = Redcarpet::Render::HTML.new(
+      hard_wrap: true,
+      link_attributes: { target: "_blank", rel: "noopener noreferrer" }
+    )
+
+    markdown = Redcarpet::Markdown.new(
+      renderer,
+      autolink: true,
+      tables: true,
+      fenced_code_blocks: true,
+      strikethrough: true,
+      superscript: true,
+      underline: true,
+      highlight: true,
+      quote: true,
+      footnotes: true
+    )
+
+    markdown.render(text).html_safe
+  end
+
+  private
+    def calculate_total(item, money_method, negate)
+      # Filter out transfer-type transactions from entries
+      # Only Entry objects have entryable transactions, Account objects don't
+      items = item.reject do |i|
+        i.is_a?(Entry) &&
+        i.entryable.is_a?(Transaction) &&
+        i.entryable.transfer?
+      end
+      total = items.sum(&money_method)
+      negate ? -total : total
+    end
 end
diff --git a/app/helpers/categories_helper.rb b/app/helpers/categories_helper.rb
index 83bddbf3..2d586dee 100644
--- a/app/helpers/categories_helper.rb
+++ b/app/helpers/categories_helper.rb
@@ -1,7 +1,25 @@
 module CategoriesHelper
-  def null_category
+  def transfer_category
     Category.new \
-      name: "Uncategorized",
-      color: Category::UNCATEGORIZED_COLOR
+      name: "Transfer",
+      color: Category::TRANSFER_COLOR,
+      lucide_icon: "arrow-right-left"
+  end
+
+  def payment_category
+    Category.new \
+      name: "Payment",
+      color: Category::PAYMENT_COLOR,
+      lucide_icon: "arrow-right"
+  end
+
+  def trade_category
+    Category.new \
+      name: "Trade",
+      color: Category::TRADE_COLOR
+  end
+
+  def family_categories
+    [ Category.uncategorized ].concat(Current.family.categories.alphabetically)
   end
 end
diff --git a/app/helpers/chats_helper.rb b/app/helpers/chats_helper.rb
new file mode 100644
index 00000000..cb933a2e
--- /dev/null
+++ b/app/helpers/chats_helper.rb
@@ -0,0 +1,12 @@
+module ChatsHelper
+  def chat_frame
+    :sidebar_chat
+  end
+
+  def chat_view_path(chat)
+    return new_chat_path if params[:chat_view] == "new"
+    return chats_path if chat.nil? || params[:chat_view] == "all"
+
+    chat.persisted? ? chat_path(chat) : new_chat_path
+  end
+end
diff --git a/app/helpers/custom_confirm.rb b/app/helpers/custom_confirm.rb
new file mode 100644
index 00000000..cdf24585
--- /dev/null
+++ b/app/helpers/custom_confirm.rb
@@ -0,0 +1,51 @@
+# The shape of data expected by `confirm_dialog_controller.js` to override the
+# default browser confirm API via Turbo.
+class CustomConfirm
+  class << self
+    def for_resource_deletion(resource_name, high_severity: false)
+      new(
+        destructive: true,
+        high_severity: high_severity,
+        title: "Delete #{resource_name.titleize}?",
+        body: "Are you sure you want to delete #{resource_name.downcase}? This is not reversible.",
+        btn_text: "Delete #{resource_name.titleize}"
+      )
+    end
+  end
+
+  def initialize(title: default_title, body: default_body, btn_text: default_btn_text, destructive: false, high_severity: false)
+    @title = title
+    @body = body
+    @btn_text = btn_text
+    @btn_variant = derive_btn_variant(destructive, high_severity)
+  end
+
+  def to_data_attribute
+    {
+      title: title,
+      body: body,
+      confirmText: btn_text,
+      variant: btn_variant
+    }
+  end
+
+  private
+    attr_reader :title, :body, :btn_text, :btn_variant
+
+    def derive_btn_variant(destructive, high_severity)
+      return "primary" unless destructive
+      high_severity ? "destructive" : "outline-destructive"
+    end
+
+    def default_title
+      "Are you sure?"
+    end
+
+    def default_body
+      "This is not reversible."
+    end
+
+    def default_btn_text
+      "Confirm"
+    end
+end
diff --git a/app/helpers/entries_helper.rb b/app/helpers/entries_helper.rb
new file mode 100644
index 00000000..1c3340ae
--- /dev/null
+++ b/app/helpers/entries_helper.rb
@@ -0,0 +1,40 @@
+module EntriesHelper
+  def entries_by_date(entries, totals: false)
+    transfer_groups = entries.group_by do |entry|
+      # Only check for transfer if it's a transaction
+      next nil unless entry.entryable_type == "Transaction"
+      entry.entryable.transfer&.id
+    end
+
+    # For a more intuitive UX, we do not want to show the same transfer twice in the list
+    deduped_entries = transfer_groups.flat_map do |transfer_id, grouped_entries|
+      if transfer_id.nil? || grouped_entries.size == 1
+        grouped_entries
+      else
+        grouped_entries.reject do |e|
+          e.entryable_type == "Transaction" &&
+          e.entryable.transfer_as_inflow.present?
+        end
+      end
+    end
+
+    deduped_entries.group_by(&:date).sort.reverse_each.map do |date, grouped_entries|
+      content = capture do
+        yield grouped_entries
+      end
+
+      next if content.blank?
+
+      render partial: "entries/entry_group", locals: { date:, entries: grouped_entries, content:, totals: }
+    end.compact.join.html_safe
+  end
+
+  def entry_name_detailed(entry)
+    [
+      entry.date,
+      format_money(entry.amount_money),
+      entry.account.name,
+      entry.name
+    ].join(" • ")
+  end
+end
diff --git a/app/helpers/forms_helper.rb b/app/helpers/forms_helper.rb
deleted file mode 100644
index 49f303cb..00000000
--- a/app/helpers/forms_helper.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-module FormsHelper
-  def styled_form_with(**options, &block)
-    options[:builder] = StyledFormBuilder
-    form_with(**options, &block)
-  end
-
-  def modal_form_wrapper(title:, subtitle: nil, &block)
-    content = capture &block
-
-    render partial: "shared/modal_form", locals: { title:, subtitle:, content: }
-  end
-
-  def radio_tab_tag(form:, name:, value:, label:, icon:, checked: false, disabled: false)
-    form.label name, for: form.field_id(name, value), class: "group has-[:disabled]:cursor-not-allowed" do
-      concat radio_tab_contents(label:, icon:)
-      concat form.radio_button(name, value, checked:, disabled:, class: "hidden")
-    end
-  end
-
-  def period_select(form:, selected:, classes: "border border-alpha-black-100 shadow-xs rounded-lg text-sm pr-7 cursor-pointer text-gray-900 focus:outline-none focus:ring-0")
-    periods_for_select = [ [ "7D", "last_7_days" ], [ "1M", "last_30_days" ], [ "1Y", "last_365_days" ], [ "All", "all" ] ]
-    form.select(:period, periods_for_select, { selected: selected }, class: classes, data: { "auto-submit-form-target": "auto" })
-  end
-
-  def currencies_for_select
-    Money::Currency.all_instances.sort_by { |currency| [ currency.priority, currency.name ] }
-  end
-
-  private
-    def radio_tab_contents(label:, icon:)
-      tag.div(class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-gray-400 group-has-[:checked]:bg-white group-has-[:checked]:text-gray-800 group-has-[:checked]:shadow-sm") do
-        concat lucide_icon(icon, class: "w-5 h-5")
-        concat tag.span(label, class: "group-has-[:checked]:font-semibold")
-      end
-    end
-end
diff --git a/app/helpers/imports_helper.rb b/app/helpers/imports_helper.rb
index a202a697..cabc31ac 100644
--- a/app/helpers/imports_helper.rb
+++ b/app/helpers/imports_helper.rb
@@ -20,6 +20,7 @@ module ImportsHelper
       notes: "Notes",
       qty: "Quantity",
       ticker: "Ticker",
+      exchange: "Exchange",
       price: "Price",
       entity_type: "Type"
     }[key]
@@ -45,15 +46,20 @@ module ImportsHelper
   end
 
   def cell_class(row, field)
-    base = "text-sm focus:ring-gray-900 focus:border-gray-900 w-full max-w-full disabled:text-gray-400"
+    base = "bg-container text-sm focus:ring-gray-900 theme-dark:focus:ring-gray-100 focus:border-solid w-full max-w-full disabled:text-subdued"
 
     row.valid? # populate errors
 
-    border = row.errors.key?(field) ? "border-red-500" : "border-transparent"
+    border = row.errors.key?(field) ? "border-destructive" : "border-transparent"
 
     [ base, border ].join(" ")
   end
 
+  def cell_is_valid?(row, field)
+    row.valid? # populate errors
+    !row.errors.key?(field)
+  end
+
   private
     def permitted_import_types
       %w[transaction_import trade_import account_import mint_import]
diff --git a/app/helpers/institutions_helper.rb b/app/helpers/institutions_helper.rb
deleted file mode 100644
index 3fa70e37..00000000
--- a/app/helpers/institutions_helper.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module InstitutionsHelper
-  def institution_logo(institution)
-    institution.logo.attached? ? institution.logo : institution.logo_url
-  end
-end
diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb
new file mode 100644
index 00000000..c26a692e
--- /dev/null
+++ b/app/helpers/languages_helper.rb
@@ -0,0 +1,375 @@
+module LanguagesHelper
+  LANGUAGE_MAPPING = {
+    en: "English",
+    ru: "Russian",
+    ar: "Arabic",
+    bg: "Bulgarian",
+    'ca-CAT': "Catalan (Catalonia)",
+    ca: "Catalan",
+    'da-DK': "Danish (Denmark)",
+    'de-AT': "German (Austria)",
+    'de-CH': "German (Switzerland)",
+    de: "German",
+    ee: "Ewe",
+    'en-AU': "English (Australia)",
+    'en-BORK': "English (Bork)",
+    'en-CA': "English (Canada)",
+    'en-GB': "English (United Kingdom)",
+    'en-IND': "English (India)",
+    'en-KE': "English (Kenya)",
+    'en-MS': "English (Malaysia)",
+    'en-NEP': "English (Nepal)",
+    'en-NG': "English (Nigeria)",
+    'en-NZ': "English (New Zealand)",
+    'en-PAK': "English (Pakistan)",
+    'en-SG': "English (Singapore)",
+    'en-TH': "English (Thailand)",
+    'en-UG': "English (Uganda)",
+    'en-US': "English (United States)",
+    'en-ZA': "English (South Africa)",
+    'en-au-ocker': "English (Australian Ocker)",
+    'es-AR': "Spanish (Argentina)",
+    'es-MX': "Spanish (Mexico)",
+    es: "Spanish",
+    fa: "Persian",
+    'fi-FI': "Finnish (Finland)",
+    fr: "French",
+    'fr-CA': "French (Canada)",
+    'fr-CH': "French (Switzerland)",
+    he: "Hebrew",
+    hy: "Armenian",
+    id: "Indonesian",
+    it: "Italian",
+    ja: "Japanese",
+    ko: "Korean",
+    lt: "Lithuanian",
+    lv: "Latvian",
+    'mi-NZ': "Maori (New Zealand)",
+    'nb-NO': "Norwegian Bokmål (Norway)",
+    nl: "Dutch",
+    'no-NO': "Norwegian (Norway)",
+    pl: "Polish",
+    'pt-BR': "Portuguese (Brazil)",
+    pt: "Portuguese",
+    sk: "Slovak",
+    sv: "Swedish",
+    th: "Thai",
+    tr: "Turkish",
+    uk: "Ukrainian",
+    vi: "Vietnamese",
+    'zh-CN': "Chinese (Simplified)",
+    'zh-TW': "Chinese (Traditional)",
+    af: "Afrikaans",
+    az: "Azerbaijani",
+    be: "Belarusian",
+    bn: "Bengali",
+    bs: "Bosnian",
+    cs: "Czech",
+    cy: "Welsh",
+    da: "Danish",
+    'de-DE': "German (Germany)",
+    dz: "Dzongkha",
+    'el-CY': "Greek (Cyprus)",
+    el: "Greek",
+    'en-CY': "English (Cyprus)",
+    'en-IE': "English (Ireland)",
+    'en-IN': "English (India)",
+    'en-TT': "English (Trinidad and Tobago)",
+    eo: "Esperanto",
+    'es-419': "Spanish (Latin America)",
+    'es-CL': "Spanish (Chile)",
+    'es-CO': "Spanish (Colombia)",
+    'es-CR': "Spanish (Costa Rica)",
+    'es-EC': "Spanish (Ecuador)",
+    'es-ES': "Spanish (Spain)",
+    'es-NI': "Spanish (Nicaragua)",
+    'es-PA': "Spanish (Panama)",
+    'es-PE': "Spanish (Peru)",
+    'es-US': "Spanish (United States)",
+    'es-VE': "Spanish (Venezuela)",
+    et: "Estonian",
+    eu: "Basque",
+    fi: "Finnish",
+    'fr-FR': "French (France)",
+    fy: "Western Frisian",
+    gd: "Scottish Gaelic",
+    gl: "Galician",
+    'hi-IN': "Hindi (India)",
+    hi: "Hindi",
+    hr: "Croatian",
+    hu: "Hungarian",
+    is: "Icelandic",
+    'it-CH': "Italian (Switzerland)",
+    ka: "Georgian",
+    kk: "Kazakh",
+    km: "Khmer",
+    kn: "Kannada",
+    lb: "Luxembourgish",
+    lo: "Lao",
+    mg: "Malagasy",
+    mk: "Macedonian",
+    ml: "Malayalam",
+    mn: "Mongolian",
+    'mr-IN': "Marathi (India)",
+    ms: "Malay",
+    nb: "Norwegian Bokmål",
+    ne: "Nepali",
+    nn: "Norwegian Nynorsk",
+    oc: "Occitan",
+    or: "Odia",
+    pa: "Punjabi",
+    rm: "Romansh",
+    ro: "Romanian",
+    sc: "Sardinian",
+    sl: "Slovenian",
+    sq: "Albanian",
+    sr: "Serbian",
+    st: "Southern Sotho",
+    'sv-FI': "Swedish (Finland)",
+    'sv-SE': "Swedish (Sweden)",
+    sw: "Swahili",
+    ta: "Tamil",
+    te: "Telugu",
+    tl: "Tagalog",
+    tt: "Tatar",
+    ug: "Uyghur",
+    ur: "Urdu",
+    uz: "Uzbek",
+    wo: "Wolof"
+  }.freeze
+
+  EXCLUDED_LOCALES = [
+    # Test locales
+    "en-BORK",
+    "en-au-ocker",
+    # Duplicate locales
+    "fr-FR",
+    "de-DE",
+    "hi-IN",
+    "sv-SE",
+    "ca-CAT",
+    "en-US",
+    "fi-FI",
+    "en-IND"
+  ].freeze
+
+  COUNTRY_MAPPING = {
+    AF: "🇦🇫 Afghanistan",
+    AL: "🇦🇱 Albania",
+    DZ: "🇩🇿 Algeria",
+    AD: "🇦🇩 Andorra",
+    AO: "🇦🇴 Angola",
+    AG: "🇦🇬 Antigua and Barbuda",
+    AR: "🇦🇷 Argentina",
+    AM: "🇦🇲 Armenia",
+    AU: "🇦🇺 Australia",
+    AT: "🇦🇹 Austria",
+    AZ: "🇦🇿 Azerbaijan",
+    BS: "🇧🇸 Bahamas",
+    BH: "🇧🇭 Bahrain",
+    BD: "🇧🇩 Bangladesh",
+    BB: "🇧🇧 Barbados",
+    BY: "🇧🇾 Belarus",
+    BE: "🇧🇪 Belgium",
+    BZ: "🇧🇿 Belize",
+    BJ: "🇧🇯 Benin",
+    BT: "🇧🇹 Bhutan",
+    BO: "🇧🇴 Bolivia",
+    BA: "🇧🇦 Bosnia and Herzegovina",
+    BW: "🇧🇼 Botswana",
+    BR: "🇧🇷 Brazil",
+    BN: "🇧🇳 Brunei",
+    BG: "🇧🇬 Bulgaria",
+    BF: "🇧🇫 Burkina Faso",
+    BI: "🇧🇮 Burundi",
+    KH: "🇰🇭 Cambodia",
+    CM: "🇨🇲 Cameroon",
+    CA: "🇨🇦 Canada",
+    CV: "🇨🇻 Cape Verde",
+    CF: "🇨🇫 Central African Republic",
+    TD: "🇹🇩 Chad",
+    CL: "🇨🇱 Chile",
+    CN: "🇨🇳 China",
+    CO: "🇨🇴 Colombia",
+    KM: "🇰🇲 Comoros",
+    CG: "🇨🇬 Congo",
+    CD: "🇨🇩 Congo, Democratic Republic of the",
+    CR: "🇨🇷 Costa Rica",
+    CI: "🇨🇮 Côte d'Ivoire",
+    HR: "🇭🇷 Croatia",
+    CU: "🇨🇺 Cuba",
+    CY: "🇨🇾 Cyprus",
+    CZ: "🇨🇿 Czech Republic",
+    DK: "🇩🇰 Denmark",
+    DJ: "🇩🇯 Djibouti",
+    DM: "🇩🇲 Dominica",
+    DO: "🇩🇴 Dominican Republic",
+    EC: "🇪🇨 Ecuador",
+    EG: "🇪🇬 Egypt",
+    SV: "🇸🇻 El Salvador",
+    GQ: "🇬🇶 Equatorial Guinea",
+    ER: "🇪🇷 Eritrea",
+    EE: "🇪🇪 Estonia",
+    ET: "🇪🇹 Ethiopia",
+    FJ: "🇫🇯 Fiji",
+    FI: "🇫🇮 Finland",
+    FR: "🇫🇷 France",
+    GA: "🇬🇦 Gabon",
+    GM: "🇬🇲 Gambia",
+    GE: "🇬🇪 Georgia",
+    DE: "🇩🇪 Germany",
+    GH: "🇬🇭 Ghana",
+    GR: "🇬🇷 Greece",
+    GD: "🇬🇩 Grenada",
+    GT: "🇬🇹 Guatemala",
+    GN: "🇬🇳 Guinea",
+    GW: "🇬🇼 Guinea-Bissau",
+    GY: "🇬🇾 Guyana",
+    HT: "🇭🇹 Haiti",
+    HN: "🇭🇳 Honduras",
+    HU: "🇭🇺 Hungary",
+    IS: "🇮🇸 Iceland",
+    IN: "🇮🇳 India",
+    ID: "🇮🇩 Indonesia",
+    IR: "🇮🇷 Iran",
+    IQ: "🇮🇶 Iraq",
+    IE: "🇮🇪 Ireland",
+    IL: "🇮🇱 Israel",
+    IT: "🇮🇹 Italy",
+    JM: "🇯🇲 Jamaica",
+    JP: "🇯🇵 Japan",
+    JO: "🇯🇴 Jordan",
+    KZ: "🇰🇿 Kazakhstan",
+    KE: "🇰🇪 Kenya",
+    KI: "🇰🇮 Kiribati",
+    KP: "🇰🇵 North Korea",
+    KR: "🇰🇷 South Korea",
+    KW: "🇰🇼 Kuwait",
+    KG: "🇰🇬 Kyrgyzstan",
+    LA: "🇱🇦 Laos",
+    LV: "🇱🇻 Latvia",
+    LB: "🇱🇧 Lebanon",
+    LS: "🇱🇸 Lesotho",
+    LR: "🇱🇷 Liberia",
+    LY: "🇱🇾 Libya",
+    LI: "🇱🇮 Liechtenstein",
+    LT: "🇱🇹 Lithuania",
+    LU: "🇱🇺 Luxembourg",
+    MK: "🇲🇰 North Macedonia",
+    MG: "🇲🇬 Madagascar",
+    MW: "🇲🇼 Malawi",
+    MY: "🇲🇾 Malaysia",
+    MV: "🇲🇻 Maldives",
+    ML: "🇲🇱 Mali",
+    MT: "🇲🇹 Malta",
+    MH: "🇲🇭 Marshall Islands",
+    MR: "🇲🇷 Mauritania",
+    MU: "🇲🇺 Mauritius",
+    MX: "🇲🇽 Mexico",
+    FM: "🇫🇲 Micronesia",
+    MD: "🇲🇩 Moldova",
+    MC: "🇲🇨 Monaco",
+    MN: "🇲🇳 Mongolia",
+    ME: "🇲🇪 Montenegro",
+    MA: "🇲🇦 Morocco",
+    MZ: "🇲🇿 Mozambique",
+    MM: "🇲🇲 Myanmar",
+    NA: "🇳🇦 Namibia",
+    NR: "🇳🇷 Nauru",
+    NP: "🇳🇵 Nepal",
+    NL: "🇳🇱 Netherlands",
+    NZ: "🇳🇿 New Zealand",
+    NI: "🇳🇮 Nicaragua",
+    NE: "🇳🇪 Niger",
+    NG: "🇳🇬 Nigeria",
+    NO: "🇳🇴 Norway",
+    OM: "🇴🇲 Oman",
+    PK: "🇵🇰 Pakistan",
+    PW: "🇵🇼 Palau",
+    PA: "🇵🇦 Panama",
+    PG: "🇵🇬 Papua New Guinea",
+    PY: "🇵🇾 Paraguay",
+    PE: "🇵🇪 Peru",
+    PH: "🇵🇭 Philippines",
+    PL: "🇵🇱 Poland",
+    PT: "🇵🇹 Portugal",
+    QA: "🇶🇦 Qatar",
+    RO: "🇷🇴 Romania",
+    RU: "🇷🇺 Russia",
+    RW: "🇷🇼 Rwanda",
+    KN: "🇰🇳 Saint Kitts and Nevis",
+    LC: "🇱🇨 Saint Lucia",
+    VC: "🇻🇨 Saint Vincent and the Grenadines",
+    WS: "🇼🇸 Samoa",
+    SM: "🇸🇲 San Marino",
+    ST: "🇸🇹 Sao Tome and Principe",
+    SA: "🇸🇦 Saudi Arabia",
+    SN: "🇸🇳 Senegal",
+    RS: "🇷🇸 Serbia",
+    SC: "🇸🇨 Seychelles",
+    SL: "🇸🇱 Sierra Leone",
+    SG: "🇸🇬 Singapore",
+    SK: "🇸🇰 Slovakia",
+    SI: "🇸🇮 Slovenia",
+    SB: "🇸🇧 Solomon Islands",
+    SO: "🇸🇴 Somalia",
+    ZA: "🇿🇦 South Africa",
+    SS: "🇸🇸 South Sudan",
+    ES: "🇪🇸 Spain",
+    LK: "🇱🇰 Sri Lanka",
+    SD: "🇸🇩 Sudan",
+    SR: "🇸🇷 Suriname",
+    SE: "🇸🇪 Sweden",
+    CH: "🇨🇭 Switzerland",
+    SY: "🇸🇾 Syria",
+    TW: "🇹🇼 Taiwan",
+    TJ: "🇹🇯 Tajikistan",
+    TZ: "🇹🇿 Tanzania",
+    TH: "🇹🇭 Thailand",
+    TL: "🇹🇱 Timor-Leste",
+    TG: "🇹🇬 Togo",
+    TO: "🇹🇴 Tonga",
+    TT: "🇹🇹 Trinidad and Tobago",
+    TN: "🇹🇳 Tunisia",
+    TR: "🇹🇷 Turkey",
+    TM: "🇹🇲 Turkmenistan",
+    TV: "🇹🇻 Tuvalu",
+    UG: "🇺🇬 Uganda",
+    UA: "🇺🇦 Ukraine",
+    AE: "🇦🇪 United Arab Emirates",
+    GB: "🇬🇧 United Kingdom",
+    US: "🇺🇸 United States",
+    UY: "🇺🇾 Uruguay",
+    UZ: "🇺🇿 Uzbekistan",
+    VU: "🇻🇺 Vanuatu",
+    VA: "🇻🇦 Vatican City",
+    VE: "🇻🇪 Venezuela",
+    VN: "🇻🇳 Vietnam",
+    YE: "🇾🇪 Yemen",
+    ZM: "🇿🇲 Zambia",
+    ZW: "🇿🇼 Zimbabwe"
+  }.freeze
+
+  def country_options
+    COUNTRY_MAPPING.keys.map { |key| [ COUNTRY_MAPPING[key], key ] }
+  end
+
+  def language_options
+    I18n.available_locales
+      .reject { |locale| EXCLUDED_LOCALES.include?(locale.to_s) }
+      .map do |locale|
+        label = LANGUAGE_MAPPING[locale.to_sym] || locale.to_s.humanize
+        [ "#{label} (#{locale})", locale ]
+      end
+      .sort_by { |label, locale| label }
+  end
+
+  def timezone_options
+    ActiveSupport::TimeZone.all
+      .sort_by { |tz| [ tz.utc_offset, tz.name ] }
+      .map do |tz|
+        name = tz.name.split(" - ").first.gsub(" (US & Canada)", "")
+        [ "(#{tz.formatted_offset}) #{name}", tz.tzinfo.identifier ]
+      end
+  end
+end
diff --git a/app/helpers/menus_helper.rb b/app/helpers/menus_helper.rb
deleted file mode 100644
index 74ec8752..00000000
--- a/app/helpers/menus_helper.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-module MenusHelper
-  def contextual_menu(&block)
-    tag.div data: { controller: "menu" } do
-      concat contextual_menu_icon
-      concat contextual_menu_content(&block)
-    end
-  end
-
-  def contextual_menu_modal_action_item(label, url, icon: "pencil-line", turbo_frame: :modal)
-    link_to url, class: "flex items-center rounded-lg text-gray-900 hover:bg-gray-50 py-2 px-3 gap-2", data: { turbo_frame: } do
-      concat(lucide_icon(icon, class: "shrink-0 w-5 h-5 text-gray-500"))
-      concat(tag.span(label, class: "text-sm"))
-    end
-  end
-
-  def contextual_menu_destructive_item(label, url, turbo_confirm: true, turbo_frame: nil)
-    button_to url,
-              method: :delete,
-              class: "flex items-center w-full rounded-lg text-red-500 hover:bg-red-500/5 py-2 px-3 gap-2",
-              data: { turbo_confirm: turbo_confirm, turbo_frame: } do
-      concat(lucide_icon("trash-2", class: "shrink-0 w-5 h-5"))
-      concat(tag.span(label, class: "text-sm"))
-    end
-  end
-
-  private
-    def contextual_menu_icon
-      tag.button class: "flex hover:bg-gray-100 p-2 rounded cursor-pointer", data: { menu_target: "button" } do
-        lucide_icon "more-horizontal", class: "w-5 h-5 text-gray-500"
-      end
-    end
-
-    def contextual_menu_content(&block)
-      tag.div class: "z-50 border border-alpha-black-25 bg-white rounded-lg shadow-xs hidden",
-               data: { menu_target: "content" } do
-        capture(&block)
-      end
-    end
-end
diff --git a/app/helpers/mfa_helper.rb b/app/helpers/mfa_helper.rb
new file mode 100644
index 00000000..f2d69ecc
--- /dev/null
+++ b/app/helpers/mfa_helper.rb
@@ -0,0 +1,20 @@
+module MfaHelper
+  def generate_mfa_qr_code(provisioning_uri)
+    qr_code = RQRCode::QRCode.new(provisioning_uri).as_svg(
+      color: "141414",
+      module_size: 4,
+      standalone: true,
+      use_path: true,
+      svg_attributes: {
+        width: "240",
+        height: "240",
+        viewBox: "0 0 65 65"
+      }
+    )
+
+    # Whitelist specific SVG attributes and elements that we know are safe
+    sanitize qr_code,
+      tags: %w[svg g path rect],
+      attributes: %w[viewBox height width fill stroke stroke-width d x y class]
+  end
+end
diff --git a/app/helpers/pages_helper.rb b/app/helpers/pages_helper.rb
deleted file mode 100644
index 2c057fd0..00000000
--- a/app/helpers/pages_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module PagesHelper
-end
diff --git a/app/helpers/properties_helper.rb b/app/helpers/properties_helper.rb
deleted file mode 100644
index e9841903..00000000
--- a/app/helpers/properties_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module PropertiesHelper
-end
diff --git a/app/helpers/settings/billing_helper.rb b/app/helpers/settings/billing_helper.rb
deleted file mode 100644
index 8de033a5..00000000
--- a/app/helpers/settings/billing_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module Settings::BillingHelper
-end
diff --git a/app/helpers/settings/hosting_helper.rb b/app/helpers/settings/hosting_helper.rb
deleted file mode 100644
index b92b592b..00000000
--- a/app/helpers/settings/hosting_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module Settings::HostingHelper
-end
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index f127905d..0f8ab471 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -1,16 +1,19 @@
 module SettingsHelper
   SETTINGS_ORDER = [
-    { name: I18n.t("settings.nav.profile_label"), path: :settings_profile_path },
-    { name: I18n.t("settings.nav.preferences_label"), path: :settings_preferences_path },
-    { name: I18n.t("settings.nav.self_hosting_label"), path: :settings_hosting_path, condition: :self_hosted? },
-    { name: I18n.t("settings.nav.billing_label"), path: :settings_billing_path },
-    { name: I18n.t("settings.nav.accounts_label"), path: :accounts_path },
-    { name: I18n.t("settings.nav.tags_label"), path: :tags_path },
-    { name: I18n.t("settings.nav.categories_label"), path: :categories_path },
-    { name: I18n.t("settings.nav.merchants_label"), path: :merchants_path },
-    { name: I18n.t("settings.nav.imports_label"), path: :imports_path },
-    { name: I18n.t("settings.nav.whats_new_label"), path: :changelog_path },
-    { name: I18n.t("settings.nav.feedback_label"), path: :feedback_path }
+    { name: "Account", path: :settings_profile_path },
+    { name: "Preferences", path: :settings_preferences_path },
+    { name: "Security", path: :settings_security_path },
+    { name: "Self hosting", path: :settings_hosting_path, condition: :self_hosted? },
+    { name: "API Key", path: :settings_api_key_path },
+    { name: "Billing", path: :settings_billing_path, condition: :not_self_hosted? },
+    { name: "Accounts", path: :accounts_path },
+    { name: "Imports", path: :imports_path },
+    { name: "Tags", path: :tags_path },
+    { name: "Categories", path: :categories_path },
+    { name: "Rules", path: :rules_path },
+    { name: "Merchants", path: :family_merchants_path },
+    { name: "What's new", path: :changelog_path },
+    { name: "Feedback", path: :feedback_path }
   ]
 
   def adjacent_setting(current_path, offset)
@@ -23,7 +26,7 @@ module SettingsHelper
 
     adjacent = visible_settings[adjacent_index]
 
-    render partial: "settings/nav_link_large", locals: {
+    render partial: "settings/settings_nav_link_large", locals: {
       path: send(adjacent[:path]),
       direction: offset > 0 ? "next" : "previous",
       title: adjacent[:name]
@@ -39,9 +42,24 @@ module SettingsHelper
     previous_setting = adjacent_setting(request.path, -1)
     next_setting = adjacent_setting(request.path, 1)
 
-    content_tag :div, class: "flex justify-between gap-4" do
+    content_tag :div, class: "hidden md:flex flex-row justify-between gap-4" do
       concat(previous_setting)
       concat(next_setting)
     end
   end
+
+  def settings_nav_footer_mobile
+    previous_setting = adjacent_setting(request.path, -1)
+    next_setting = adjacent_setting(request.path, 1)
+
+    content_tag :div, class: "md:hidden flex flex-col gap-4" do
+      concat(previous_setting)
+      concat(next_setting)
+    end
+  end
+
+  private
+    def not_self_hosted?
+      !self_hosted?
+    end
 end
diff --git a/app/helpers/styled_form_builder.rb b/app/helpers/styled_form_builder.rb
index 885509d6..f90888d7 100644
--- a/app/helpers/styled_form_builder.rb
+++ b/app/helpers/styled_form_builder.rb
@@ -1,42 +1,38 @@
 class StyledFormBuilder < ActionView::Helpers::FormBuilder
-  # Fields that visually inherit from "text field"
   class_attribute :text_field_helpers, default: field_helpers - [ :label, :check_box, :radio_button, :fields_for, :fields, :hidden_field, :file_field ]
 
-  # Wraps "text" inputs with custom structure + base styles
   text_field_helpers.each do |selector|
     class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
       def #{selector}(method, options = {})
-        merged_options = { class: "form-field__input" }.merge(options)
-        label = build_label(method, options)
-        field = super(method, merged_options)
+        form_options = options.slice(:label, :label_tooltip, :inline, :container_class, :required)
+        html_options = options.except(:label, :label_tooltip, :inline, :container_class)
 
-        build_styled_field(label, field, merged_options)
+        build_field(method, form_options, html_options) do |merged_options|
+          super(method, merged_options)
+        end
       end
     RUBY_EVAL
   end
 
   def radio_button(method, tag_value, options = {})
     merged_options = { class: "form-field__radio" }.merge(options)
-
     super(method, tag_value, merged_options)
   end
 
   def select(method, choices, options = {}, html_options = {})
-    merged_html_options = { class: "form-field__input" }.merge(html_options)
+    field_options = normalize_options(options, html_options)
 
-    label = build_label(method, options)
-    field = super(method, choices, options, merged_html_options)
-
-    build_styled_field(label, field, options, remove_padding_right: true)
+    build_field(method, field_options, html_options) do |merged_html_options|
+      super(method, choices, options, merged_html_options)
+    end
   end
 
   def collection_select(method, collection, value_method, text_method, options = {}, html_options = {})
-    merged_html_options = { class: "form-field__input" }.merge(html_options)
+    field_options = normalize_options(options, html_options)
 
-    label = build_label(method, options)
-    field = super(method, collection, value_method, text_method, options, merged_html_options)
-
-    build_styled_field(label, field, options, remove_padding_right: true)
+    build_field(method, field_options, html_options) do |merged_html_options|
+      super(method, collection, value_method, text_method, options, merged_html_options)
+    end
   end
 
   def money_field(amount_method, options = {})
@@ -48,27 +44,95 @@ class StyledFormBuilder < ActionView::Helpers::FormBuilder
     }
   end
 
+  def toggle(method, options = {}, checked_value = "1", unchecked_value = "0")
+    field_id = field_id(method)
+    field_name = field_name(method)
+    checked = object ? object.send(method) : options[:checked]
+
+    @template.render(
+      DS::Toggle.new(
+        id: field_id,
+        name: field_name,
+        checked: checked,
+        disabled: options[:disabled],
+        checked_value: checked_value,
+        unchecked_value: unchecked_value,
+        **options
+      )
+    )
+  end
+
   def submit(value = nil, options = {})
-    merged_options = { class: "btn btn--primary w-full" }.merge(options)
     value, options = nil, value if value.is_a?(Hash)
-    super(value, merged_options)
+    value ||= submit_default_value
+
+    @template.render(
+      DS::Button.new(
+        text: value,
+        data: (options[:data] || {}).merge({ turbo_submits_with: "Submitting..." }),
+        full_width: true
+      )
+    )
   end
 
   private
+    def build_field(method, options = {}, html_options = {}, &block)
+      if options[:inline] || options[:label] == false
+        return yield({ class: "form-field__input" }.merge(html_options))
+      end
 
-    def build_styled_field(label, field, options, remove_padding_right: false)
-      if options[:inline]
-        label + field
-      else
-        @template.tag.div class: [ "form-field", options[:container_class], ("pr-0" if remove_padding_right) ] do
-          label + field
+      label_element = build_label(method, options)
+      field_element = yield({ class: "form-field__input" }.merge(html_options))
+
+      container_classes = [ "form-field", options[:container_class] ].compact
+
+      @template.tag.div class: container_classes do
+        if options[:label_tooltip]
+          @template.tag.div(class: "form-field__header") do
+            label_element +
+            @template.tag.div(class: "form-field__actions") do
+              build_tooltip(options[:label_tooltip])
+            end
+          end +
+          @template.tag.div(class: "form-field__body") do
+            field_element
+          end
+        else
+          @template.tag.div(class: "form-field__body") do
+            label_element + field_element
+          end
         end
       end
     end
 
+    def normalize_options(options, html_options)
+      options.merge(required: options[:required] || html_options[:required])
+    end
+
     def build_label(method, options)
       return "".html_safe unless options[:label]
-      return label(method, class: "form-field__label") if options[:label] == true
-      label(method, options[:label], class: "form-field__label")
+
+      label_text = options[:label]
+
+      if options[:required]
+        label_text = @template.safe_join([
+          label_text == true ? method.to_s.humanize : label_text,
+          @template.tag.span("*", class: "text-red-500 ml-0.5")
+        ])
+      end
+
+      return label(method, class: "form-field__label") if label_text == true
+      label(method, label_text, class: "form-field__label")
+    end
+
+    def build_tooltip(tooltip_text)
+      return nil unless tooltip_text
+
+      @template.tag.div(data: { controller: "tooltip" }) do
+        @template.safe_join([
+          @template.icon("help-circle", size: "sm", color: "default", class: "cursor-help"),
+          @template.tag.div(tooltip_text, role: "tooltip", data: { tooltip_target: "tooltip" }, class: "tooltip bg-gray-700 text-sm p-2 rounded w-64 text-white")
+        ])
+      end
     end
 end
diff --git a/app/helpers/subscription_helper.rb b/app/helpers/subscription_helper.rb
deleted file mode 100644
index bac8d5a9..00000000
--- a/app/helpers/subscription_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module SubscriptionHelper
-end
diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb
deleted file mode 100644
index 4a796243..00000000
--- a/app/helpers/tags_helper.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module TagsHelper
-  def null_tag
-    Tag.new \
-      name: "Uncategorized",
-      color: Tag::UNCATEGORIZED_COLOR
-  end
-end
diff --git a/app/helpers/transactions_helper.rb b/app/helpers/transactions_helper.rb
index 5c6f4d7b..173306b9 100644
--- a/app/helpers/transactions_helper.rb
+++ b/app/helpers/transactions_helper.rb
@@ -1,13 +1,13 @@
 module TransactionsHelper
   def transaction_search_filters
     [
-      { key: "account_filter", icon: "layers" },
-      { key: "date_filter", icon: "calendar" },
-      { key: "type_filter", icon: "tag" },
-      { key: "amount_filter", icon: "hash" },
-      { key: "category_filter", icon: "shapes" },
-      { key: "tag_filter", icon: "tags" },
-      { key: "merchant_filter", icon: "store" }
+      { key: "account_filter", label: "Account", icon: "layers" },
+      { key: "date_filter", label: "Date", icon: "calendar" },
+      { key: "type_filter", label: "Type", icon: "tag" },
+      { key: "amount_filter", label: "Amount", icon: "hash" },
+      { key: "category_filter", label: "Category", icon: "shapes" },
+      { key: "tag_filter", label: "Tag", icon: "tags" },
+      { key: "merchant_filter", label: "Merchant", icon: "store" }
     ]
   end
 
@@ -18,21 +18,4 @@ module TransactionsHelper
   def get_default_transaction_search_filter
     transaction_search_filters[0]
   end
-
-  def transactions_path_without_param(param_key, param_value)
-    updated_params = request.query_parameters.deep_dup
-
-    q_params = updated_params[:q] || {}
-
-    current_value = q_params[param_key]
-    if current_value.is_a?(Array)
-      q_params[param_key] = current_value - [ param_value ]
-    else
-      q_params.delete(param_key)
-    end
-
-    updated_params[:q] = q_params
-
-    transactions_path(updated_params)
-  end
 end
diff --git a/app/helpers/upgrades_helper.rb b/app/helpers/upgrades_helper.rb
deleted file mode 100644
index c8f579c6..00000000
--- a/app/helpers/upgrades_helper.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module UpgradesHelper
-  def get_upgrade_for_notification(user, upgrades_mode)
-    return nil unless ENV["UPGRADES_ENABLED"] == "true"
-
-    completed_upgrade = Upgrader.completed_upgrade
-    return completed_upgrade if completed_upgrade && user.last_alerted_upgrade_commit_sha != completed_upgrade.commit_sha
-
-    available_upgrade = Upgrader.available_upgrade
-    if available_upgrade && upgrades_mode == "manual" && user.last_prompted_upgrade_commit_sha != available_upgrade.commit_sha
-      available_upgrade
-    end
-  end
-end
diff --git a/app/helpers/value_groups_helper.rb b/app/helpers/value_groups_helper.rb
deleted file mode 100644
index 5362ed0c..00000000
--- a/app/helpers/value_groups_helper.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module ValueGroupsHelper
-  def value_group_pie_data(value_group)
-    value_group.children.filter { |c| c.sum > 0 }.map do |child|
-      {
-        label: to_accountable_title(Accountable.from_type(child.name)),
-        percent_of_total: child.percent_of_total.round(1).to_f,
-        formatted_value: format_money(child.sum, precision: 0),
-        bg_color: accountable_bg_class(child.name),
-        fill_color: accountable_fill_class(child.name)
-      }
-    end.to_json
-  end
-end
diff --git a/app/helpers/vehicles_helper.rb b/app/helpers/vehicles_helper.rb
deleted file mode 100644
index f8e7abd9..00000000
--- a/app/helpers/vehicles_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module VehiclesHelper
-end
diff --git a/app/helpers/webhooks_helper.rb b/app/helpers/webhooks_helper.rb
deleted file mode 100644
index 3fa66567..00000000
--- a/app/helpers/webhooks_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module WebhooksHelper
-end
diff --git a/app/javascript/application.js b/app/javascript/application.js
index 0d7b4940..12751637 100644
--- a/app/javascript/application.js
+++ b/app/javascript/application.js
@@ -1,3 +1,7 @@
 // Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
-import "@hotwired/turbo-rails"
-import "controllers"
+import "@hotwired/turbo-rails";
+import "controllers";
+
+Turbo.StreamActions.redirect = function () {
+  Turbo.visit(this.target);
+};
diff --git a/app/javascript/controllers/account_collapse_controller.js b/app/javascript/controllers/account_collapse_controller.js
deleted file mode 100644
index 9e597eea..00000000
--- a/app/javascript/controllers/account_collapse_controller.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-// Connects to data-controller="account-collapse"
-export default class extends Controller {
-  static values = { type: String }
-  initialToggle = false
-  STORAGE_NAME = "accountCollapseStates"
-
-  connect() {
-    this.element.addEventListener("toggle", this.onToggle)
-    this.updateFromLocalStorage()
-  }
-
-  disconnect() {
-    this.element.removeEventListener("toggle", this.onToggle)
-  }
-
-  onToggle = () => {
-    if (this.initialToggle) {
-      this.initialToggle = false
-      return
-    }
-
-    const items = this.getItemsFromLocalStorage()
-    if (items.has(this.typeValue)) {
-      items.delete(this.typeValue)
-    } else {
-      items.add(this.typeValue)
-    }
-    localStorage.setItem(this.STORAGE_NAME, JSON.stringify([...items]))
-  }
-
-  updateFromLocalStorage() {
-    const items = this.getItemsFromLocalStorage()
-
-    if (items.has(this.typeValue)) {
-      this.initialToggle = true
-      this.element.setAttribute("open", "")
-    }
-  }
-
-  getItemsFromLocalStorage() {
-    try {
-      const items = localStorage.getItem(this.STORAGE_NAME)
-      return new Set(items ? JSON.parse(items) : [])
-    } catch (error) {
-      console.error("Error parsing items from localStorage:", error)
-      return new Set()
-    }
-  }
-}
diff --git a/app/javascript/controllers/app_layout_controller.js b/app/javascript/controllers/app_layout_controller.js
new file mode 100644
index 00000000..cc15c78c
--- /dev/null
+++ b/app/javascript/controllers/app_layout_controller.js
@@ -0,0 +1,56 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="dialog"
+export default class extends Controller {
+  static targets = ["leftSidebar", "rightSidebar", "mobileSidebar"];
+  static classes = [
+    "expandedSidebar",
+    "collapsedSidebar",
+    "expandedTransition",
+    "collapsedTransition",
+  ];
+
+  openMobileSidebar() {
+    this.mobileSidebarTarget.classList.remove("hidden");
+  }
+
+  closeMobileSidebar() {
+    this.mobileSidebarTarget.classList.add("hidden");
+  }
+
+  toggleLeftSidebar() {
+    const isOpen = this.leftSidebarTarget.classList.contains("w-full");
+    this.#updateUserPreference("show_sidebar", !isOpen);
+    this.#toggleSidebarWidth(this.leftSidebarTarget, isOpen);
+  }
+
+  toggleRightSidebar() {
+    const isOpen = this.rightSidebarTarget.classList.contains("w-full");
+    this.#updateUserPreference("show_ai_sidebar", !isOpen);
+    this.#toggleSidebarWidth(this.rightSidebarTarget, isOpen);
+  }
+
+  #toggleSidebarWidth(el, isCurrentlyOpen) {
+    if (isCurrentlyOpen) {
+      el.classList.remove(...this.expandedSidebarClasses);
+      el.classList.add(...this.collapsedSidebarClasses);
+    } else {
+      el.classList.add(...this.expandedSidebarClasses);
+      el.classList.remove(...this.collapsedSidebarClasses);
+    }
+  }
+
+  #updateUserPreference(field, value) {
+    fetch(`/users/${this.userIdValue}`, {
+      method: "PATCH",
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded",
+        "X-CSRF-Token": document.querySelector('[name="csrf-token"]').content,
+        Accept: "application/json",
+      },
+      body: new URLSearchParams({
+        [`user[${field}]`]: value,
+      }).toString(),
+    });
+  }
+}
diff --git a/app/javascript/controllers/application.js b/app/javascript/controllers/application.js
index f25e31b6..ae24872d 100644
--- a/app/javascript/controllers/application.js
+++ b/app/javascript/controllers/application.js
@@ -1,43 +1,19 @@
-import { Application } from "@hotwired/stimulus"
+import { Application } from "@hotwired/stimulus";
 
-const application = Application.start()
+const application = Application.start();
 
 // Configure Stimulus development experience
-application.debug = false
-window.Stimulus   = application
+application.debug = false;
+window.Stimulus = application;
 
-Turbo.setConfirmMethod((message) => {
-  const dialog = document.getElementById("turbo-confirm");
+Turbo.config.forms.confirm = (data) => {
+  const confirmDialogController =
+    application.getControllerForElementAndIdentifier(
+      document.getElementById("confirm-dialog"),
+      "confirm-dialog",
+    );
 
-  try {
-    const { title, body, accept, acceptClass } = JSON.parse(message);
+  return confirmDialogController.handleConfirm(data);
+};
 
-    if (title) {
-      document.getElementById("turbo-confirm-title").innerHTML = title;
-    }
-
-    if (body) {
-      document.getElementById("turbo-confirm-body").innerHTML = body;
-    }
-
-    if (accept) {
-      document.getElementById("turbo-confirm-accept").innerHTML = accept;
-    }
-
-    if (acceptClass) {
-      document.getElementById("turbo-confirm-accept").className = acceptClass;
-    }
-  } catch (e) {
-    document.getElementById("turbo-confirm-title").innerText = message;
-  }
-
-  dialog.showModal();
-
-  return new Promise((resolve) => {
-    dialog.addEventListener("close", () => {
-        resolve(dialog.returnValue == "confirm")
-    }, { once: true })
-  })
-})
-
-export { application }
+export { application };
diff --git a/app/javascript/controllers/auto_submit_form_controller.js b/app/javascript/controllers/auto_submit_form_controller.js
index 56eb9fd2..18744c4d 100644
--- a/app/javascript/controllers/auto_submit_form_controller.js
+++ b/app/javascript/controllers/auto_submit_form_controller.js
@@ -24,10 +24,31 @@ export default class extends Controller {
     });
   }
 
-  handleInput = () => {
+  handleInput = (event) => {
+    const target = event.target;
+
     clearTimeout(this.timeout);
     this.timeout = setTimeout(() => {
       this.element.requestSubmit();
-    }, 500);
+    }, this.#debounceTimeout(target));
   };
+
+  #debounceTimeout(element) {
+    if (element.dataset.autosubmitDebounceTimeout) {
+      return Number.parseInt(element.dataset.autosubmitDebounceTimeout);
+    }
+
+    const type = element.type || element.tagName;
+
+    switch (type.toLowerCase()) {
+      case "input":
+      case "textarea":
+        return 500;
+      case "select-one":
+      case "select-multiple":
+        return 0;
+      default:
+        return 500;
+    }
+  }
 }
diff --git a/app/javascript/controllers/budget_form_controller.js b/app/javascript/controllers/budget_form_controller.js
new file mode 100644
index 00000000..0647736e
--- /dev/null
+++ b/app/javascript/controllers/budget_form_controller.js
@@ -0,0 +1,25 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="budget-form"
+export default class extends Controller {
+  toggleAutoFill(e) {
+    const expectedIncome = e.params.income;
+    const budgetedSpending = e.params.spending;
+
+    if (e.target.checked) {
+      this.#fillField(expectedIncome.key, expectedIncome.value);
+      this.#fillField(budgetedSpending.key, budgetedSpending.value);
+    } else {
+      this.#clearField(expectedIncome.key);
+      this.#clearField(budgetedSpending.key);
+    }
+  }
+
+  #fillField(id, value) {
+    this.element.querySelector(`input[id="${id}"]`).value = value;
+  }
+
+  #clearField(id) {
+    this.element.querySelector(`input[id="${id}"]`).value = "";
+  }
+}
diff --git a/app/javascript/controllers/bulk_select_controller.js b/app/javascript/controllers/bulk_select_controller.js
index f7050b1a..0851da7a 100644
--- a/app/javascript/controllers/bulk_select_controller.js
+++ b/app/javascript/controllers/bulk_select_controller.js
@@ -1,134 +1,165 @@
-import { Controller } from "@hotwired/stimulus"
+import { Controller } from "@hotwired/stimulus";
 
 // Connects to data-controller="bulk-select"
 export default class extends Controller {
-  static targets = ["row", "group", "selectionBar", "selectionBarText", "bulkEditDrawerTitle"]
+  static targets = [
+    "row",
+    "group",
+    "selectionBar",
+    "selectionBarText",
+    "bulkEditDrawerHeader",
+  ];
   static values = {
-    resource: String,
-    selectedIds: { type: Array, default: [] }
-  }
+    singularLabel: String,
+    pluralLabel: String,
+    selectedIds: { type: Array, default: [] },
+  };
 
   connect() {
-    document.addEventListener("turbo:load", this._updateView)
+    document.addEventListener("turbo:load", this._updateView);
 
-    this._updateView()
+    this._updateView();
   }
 
   disconnect() {
-    document.removeEventListener("turbo:load", this._updateView)
+    document.removeEventListener("turbo:load", this._updateView);
   }
 
-  bulkEditDrawerTitleTargetConnected(element) {
-    element.innerText = `Edit ${this.selectedIdsValue.length} ${this.#pluralizedResourceName()}`
+  bulkEditDrawerHeaderTargetConnected(element) {
+    const headingTextEl = element.querySelector("h2");
+    headingTextEl.innerText = `Edit ${
+      this.selectedIdsValue.length
+    } ${this._pluralizedResourceName()}`;
   }
 
   submitBulkRequest(e) {
     const form = e.target.closest("form");
-    const scope = e.params.scope
-    this.#addHiddenFormInputsForSelectedIds(form, `${scope}[entry_ids][]`, this.selectedIdsValue)
-    form.requestSubmit()
+    const scope = e.params.scope;
+    this._addHiddenFormInputsForSelectedIds(
+      form,
+      `${scope}[entry_ids][]`,
+      this.selectedIdsValue,
+    );
+    form.requestSubmit();
   }
 
   togglePageSelection(e) {
     if (e.target.checked) {
-      this.#selectAll()
+      this._selectAll();
     } else {
-      this.deselectAll()
+      this.deselectAll();
     }
   }
 
   toggleGroupSelection(e) {
-    const group = this.groupTargets.find(group => group.contains(e.target))
+    const group = this.groupTargets.find((group) => group.contains(e.target));
 
-    this.#rowsForGroup(group).forEach(row => {
+    this._rowsForGroup(group).forEach((row) => {
       if (e.target.checked) {
-        this.#addToSelection(row.dataset.id)
+        this._addToSelection(row.dataset.id);
       } else {
-        this.#removeFromSelection(row.dataset.id)
+        this._removeFromSelection(row.dataset.id);
       }
-    })
+    });
   }
 
   toggleRowSelection(e) {
     if (e.target.checked) {
-      this.#addToSelection(e.target.dataset.id)
+      this._addToSelection(e.target.dataset.id);
     } else {
-      this.#removeFromSelection(e.target.dataset.id)
+      this._removeFromSelection(e.target.dataset.id);
     }
   }
 
   deselectAll() {
-    this.selectedIdsValue = []
-    this.element.querySelectorAll('input[type="checkbox"]').forEach(el => el.checked = false)
+    this.selectedIdsValue = [];
+    this.element.querySelectorAll('input[type="checkbox"]').forEach((el) => {
+      el.checked = false;
+    });
   }
 
   selectedIdsValueChanged() {
-    this._updateView()
+    this._updateView();
   }
 
-  #addHiddenFormInputsForSelectedIds(form, paramName, transactionIds) {
-    this.#resetFormInputs(form, paramName);
+  _addHiddenFormInputsForSelectedIds(form, paramName, transactionIds) {
+    this._resetFormInputs(form, paramName);
 
-    transactionIds.forEach(id => {
+    transactionIds.forEach((id) => {
       const input = document.createElement("input");
-      input.type = 'hidden'
-      input.name = paramName
-      input.value = id
-      form.appendChild(input)
-    })
+      input.type = "hidden";
+      input.name = paramName;
+      input.value = id;
+      form.appendChild(input);
+    });
   }
 
-  #resetFormInputs(form, paramName) {
+  _resetFormInputs(form, paramName) {
     const existingInputs = form.querySelectorAll(`input[name='${paramName}']`);
     existingInputs.forEach((input) => input.remove());
   }
 
-  #rowsForGroup(group) {
-    return this.rowTargets.filter(row => group.contains(row))
+  _rowsForGroup(group) {
+    return this.rowTargets.filter(
+      (row) => group.contains(row) && !row.disabled,
+    );
   }
 
-  #addToSelection(idToAdd) {
+  _addToSelection(idToAdd) {
     this.selectedIdsValue = Array.from(
-      new Set([...this.selectedIdsValue, idToAdd])
-    )
+      new Set([...this.selectedIdsValue, idToAdd]),
+    );
   }
 
-  #removeFromSelection(idToRemove) {
-    this.selectedIdsValue = this.selectedIdsValue.filter(id => id !== idToRemove)
+  _removeFromSelection(idToRemove) {
+    this.selectedIdsValue = this.selectedIdsValue.filter(
+      (id) => id !== idToRemove,
+    );
   }
 
-  #selectAll() {
-    this.selectedIdsValue = this.rowTargets.map(t => t.dataset.id)
+  _selectAll() {
+    this.selectedIdsValue = this.rowTargets
+      .filter((t) => !t.disabled)
+      .map((t) => t.dataset.id);
   }
 
   _updateView = () => {
-    this.#updateSelectionBar()
-    this.#updateGroups()
-    this.#updateRows()
+    this._updateSelectionBar();
+    this._updateGroups();
+    this._updateRows();
+  };
+
+  _updateSelectionBar() {
+    const count = this.selectedIdsValue.length;
+    this.selectionBarTextTarget.innerText = `${count} ${this._pluralizedResourceName()} selected`;
+    this.selectionBarTarget.classList.toggle("hidden", count === 0);
+    this.selectionBarTarget.querySelector("input[type='checkbox']").checked =
+      count > 0;
   }
 
-  #updateSelectionBar() {
-    const count = this.selectedIdsValue.length
-    this.selectionBarTextTarget.innerText = `${count} ${this.#pluralizedResourceName()} selected`
-    this.selectionBarTarget.hidden = count === 0
-    this.selectionBarTarget.querySelector("input[type='checkbox']").checked = count > 0
+  _pluralizedResourceName() {
+    if (this.selectedIdsValue.length === 1) {
+      return this.singularLabelValue;
+    }
+
+    return this.pluralLabelValue;
   }
 
-  #pluralizedResourceName() {
-    return `${this.resourceValue}${this.selectedIdsValue.length === 1 ? "" : "s"}`
+  _updateGroups() {
+    this.groupTargets.forEach((group) => {
+      const rows = this.rowTargets.filter(
+        (row) => group.contains(row) && !row.disabled,
+      );
+      const groupSelected =
+        rows.length > 0 &&
+        rows.every((row) => this.selectedIdsValue.includes(row.dataset.id));
+      group.querySelector("input[type='checkbox']").checked = groupSelected;
+    });
   }
 
-  #updateGroups() {
-    this.groupTargets.forEach(group => {
-      const rows = this.rowTargets.filter(row => group.contains(row))
-      const groupSelected = rows.length > 0 && rows.every(row => this.selectedIdsValue.includes(row.dataset.id))
-      group.querySelector("input[type='checkbox']").checked = groupSelected
-    })
-  }
-
-  #updateRows() {
-    this.rowTargets.forEach(row => {
-      row.checked = this.selectedIdsValue.includes(row.dataset.id)
-    })
+  _updateRows() {
+    this.rowTargets.forEach((row) => {
+      row.checked = this.selectedIdsValue.includes(row.dataset.id);
+    });
   }
 }
diff --git a/app/javascript/controllers/category_controller.js b/app/javascript/controllers/category_controller.js
new file mode 100644
index 00000000..ec0ab645
--- /dev/null
+++ b/app/javascript/controllers/category_controller.js
@@ -0,0 +1,262 @@
+import { Controller } from "@hotwired/stimulus";
+import Pickr from "@simonwep/pickr";
+
+export default class extends Controller {
+  static targets = [
+    "pickerBtn",
+    "colorInput",
+    "colorsSection",
+    "paletteSection",
+    "pickerSection",
+    "colorPreview",
+    "avatar",
+    "details",
+    "icon",
+    "validationMessage",
+    "selection",
+    "colorPickerRadioBtn",
+    "popup",
+  ];
+
+  static values = {
+    presetColors: Array,
+  };
+
+  initialize() {
+    this.pickerBtnTarget.addEventListener("click", () => {
+      this.showPaletteSection();
+    });
+
+    this.colorInputTarget.addEventListener("input", (e) => {
+      this.picker.setColor(e.target.value);
+    });
+
+    this.detailsTarget.addEventListener("toggle", (e) => {
+      if (!this.colorInputTarget.checkValidity()) {
+        e.preventDefault();
+        this.colorInputTarget.reportValidity();
+        e.target.open = true;
+      }
+      this.updatePopupPosition()
+    });
+
+    this.selectedIcon = null;
+
+    if (!this.presetColorsValue.includes(this.colorInputTarget.value)) {
+      this.colorPickerRadioBtnTarget.checked = true;
+    }
+
+    document.addEventListener("mousedown", this.handleOutsideClick);
+  }
+
+  initPicker() {
+    const pickerContainer = document.createElement("div");
+    pickerContainer.classList.add("pickerContainer");
+    this.pickerSectionTarget.append(pickerContainer);
+
+    this.picker = Pickr.create({
+      el: this.pickerBtnTarget,
+      theme: "monolith",
+      container: ".pickerContainer",
+      useAsButton: true,
+      showAlways: true,
+      default: this.colorInputTarget.value,
+      components: {
+        hue: true,
+      },
+    });
+
+    this.picker.on("change", (color) => {
+      const hexColor = color.toHEXA().toString();
+      const rgbacolor = color.toRGBA();
+
+      this.updateAvatarColors(hexColor);
+      this.updateSelectedIconColor(hexColor);
+
+      const backgroundColor = this.backgroundColor(rgbacolor, 10);
+      const contrastRatio = this.contrast(rgbacolor, backgroundColor);
+
+      this.colorInputTarget.value = hexColor;
+      this.colorInputTarget.dataset.colorPickerColorValue = hexColor;
+      this.colorPreviewTarget.style.backgroundColor = hexColor;
+
+      this.handleContrastValidation(contrastRatio);
+    });
+  }
+
+  updateAvatarColors(color) {
+    this.avatarTarget.style.backgroundColor = `${this.#backgroundColor(color)}`;
+    this.avatarTarget.style.color = color;
+  }
+
+  handleIconColorChange(e) {
+    const selectedIcon = e.target;
+    this.selectedIcon = selectedIcon;
+
+    const currentColor = this.colorInputTarget.value;
+
+    this.iconTargets.forEach((icon) => {
+      const iconWrapper = icon.nextElementSibling;
+      iconWrapper.style.removeProperty("background-color");
+      iconWrapper.style.removeProperty("color");
+    });
+
+    this.updateSelectedIconColor(currentColor);
+  }
+
+  handleIconChange(e) {
+    const iconSVG = e.currentTarget
+      .closest("label")
+      .querySelector("svg")
+      .cloneNode(true);
+    this.avatarTarget.innerHTML = "";
+    iconSVG.style.padding = "0px";
+    iconSVG.classList.add("w-8", "h-8");
+    this.avatarTarget.appendChild(iconSVG);
+  }
+
+  updateSelectedIconColor(color) {
+    if (this.selectedIcon) {
+      const iconWrapper = this.selectedIcon.nextElementSibling;
+      iconWrapper.style.backgroundColor = `${this.#backgroundColor(color)}`;
+      iconWrapper.style.color = color;
+    }
+  }
+
+  handleColorChange(e) {
+    const color = e.currentTarget.value;
+    this.colorInputTarget.value = color;
+    this.colorPreviewTarget.style.backgroundColor = color;
+    this.updateAvatarColors(color);
+    this.updateSelectedIconColor(color);
+  }
+
+  handleContrastValidation(contrastRatio) {
+    if (contrastRatio < 4.5) {
+      this.colorInputTarget.setCustomValidity(
+        "Poor contrast, choose darker color or auto-adjust.",
+      );
+
+      this.validationMessageTarget.classList.remove("hidden");
+    } else {
+      this.colorInputTarget.setCustomValidity("");
+      this.validationMessageTarget.classList.add("hidden");
+    }
+  }
+
+  autoAdjust(e) {
+    const currentRGBA = this.picker.getColor();
+    const adjustedRGBA = this.darkenColor(currentRGBA).toString();
+    this.picker.setColor(adjustedRGBA);
+  }
+
+  handleParentChange(e) {
+    const parent = e.currentTarget.value;
+    const display =
+      typeof parent === "string" && parent !== "" ? "none" : "flex";
+    this.selectionTarget.style.display = display;
+  }
+
+  backgroundColor([r, g, b, a], percentage) {
+    const mixedR = Math.round(
+      r * (percentage / 100) + 255 * (1 - percentage / 100),
+    );
+    const mixedG = Math.round(
+      g * (percentage / 100) + 255 * (1 - percentage / 100),
+    );
+    const mixedB = Math.round(
+      b * (percentage / 100) + 255 * (1 - percentage / 100),
+    );
+    return [mixedR, mixedG, mixedB];
+  }
+
+  luminance([r, g, b]) {
+    const toLinear = (c) => {
+      const scaled = c / 255;
+      return scaled <= 0.04045
+        ? scaled / 12.92
+        : ((scaled + 0.055) / 1.055) ** 2.4;
+    };
+    return 0.2126 * toLinear(r) + 0.7152 * toLinear(g) + 0.0722 * toLinear(b);
+  }
+
+  contrast(foregroundColor, backgroundColor) {
+    const fgLum = this.luminance(foregroundColor);
+    const bgLum = this.luminance(backgroundColor);
+    const [l1, l2] = [Math.max(fgLum, bgLum), Math.min(fgLum, bgLum)];
+    return (l1 + 0.05) / (l2 + 0.05);
+  }
+
+  darkenColor(color) {
+    let darkened = color.toRGBA();
+    const backgroundColor = this.backgroundColor(darkened, 10);
+    let contrastRatio = this.contrast(darkened, backgroundColor);
+
+    while (
+      contrastRatio < 4.5 &&
+      (darkened[0] > 0 || darkened[1] > 0 || darkened[2] > 0)
+    ) {
+      darkened = [
+        Math.max(0, darkened[0] - 10),
+        Math.max(0, darkened[1] - 10),
+        Math.max(0, darkened[2] - 10),
+        darkened[3],
+      ];
+      contrastRatio = this.contrast(darkened, backgroundColor);
+    }
+
+    return `rgba(${darkened.join(", ")})`;
+  }
+
+  showPaletteSection() {
+    this.initPicker();
+    this.colorsSectionTarget.classList.add("hidden");
+    this.paletteSectionTarget.classList.remove("hidden");
+    this.pickerSectionTarget.classList.remove("hidden");
+    this.updatePopupPosition();
+    this.picker.show();
+  }
+
+  showColorsSection() {
+    this.colorsSectionTarget.classList.remove("hidden");
+    this.paletteSectionTarget.classList.add("hidden");
+    this.pickerSectionTarget.classList.add("hidden");
+    this.updatePopupPosition()
+    if (this.picker) {
+      this.picker.destroyAndRemove();
+    }
+  }
+
+  toggleSections() {
+    if (this.colorsSectionTarget.classList.contains("hidden")) {
+      this.showColorsSection();
+    } else {
+      this.showPaletteSection();
+    }
+  }
+
+  handleOutsideClick = (event) => {
+    if (this.detailsTarget.open && !this.detailsTarget.contains(event.target)) {
+      this.detailsTarget.open = false;
+    }
+  };
+
+  updatePopupPosition() {
+    const popup = this.popupTarget;
+    popup.style.top = "";
+    popup.style.bottom = "";
+
+    const rect = popup.getBoundingClientRect();
+    const overflow = rect.bottom > window.innerHeight;
+
+    if (overflow) {
+      popup.style.bottom = "0px";
+    } else {
+      popup.style.bottom = "";
+    }
+  }
+
+  #backgroundColor(color) {
+    return `color-mix(in oklab, ${color} 10%, transparent)`;
+  }
+}
diff --git a/app/javascript/controllers/chat_controller.js b/app/javascript/controllers/chat_controller.js
new file mode 100644
index 00000000..7e067309
--- /dev/null
+++ b/app/javascript/controllers/chat_controller.js
@@ -0,0 +1,60 @@
+import { Controller } from "@hotwired/stimulus";
+
+export default class extends Controller {
+  static targets = ["messages", "form", "input"];
+
+  connect() {
+    this.#configureAutoScroll();
+  }
+
+  disconnect() {
+    if (this.messagesObserver) {
+      this.messagesObserver.disconnect();
+    }
+  }
+
+  autoResize() {
+    const input = this.inputTarget;
+    const lineHeight = 20; // text-sm line-height (14px * 1.429 ≈ 20px)
+    const maxLines = 3; // 3 lines = 60px total
+
+    input.style.height = "auto";
+    input.style.height = `${Math.min(input.scrollHeight, lineHeight * maxLines)}px`;
+    input.style.overflowY =
+      input.scrollHeight > lineHeight * maxLines ? "auto" : "hidden";
+  }
+
+  submitSampleQuestion(e) {
+    this.inputTarget.value = e.target.dataset.chatQuestionParam;
+
+    setTimeout(() => {
+      this.formTarget.requestSubmit();
+    }, 200);
+  }
+
+  // Newlines require shift+enter, otherwise submit the form (same functionality as ChatGPT and others)
+  handleInputKeyDown(e) {
+    if (e.key === "Enter" && !e.shiftKey) {
+      e.preventDefault();
+      this.formTarget.requestSubmit();
+    }
+  }
+
+  #configureAutoScroll() {
+    this.messagesObserver = new MutationObserver((_mutations) => {
+      if (this.hasMessagesTarget) {
+        this.#scrollToBottom();
+      }
+    });
+
+    // Listen to entire sidebar for changes, always try to scroll to the bottom
+    this.messagesObserver.observe(this.element, {
+      childList: true,
+      subtree: true,
+    });
+  }
+
+  #scrollToBottom = () => {
+    this.messagesTarget.scrollTop = this.messagesTarget.scrollHeight;
+  };
+}
diff --git a/app/javascript/controllers/clipboard_controller.js b/app/javascript/controllers/clipboard_controller.js
index 34e29a28..7e0b1a49 100644
--- a/app/javascript/controllers/clipboard_controller.js
+++ b/app/javascript/controllers/clipboard_controller.js
@@ -1,28 +1,28 @@
-import { Controller } from "@hotwired/stimulus"
-
+import { Controller } from "@hotwired/stimulus";
 
 export default class extends Controller {
-  static targets = ["source", "iconDefault", "iconSuccess"]
+  static targets = ["source", "iconDefault", "iconSuccess"];
 
   copy(event) {
     event.preventDefault();
-    if (this.sourceTarget && this.sourceTarget.textContent) {
-      navigator.clipboard.writeText(this.sourceTarget.textContent)
+    if (this.sourceTarget?.textContent) {
+      navigator.clipboard
+        .writeText(this.sourceTarget.textContent)
         .then(() => {
           this.showSuccess();
         })
         .catch((error) => {
-          console.error('Failed to copy text: ', error);
+          console.error("Failed to copy text: ", error);
         });
     }
   }
 
   showSuccess() {
-    this.iconDefaultTarget.classList.add('hidden');
-    this.iconSuccessTarget.classList.remove('hidden');
+    this.iconDefaultTarget.classList.add("hidden");
+    this.iconSuccessTarget.classList.remove("hidden");
     setTimeout(() => {
-      this.iconDefaultTarget.classList.remove('hidden');
-      this.iconSuccessTarget.classList.add('hidden');
+      this.iconDefaultTarget.classList.remove("hidden");
+      this.iconSuccessTarget.classList.add("hidden");
     }, 3000);
   }
 }
diff --git a/app/javascript/controllers/color_avatar_controller.js b/app/javascript/controllers/color_avatar_controller.js
index 7a1ba0d0..351bc437 100644
--- a/app/javascript/controllers/color_avatar_controller.js
+++ b/app/javascript/controllers/color_avatar_controller.js
@@ -3,10 +3,7 @@ import { Controller } from "@hotwired/stimulus";
 // Connects to data-controller="color-avatar"
 // Used by the transaction merchant form to show a preview of what the avatar will look like
 export default class extends Controller {
-  static targets = [
-    "name",
-    "avatar"
-  ];
+  static targets = ["name", "avatar", "selection"];
 
   connect() {
     this.nameTarget.addEventListener("input", this.handleNameChange);
@@ -17,13 +14,15 @@ export default class extends Controller {
   }
 
   handleNameChange = (e) => {
-    this.avatarTarget.textContent = (e.currentTarget.value?.[0] || "?").toUpperCase();
-  }
+    this.avatarTarget.textContent = (
+      e.currentTarget.value?.[0] || "?"
+    ).toUpperCase();
+  };
 
   handleColorChange(e) {
     const color = e.currentTarget.value;
-    this.avatarTarget.style.backgroundColor = `color-mix(in srgb, ${color} 5%, white)`;
-    this.avatarTarget.style.borderColor = `color-mix(in srgb, ${color} 10%, white)`;
+    this.avatarTarget.style.backgroundColor = `color-mix(in srgb, ${color} 10%, transparent)`;
+    this.avatarTarget.style.borderColor = `color-mix(in srgb, ${color} 10%, transparent)`;
     this.avatarTarget.style.color = color;
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/controllers/color_select_controller.js b/app/javascript/controllers/color_select_controller.js
index e18bb84f..71b9cea4 100644
--- a/app/javascript/controllers/color_select_controller.js
+++ b/app/javascript/controllers/color_select_controller.js
@@ -1,59 +1,65 @@
 import { Controller } from "@hotwired/stimulus";
 
 export default class extends Controller {
-  static targets = [ "input", "decoration" ]
-  static values = { selection: String }
+  static targets = ["input", "decoration"];
+  static values = { selection: String };
 
   connect() {
-    this.#renderOptions()
+    this.#renderOptions();
   }
 
   select({ target }) {
-    this.selectionValue = target.dataset.value
+    this.selectionValue = target.dataset.value;
   }
 
   selectionValueChanged() {
-    this.#options.forEach(option => {
+    this.#options.forEach((option) => {
       if (option.dataset.value === this.selectionValue) {
-        this.#check(option)
-        this.inputTarget.value = this.selectionValue
+        this.#check(option);
+        this.inputTarget.value = this.selectionValue;
       } else {
-        this.#uncheck(option)
+        this.#uncheck(option);
       }
-    })
+    });
   }
 
   #renderOptions() {
-    this.#options.forEach(option => option.style.backgroundColor = option.dataset.value)
+    this.#options.forEach((option) => {
+      option.style.backgroundColor = option.dataset.value;
+    });
   }
 
   #check(option) {
-    option.setAttribute("aria-checked", "true")
-    option.style.boxShadow = `0px 0px 0px 4px ${hexToRGBA(option.dataset.value, 0.2)}`
-    this.decorationTarget.style.backgroundColor = option.dataset.value
+    option.setAttribute("aria-checked", "true");
+    option.style.boxShadow = `0px 0px 0px 4px ${hexToRGBA(
+      option.dataset.value,
+      0.2,
+    )}`;
+    this.decorationTarget.style.backgroundColor = option.dataset.value;
   }
 
   #uncheck(option) {
-    option.setAttribute("aria-checked", "false")
-    option.style.boxShadow = "none"
+    option.setAttribute("aria-checked", "false");
+    option.style.boxShadow = "none";
   }
 
   get #options() {
-    return Array.from(this.element.querySelectorAll("[role='radio']"))
+    return Array.from(this.element.querySelectorAll("[role='radio']"));
   }
 }
 
 function hexToRGBA(hex, alpha = 1) {
-  hex = hex.replace(/^#/, '');
+  let hexCode = hex.replace(/^#/, "");
+  let calculatedAlpha = alpha;
 
-  if (hex.length === 8) {
-    alpha = parseInt(hex.slice(6, 8), 16) / 255;
-    hex = hex.slice(0, 6);
+  if (hexCode.length === 8) {
+    calculatedAlpha = Number.parseInt(hexCode.slice(6, 8), 16) / 255;
+    hexCode = hexCode.slice(0, 6);
   }
 
-  let r = parseInt(hex.slice(0, 2), 16);
-  let g = parseInt(hex.slice(2, 4), 16);
-  let b = parseInt(hex.slice(4, 6), 16);
+  const r = Number.parseInt(hexCode.slice(0, 2), 16);
+  const g = Number.parseInt(hexCode.slice(2, 4), 16);
+  const b = Number.parseInt(hexCode.slice(4, 6), 16);
 
-  return `rgba(${r}, ${g}, ${b}, ${alpha})`;
+  return `rgba(${r}, ${g}, ${b}, ${calculatedAlpha})`;
 }
diff --git a/app/javascript/controllers/confirm_dialog_controller.js b/app/javascript/controllers/confirm_dialog_controller.js
new file mode 100644
index 00000000..e66269a6
--- /dev/null
+++ b/app/javascript/controllers/confirm_dialog_controller.js
@@ -0,0 +1,59 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="confirm-dialog"
+// See javascript/controllers/application.js for how this is wired up
+export default class extends Controller {
+  static targets = ["title", "subtitle", "confirmButton"];
+
+  handleConfirm(rawData) {
+    const data = this.#normalizeRawData(rawData);
+
+    this.#prepareDialog(data);
+
+    this.element.showModal();
+
+    return new Promise((resolve) => {
+      this.element.addEventListener(
+        "close",
+        () => {
+          const isConfirmed = this.element.returnValue === "confirm";
+          resolve(isConfirmed);
+        },
+        { once: true },
+      );
+    });
+  }
+
+  #prepareDialog(data) {
+    const variant = data.variant || "primary";
+
+    this.confirmButtonTargets.forEach((button) => {
+      if (button.dataset.variant === variant) {
+        button.removeAttribute("hidden");
+      } else {
+        button.setAttribute("hidden", true);
+      }
+
+      button.textContent = data.confirmText || "Confirm";
+    });
+
+    this.titleTarget.textContent = data.title || "Are you sure?";
+    this.subtitleTarget.innerHTML =
+      data.body || "This action cannot be undone.";
+  }
+
+  // If data is a string, it's the title.  Otherwise, return the parsed object.
+  #normalizeRawData(rawData) {
+    try {
+      const parsed = JSON.parse(rawData);
+
+      if (typeof parsed === "boolean") {
+        return { title: "Are you sure?" };
+      }
+
+      return parsed;
+    } catch (e) {
+      return { title: rawData };
+    }
+  }
+}
diff --git a/app/javascript/controllers/deletion_controller.js b/app/javascript/controllers/deletion_controller.js
index af3f0b04..ec4bc9f2 100644
--- a/app/javascript/controllers/deletion_controller.js
+++ b/app/javascript/controllers/deletion_controller.js
@@ -1,30 +1,28 @@
 import { Controller } from "@hotwired/stimulus";
 
 export default class extends Controller {
-  static targets = ["replacementField", "submitButton"]
-  static classes = [ "dangerousAction", "safeAction" ]
+  static targets = [
+    "replacementField",
+    "destructiveSubmitButton",
+    "safeSubmitButton",
+  ];
+
   static values = {
     submitTextWhenReplacing: String,
-    submitTextWhenNotReplacing: String
-  }
+    submitTextWhenNotReplacing: String,
+  };
 
-  updateSubmitButton() {
+  chooseSubmitButton() {
     if (this.replacementFieldTarget.value) {
-      this.submitButtonTarget.value = this.submitTextWhenReplacingValue
-      this.#markSafe()
+      this.destructiveSubmitButtonTarget.hidden = true;
+      this.safeSubmitButtonTarget.textContent =
+        this.submitTextWhenReplacingValue;
+      this.safeSubmitButtonTarget.hidden = false;
     } else {
-      this.submitButtonTarget.value = this.submitTextWhenNotReplacingValue
-      this.#markDangerous()
+      this.destructiveSubmitButtonTarget.textContent =
+        this.submitTextWhenNotReplacingValue;
+      this.destructiveSubmitButtonTarget.hidden = false;
+      this.safeSubmitButtonTarget.hidden = true;
     }
   }
-
-  #markSafe() {
-    this.submitButtonTarget.classList.remove(...this.dangerousActionClasses)
-    this.submitButtonTarget.classList.add(...this.safeActionClasses)
-  }
-
-  #markDangerous() {
-    this.submitButtonTarget.classList.remove(...this.safeActionClasses)
-    this.submitButtonTarget.classList.add(...this.dangerousActionClasses)
-  }
 }
diff --git a/app/javascript/controllers/donut_chart_controller.js b/app/javascript/controllers/donut_chart_controller.js
new file mode 100644
index 00000000..0c52104b
--- /dev/null
+++ b/app/javascript/controllers/donut_chart_controller.js
@@ -0,0 +1,168 @@
+import { Controller } from "@hotwired/stimulus";
+import * as d3 from "d3";
+
+// Connects to data-controller="donut-chart"
+export default class extends Controller {
+  static targets = ["chartContainer", "contentContainer", "defaultContent"];
+  static values = {
+    segments: { type: Array, default: [] },
+    unusedSegmentId: { type: String, default: "unused" },
+    overageSegmentId: { type: String, default: "overage" },
+    segmentHeight: { type: Number, default: 3 },
+    segmentOpacity: { type: Number, default: 1 },
+  };
+
+  #viewBoxSize = 100;
+  #minSegmentAngle = this.segmentHeightValue * 0.01;
+
+  connect() {
+    this.#draw();
+    document.addEventListener("turbo:load", this.#redraw);
+    this.element.addEventListener("mouseleave", this.#clearSegmentHover);
+  }
+
+  disconnect() {
+    this.#teardown();
+    document.removeEventListener("turbo:load", this.#redraw);
+    this.element.removeEventListener("mouseleave", this.#clearSegmentHover);
+  }
+
+  get #data() {
+    const totalPieValue = this.segmentsValue.reduce(
+      (acc, s) => acc + Number(s.amount),
+      0,
+    );
+
+    // Overage is always first segment, unused is always last segment
+    return this.segmentsValue
+      .filter((s) => s.amount > 0)
+      .map((s) => ({
+        ...s,
+        amount: Math.max(
+          Number(s.amount),
+          totalPieValue * this.#minSegmentAngle,
+        ),
+      }))
+      .sort((a, b) => {
+        if (a.id === this.overageSegmentIdValue) return -1;
+        if (b.id === this.overageSegmentIdValue) return 1;
+        if (a.id === this.unusedSegmentIdValue) return 1;
+        if (b.id === this.unusedSegmentIdValue) return -1;
+        return b.amount - a.amount;
+      });
+  }
+
+  #redraw = () => {
+    this.#teardown();
+    this.#draw();
+  };
+
+  #teardown() {
+    d3.select(this.chartContainerTarget).selectAll("*").remove();
+  }
+
+  #draw() {
+    const svg = d3
+      .select(this.chartContainerTarget)
+      .append("svg")
+      .attr("viewBox", `0 0 ${this.#viewBoxSize} ${this.#viewBoxSize}`) // Square aspect ratio
+      .attr("preserveAspectRatio", "xMidYMid meet")
+      .attr("class", "w-full h-full");
+
+    const pie = d3
+      .pie()
+      .sortValues(null) // Preserve order of segments
+      .value((d) => d.amount);
+
+    const mainArc = d3
+      .arc()
+      .innerRadius(this.#viewBoxSize / 2 - this.segmentHeightValue)
+      .outerRadius(this.#viewBoxSize / 2)
+      .cornerRadius(this.segmentHeightValue)
+      .padAngle(this.#minSegmentAngle);
+
+    const segmentArcs = svg
+      .append("g")
+      .attr(
+        "transform",
+        `translate(${this.#viewBoxSize / 2}, ${this.#viewBoxSize / 2})`,
+      )
+      .selectAll("arc")
+      .data(pie(this.#data))
+      .enter()
+      .append("g")
+      .attr("class", "arc pointer-events-auto")
+      .append("path")
+      .attr("data-segment-id", (d) => d.data.id)
+      .attr("data-original-color", this.#transformRingColor)
+      .attr("fill", this.#transformRingColor)
+      .attr("d", mainArc);
+
+    // Ensures that user can click on default content without triggering hover on a segment if that is their intent
+    let hoverTimeout = null;
+
+    segmentArcs
+      .on("mouseover", (event) => {
+        hoverTimeout = setTimeout(() => {
+          this.#clearSegmentHover();
+          this.#handleSegmentHover(event);
+        }, 150);
+      })
+      .on("mouseleave", () => {
+        clearTimeout(hoverTimeout);
+      });
+  }
+
+  #transformRingColor = ({ data: { id, color } }) => {
+    if (id === this.unusedSegmentIdValue || id === this.overageSegmentIdValue) {
+      return color;
+    }
+
+    const reducedOpacityColor = d3.color(color);
+    reducedOpacityColor.opacity = this.segmentOpacityValue;
+    return reducedOpacityColor;
+  };
+
+  // Highlights segment and shows segment specific content (all other segments are grayed out)
+  #handleSegmentHover(event) {
+    const segmentId = event.target.dataset.segmentId;
+    const template = this.element.querySelector(`#segment_${segmentId}`);
+    const unusedSegmentId = this.unusedSegmentIdValue;
+
+    if (!template) return;
+
+    d3.select(this.chartContainerTarget)
+      .selectAll("path")
+      .attr("fill", function () {
+        if (this.dataset.segmentId === segmentId) {
+          if (this.dataset.segmentId === unusedSegmentId) {
+            return "var(--budget-unused-fill)";
+          }
+
+          return this.dataset.originalColor;
+        }
+
+        return "var(--budget-unallocated-fill)";
+      });
+
+    this.defaultContentTarget.classList.add("hidden");
+    template.classList.remove("hidden");
+  }
+
+  // Restores original segment colors and hides segment specific content
+  #clearSegmentHover = () => {
+    this.defaultContentTarget.classList.remove("hidden");
+
+    d3.select(this.chartContainerTarget)
+      .selectAll("path")
+      .attr("fill", function () {
+        return this.dataset.originalColor;
+      });
+
+    for (const child of this.contentContainerTarget.children) {
+      if (child !== this.defaultContentTarget) {
+        child.classList.add("hidden");
+      }
+    }
+  };
+}
diff --git a/app/javascript/controllers/element_removal_controller.js b/app/javascript/controllers/element_removal_controller.js
index b14906a9..fade773d 100644
--- a/app/javascript/controllers/element_removal_controller.js
+++ b/app/javascript/controllers/element_removal_controller.js
@@ -1,9 +1,8 @@
-import { Controller } from '@hotwired/stimulus'
+import { Controller } from "@hotwired/stimulus";
 
 // Connects to data-controller="element-removal"
 export default class extends Controller {
   remove() {
-    this.element.remove()
+    this.element.remove();
   }
 }
-
diff --git a/app/javascript/controllers/file_upload_controller.js b/app/javascript/controllers/file_upload_controller.js
new file mode 100644
index 00000000..6ad3e5d9
--- /dev/null
+++ b/app/javascript/controllers/file_upload_controller.js
@@ -0,0 +1,74 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static targets = ["input", "fileName", "uploadArea", "uploadText"]
+
+  connect() {
+    if (this.hasInputTarget) {
+      this.inputTarget.addEventListener("change", this.fileSelected.bind(this))
+    }
+    
+    // Find the form element
+    this.form = this.element.closest("form")
+    if (this.form) {
+      this.form.addEventListener("turbo:submit-start", this.formSubmitting.bind(this))
+    }
+  }
+
+  disconnect() {
+    if (this.hasInputTarget) {
+      this.inputTarget.removeEventListener("change", this.fileSelected.bind(this))
+    }
+    
+    if (this.form) {
+      this.form.removeEventListener("turbo:submit-start", this.formSubmitting.bind(this))
+    }
+  }
+
+  triggerFileInput() {
+    if (this.hasInputTarget) {
+      this.inputTarget.click()
+    }
+  }
+
+  fileSelected() {
+    if (this.hasInputTarget && this.inputTarget.files.length > 0) {
+      const fileName = this.inputTarget.files[0].name
+      
+      if (this.hasFileNameTarget) {
+        // Find the paragraph element inside the fileName target
+        const fileNameText = this.fileNameTarget.querySelector('p')
+        if (fileNameText) {
+          fileNameText.textContent = fileName
+        }
+        
+        this.fileNameTarget.classList.remove("hidden")
+      }
+      
+      if (this.hasUploadTextTarget) {
+        this.uploadTextTarget.classList.add("hidden")
+      }
+      
+    
+    }
+  }
+  
+  formSubmitting() {
+    if (this.hasFileNameTarget && this.hasInputTarget && this.inputTarget.files.length > 0) {
+      const fileNameText = this.fileNameTarget.querySelector('p')
+      if (fileNameText) {
+        fileNameText.textContent = `Uploading ${this.inputTarget.files[0].name}...`
+      }
+      
+      // Change the icon to a loader
+      const iconContainer = this.fileNameTarget.querySelector('.lucide-file-text')
+      if (iconContainer) {
+        iconContainer.classList.add('animate-pulse')
+      }
+    }
+    
+    if (this.hasUploadAreaTarget) {
+      this.uploadAreaTarget.classList.add("opacity-70")
+    }
+  }
+} 
\ No newline at end of file
diff --git a/app/javascript/controllers/hotkey_controller.js b/app/javascript/controllers/hotkey_controller.js
index b7b346e3..f01713a9 100644
--- a/app/javascript/controllers/hotkey_controller.js
+++ b/app/javascript/controllers/hotkey_controller.js
@@ -1,5 +1,5 @@
-import { Controller } from "@hotwired/stimulus";
 import { install, uninstall } from "@github/hotkey";
+import { Controller } from "@hotwired/stimulus";
 
 // Connects to data-controller="hotkey"
 export default class extends Controller {
diff --git a/app/javascript/controllers/import_controller.js b/app/javascript/controllers/import_controller.js
new file mode 100644
index 00000000..7c555d3f
--- /dev/null
+++ b/app/javascript/controllers/import_controller.js
@@ -0,0 +1,118 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="import"
+export default class extends Controller {
+  static values = {
+    csv: { type: Array, default: [] },
+    amountTypeColumnKey: { type: String, default: "" },
+  };
+
+  static targets = [
+    "signedAmountFieldset",
+    "customColumnFieldset",
+    "amountTypeValue",
+    "amountTypeStrategySelect",
+  ];
+
+  connect() {
+    if (
+      this.amountTypeStrategySelectTarget.value === "custom_column" &&
+      this.amountTypeColumnKeyValue
+    ) {
+      this.#showAmountTypeValueTargets(this.amountTypeColumnKeyValue);
+    }
+  }
+
+  handleAmountTypeStrategyChange(event) {
+    const amountTypeStrategy = event.target.value;
+
+    if (amountTypeStrategy === "custom_column") {
+      this.#enableCustomColumnFieldset();
+
+      if (this.amountTypeColumnKeyValue) {
+        this.#showAmountTypeValueTargets(this.amountTypeColumnKeyValue);
+      }
+    }
+
+    if (amountTypeStrategy === "signed_amount") {
+      this.#enableSignedAmountFieldset();
+    }
+  }
+
+  handleAmountTypeChange(event) {
+    const amountTypeColumnKey = event.target.value;
+
+    this.#showAmountTypeValueTargets(amountTypeColumnKey);
+  }
+
+  #showAmountTypeValueTargets(amountTypeColumnKey) {
+    const selectableValues = this.#uniqueValuesForColumn(amountTypeColumnKey);
+
+    this.amountTypeValueTarget.classList.remove("hidden");
+    this.amountTypeValueTarget.classList.add("flex");
+
+    const select = this.amountTypeValueTarget.querySelector("select");
+    const currentValue = select.value;
+    select.options.length = 0;
+    const fragment = document.createDocumentFragment();
+
+    // Only add the prompt if there's no current value
+    if (!currentValue) {
+      fragment.appendChild(new Option("Select value", ""));
+    }
+
+    selectableValues.forEach((value) => {
+      const option = new Option(value, value);
+      if (value === currentValue) {
+        option.selected = true;
+      }
+      fragment.appendChild(option);
+    });
+
+    select.appendChild(fragment);
+  }
+
+  #uniqueValuesForColumn(column) {
+    const colIdx = this.csvValue[0].indexOf(column);
+    const values = this.csvValue.slice(1).map((row) => row[colIdx]);
+    return [...new Set(values)];
+  }
+
+  #enableCustomColumnFieldset() {
+    this.customColumnFieldsetTarget.classList.remove("hidden");
+    this.signedAmountFieldsetTarget.classList.add("hidden");
+
+    // Set required on custom column fields
+    this.customColumnFieldsetTarget
+      .querySelectorAll("select, input")
+      .forEach((field) => {
+        field.setAttribute("required", "");
+      });
+
+    // Remove required from signed amount fields
+    this.signedAmountFieldsetTarget
+      .querySelectorAll("select, input")
+      .forEach((field) => {
+        field.removeAttribute("required");
+      });
+  }
+
+  #enableSignedAmountFieldset() {
+    this.customColumnFieldsetTarget.classList.add("hidden");
+    this.signedAmountFieldsetTarget.classList.remove("hidden");
+
+    // Remove required from custom column fields
+    this.customColumnFieldsetTarget
+      .querySelectorAll("select, input")
+      .forEach((field) => {
+        field.removeAttribute("required");
+      });
+
+    // Set required on signed amount fields
+    this.signedAmountFieldsetTarget
+      .querySelectorAll("select, input")
+      .forEach((field) => {
+        field.setAttribute("required", "");
+      });
+  }
+}
diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js
index 54ad4cad..74c6c0a2 100644
--- a/app/javascript/controllers/index.js
+++ b/app/javascript/controllers/index.js
@@ -1,10 +1,10 @@
 // Import and register all your controllers from the importmap under controllers/*
 
-import { application } from "controllers/application"
+import { application } from "controllers/application";
 
 // Eager load all controllers defined in the import map under controllers/**/*_controller
-import { eagerLoadControllersFrom } from "@hotwired/stimulus-loading"
-eagerLoadControllersFrom("controllers", application)
+import { eagerLoadControllersFrom } from "@hotwired/stimulus-loading";
+eagerLoadControllersFrom("controllers", application);
 
 // Lazy load controllers as they appear in the DOM (remember not to preload controllers in import map!)
 // import { lazyLoadControllersFrom } from "@hotwired/stimulus-loading"
diff --git a/app/javascript/controllers/intercom_controller.js b/app/javascript/controllers/intercom_controller.js
new file mode 100644
index 00000000..f22d1db8
--- /dev/null
+++ b/app/javascript/controllers/intercom_controller.js
@@ -0,0 +1,8 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="intercom"
+export default class extends Controller {
+  show() {
+    Intercom("show");
+  }
+}
diff --git a/app/javascript/controllers/list_filter_controller.js b/app/javascript/controllers/list_filter_controller.js
index dafb214a..279d8b47 100644
--- a/app/javascript/controllers/list_filter_controller.js
+++ b/app/javascript/controllers/list_filter_controller.js
@@ -4,6 +4,10 @@ import { Controller } from "@hotwired/stimulus";
 export default class extends Controller {
   static targets = ["input", "list", "emptyMessage"];
 
+  connect() {
+    this.inputTarget.focus();
+  }
+
   filter() {
     const filterValue = this.inputTarget.value.toLowerCase();
     const items = this.listTarget.querySelectorAll(".filterable-item");
diff --git a/app/javascript/controllers/list_keyboard_navigation_controller.js b/app/javascript/controllers/list_keyboard_navigation_controller.js
index 7e28069e..500e0f26 100644
--- a/app/javascript/controllers/list_keyboard_navigation_controller.js
+++ b/app/javascript/controllers/list_keyboard_navigation_controller.js
@@ -1,39 +1,40 @@
-import { Controller } from "@hotwired/stimulus"
+import { Controller } from "@hotwired/stimulus";
 
 // Connects to data-controller="list-keyboard-navigation"
 export default class extends Controller {
   focusPrevious() {
-    this.focusLinkTargetInDirection(-1)
+    this.focusLinkTargetInDirection(-1);
   }
 
   focusNext() {
-    this.focusLinkTargetInDirection(1)
+    this.focusLinkTargetInDirection(1);
   }
 
   focusLinkTargetInDirection(direction) {
-    const element = this.getLinkTargetInDirection(direction)
-    element?.focus()
+    const element = this.getLinkTargetInDirection(direction);
+    element?.focus();
   }
 
   getLinkTargetInDirection(direction) {
-    const indexOfLastFocus = this.indexOfLastFocus()
-    let nextIndex = (indexOfLastFocus + direction) % this.focusableLinks.length
-    if (nextIndex < 0) nextIndex = this.focusableLinks.length - 1
-      
-    return this.focusableLinks[nextIndex]
+    const indexOfLastFocus = this.indexOfLastFocus();
+    let nextIndex = (indexOfLastFocus + direction) % this.focusableLinks.length;
+    if (nextIndex < 0) nextIndex = this.focusableLinks.length - 1;
+
+    return this.focusableLinks[nextIndex];
   }
 
   indexOfLastFocus(targets = this.focusableLinks) {
-    const indexOfActiveElement = targets.indexOf(document.activeElement)
+    const indexOfActiveElement = targets.indexOf(document.activeElement);
 
     if (indexOfActiveElement !== -1) {
-      return indexOfActiveElement
-    } else {
-      return targets.findIndex(target => target.getAttribute("tabindex") === "0")
+      return indexOfActiveElement;
     }
+    return targets.findIndex(
+      (target) => target.getAttribute("tabindex") === "0",
+    );
   }
 
   get focusableLinks() {
-    return Array.from(this.element.querySelectorAll("a[href]"))
+    return Array.from(this.element.querySelectorAll("a[href]"));
   }
 }
diff --git a/app/javascript/controllers/mobile_cell_interaction_controller.js b/app/javascript/controllers/mobile_cell_interaction_controller.js
new file mode 100644
index 00000000..1eb0d82b
--- /dev/null
+++ b/app/javascript/controllers/mobile_cell_interaction_controller.js
@@ -0,0 +1,149 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="mobile-cell-interaction"
+export default class extends Controller {
+  static targets = ["field", "highlight", "errorTooltip", "errorIcon"];
+  static values = { error: String };
+  
+  touchTimeout = null;
+  activeTooltip = null;
+  documentClickHandler = null;
+
+  connect() {
+    this.documentClickHandler = this.handleDocumentClick.bind(this);
+    document.addEventListener('click', this.documentClickHandler);
+  }
+
+  disconnect() {
+    if (this.documentClickHandler) {
+      document.removeEventListener('click', this.documentClickHandler);
+    }
+  }
+
+  handleDocumentClick(event) {
+    if (event.target.closest('[data-mobile-cell-interaction-target="errorTooltip"]') || 
+        event.target.closest('[data-mobile-cell-interaction-target="errorIcon"]')) {
+      return;
+    }
+    
+    this.hideAllErrorTooltips();
+  }
+
+  highlightCell(event) {
+    const field = event.target;
+    const highlight = this.findHighlightForField(field);
+    if (highlight) {
+      highlight.style.opacity = '1';
+    }
+  }
+  
+  unhighlightCell(event) {
+    const field = event.target;
+    const highlight = this.findHighlightForField(field);
+    if (highlight) {
+      highlight.style.opacity = '0';
+    }
+    
+    this.hideAllErrorTooltips();
+  }
+  
+  handleCellTouch(event) {
+    if (this.touchTimeout) {
+      clearTimeout(this.touchTimeout);
+    }
+    
+    const field = event.target;
+    
+    const highlight = this.findHighlightForField(field);
+    if (highlight) {
+      highlight.style.opacity = '1';
+      
+      this.touchTimeout = window.setTimeout(() => {
+        if (document.activeElement !== field) {
+          highlight.style.opacity = '0';
+        }
+      }, 1000);
+    }
+    
+    if (this.hasErrorValue && this.errorValue) {
+      this.showErrorTooltip();
+    }
+  }
+  
+  toggleErrorMessage(event) {
+    const errorIcon = event.currentTarget;
+    const cellContainer = errorIcon.closest('div');
+    const field = cellContainer.querySelector('input');
+    
+    if (field) {
+      field.focus();
+    }
+    
+    const tooltip = this.errorTooltipTarget;
+    
+    this.hideAllTooltipsExcept(tooltip);
+    
+    if (tooltip.classList.contains('hidden')) {
+      tooltip.classList.remove('hidden');
+      this.activeTooltip = tooltip;
+      
+      setTimeout(() => {
+        if (tooltip === this.activeTooltip) {
+          tooltip.classList.add('hidden');
+          this.activeTooltip = null;
+        }
+      }, 3000);
+    } else {
+      tooltip.classList.add('hidden');
+      this.activeTooltip = null;
+    }
+    
+    event.stopPropagation();
+  }
+  
+  showErrorTooltip() {
+    if (this.hasErrorTooltipTarget) {
+      const tooltip = this.errorTooltipTarget;
+      tooltip.classList.remove('hidden');
+      this.activeTooltip = tooltip;
+      
+      setTimeout(() => {
+        if (tooltip === this.activeTooltip) {
+          tooltip.classList.add('hidden');
+          this.activeTooltip = null;
+        }
+      }, 3000);
+    }
+  }
+  
+  hideAllErrorTooltips() {
+    document.querySelectorAll('[data-mobile-cell-interaction-target="errorTooltip"]').forEach(tooltip => {
+      tooltip.classList.add('hidden');
+    });
+    this.activeTooltip = null;
+  }
+  
+  hideAllTooltipsExcept(tooltipToKeep) {
+    document.querySelectorAll('[data-mobile-cell-interaction-target="errorTooltip"]').forEach(tooltip => {
+      if (tooltip !== tooltipToKeep) {
+        tooltip.classList.add('hidden');
+      }
+    });
+  }
+  
+  selectCell(event) {
+    const errorIcon = event.currentTarget;
+    const cellContainer = errorIcon.closest('div');
+    const field = cellContainer.querySelector('input');
+    
+    if (field) {
+      field.focus();
+      event.stopPropagation();
+    }
+  }
+  
+  findHighlightForField(field) {
+    const container = field.closest('div');
+    return container ? container.querySelector('[data-mobile-cell-interaction-target="highlight"]') : null;
+  }
+} 
\ No newline at end of file
diff --git a/app/javascript/controllers/modal_controller.js b/app/javascript/controllers/modal_controller.js
deleted file mode 100644
index 87cdd3cd..00000000
--- a/app/javascript/controllers/modal_controller.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-// Connects to data-controller="modal"
-export default class extends Controller {
-  connect() {
-    if (this.element.open) return
-    else this.element.showModal()
-  }
-
-  // Hide the dialog when the user clicks outside of it
-  clickOutside(e) {
-    if (e.target === this.element) {
-      this.element.close();
-    }
-  }
-
-  close() {
-    this.element.close();
-  }
-}
diff --git a/app/javascript/controllers/money_field_controller.js b/app/javascript/controllers/money_field_controller.js
index 70ef4bfe..2aab2d16 100644
--- a/app/javascript/controllers/money_field_controller.js
+++ b/app/javascript/controllers/money_field_controller.js
@@ -12,14 +12,16 @@ export default class extends Controller {
   }
 
   updateAmount(currency) {
-    (new CurrenciesService).get(currency).then((currency) => {
+    new CurrenciesService().get(currency).then((currency) => {
       this.amountTarget.step = currency.step;
 
-      if (isFinite(this.amountTarget.value)) {
-        this.amountTarget.value = parseFloat(this.amountTarget.value).toFixed(currency.default_precision)
+      if (Number.isFinite(this.amountTarget.value)) {
+        this.amountTarget.value = Number.parseFloat(
+          this.amountTarget.value,
+        ).toFixed(currency.default_precision);
       }
 
       this.symbolTarget.innerText = currency.symbol;
     });
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/controllers/onboarding_controller.js b/app/javascript/controllers/onboarding_controller.js
new file mode 100644
index 00000000..5712ab30
--- /dev/null
+++ b/app/javascript/controllers/onboarding_controller.js
@@ -0,0 +1,33 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="onboarding"
+export default class extends Controller {
+  setLocale(event) {
+    this.refreshWithParam("locale", event.target.value);
+  }
+
+  setDateFormat(event) {
+    this.refreshWithParam("date_format", event.target.value);
+  }
+
+  setCurrency(event) {
+    this.refreshWithParam("currency", event.target.value);
+  }
+
+  setTheme(event) {
+    document.documentElement.setAttribute("data-theme", event.target.value);
+  }
+
+  refreshWithParam(key, value) {
+    const url = new URL(window.location);
+    url.searchParams.set(key, value);
+
+    // Preserve existing params by getting the current search string
+    // and appending our new param to it
+    const currentParams = new URLSearchParams(window.location.search);
+    currentParams.set(key, value);
+
+    // Refresh the page with all params
+    window.location.search = currentParams.toString();
+  }
+}
diff --git a/app/javascript/controllers/password_validator_controller.js b/app/javascript/controllers/password_validator_controller.js
new file mode 100644
index 00000000..4de9c6fd
--- /dev/null
+++ b/app/javascript/controllers/password_validator_controller.js
@@ -0,0 +1,63 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="password-validator"
+export default class extends Controller {
+  static targets = ["input", "requirementType", "blockLine"];
+
+  connect() {
+    this.validate();
+  }
+
+  validate() {
+    const password = this.inputTarget.value;
+    let requirementsMet = 0;
+
+    // Check each requirement and count how many are met
+    const lengthValid = password.length >= 8;
+    const caseValid = /[A-Z]/.test(password) && /[a-z]/.test(password);
+    const numberValid = /\d/.test(password);
+    const specialValid = /[!@#$%^&*(),.?":{}|<>]/.test(password);
+
+    // Update individual requirement text
+    this.validateRequirementText("length", lengthValid);
+    this.validateRequirementText("case", caseValid);
+    this.validateRequirementText("number", numberValid);
+    this.validateRequirementText("special", specialValid);
+
+    // Count total requirements met
+    if (lengthValid) requirementsMet++;
+    if (caseValid) requirementsMet++;
+    if (numberValid) requirementsMet++;
+    if (specialValid) requirementsMet++;
+
+    // Update block lines sequentially
+    this.updateBlockLines(requirementsMet);
+  }
+
+  validateRequirementText(type, isValid) {
+    this.requirementTypeTargets.forEach((target) => {
+      if (target.dataset.requirementType === type) {
+        if (isValid) {
+          target.classList.remove("text-secondary");
+          target.classList.add("text-green-600");
+        } else {
+          target.classList.remove("text-green-600");
+          target.classList.add("text-secondary");
+        }
+      }
+    });
+  }
+
+  updateBlockLines(requirementsMet) {
+    // Update block lines sequentially based on total requirements met
+    this.blockLineTargets.forEach((line, index) => {
+      if (index < requirementsMet) {
+        line.classList.remove("bg-gray-200");
+        line.classList.add("bg-green-600");
+      } else {
+        line.classList.remove("bg-green-600");
+        line.classList.add("bg-gray-200");
+      }
+    });
+  }
+}
diff --git a/app/javascript/controllers/password_visibility_controller.js b/app/javascript/controllers/password_visibility_controller.js
new file mode 100644
index 00000000..ebe68eae
--- /dev/null
+++ b/app/javascript/controllers/password_visibility_controller.js
@@ -0,0 +1,19 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="password-visibility"
+export default class extends Controller {
+  static targets = ["input", "showIcon", "hideIcon"];
+
+  connect() {
+    this.hideIconTarget.classList.add("hidden");
+  }
+
+  toggle() {
+    const input = this.inputTarget;
+    const type = input.type === "password" ? "text" : "password";
+    input.type = type;
+
+    this.showIconTarget.classList.toggle("hidden");
+    this.hideIconTarget.classList.toggle("hidden");
+  }
+}
diff --git a/app/javascript/controllers/pie_chart_controller.js b/app/javascript/controllers/pie_chart_controller.js
deleted file mode 100644
index 1bb41447..00000000
--- a/app/javascript/controllers/pie_chart_controller.js
+++ /dev/null
@@ -1,156 +0,0 @@
-import { Controller } from "@hotwired/stimulus";
-import * as d3 from "d3";
-
-// Connects to data-controller="pie-chart"
-export default class extends Controller {
-  static values = {
-    data: Array,
-    total: String,
-    label: String,
-  };
-
-  #d3SvgMemo = null;
-  #d3GroupMemo = null;
-  #d3ContentMemo = null;
-  #d3ViewboxWidth = 200;
-  #d3ViewboxHeight = 200;
-
-  connect() {
-    this.#draw();
-    document.addEventListener("turbo:load", this.#redraw);
-  }
-
-  disconnect() {
-    this.#teardown();
-    document.removeEventListener("turbo:load", this.#redraw);
-  }
-
-  #redraw = () => {
-    this.#teardown();
-    this.#draw();
-  };
-
-  #teardown() {
-    this.#d3SvgMemo = null;
-    this.#d3GroupMemo = null;
-    this.#d3ContentMemo = null;
-    this.#d3Container.selectAll("*").remove();
-  }
-
-  #draw() {
-    this.#d3Container.attr("class", "relative");
-    this.#d3Content.html(this.#contentSummaryTemplate());
-
-    const pie = d3
-      .pie()
-      .value((d) => d.percent_of_total)
-      .padAngle(0.06);
-
-    const arc = d3
-      .arc()
-      .innerRadius(this.#radius - 8)
-      .outerRadius(this.#radius)
-      .cornerRadius(2);
-
-    const arcs = this.#d3Group
-      .selectAll("arc")
-      .data(pie(this.dataValue))
-      .enter()
-      .append("g")
-      .attr("class", "arc");
-
-    const paths = arcs
-      .append("path")
-      .attr("class", (d) => d.data.fill_color)
-      .attr("d", arc);
-
-    paths
-      .on("mouseover", (event) => {
-        this.#d3Svg.selectAll(".arc path").attr("class", "fill-gray-200");
-        d3.select(event.target).attr("class", (d) => d.data.fill_color);
-        this.#d3ContentMemo.html(
-          this.#contentDetailTemplate(d3.select(event.target).datum().data),
-        );
-      })
-      .on("mouseout", () => {
-        this.#d3Svg
-          .selectAll(".arc path")
-          .attr("class", (d) => d.data.fill_color);
-        this.#d3ContentMemo.html(this.#contentSummaryTemplate());
-      });
-  }
-
-  #contentSummaryTemplate() {
-    return `<span class="text-xl text-gray-900 font-medium">${this.totalValue}</span> <span class="text-xs">${this.labelValue}</span>`;
-  }
-
-  #contentDetailTemplate(datum) {
-    return `
-      <span class="text-xl text-gray-900 font-medium">${datum.formatted_value}</span>
-      <div class="flex flex-row text-xs gap-2 items-center">
-      <div class="w-[10px] h-[10px] rounded-full ${datum.bg_color}"></div>
-        <span>${datum.label}</span>
-        <span>${datum.percent_of_total}%</span>
-      </div>
-    `;
-  }
-
-  get #radius() {
-    return Math.min(this.#d3ViewboxWidth, this.#d3ViewboxHeight) / 2;
-  }
-
-  get #d3Container() {
-    return d3.select(this.element);
-  }
-
-  get #d3Svg() {
-    if (this.#d3SvgMemo) {
-      return this.#d3SvgMemo;
-    } else {
-      return (this.#d3SvgMemo = this.#createMainSvg());
-    }
-  }
-
-  get #d3Group() {
-    if (this.#d3GroupMemo) {
-      return this.#d3GroupMemo;
-    } else {
-      return (this.#d3GroupMemo = this.#createMainGroup());
-    }
-  }
-
-  get #d3Content() {
-    if (this.#d3ContentMemo) {
-      return this.#d3ContentMemo;
-    } else {
-      return (this.#d3ContentMemo = this.#createContent());
-    }
-  }
-
-  #createMainSvg() {
-    return this.#d3Container
-      .append("svg")
-      .attr("width", "100%")
-      .attr("class", "relative aspect-1")
-      .attr("viewBox", [0, 0, this.#d3ViewboxWidth, this.#d3ViewboxHeight]);
-  }
-
-  #createMainGroup() {
-    return this.#d3Svg
-      .append("g")
-      .attr(
-        "transform",
-        `translate(${this.#d3ViewboxWidth / 2},${this.#d3ViewboxHeight / 2})`,
-      );
-  }
-
-  #createContent() {
-    this.#d3ContentMemo = this.#d3Container
-      .append("div")
-      .attr(
-        "class",
-        "absolute inset-0 w-full text-center flex flex-col items-center justify-center",
-      );
-    return this.#d3ContentMemo;
-  }
-}
diff --git a/app/javascript/controllers/plaid_controller.js b/app/javascript/controllers/plaid_controller.js
new file mode 100644
index 00000000..a12660f0
--- /dev/null
+++ b/app/javascript/controllers/plaid_controller.js
@@ -0,0 +1,80 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="plaid"
+export default class extends Controller {
+  static values = {
+    linkToken: String,
+    region: { type: String, default: "us" },
+    isUpdate: { type: Boolean, default: false },
+    itemId: String,
+  };
+
+  connect() {
+    this.open();
+  }
+
+  open() {
+    const handler = Plaid.create({
+      token: this.linkTokenValue,
+      onSuccess: this.handleSuccess,
+      onLoad: this.handleLoad,
+      onExit: this.handleExit,
+      onEvent: this.handleEvent,
+    });
+
+    handler.open();
+  }
+
+  handleSuccess = (public_token, metadata) => {
+    if (this.isUpdateValue) {
+      // Trigger a sync to verify the connection and update status
+      fetch(`/plaid_items/${this.itemIdValue}/sync`, {
+        method: "POST",
+        headers: {
+          Accept: "application/json",
+          "Content-Type": "application/json",
+          "X-CSRF-Token": document.querySelector('[name="csrf-token"]').content,
+        },
+      }).then(() => {
+        // Refresh the page to show the updated status
+        window.location.href = "/accounts";
+      });
+      return;
+    }
+
+    // For new connections, create a new Plaid item
+    fetch("/plaid_items", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "X-CSRF-Token": document.querySelector('[name="csrf-token"]').content,
+      },
+      body: JSON.stringify({
+        plaid_item: {
+          public_token: public_token,
+          metadata: metadata,
+          region: this.regionValue,
+        },
+      }),
+    }).then((response) => {
+      if (response.redirected) {
+        window.location.href = response.url;
+      }
+    });
+  };
+
+  handleExit = (err, metadata) => {
+    // If there was an error during update mode, refresh the page to show latest status
+    if (err && metadata.status === "requires_credentials") {
+      window.location.href = "/accounts";
+    }
+  };
+
+  handleEvent = (eventName, metadata) => {
+    // no-op
+  };
+
+  handleLoad = () => {
+    // no-op
+  };
+}
diff --git a/app/javascript/controllers/preserve_scroll_controller.js b/app/javascript/controllers/preserve_scroll_controller.js
new file mode 100644
index 00000000..8bf20e52
--- /dev/null
+++ b/app/javascript/controllers/preserve_scroll_controller.js
@@ -0,0 +1,44 @@
+import { Controller } from "@hotwired/stimulus"
+
+/*
+  https://dev.to/konnorrogers/maintain-scroll-position-in-turbo-without-data-turbo-permanent-2b1i
+  modified to add support for horizontal scrolling
+
+  only requirement is that the element has an id
+ */
+export default class extends Controller {
+  static scrollPositions = {}
+
+  connect() {
+    this.preserveScrollBound = this.preserveScroll.bind(this)
+    this.restoreScrollBound = this.restoreScroll.bind(this)
+
+    window.addEventListener("turbo:before-cache", this.preserveScrollBound)
+    window.addEventListener("turbo:before-render", this.restoreScrollBound)
+    window.addEventListener("turbo:render", this.restoreScrollBound)
+  }
+
+  disconnect() {
+    window.removeEventListener("turbo:before-cache", this.preserveScrollBound)
+    window.removeEventListener("turbo:before-render", this.restoreScrollBound)
+    window.removeEventListener("turbo:render", this.restoreScrollBound)
+  }
+
+  preserveScroll() {
+    if (!this.element.id) return
+
+    this.constructor.scrollPositions[this.element.id] = {
+      top: this.element.scrollTop,
+      left: this.element.scrollLeft
+    }
+  }
+
+  restoreScroll(event) {
+    if (!this.element.id) return
+
+    if (this.constructor.scrollPositions[this.element.id]) {
+      this.element.scrollTop = this.constructor.scrollPositions[this.element.id].top
+      this.element.scrollLeft = this.constructor.scrollPositions[this.element.id].left
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/javascript/controllers/profile_image_preview_controller.js b/app/javascript/controllers/profile_image_preview_controller.js
index 50896625..83134e38 100644
--- a/app/javascript/controllers/profile_image_preview_controller.js
+++ b/app/javascript/controllers/profile_image_preview_controller.js
@@ -1,27 +1,48 @@
-import { Controller } from "@hotwired/stimulus"
+import { Controller } from "@hotwired/stimulus";
 
 export default class extends Controller {
-  static targets = ["imagePreview", "fileField", "deleteField", "clearBtn", "template"]
+  static targets = [
+    "attachedImage",
+    "previewImage",
+    "placeholderImage",
+    "deleteProfileImage",
+    "input",
+    "clearBtn",
+    "uploadText",
+    "changeText",
+    "cameraIcon"
+  ];
+
+  clearFileInput() {
+    this.inputTarget.value = null;
+    this.clearBtnTarget.classList.add("hidden");
+    this.placeholderImageTarget.classList.remove("hidden");
+    this.attachedImageTarget.classList.add("hidden");
+    this.previewImageTarget.classList.add("hidden");
+    this.deleteProfileImageTarget.value = "1";
+    this.uploadTextTarget.classList.remove("hidden");
+    this.changeTextTarget.classList.add("hidden");
+    this.changeTextTarget.setAttribute("aria-hidden", "true");
+    this.uploadTextTarget.setAttribute("aria-hidden", "false");
+    this.cameraIconTarget.classList.remove("!hidden");
 
-  preview(event) {
-    const file = event.target.files[0];
-    if (file) {
-      const reader = new FileReader();
-      reader.onload = (e) => {
-        this.imagePreviewTarget.innerHTML = `<img src="${e.target.result}" alt="Preview" class="w-full h-full rounded-full object-cover" />`;
-        this.templateTarget.classList.add("hidden");
-        this.clearBtnTarget.classList.remove("hidden");
-      };
-      reader.readAsDataURL(file);
-    }
   }
 
-  clear() {
-    this.deleteFieldTarget.value = true;
-    this.fileFieldTarget.value = null;
-    this.templateTarget.classList.remove("hidden");
-    this.imagePreviewTarget.innerHTML = this.templateTarget.innerHTML;
-    this.clearBtnTarget.classList.add("hidden");
-    this.element.submit();
+  showFileInputPreview(event) {
+    const file = event.target.files[0];
+    if (!file) return;
+
+    this.placeholderImageTarget.classList.add("hidden");
+    this.attachedImageTarget.classList.add("hidden");
+    this.previewImageTarget.classList.remove("hidden");
+    this.clearBtnTarget.classList.remove("hidden");
+    this.deleteProfileImageTarget.value = "0";
+    this.uploadTextTarget.classList.add("hidden");
+    this.changeTextTarget.classList.remove("hidden");
+    this.changeTextTarget.setAttribute("aria-hidden", "false");
+    this.uploadTextTarget.setAttribute("aria-hidden", "true");
+    this.cameraIconTarget.classList.add("!hidden");
+    this.previewImageTarget.querySelector("img").src =
+      URL.createObjectURL(file);
   }
 }
diff --git a/app/javascript/controllers/rule/actions_controller.js b/app/javascript/controllers/rule/actions_controller.js
new file mode 100644
index 00000000..0ca8a252
--- /dev/null
+++ b/app/javascript/controllers/rule/actions_controller.js
@@ -0,0 +1,90 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="rule--actions"
+export default class extends Controller {
+  static values = { actionExecutors: Array };
+  static targets = [
+    "destroyField",
+    "actionValue",
+    "selectTemplate",
+    "textTemplate"
+  ];
+
+  remove(e) {
+    if (e.params.destroy) {
+      this.destroyFieldTarget.value = true;
+      this.element.classList.add("hidden");
+    } else {
+      this.element.remove();
+    }
+  }
+
+  handleActionTypeChange(e) {
+    const actionExecutor = this.actionExecutorsValue.find(
+      (executor) => executor.key === e.target.value,
+    );
+
+    // Clear any existing input elements first
+    this.#clearFormFields();
+
+    if (actionExecutor.type === "select") {
+      this.#buildSelectFor(actionExecutor);
+    } else if (actionExecutor.type === "text") {
+      this.#buildTextInputFor();
+    } else {
+      // Hide for any type that doesn't need a value (e.g. function)
+      this.#hideActionValue();
+    }
+  }
+
+  #hideActionValue() {
+    this.actionValueTarget.classList.add("hidden");
+  }
+
+  #clearFormFields() {
+    // Remove all children from actionValueTarget
+    this.actionValueTarget.innerHTML = "";
+  }
+
+  #buildSelectFor(actionExecutor) {
+    // Clone the select template
+    const template = this.selectTemplateTarget.content.cloneNode(true);
+    const selectEl = template.querySelector("select");
+
+    // Add options to the select element
+    if (selectEl) {
+      selectEl.innerHTML = "";
+      if (!actionExecutor.options || actionExecutor.options.length === 0) {
+        selectEl.disabled = true;
+        const optionEl = document.createElement("option");
+        optionEl.textContent = "(none)";
+        selectEl.appendChild(optionEl);
+      } else {
+        selectEl.disabled = false;
+        for (const option of actionExecutor.options) {
+          const optionEl = document.createElement("option");
+          optionEl.value = option[1];
+          optionEl.textContent = option[0];
+          selectEl.appendChild(optionEl);
+        }
+      }
+    }
+
+    // Add the template content to the actionValue target and ensure it's visible
+    this.actionValueTarget.appendChild(template);
+    this.actionValueTarget.classList.remove("hidden");
+  }
+
+  #buildTextInputFor() {
+    // Clone the text template
+    const template = this.textTemplateTarget.content.cloneNode(true);
+
+    // Ensure the input is always empty
+    const inputEl = template.querySelector("input");
+    if (inputEl) inputEl.value = "";
+
+    // Add the template content to the actionValue target and ensure it's visible
+    this.actionValueTarget.appendChild(template);
+    this.actionValueTarget.classList.remove("hidden");
+  }
+}
diff --git a/app/javascript/controllers/rule/conditions_controller.js b/app/javascript/controllers/rule/conditions_controller.js
new file mode 100644
index 00000000..1a20d00d
--- /dev/null
+++ b/app/javascript/controllers/rule/conditions_controller.js
@@ -0,0 +1,115 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="rule--conditions"
+export default class extends Controller {
+  static values = { conditionFilters: Array };
+  static targets = [
+    "destroyField",
+    "filterValue",
+    "operatorSelect",
+    "subConditionTemplate",
+    "subConditionsList",
+  ];
+
+  addSubCondition() {
+    const html = this.subConditionTemplateTarget.innerHTML.replaceAll(
+      "IDX_CHILD_PLACEHOLDER",
+      this.#uniqueKey(),
+    );
+
+    this.subConditionsListTarget.insertAdjacentHTML("beforeend", html);
+  }
+
+  remove(e) {
+    // Find the parent rules controller before removing the condition
+    const rulesEl = this.element.closest('[data-controller~="rules"]');
+
+    if (e.params.destroy) {
+      this.destroyFieldTarget.value = true;
+      this.element.classList.add("hidden");
+    } else {
+      this.element.remove();
+    }
+
+    // Update the prefixes of all conditions from the parent rules controller
+    if (rulesEl) {
+      const rulesController = this.application.getControllerForElementAndIdentifier(rulesEl, "rules");
+      if (rulesController && typeof rulesController.updateConditionPrefixes === "function") {
+        rulesController.updateConditionPrefixes();
+      }
+    }
+  }
+
+  handleConditionTypeChange(e) {
+    const conditionFilter = this.conditionFiltersValue.find(
+      (filter) => filter.key === e.target.value,
+    );
+
+    if (conditionFilter.type === "select") {
+      this.#buildSelectFor(conditionFilter);
+    } else {
+      this.#buildTextInputFor(conditionFilter);
+    }
+
+    this.#updateOperatorsField(conditionFilter);
+  }
+
+  get valueInputEl() {
+    const textInput = this.filterValueTarget.querySelector("input");
+    const selectInput = this.filterValueTarget.querySelector("select");
+
+    return textInput || selectInput;
+  }
+
+  #updateOperatorsField(conditionFilter) {
+    this.operatorSelectTarget.innerHTML = "";
+
+    for (const operator of conditionFilter.operators) {
+      const optionEl = document.createElement("option");
+      optionEl.value = operator[1];
+      optionEl.textContent = operator[0];
+      this.operatorSelectTarget.appendChild(optionEl);
+    }
+  }
+
+  #buildSelectFor(conditionFilter) {
+    const selectEl = this.#convertFormFieldTo("select", this.valueInputEl);
+
+    for (const option of conditionFilter.options) {
+      const optionEl = document.createElement("option");
+      optionEl.value = option[1];
+      optionEl.textContent = option[0];
+      selectEl.appendChild(optionEl);
+    }
+
+    this.valueInputEl.replaceWith(selectEl);
+  }
+
+  #buildTextInputFor(conditionFilter) {
+    const textInput = this.#convertFormFieldTo("input", this.valueInputEl);
+    textInput.placeholder = "Enter a value";
+    textInput.type = conditionFilter.type; // "text" || "number"
+    if (conditionFilter.type === "number") {
+      textInput.step = conditionFilter.number_step;
+    }
+
+    this.valueInputEl.replaceWith(textInput);
+  }
+
+  #convertFormFieldTo(type, el) {
+    const priorClasses = el.classList;
+    const priorId = el.id;
+    const priorName = el.name;
+
+    const newFormField = document.createElement(type);
+    newFormField.classList.add(...priorClasses);
+    newFormField.id = priorId;
+    newFormField.name = priorName;
+
+    return newFormField;
+  }
+
+  #uniqueKey() {
+    return Date.now();
+  }
+}
diff --git a/app/javascript/controllers/rules_controller.js b/app/javascript/controllers/rules_controller.js
new file mode 100644
index 00000000..3618acc6
--- /dev/null
+++ b/app/javascript/controllers/rules_controller.js
@@ -0,0 +1,78 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="rules"
+export default class extends Controller {
+  static targets = [
+    "conditionTemplate",
+    "conditionGroupTemplate",
+    "actionTemplate",
+    "conditionsList",
+    "actionsList",
+    "effectiveDateInput",
+  ];
+
+  connect() {
+    // Update condition prefixes on first connection (form render on edit)
+    this.updateConditionPrefixes();
+  }
+
+  addConditionGroup() {
+    this.#appendTemplate(
+      this.conditionGroupTemplateTarget,
+      this.conditionsListTarget,
+    );
+    this.updateConditionPrefixes();
+  }
+
+  addCondition() {
+    this.#appendTemplate(
+      this.conditionTemplateTarget,
+      this.conditionsListTarget,
+    );
+    this.updateConditionPrefixes();
+  }
+
+  addAction() {
+    this.#appendTemplate(this.actionTemplateTarget, this.actionsListTarget);
+  }
+
+  clearEffectiveDate() {
+    this.effectiveDateInputTarget.value = "";
+  }
+
+  #appendTemplate(templateEl, listEl) {
+    const html = templateEl.innerHTML.replaceAll(
+      "IDX_PLACEHOLDER",
+      this.#uniqueKey(),
+    );
+
+    listEl.insertAdjacentHTML("beforeend", html);
+  }
+
+  #uniqueKey() {
+    return Date.now();
+  }
+
+  // Updates the prefix visibility of all conditions and condition groups
+  // This is also called by the rule/conditions_controller when a subcondition is removed
+  updateConditionPrefixes() {
+    const conditions = Array.from(this.conditionsListTarget.children);
+    let conditionIndex = 0;
+
+    conditions.forEach((condition) => {
+      // Only process visible conditions, this prevents conditions that are marked for removal and hidden
+      // from being added to the index. This is important when editing a rule.
+      if (!condition.classList.contains('hidden')) {
+        const prefixEl = condition.querySelector('[data-condition-prefix]');
+        if (prefixEl) {
+          if (conditionIndex === 0) {
+            prefixEl.classList.add('hidden');
+          } else {
+            prefixEl.classList.remove('hidden');
+          }
+          conditionIndex++;
+        }
+      }
+    });
+  }
+}
diff --git a/app/javascript/controllers/sankey_chart_controller.js b/app/javascript/controllers/sankey_chart_controller.js
new file mode 100644
index 00000000..9601b088
--- /dev/null
+++ b/app/javascript/controllers/sankey_chart_controller.js
@@ -0,0 +1,204 @@
+import { Controller } from "@hotwired/stimulus";
+import * as d3 from "d3";
+import { sankey, sankeyLinkHorizontal } from "d3-sankey";
+
+// Connects to data-controller="sankey-chart"
+export default class extends Controller {
+  static values = {
+    data: Object,
+    nodeWidth: { type: Number, default: 15 },
+    nodePadding: { type: Number, default: 20 },
+    currencySymbol: { type: String, default: "$" }
+  };
+
+  connect() {
+    this.resizeObserver = new ResizeObserver(() => this.#draw());
+    this.resizeObserver.observe(this.element);
+    this.#draw();
+  }
+
+  disconnect() {
+    this.resizeObserver?.disconnect();
+  }
+
+  #draw() {
+    const { nodes = [], links = [] } = this.dataValue || {};
+
+    if (!nodes.length || !links.length) return;
+
+    // Clear previous SVG
+    d3.select(this.element).selectAll("svg").remove();
+
+    const width = this.element.clientWidth || 600;
+    const height = this.element.clientHeight || 400;
+
+    const svg = d3
+      .select(this.element)
+      .append("svg")
+      .attr("width", width)
+      .attr("height", height);
+
+    const sankeyGenerator = sankey()
+      .nodeWidth(this.nodeWidthValue)
+      .nodePadding(this.nodePaddingValue)
+      .extent([
+        [16, 16],
+        [width - 16, height - 16],
+      ]);
+
+    const sankeyData = sankeyGenerator({
+      nodes: nodes.map((d) => Object.assign({}, d)),
+      links: links.map((d) => Object.assign({}, d)),
+    });
+
+    // Define gradients for links
+    const defs = svg.append("defs");
+
+    sankeyData.links.forEach((link, i) => {
+      const gradientId = `link-gradient-${link.source.index}-${link.target.index}-${i}`;
+
+      const getStopColorWithOpacity = (nodeColorInput, opacity = 0.1) => {
+        let colorStr = nodeColorInput || "var(--color-gray-400)";
+        if (colorStr === "var(--color-success)") {
+          colorStr = "#10A861"; // Hex for --color-green-600
+        }
+        // Add other CSS var to hex mappings here if needed
+
+        if (colorStr.startsWith("var(--")) { // Unmapped CSS var, use as is (likely solid)
+          return colorStr;
+        }
+
+        const d3Color = d3.color(colorStr);
+        return d3Color ? d3Color.copy({ opacity: opacity }) : "var(--color-gray-400)";
+      };
+
+      const sourceStopColor = getStopColorWithOpacity(link.source.color);
+      const targetStopColor = getStopColorWithOpacity(link.target.color);
+
+      const gradient = defs.append("linearGradient")
+        .attr("id", gradientId)
+        .attr("gradientUnits", "userSpaceOnUse")
+        .attr("x1", link.source.x1)
+        .attr("x2", link.target.x0);
+
+      gradient.append("stop")
+        .attr("offset", "0%")
+        .attr("stop-color", sourceStopColor);
+
+      gradient.append("stop")
+        .attr("offset", "100%")
+        .attr("stop-color", targetStopColor);
+    });
+
+    // Draw links
+    svg
+      .append("g")
+      .attr("fill", "none")
+      .selectAll("path")
+      .data(sankeyData.links)
+      .join("path")
+      .attr("d", (d) => {
+        const sourceX = d.source.x1;
+        const targetX = d.target.x0;
+        const path = d3.linkHorizontal()({
+          source: [sourceX, d.y0],
+          target: [targetX, d.y1]
+        });
+        return path;
+      })
+      .attr("stroke", (d, i) => `url(#link-gradient-${d.source.index}-${d.target.index}-${i})`)
+      .attr("stroke-width", (d) => Math.max(1, d.width))
+      .append("title")
+      .text((d) => `${nodes[d.source.index].name} → ${nodes[d.target.index].name}: ${this.currencySymbolValue}${Number.parseFloat(d.value).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })} (${d.percentage}%)`);
+
+    // Draw nodes
+    const node = svg
+      .append("g")
+      .selectAll("g")
+      .data(sankeyData.nodes)
+      .join("g");
+
+    const cornerRadius = 8;
+
+    node.append("path")
+      .attr("d", (d) => {
+        const x0 = d.x0;
+        const y0 = d.y0;
+        const x1 = d.x1;
+        const y1 = d.y1;
+        const h = y1 - y0;
+        // const w = x1 - x0; // Not directly used in path string, but good for context
+
+        // Dynamic corner radius based on node height, maxed at 8
+        const effectiveCornerRadius = Math.max(0, Math.min(cornerRadius, h / 2));
+
+        const isSourceNode = d.sourceLinks && d.sourceLinks.length > 0 && (!d.targetLinks || d.targetLinks.length === 0);
+        const isTargetNode = d.targetLinks && d.targetLinks.length > 0 && (!d.sourceLinks || d.sourceLinks.length === 0);
+
+        if (isSourceNode) { // Round left corners, flat right for "Total Income"
+          if (h < effectiveCornerRadius * 2) {
+            return `M ${x0},${y0} L ${x1},${y0} L ${x1},${y1} L ${x0},${y1} Z`;
+          }
+          return `M ${x0 + effectiveCornerRadius},${y0}
+                  L ${x1},${y0}
+                  L ${x1},${y1}
+                  L ${x0 + effectiveCornerRadius},${y1}
+                  Q ${x0},${y1} ${x0},${y1 - effectiveCornerRadius}
+                  L ${x0},${y0 + effectiveCornerRadius}
+                  Q ${x0},${y0} ${x0 + effectiveCornerRadius},${y0} Z`;
+        }
+
+        if (isTargetNode) { // Flat left corners, round right for Categories/Surplus
+          if (h < effectiveCornerRadius * 2) {
+            return `M ${x0},${y0} L ${x1},${y0} L ${x1},${y1} L ${x0},${y1} Z`;
+          }
+          return `M ${x0},${y0}
+                  L ${x1 - effectiveCornerRadius},${y0}
+                  Q ${x1},${y0} ${x1},${y0 + effectiveCornerRadius}
+                  L ${x1},${y1 - effectiveCornerRadius}
+                  Q ${x1},${y1} ${x1 - effectiveCornerRadius},${y1}
+                  L ${x0},${y1} Z`;
+        }
+
+        // Fallback for intermediate nodes (e.g., "Cash Flow") - draw as a simple sharp-cornered rectangle
+        return `M ${x0},${y0} L ${x1},${y0} L ${x1},${y1} L ${x0},${y1} Z`;
+      })
+      .attr("fill", (d) => d.color || "var(--color-gray-400)")
+      .attr("stroke", (d) => {
+        // If a node has an explicit color assigned (even if it's a gray variable),
+        // it gets no stroke. Only truly un-colored nodes (falling back to default fill)
+        // would get a stroke, but our current data structure assigns colors to all nodes.
+        if (d.color) {
+          return "none";
+        }
+        return "var(--color-gray-500)"; // Fallback, likely unused with current data
+      });
+
+    const stimulusControllerInstance = this;
+    node
+      .append("text")
+      .attr("x", (d) => (d.x0 < width / 2 ? d.x1 + 6 : d.x0 - 6))
+      .attr("y", (d) => (d.y1 + d.y0) / 2)
+      .attr("dy", "-0.2em")
+      .attr("text-anchor", (d) => (d.x0 < width / 2 ? "start" : "end"))
+      .attr("class", "text-xs font-medium text-primary fill-current")
+      .each(function (d) {
+        const textElement = d3.select(this);
+        textElement.selectAll("tspan").remove();
+
+        // Node Name on the first line
+        textElement.append("tspan")
+          .text(d.name);
+
+        // Financial details on the second line
+        const financialDetailsTspan = textElement.append("tspan")
+          .attr("x", textElement.attr("x"))
+          .attr("dy", "1.2em")
+          .attr("class", "font-mono text-secondary")
+          .style("font-size", "0.65rem"); // Explicitly set smaller font size
+
+        financialDetailsTspan.append("tspan")
+          .text(stimulusControllerInstance.currencySymbolValue + Number.parseFloat(d.value).toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 }));
+      });
+  }
+} 
\ No newline at end of file
diff --git a/app/javascript/controllers/scroll_on_connect_controller.js b/app/javascript/controllers/scroll_on_connect_controller.js
new file mode 100644
index 00000000..c03cdbcb
--- /dev/null
+++ b/app/javascript/controllers/scroll_on_connect_controller.js
@@ -0,0 +1,41 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static values = {
+    selector: { type: String, default: "[aria-current=\"page\"]" },
+    delay: { type: Number, default: 500 }
+  }
+
+  connect() {
+    setTimeout(() => {
+      this.scrollToActiveItem()
+    }, this.delayValue)
+  }
+
+  scrollToActiveItem() {
+    const activeItem = this.element?.querySelector(this.selectorValue)
+
+
+    if (!activeItem) return
+
+    const scrollContainer = this.element
+    const containerRect = scrollContainer.getBoundingClientRect()
+    const activeItemRect = activeItem.getBoundingClientRect()
+
+    const scrollPositionX = (activeItemRect.left + scrollContainer.scrollLeft) -
+                          (containerRect.width / 2) +
+                          (activeItemRect.width / 2)
+
+    const scrollPositionY = (activeItemRect.top + scrollContainer.scrollTop) -
+                          (containerRect.height / 2) +
+                          (activeItemRect.height / 2)
+
+
+    // Smooth scroll to position
+    scrollContainer.scrollTo({
+      top: Math.max(0, scrollPositionY),
+      left: Math.max(0, scrollPositionX),
+      behavior: 'smooth'
+    })
+  }
+}
\ No newline at end of file
diff --git a/app/javascript/controllers/selectable_link_controller.js b/app/javascript/controllers/selectable_link_controller.js
new file mode 100644
index 00000000..7d93a7ce
--- /dev/null
+++ b/app/javascript/controllers/selectable_link_controller.js
@@ -0,0 +1,20 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="selectable-link"
+export default class extends Controller {
+  connect() {
+    this.element.addEventListener("change", this.handleChange.bind(this));
+  }
+
+  disconnect() {
+    this.element.removeEventListener("change", this.handleChange.bind(this));
+  }
+
+  handleChange(event) {
+    const paramName = this.element.name;
+    const currentUrl = new URL(window.location.href);
+    currentUrl.searchParams.set(paramName, event.target.value);
+
+    Turbo.visit(currentUrl.toString());
+  }
+}
diff --git a/app/javascript/controllers/tabs_controller.js b/app/javascript/controllers/tabs_controller.js
deleted file mode 100644
index 16838e2a..00000000
--- a/app/javascript/controllers/tabs_controller.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Controller } from "@hotwired/stimulus";
-
-// Connects to data-controller="tabs"
-export default class extends Controller {
-  static classes = ["active"];
-  static targets = ["btn", "tab"];
-  static values = { defaultTab: String };
-
-  connect() {
-    this.updateClasses(this.defaultTabValue);
-    document.addEventListener("turbo:load", this.onTurboLoad);
-  }
-
-  disconnect() {
-    document.removeEventListener("turbo:load", this.onTurboLoad);
-  }
-
-  select(event) {
-    const element = event.target.closest("[data-id]");
-    if (element) {
-      this.updateClasses(element.dataset.id);
-    }
-  }
-
-  onTurboLoad = () => {
-    this.updateClasses(this.defaultTabValue);
-  };
-
-  updateClasses = (selectedId) => {
-    this.btnTargets.forEach((btn) =>
-      btn.classList.remove(...this.activeClasses)
-    );
-    this.tabTargets.forEach((tab) => tab.classList.add("hidden"));
-
-    this.btnTargets.forEach((btn) => {
-      if (btn.dataset.id === selectedId) {
-        btn.classList.add(...this.activeClasses);
-      }
-    });
-
-    this.tabTargets.forEach((tab) => {
-      if (tab.id === selectedId) {
-        tab.classList.remove("hidden");
-      }
-    });
-  };
-}
diff --git a/app/javascript/controllers/theme_controller.js b/app/javascript/controllers/theme_controller.js
new file mode 100644
index 00000000..10aa7b9a
--- /dev/null
+++ b/app/javascript/controllers/theme_controller.js
@@ -0,0 +1,87 @@
+import { Controller } from "@hotwired/stimulus";
+
+export default class extends Controller {
+  static values = { userPreference: String };
+
+  connect() {
+    this.startSystemThemeListener();
+  }
+
+  disconnect() {
+    this.stopSystemThemeListener();
+  }
+
+  // Called automatically by Stimulus when the userPreferenceValue changes (e.g., after form submit/page reload)
+  userPreferenceValueChanged() {
+    this.applyTheme();
+  }
+
+  // Called when a theme radio button is clicked
+  updateTheme(event) {
+    const selectedTheme = event.currentTarget.value;
+    if (selectedTheme === "system") {
+      this.setTheme(this.systemPrefersDark());
+    } else if (selectedTheme === "dark") {
+      this.setTheme(true);
+    } else {
+      this.setTheme(false);
+    }
+  }
+
+  // Applies theme based on the userPreferenceValue (from server)
+  applyTheme() {
+    if (this.userPreferenceValue === "system") {
+      this.setTheme(this.systemPrefersDark());
+    } else if (this.userPreferenceValue === "dark") {
+      this.setTheme(true);
+    } else {
+      this.setTheme(false);
+    }
+  }
+
+  // Sets or removes the data-theme attribute
+  setTheme(isDark) {
+    if (isDark) {
+      document.documentElement.setAttribute("data-theme", "dark");
+    } else {
+      document.documentElement.setAttribute("data-theme", "light");
+    }
+  }
+
+  systemPrefersDark() {
+    return window.matchMedia("(prefers-color-scheme: dark)").matches;
+  }
+
+  handleSystemThemeChange = (event) => {
+    // Only apply system theme changes if the user preference is currently 'system'
+    if (this.userPreferenceValue === "system") {
+      this.setTheme(event.matches);
+    }
+  };
+
+  toggle() {
+    const currentTheme = document.documentElement.getAttribute("data-theme");
+    if (currentTheme === "dark") {
+      this.setTheme(false);
+    } else {
+      this.setTheme(true);
+    }
+  }
+
+  startSystemThemeListener() {
+    this.darkMediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
+    this.darkMediaQuery.addEventListener(
+      "change",
+      this.handleSystemThemeChange,
+    );
+  }
+
+  stopSystemThemeListener() {
+    if (this.darkMediaQuery) {
+      this.darkMediaQuery.removeEventListener(
+        "change",
+        this.handleSystemThemeChange,
+      );
+    }
+  }
+}
diff --git a/app/javascript/controllers/time_series_chart_controller.js b/app/javascript/controllers/time_series_chart_controller.js
index b094f41c..7c1a1a06 100644
--- a/app/javascript/controllers/time_series_chart_controller.js
+++ b/app/javascript/controllers/time_series_chart_controller.js
@@ -1,6 +1,7 @@
-import { Controller } from "@hotwired/stimulus"
-import tailwindColors from "@maybe/tailwindcolors"
-import * as d3 from "d3"
+import { Controller } from "@hotwired/stimulus";
+import * as d3 from "d3";
+
+const parseLocalDate = d3.timeParse("%Y-%m-%d");
 
 export default class extends Controller {
   static values = {
@@ -8,512 +9,562 @@ export default class extends Controller {
     strokeWidth: { type: Number, default: 2 },
     useLabels: { type: Boolean, default: true },
     useTooltip: { type: Boolean, default: true },
-    usePercentSign: Boolean
-  }
+  };
 
-  #d3SvgMemo = null;
-  #d3GroupMemo = null;
-  #d3Tooltip = null;
-  #d3InitialContainerWidth = 0;
-  #d3InitialContainerHeight = 0;
-  #normalDataPoints = [];
+  _d3SvgMemo = null;
+  _d3GroupMemo = null;
+  _d3Tooltip = null;
+  _d3InitialContainerWidth = 0;
+  _d3InitialContainerHeight = 0;
+  _normalDataPoints = [];
+  _resizeObserver = null;
 
   connect() {
-    this.#install()
-    document.addEventListener("turbo:load", this.#reinstall)
+    this._install();
+    document.addEventListener("turbo:load", this._reinstall);
+    this._setupResizeObserver();
   }
 
   disconnect() {
-    this.#teardown()
-    document.removeEventListener("turbo:load", this.#reinstall)
+    this._teardown();
+    document.removeEventListener("turbo:load", this._reinstall);
+    this._resizeObserver?.disconnect();
   }
 
+  _reinstall = () => {
+    this._teardown();
+    this._install();
+  };
 
-  #reinstall = () => {
-    this.#teardown()
-    this.#install()
+  _teardown() {
+    this._d3SvgMemo = null;
+    this._d3GroupMemo = null;
+    this._d3Tooltip = null;
+    this._normalDataPoints = [];
+
+    this._d3Container.selectAll("*").remove();
   }
 
-  #teardown() {
-    this.#d3SvgMemo = null
-    this.#d3GroupMemo = null
-    this.#d3Tooltip = null
-    this.#normalDataPoints = []
-
-    this.#d3Container.selectAll("*").remove()
+  _install() {
+    this._normalizeDataPoints();
+    this._rememberInitialContainerSize();
+    this._draw();
   }
 
-  #install() {
-    this.#normalizeDataPoints()
-    this.#rememberInitialContainerSize()
-    this.#draw()
+  _normalizeDataPoints() {
+    this._normalDataPoints = (this.dataValue.values || []).map((d) => ({
+      date: parseLocalDate(d.date),
+      date_formatted: d.date_formatted,
+      value: d.value,
+      trend: d.trend,
+    }));
   }
 
-
-  #normalizeDataPoints() {
-    this.#normalDataPoints = (this.dataValue.values || []).map((d) => ({
-      ...d,
-      date: new Date(d.date),
-      value: d.value.amount ? +d.value.amount : +d.value,
-      currency: d.value.currency
-    }))
+  _rememberInitialContainerSize() {
+    this._d3InitialContainerWidth = this._d3Container.node().clientWidth;
+    this._d3InitialContainerHeight = this._d3Container.node().clientHeight;
   }
 
-
-  #rememberInitialContainerSize() {
-    this.#d3InitialContainerWidth = this.#d3Container.node().clientWidth
-    this.#d3InitialContainerHeight = this.#d3Container.node().clientHeight
-  }
-
-
-  #draw() {
-    if (this.#normalDataPoints.length < 2) {
-      this.#drawEmpty()
+  _draw() {
+    if (this._normalDataPoints.length < 2) {
+      this._drawEmpty();
     } else {
-      this.#drawChart()
+      this._drawChart();
     }
   }
 
+  _drawEmpty() {
+    this._d3Svg.selectAll(".tick").remove();
+    this._d3Svg.selectAll(".domain").remove();
 
-  #drawEmpty() {
-    this.#d3Svg.selectAll(".tick").remove()
-    this.#d3Svg.selectAll(".domain").remove()
-
-    this.#drawDashedLineEmptyState()
-    this.#drawCenteredCircleEmptyState()
+    this._drawDashedLineEmptyState();
+    this._drawCenteredCircleEmptyState();
   }
 
-  #drawDashedLineEmptyState() {
-    this.#d3Svg
+  _drawDashedLineEmptyState() {
+    this._d3Svg
       .append("line")
-      .attr("x1", this.#d3InitialContainerWidth / 2)
+      .attr("x1", this._d3InitialContainerWidth / 2)
       .attr("y1", 0)
-      .attr("x2", this.#d3InitialContainerWidth / 2)
-      .attr("y2", this.#d3InitialContainerHeight)
-      .attr("stroke", tailwindColors.gray[300])
-      .attr("stroke-dasharray", "4, 4")
+      .attr("x2", this._d3InitialContainerWidth / 2)
+      .attr("y2", this._d3InitialContainerHeight)
+      .attr("stroke", "var(--color-gray-300)")
+      .attr("stroke-dasharray", "4, 4");
   }
 
-  #drawCenteredCircleEmptyState() {
-    this.#d3Svg
+  _drawCenteredCircleEmptyState() {
+    this._d3Svg
       .append("circle")
-      .attr("cx", this.#d3InitialContainerWidth / 2)
-      .attr("cy", this.#d3InitialContainerHeight / 2)
+      .attr("cx", this._d3InitialContainerWidth / 2)
+      .attr("cy", this._d3InitialContainerHeight / 2)
       .attr("r", 4)
-      .style("fill", tailwindColors.gray[400])
+      .attr("class", "fg-subdued")
+      .style("fill", "currentColor");
   }
 
-
-  #drawChart() {
-    this.#drawTrendline()
+  _drawChart() {
+    this._drawTrendline();
 
     if (this.useLabelsValue) {
-      this.#drawXAxisLabels()
-      this.#drawGradientBelowTrendline()
+      this._drawXAxisLabels();
+      this._drawGradientBelowTrendline();
     }
 
     if (this.useTooltipValue) {
-      this.#drawTooltip()
-      this.#trackMouseForShowingTooltip()
+      this._drawTooltip();
+      this._trackMouseForShowingTooltip();
     }
   }
 
-  #drawTrendline() {
-    this.#installTrendlineSplit()
+  _drawTrendline() {
+    this._installTrendlineSplit();
 
-    this.#d3Group
+    this._d3Group
       .append("path")
-      .datum(this.#normalDataPoints)
+      .datum(this._normalDataPoints)
       .attr("fill", "none")
       .attr("stroke", `url(#${this.element.id}-split-gradient)`)
-      .attr("d", this.#d3Line)
+      .attr("d", this._d3Line)
       .attr("stroke-linejoin", "round")
       .attr("stroke-linecap", "round")
-      .attr("stroke-width", this.strokeWidthValue)
+      .attr("stroke-width", this.strokeWidthValue);
   }
 
-  #installTrendlineSplit() {
-    const gradient = this.#d3Svg
+  _installTrendlineSplit() {
+    const gradient = this._d3Svg
       .append("defs")
       .append("linearGradient")
       .attr("id", `${this.element.id}-split-gradient`)
       .attr("gradientUnits", "userSpaceOnUse")
-      .attr("x1", this.#d3XScale.range()[0])
-      .attr("x2", this.#d3XScale.range()[1])
+      .attr("x1", this._d3XScale.range()[0])
+      .attr("x2", this._d3XScale.range()[1]);
 
-    gradient.append("stop")
+    // First stop - solid trend color
+    gradient
+      .append("stop")
       .attr("class", "start-color")
       .attr("offset", "0%")
-      .attr("stop-color", this.#trendColor)
+      .attr("stop-color", this.dataValue.trend.color);
 
-    gradient.append("stop")
-      .attr("class", "middle-color")
+    // Second stop - trend color right before split
+    gradient
+      .append("stop")
+      .attr("class", "split-before")
       .attr("offset", "100%")
-      .attr("stop-color", this.#trendColor)
+      .attr("stop-color", this.dataValue.trend.color);
 
-    gradient.append("stop")
+    // Third stop - gray color right after split
+    gradient
+      .append("stop")
+      .attr("class", "split-after")
+      .attr("offset", "100%")
+      .attr("stop-color", "var(--color-gray-400)");
+
+    // Fourth stop - solid gray to end
+    gradient
+      .append("stop")
       .attr("class", "end-color")
       .attr("offset", "100%")
-      .attr("stop-color", tailwindColors.gray[300])
+      .attr("stop-color", "var(--color-gray-400)");
   }
 
-  #setTrendlineSplitAt(percent) {
-    this.#d3Svg
-      .select(`#${this.element.id}-split-gradient`)
-      .select(".middle-color")
-      .attr("offset", `${percent * 100}%`)
+  _setTrendlineSplitAt(percent) {
+    const position = percent * 100;
 
-    this.#d3Svg
+    // Update both stops at the split point
+    this._d3Svg
       .select(`#${this.element.id}-split-gradient`)
-      .select(".end-color")
-      .attr("offset", `${percent * 100}%`)
+      .select(".split-before")
+      .attr("offset", `${position}%`);
 
-    this.#d3Svg
+    this._d3Svg
+      .select(`#${this.element.id}-split-gradient`)
+      .select(".split-after")
+      .attr("offset", `${position}%`);
+
+    this._d3Svg
       .select(`#${this.element.id}-trendline-gradient-rect`)
-      .attr("width", this.#d3ContainerWidth * percent)
+      .attr("width", this._d3ContainerWidth * percent);
   }
 
-  #drawXAxisLabels() {
+  _drawXAxisLabels() {
     // Add ticks
-    this.#d3Group
+    this._d3Group
       .append("g")
-      .attr("transform", `translate(0,${this.#d3ContainerHeight})`)
+      .attr("transform", `translate(0,${this._d3ContainerHeight})`)
       .call(
         d3
-          .axisBottom(this.#d3XScale)
-          .tickValues([this.#normalDataPoints[0].date, this.#normalDataPoints[this.#normalDataPoints.length - 1].date])
+          .axisBottom(this._d3XScale)
+          .tickValues([
+            this._normalDataPoints[0].date,
+            this._normalDataPoints[this._normalDataPoints.length - 1].date,
+          ])
           .tickSize(0)
-          .tickFormat(d3.timeFormat("%d %b %Y"))
+          .tickFormat(d3.timeFormat("%b %d, %Y")),
       )
       .select(".domain")
-      .remove()
+      .remove();
 
     // Style ticks
-    this.#d3Group.selectAll(".tick text")
-      .style("fill", tailwindColors.gray[500])
+    this._d3Group
+      .selectAll(".tick text")
+      .attr("class", "fg-gray")
       .style("font-size", "12px")
       .style("font-weight", "500")
       .attr("text-anchor", "middle")
       .attr("dx", (_d, i) => {
         // We know we only have 2 values
-        return i === 0 ? "5em" : "-5em"
+        return i === 0 ? "5em" : "-5em";
       })
-      .attr("dy", "0em")
+      .attr("dy", "0em");
   }
 
-  #drawGradientBelowTrendline() {
+  _drawGradientBelowTrendline() {
     // Define gradient
-    const gradient = this.#d3Group
+    const gradient = this._d3Group
       .append("defs")
       .append("linearGradient")
       .attr("id", `${this.element.id}-trendline-gradient`)
       .attr("gradientUnits", "userSpaceOnUse")
       .attr("x1", 0)
       .attr("x2", 0)
-      .attr("y1", this.#d3YScale(d3.max(this.#normalDataPoints, d => d.value)))
-      .attr("y2", this.#d3ContainerHeight)
+      .attr(
+        "y1",
+        this._d3YScale(d3.max(this._normalDataPoints, this._getDatumValue)),
+      )
+      .attr("y2", this._d3ContainerHeight);
 
     gradient
       .append("stop")
       .attr("offset", 0)
-      .attr("stop-color", this.#trendColor)
-      .attr("stop-opacity", 0.06)
+      .attr("stop-color", this._trendColor)
+      .attr("stop-opacity", 0.06);
 
     gradient
       .append("stop")
       .attr("offset", 0.5)
-      .attr("stop-color", this.#trendColor)
-      .attr("stop-opacity", 0)
+      .attr("stop-color", this._trendColor)
+      .attr("stop-opacity", 0);
 
     // Clip path makes gradient start at the trendline
-    this.#d3Group
+    this._d3Group
       .append("clipPath")
       .attr("id", `${this.element.id}-clip-below-trendline`)
       .append("path")
-      .datum(this.#normalDataPoints)
-      .attr("d", d3.area()
-        .x(d => this.#d3XScale(d.date))
-        .y0(this.#d3ContainerHeight)
-        .y1(d => this.#d3YScale(d.value))
-      )
+      .datum(this._normalDataPoints)
+      .attr(
+        "d",
+        d3
+          .area()
+          .x((d) => this._d3XScale(d.date))
+          .y0(this._d3ContainerHeight)
+          .y1((d) => this._d3YScale(this._getDatumValue(d))),
+      );
 
     // Apply the gradient + clip path
-    this.#d3Group
+    this._d3Group
       .append("rect")
       .attr("id", `${this.element.id}-trendline-gradient-rect`)
-      .attr("width", this.#d3ContainerWidth)
-      .attr("height", this.#d3ContainerHeight)
+      .attr("width", this._d3ContainerWidth)
+      .attr("height", this._d3ContainerHeight)
       .attr("clip-path", `url(#${this.element.id}-clip-below-trendline)`)
-      .style("fill", `url(#${this.element.id}-trendline-gradient)`)
+      .style("fill", `url(#${this.element.id}-trendline-gradient)`);
   }
 
-  #drawTooltip() {
-    this.#d3Tooltip = d3
+  _drawTooltip() {
+    this._d3Tooltip = d3
       .select(`#${this.element.id}`)
       .append("div")
-      .style("position", "absolute")
-      .style("padding", "8px")
-      .style("font", "14px Inter, sans-serif")
-      .style("background", tailwindColors.white)
-      .style("border", `1px solid ${tailwindColors["alpha-black"][100]}`)
-      .style("border-radius", "10px")
-      .style("pointer-events", "none")
-      .style("opacity", 0) // Starts as hidden
+      .attr(
+        "class",
+        "bg-container text-sm font-sans absolute p-2 border border-secondary rounded-lg pointer-events-none opacity-0",
+      );
   }
 
-  #trackMouseForShowingTooltip() {
-    const bisectDate = d3.bisector(d => d.date).left
+  _trackMouseForShowingTooltip() {
+    const bisectDate = d3.bisector((d) => d.date).left;
 
-    this.#d3Group
+    this._d3Group
       .append("rect")
-      .attr("width", this.#d3ContainerWidth)
-      .attr("height", this.#d3ContainerHeight)
+      .attr("class", "bg-container")
+      .attr("width", this._d3ContainerWidth)
+      .attr("height", this._d3ContainerHeight)
       .attr("fill", "none")
       .attr("pointer-events", "all")
       .on("mousemove", (event) => {
-        const estimatedTooltipWidth = 250
-        const pageWidth = document.body.clientWidth
-        const tooltipX = event.pageX + 10
-        const overflowX = tooltipX + estimatedTooltipWidth - pageWidth
-        const adjustedX = overflowX > 0 ? event.pageX - overflowX - 20 : tooltipX
+        const estimatedTooltipWidth = 250;
+        const pageWidth = document.body.clientWidth;
+        const tooltipX = event.pageX + 10;
+        const overflowX = tooltipX + estimatedTooltipWidth - pageWidth;
+        const adjustedX =
+          overflowX > 0 ? event.pageX - overflowX - 20 : tooltipX;
 
-        const [xPos] = d3.pointer(event)
-        const x0 = bisectDate(this.#normalDataPoints, this.#d3XScale.invert(xPos), 1)
-        const d0 = this.#normalDataPoints[x0 - 1]
-        const d1 = this.#normalDataPoints[x0]
-        const d = xPos - this.#d3XScale(d0.date) > this.#d3XScale(d1.date) - xPos ? d1 : d0
-        const xPercent = this.#d3XScale(d.date) / this.#d3ContainerWidth
+        const [xPos] = d3.pointer(event);
+        const x0 = bisectDate(
+          this._normalDataPoints,
+          this._d3XScale.invert(xPos),
+          1,
+        );
+        const d0 = this._normalDataPoints[x0 - 1];
+        const d1 = this._normalDataPoints[x0];
+        const d =
+          xPos - this._d3XScale(d0.date) > this._d3XScale(d1.date) - xPos
+            ? d1
+            : d0;
+        const xPercent = this._d3XScale(d.date) / this._d3ContainerWidth;
 
-        this.#setTrendlineSplitAt(xPercent)
+        this._setTrendlineSplitAt(xPercent);
 
         // Reset
-        this.#d3Group.selectAll(".data-point-circle").remove()
-        this.#d3Group.selectAll(".guideline").remove()
+        this._d3Group.selectAll(".data-point-circle").remove();
+        this._d3Group.selectAll(".guideline").remove();
 
         // Guideline
-        this.#d3Group
+        this._d3Group
           .append("line")
-          .attr("class", "guideline")
-          .attr("x1", this.#d3XScale(d.date))
+          .attr("class", "guideline fg-subdued")
+          .attr("x1", this._d3XScale(d.date))
           .attr("y1", 0)
-          .attr("x2", this.#d3XScale(d.date))
-          .attr("y2", this.#d3ContainerHeight)
-          .attr("stroke", tailwindColors.gray[300])
-          .attr("stroke-dasharray", "4, 4")
+          .attr("x2", this._d3XScale(d.date))
+          .attr("y2", this._d3ContainerHeight)
+          .attr("stroke", "currentColor")
+          .attr("stroke-dasharray", "4, 4");
 
         // Big circle
-        this.#d3Group
+        this._d3Group
           .append("circle")
           .attr("class", "data-point-circle")
-          .attr("cx", this.#d3XScale(d.date))
-          .attr("cy", this.#d3YScale(d.value))
-          .attr("r", 8)
-          .attr("fill", this.#trendColor)
+          .attr("cx", this._d3XScale(d.date))
+          .attr("cy", this._d3YScale(this._getDatumValue(d)))
+          .attr("r", 10)
+          .attr("fill", this._trendColor)
           .attr("fill-opacity", "0.1")
-          .attr("pointer-events", "none")
+          .attr("pointer-events", "none");
 
         // Small circle
-        this.#d3Group
+        this._d3Group
           .append("circle")
           .attr("class", "data-point-circle")
-          .attr("cx", this.#d3XScale(d.date))
-          .attr("cy", this.#d3YScale(d.value))
-          .attr("r", 3)
-          .attr("fill", this.#trendColor)
-          .attr("pointer-events", "none")
+          .attr("cx", this._d3XScale(d.date))
+          .attr("cy", this._d3YScale(this._getDatumValue(d)))
+          .attr("r", 5)
+          .attr("fill", this._trendColor)
+          .attr("pointer-events", "none");
 
         // Render tooltip
-        this.#d3Tooltip
-          .html(this.#tooltipTemplate(d))
+        this._d3Tooltip
+          .html(this._tooltipTemplate(d))
           .style("opacity", 1)
           .style("z-index", 999)
-          .style("left", adjustedX + "px")
-          .style("top", event.pageY - 10 + "px")
+          .style("left", `${adjustedX}px`)
+          .style("top", `${event.pageY - 10}px`);
       })
       .on("mouseout", (event) => {
-        const hoveringOnGuideline = event.toElement?.classList.contains("guideline")
+        const hoveringOnGuideline =
+          event.toElement?.classList.contains("guideline");
 
         if (!hoveringOnGuideline) {
-          this.#d3Group.selectAll(".guideline").remove()
-          this.#d3Group.selectAll(".data-point-circle").remove()
-          this.#d3Tooltip.style("opacity", 0)
-
-          this.#setTrendlineSplitAt(1)
+          this._d3Group.selectAll(".guideline").remove();
+          this._d3Group.selectAll(".data-point-circle").remove();
+          this._d3Tooltip.style("opacity", 0);
+          this._setTrendlineSplitAt(1);
         }
-      })
+      });
   }
 
-  #tooltipTemplate(datum) {
-    return (`
-      <div style="margin-bottom: 4px; color: ${tailwindColors.gray[500]};">
-        ${d3.timeFormat("%b %d, %Y")(datum.date)}
+  _tooltipTemplate(datum) {
+    return `
+      <div style="margin-bottom: 4px; color: var(--color-gray-500);">
+        ${datum.date_formatted}
       </div>
-
-      <div style="display: flex; align-items: center; gap: 16px;">
-        <div style="display: flex; align-items: center; gap: 8px;">
-          <svg width="10" height="10">
-            <circle
-              cx="5"
-              cy="5"
-              r="4"
-              stroke="${this.#tooltipTrendColor(datum)}"
-              fill="transparent"
-              stroke-width="1"></circle>
-          </svg>
-
-          ${this.#tooltipValue(datum)}${this.usePercentSignValue ? "%" : ""}
+      <div class="flex items-center gap-4">
+        <div class="flex items-center gap-2 text-primary">
+          <div class="flex items-center justify-center h-4 w-4">
+            ${this._getTrendIcon(datum)}
+          </div>
+          ${this._extractFormattedValue(datum.trend.current)}
         </div>
 
-        ${this.usePercentSignValue || datum.trend.value === 0 || datum.trend.value.amount === 0 ? `
-          <span style="width: 80px;"></span>
-        ` : `
-          <span style="color: ${this.#tooltipTrendColor(datum)};">
-            ${this.#tooltipChange(datum)} (${datum.trend.percent}%)
+        ${
+          datum.trend.value === 0
+            ? `<span class="w-20"></span>`
+            : `
+          <span style="color: ${datum.trend.color};">
+            ${this._extractFormattedValue(datum.trend.value)} (${datum.trend.percent_formatted})
           </span>
-        `}
+        `
+        }
       </div>
-    `)
+    `;
   }
 
-  #tooltipTrendColor(datum) {
-    return {
-      up: tailwindColors.success,
-      down: tailwindColors.error,
-      flat: tailwindColors.gray[500],
-    }[datum.trend.direction]
-  }
+  _getTrendIcon(datum) {
+    const isIncrease =
+      Number(datum.trend.previous.amount) < Number(datum.trend.current.amount);
+    const isDecrease =
+      Number(datum.trend.previous.amount) > Number(datum.trend.current.amount);
 
-  #tooltipValue(datum) {
-    if (datum.currency) {
-      return this.#currencyValue(datum)
-    } else {
-      return datum.value
+    if (isIncrease) {
+      return `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="${datum.trend.color}" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-up-right-icon lucide-arrow-up-right"><path d="M7 7h10v10"/><path d="M7 17 17 7"/></svg>`;
     }
-  }
 
-  #tooltipChange(datum) {
-    if (datum.currency) {
-      return this.#currencyChange(datum)
-    } else {
-      return this.#decimalChange(datum)
+    if (isDecrease) {
+      return `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="${datum.trend.color}" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-down-right-icon lucide-arrow-down-right"><path d="m7 7 10 10"/><path d="M17 7v10H7"/></svg>`;
     }
+
+    return `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="${datum.trend.color}" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-minus-icon lucide-minus"><path d="M5 12h14"/></svg>`;
   }
 
-  #currencyValue(datum) {
-    return Intl.NumberFormat(undefined, {
-      style: "currency",
-      currency: datum.currency,
-    }).format(datum.value)
-  }
+  _getDatumValue = (datum) => {
+    return this._extractNumericValue(datum.value);
+  };
 
-  #currencyChange(datum) {
-    return Intl.NumberFormat(undefined, {
-      style: "currency",
-      currency: datum.currency,
-      signDisplay: "always",
-    }).format(datum.trend.value.amount)
-  }
+  _extractNumericValue = (numeric) => {
+    if (typeof numeric === "object" && "amount" in numeric) {
+      return Number(numeric.amount);
+    }
+    return Number(numeric);
+  };
 
-  #decimalChange(datum) {
-    return Intl.NumberFormat(undefined, {
-      style: "decimal",
-      signDisplay: "always",
-    }).format(datum.trend.value)
-  }
+  _extractFormattedValue = (numeric) => {
+    if (typeof numeric === "object" && "formatted" in numeric) {
+      return numeric.formatted;
+    }
+    return numeric;
+  };
 
-
-  #createMainSvg() {
-    return this.#d3Container
+  _createMainSvg() {
+    return this._d3Container
       .append("svg")
-      .attr("width", this.#d3InitialContainerWidth)
-      .attr("height", this.#d3InitialContainerHeight)
-      .attr("viewBox", [0, 0, this.#d3InitialContainerWidth, this.#d3InitialContainerHeight])
+      .attr("width", this._d3InitialContainerWidth)
+      .attr("height", this._d3InitialContainerHeight)
+      .attr("viewBox", [
+        0,
+        0,
+        this._d3InitialContainerWidth,
+        this._d3InitialContainerHeight,
+      ]);
   }
 
-  #createMainGroup() {
-    return this.#d3Svg
+  _createMainGroup() {
+    return this._d3Svg
       .append("g")
-      .attr("transform", `translate(${this.#margin.left},${this.#margin.top})`)
+      .attr("transform", `translate(${this._margin.left},${this._margin.top})`);
   }
 
-
-  get #d3Svg() {
-    if (this.#d3SvgMemo) {
-      return this.#d3SvgMemo
-    } else {
-      return this.#d3SvgMemo = this.#createMainSvg()
+  get _d3Svg() {
+    if (!this._d3SvgMemo) {
+      this._d3SvgMemo = this._createMainSvg();
     }
+    return this._d3SvgMemo;
   }
 
-  get #d3Group() {
-    if (this.#d3GroupMemo) {
-      return this.#d3GroupMemo
-    } else {
-      return this.#d3GroupMemo = this.#createMainGroup()
+  get _d3Group() {
+    if (!this._d3GroupMemo) {
+      this._d3GroupMemo = this._createMainGroup();
     }
+    return this._d3GroupMemo;
   }
 
-  get #margin() {
+  get _margin() {
     if (this.useLabelsValue) {
-      return { top: 20, right: 0, bottom: 30, left: 0 }
-    } else {
-      return { top: 0, right: 0, bottom: 0, left: 0 }
+      return { top: 20, right: 0, bottom: 10, left: 0 };
     }
+    return { top: 0, right: 0, bottom: 0, left: 0 };
   }
 
-  get #d3ContainerWidth() {
-    return this.#d3InitialContainerWidth - this.#margin.left - this.#margin.right
+  get _d3ContainerWidth() {
+    return (
+      this._d3InitialContainerWidth - this._margin.left - this._margin.right
+    );
   }
 
-  get #d3ContainerHeight() {
-    return this.#d3InitialContainerHeight - this.#margin.top - this.#margin.bottom
+  get _d3ContainerHeight() {
+    return (
+      this._d3InitialContainerHeight - this._margin.top - this._margin.bottom
+    );
   }
 
-  get #d3Container() {
-    return d3.select(this.element)
+  get _d3Container() {
+    return d3.select(this.element);
   }
 
-  get #trendColor() {
-    if (this.#trendDirection === "flat") {
-      return tailwindColors.gray[500]
-    } else if (this.#trendDirection === this.#favorableDirection) {
-      return tailwindColors.green[500]
-    } else {
-      return tailwindColors.error
-    }
+  get _trendColor() {
+    return this.dataValue.trend.color;
   }
 
-  get #trendDirection() {
-    return this.dataValue.trend.direction
-  }
-
-  get #favorableDirection() {
-    return this.dataValue.trend.favorable_direction
-  }
-
-  get #d3Line() {
+  get _d3Line() {
     return d3
       .line()
-      .x(d => this.#d3XScale(d.date))
-      .y(d => this.#d3YScale(d.value))
+      .x((d) => this._d3XScale(d.date))
+      .y((d) => this._d3YScale(this._getDatumValue(d)));
   }
 
-  get #d3XScale() {
+  get _d3XScale() {
     return d3
       .scaleTime()
-      .rangeRound([0, this.#d3ContainerWidth])
-      .domain(d3.extent(this.#normalDataPoints, d => d.date))
+      .rangeRound([0, this._d3ContainerWidth])
+      .domain(d3.extent(this._normalDataPoints, (d) => d.date));
   }
 
-  get #d3YScale() {
-    const reductionPercent = this.useLabelsValue ? 0.15 : 0.05
-    const dataMin = d3.min(this.#normalDataPoints, d => d.value)
-    const dataMax = d3.max(this.#normalDataPoints, d => d.value)
-    const padding = (dataMax - dataMin) * reductionPercent
+  get _d3YScale() {
+    const dataMin = d3.min(this._normalDataPoints, this._getDatumValue);
+    const dataMax = d3.max(this._normalDataPoints, this._getDatumValue);
+
+    // Handle edge case where all values are the same
+    if (dataMin === dataMax) {
+      const padding = dataMax === 0 ? 100 : Math.abs(dataMax) * 0.5;
+      return d3
+        .scaleLinear()
+        .rangeRound([this._d3ContainerHeight, 0])
+        .domain([dataMin - padding, dataMax + padding]);
+    }
+
+    const dataRange = dataMax - dataMin;
+    const avgValue = (dataMax + dataMin) / 2;
+
+    // Calculate relative change as a percentage
+    const relativeChange = avgValue !== 0 ? dataRange / Math.abs(avgValue) : 1;
+
+    // Dynamic baseline calculation
+    let yMin;
+    let yMax;
+
+    // For small relative changes (< 10%), use a tighter scale
+    if (relativeChange < 0.1 && dataMin > 0) {
+      // Start axis at a percentage below the minimum, not at 0
+      const baselinePadding = dataRange * 2; // Show 2x the data range below min
+      yMin = Math.max(0, dataMin - baselinePadding);
+      yMax = dataMax + dataRange * 0.5; // Add 50% padding above
+    } else {
+      // For larger changes or when data crosses zero, use more context
+      // Always include 0 when data is negative or close to 0
+      if (dataMin < 0 || (dataMin >= 0 && dataMin < avgValue * 0.1)) {
+        yMin = Math.min(0, dataMin * 1.1);
+      } else {
+        // Otherwise use dynamic baseline
+        yMin = dataMin - dataRange * 0.3;
+      }
+      yMax = dataMax + dataRange * 0.1;
+    }
+
+    // Adjust padding for labels if needed
+    if (this.useLabelsValue) {
+      const extraPadding = (yMax - yMin) * 0.1;
+      yMin -= extraPadding;
+      yMax += extraPadding;
+    }
 
     return d3
       .scaleLinear()
-      .rangeRound([this.#d3ContainerHeight, 0])
-      .domain([dataMin - padding, dataMax + padding])
+      .rangeRound([this._d3ContainerHeight, 0])
+      .domain([yMin, yMax]);
+  }
+
+  _setupResizeObserver() {
+    this._resizeObserver = new ResizeObserver(() => {
+      this._reinstall();
+    });
+    this._resizeObserver.observe(this.element);
   }
 }
diff --git a/app/javascript/controllers/tooltip_controller.js b/app/javascript/controllers/tooltip_controller.js
index 7013607f..f691b2ec 100644
--- a/app/javascript/controllers/tooltip_controller.js
+++ b/app/javascript/controllers/tooltip_controller.js
@@ -1,11 +1,11 @@
-import { Controller } from '@hotwired/stimulus'
 import {
+  autoUpdate,
   computePosition,
   flip,
-  shift,
   offset,
-  autoUpdate
-} from '@floating-ui/dom';
+  shift,
+} from "@floating-ui/dom";
+import { Controller } from "@hotwired/stimulus";
 
 export default class extends Controller {
   static targets = ["tooltip"];
@@ -39,20 +39,20 @@ export default class extends Controller {
   }
 
   show = () => {
-    this.tooltipTarget.style.display = 'block';
+    this.tooltipTarget.style.display = "block";
     this.update(); // Ensure immediate update when shown
-  }
+  };
 
   hide = () => {
-    this.tooltipTarget.style.display = 'none';
-  }
+    this.tooltipTarget.style.display = "none";
+  };
 
   startAutoUpdate() {
     if (!this._cleanup) {
       this._cleanup = autoUpdate(
         this.element,
         this.tooltipTarget,
-        this.boundUpdate
+        this.boundUpdate,
       );
     }
   }
@@ -69,9 +69,13 @@ export default class extends Controller {
     computePosition(this.element, this.tooltipTarget, {
       placement: this.placementValue,
       middleware: [
-        offset({ mainAxis: this.offsetValue, crossAxis: this.crossAxisValue, alignmentAxis: this.alignmentAxisValue }),
+        offset({
+          mainAxis: this.offsetValue,
+          crossAxis: this.crossAxisValue,
+          alignmentAxis: this.alignmentAxisValue,
+        }),
         flip(),
-        shift({ padding: 5 })
+        shift({ padding: 5 }),
       ],
     }).then(({ x, y, placement, middlewareData }) => {
       Object.assign(this.tooltipTarget.style, {
@@ -80,4 +84,4 @@ export default class extends Controller {
       });
     });
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/controllers/trade_form_controller.js b/app/javascript/controllers/trade_form_controller.js
index 61751c02..bff84364 100644
--- a/app/javascript/controllers/trade_form_controller.js
+++ b/app/javascript/controllers/trade_form_controller.js
@@ -1,64 +1,11 @@
-import {Controller} from "@hotwired/stimulus"
-
-const TRADE_TYPES = {
-  BUY: "buy",
-  SELL: "sell",
-  TRANSFER_IN: "transfer_in",
-  TRANSFER_OUT: "transfer_out",
-  INTEREST: "interest"
-}
-
-const FIELD_VISIBILITY = {
-  [TRADE_TYPES.BUY]: {ticker: true, qty: true, price: true},
-  [TRADE_TYPES.SELL]: {ticker: true, qty: true, price: true},
-  [TRADE_TYPES.TRANSFER_IN]: {amount: true, transferAccount: true},
-  [TRADE_TYPES.TRANSFER_OUT]: {amount: true, transferAccount: true},
-  [TRADE_TYPES.INTEREST]: {amount: true}
-}
+import { Controller } from "@hotwired/stimulus";
 
 // Connects to data-controller="trade-form"
 export default class extends Controller {
-  static targets = ["typeInput", "tickerInput", "amountInput", "transferAccountInput", "qtyInput", "priceInput"]
-
-  connect() {
-    this.handleTypeChange = this.handleTypeChange.bind(this)
-    this.typeInputTarget.addEventListener("change", this.handleTypeChange)
-    this.updateFields(this.typeInputTarget.value || TRADE_TYPES.BUY)
+  // Reloads the page with a new type without closing the modal
+  async changeType(event) {
+    const url = new URL(event.params.url, window.location.origin);
+    url.searchParams.set(event.params.key, event.target.value);
+    Turbo.visit(url, { frame: "modal" });
   }
-
-  disconnect() {
-    this.typeInputTarget.removeEventListener("change", this.handleTypeChange)
-  }
-
-  handleTypeChange(event) {
-    this.updateFields(event.target.value)
-  }
-
-  updateFields(type) {
-    const visibleFields = FIELD_VISIBILITY[type] || {}
-
-    Object.entries(this.fieldTargets).forEach(([field, target]) => {
-      const isVisible = visibleFields[field] || false
-
-      // Update visibility
-      target.hidden = !isVisible
-
-      // Update required status based on visibility
-      if (isVisible) {
-        target.setAttribute('required', '')
-      } else {
-        target.removeAttribute('required')
-      }
-    })
-  }
-
-  get fieldTargets() {
-    return {
-      ticker: this.tickerInputTarget,
-      amount: this.amountInputTarget,
-      transferAccount: this.transferAccountInputTarget,
-      qty: this.qtyInputTarget,
-      price: this.priceInputTarget
-    }
-  }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/controllers/transfer_match_controller.js b/app/javascript/controllers/transfer_match_controller.js
new file mode 100644
index 00000000..eda4a90c
--- /dev/null
+++ b/app/javascript/controllers/transfer_match_controller.js
@@ -0,0 +1,16 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Connects to data-controller="transfer-match"
+export default class extends Controller {
+  static targets = ["newSelect", "existingSelect"];
+
+  update(event) {
+    if (event.target.value === "new") {
+      this.newSelectTarget.classList.remove("hidden");
+      this.existingSelectTarget.classList.add("hidden");
+    } else {
+      this.newSelectTarget.classList.add("hidden");
+      this.existingSelectTarget.classList.remove("hidden");
+    }
+  }
+}
diff --git a/app/javascript/controllers/turbo_frame_timeout_controller.js b/app/javascript/controllers/turbo_frame_timeout_controller.js
new file mode 100644
index 00000000..a81b3dde
--- /dev/null
+++ b/app/javascript/controllers/turbo_frame_timeout_controller.js
@@ -0,0 +1,42 @@
+import { Controller } from "@hotwired/stimulus"
+
+// Connects to data-controller="turbo-frame-timeout"
+export default class extends Controller {
+  static values = { timeout: { type: Number, default: 10000 } }
+
+  connect() {
+    this.timeoutId = setTimeout(() => {
+      this.handleTimeout()
+    }, this.timeoutValue)
+
+    // Listen for successful frame loads to clear timeout
+    this.element.addEventListener("turbo:frame-load", this.clearTimeout.bind(this))
+  }
+
+  disconnect() {
+    this.clearTimeout()
+  }
+
+  clearTimeout() {
+    if (this.timeoutId) {
+      clearTimeout(this.timeoutId)
+      this.timeoutId = null
+    }
+  }
+
+  handleTimeout() {
+    // Replace loading content with error state
+    this.element.innerHTML = `
+      <div class="flex items-center justify-end gap-1">
+        <div class="w-8 h-4 flex items-center justify-center">
+          <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="text-warning">
+            <path d="m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3Z"/>
+            <path d="M12 9v4"/>
+            <path d="m12 17 .01 0"/>
+          </svg>
+        </div>
+        <p class="font-mono text-right text-xs text-warning">Timeout</p>
+      </div>
+    `
+  }
+} 
\ No newline at end of file
diff --git a/app/javascript/shims/d3-array-default.js b/app/javascript/shims/d3-array-default.js
new file mode 100644
index 00000000..1b1e088e
--- /dev/null
+++ b/app/javascript/shims/d3-array-default.js
@@ -0,0 +1,3 @@
+import * as d3Array from "d3-array-src";
+export * from "d3-array-src";
+export default d3Array; 
\ No newline at end of file
diff --git a/app/javascript/shims/d3-shape-default.js b/app/javascript/shims/d3-shape-default.js
new file mode 100644
index 00000000..23920eda
--- /dev/null
+++ b/app/javascript/shims/d3-shape-default.js
@@ -0,0 +1,3 @@
+import * as d3Shape from "d3-shape-src";
+export * from "d3-shape-src";
+export default d3Shape; 
\ No newline at end of file
diff --git a/app/javascript/tailwindColors.js b/app/javascript/tailwindColors.js
deleted file mode 100644
index 2f5e1a4f..00000000
--- a/app/javascript/tailwindColors.js
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * To keep consistent styling across the app, this file can be imported in
- * Stimulus controllers to reference our color palette.  Mostly used for D3 charts.
- */
-
-export default {
-  transparent: "transparent",
-  current: "currentColor",
-  white: "#ffffff",
-  black: "#0B0B0B",
-  success: "#10A861",
-  warning: "#F79009",
-  error: "#F13636",
-  gray: {
-    25: "#FAFAFA",
-    50: "#F5F5F5",
-    100: "#F0F0F0",
-    200: "#E5E5E5",
-    300: "#D6D6D6",
-    400: "#A3A3A3",
-    500: "#737373",
-    600: "#525252",
-    700: "#3D3D3D",
-    800: "#212121",
-    900: "#141414",
-  },
-  "alpha-white": {
-    25: "rgba(255, 255, 255, 0.03)",
-    50: "rgba(255, 255, 255, 0.05)",
-    100: "rgba(255, 255, 255, 0.08)",
-    200: "rgba(255, 255, 255, 0.1)",
-    300: "rgba(255, 255, 255, 0.15)",
-    400: "rgba(255, 255, 255, 0.2)",
-    500: "rgba(255, 255, 255, 0.3)",
-    600: "rgba(255, 255, 255, 0.4)",
-    700: "rgba(255, 255, 255, 0.5)",
-    800: "rgba(255, 255, 255, 0.6)",
-    900: "rgba(255, 255, 255, 0.7)",
-  },
-  "alpha-black": {
-    25: "rgba(11, 11, 11, 0.03)",
-    50: "rgba(11, 11, 11, 0.05)",
-    100: "rgba(11, 11, 11, 0.08)",
-    200: "rgba(11, 11, 11, 0.1)",
-    300: "rgba(11, 11, 11, 0.15)",
-    400: "rgba(11, 11, 11, 0.2)",
-    500: "rgba(11, 11, 11, 0.3)",
-    600: "rgba(11, 11, 11, 0.4)",
-    700: "rgba(11, 11, 11, 0.5)",
-    800: "rgba(11, 11, 11, 0.6)",
-    900: "rgba(11, 11, 11, 0.7)",
-  },
-  red: {
-    25: "#FFFBFB",
-    50: "#FFF1F0",
-    100: "#FFDEDB",
-    200: "#FEB9B3",
-    300: "#F88C86",
-    400: "#ED4E4E",
-    500: "#F13636",
-    600: "#EC2222",
-    700: "#C91313",
-    800: "#A40E0E",
-    900: "#7E0707",
-  },
-  green: {
-    25: "#F6FEF9",
-    50: "#ECFDF3",
-    100: "#D1FADF",
-    200: "#A6F4C5",
-    300: "#6CE9A6",
-    400: "#32D583",
-    500: "#12B76A",
-    600: "#10A861",
-    700: "#078C52",
-    800: "#05603A",
-    900: "#054F31",
-  },
-  yellow: {
-    25: "#FFFCF5",
-    50: "#FFFAEB",
-    100: "#FEF0C7",
-    200: "#FEDF89",
-    300: "#FEC84B",
-    400: "#FDB022",
-    500: "#F79009",
-    600: "#DC6803",
-    700: "#B54708",
-    800: "#93370D",
-    900: "#7A2E0E",
-  },
-  cyan: {
-    25: "#F5FEFF",
-    50: "#ECFDFF",
-    100: "#CFF9FE",
-    200: "#A5F0FC",
-    300: "#67E3F9",
-    400: "#22CCEE",
-    500: "#06AED4",
-    600: "#088AB2",
-    700: "#0E7090",
-    800: "#155B75",
-    900: "#155B75",
-  },
-  blue: {
-    25: "#F5FAFF",
-    50: "#EFF8FF",
-    100: "#D1E9FF",
-    200: "#B2DDFF",
-    300: "#84CAFF",
-    400: "#53B1FD",
-    500: "#2E90FA",
-    600: "#1570EF",
-    700: "#175CD3",
-    800: "#1849A9",
-    900: "#194185",
-  },
-  indigo: {
-    25: "#F5F8FF",
-    50: "#EFF4FF",
-    100: "#E0EAFF",
-    200: "#C7D7FE",
-    300: "#A4BCFD",
-    400: "#8098F9",
-    500: "#6172F3",
-    600: "#444CE7",
-    700: "#3538CD",
-    800: "#2D31A6",
-    900: "#2D3282",
-  },
-  violet: {
-    25: "#FBFAFF",
-    50: "#F5F3FF",
-    100: "#ECE9FE",
-    200: "#DDD6FE",
-    300: "#C3B5FD",
-    400: "#A48AFB",
-    500: "#875BF7",
-    600: "#7839EE",
-    700: "#6927DA",
-  },
-  fuchsia: {
-    25: "#FEFAFF",
-    50: "#FDF4FF",
-    100: "#FBE8FF",
-    200: "#F6D0FE",
-    300: "#EEAAFD",
-    400: "#E478FA",
-    500: "#D444F1",
-    600: "#BA24D5",
-    700: "#9F1AB1",
-    800: "#821890",
-    900: "#6F1877",
-  },
-  pink: {
-    25: "#FFFAFC",
-    50: "#FEF0F7",
-    100: "#FFD1E2",
-    200: "#FFB1CE",
-    300: "#FD8FBA",
-    400: "#F86BA7",
-    500: "#F23E94",
-    600: "#D5327F",
-    700: "#BA256B",
-    800: "#9E1958",
-    900: "#840B45",
-  },
-  orange: {
-    25: "#FFF9F5",
-    50: "#FFF4ED",
-    100: "#FFE6D5",
-    200: "#FFD6AE",
-    300: "#FF9C66",
-    400: "#FF692E",
-    500: "#FF4405",
-    600: "#E62E05",
-    700: "#BC1B06",
-    800: "#97180C",
-    900: "#771A0D",
-  },
-};
diff --git a/app/jobs/account_sync_job.rb b/app/jobs/account_sync_job.rb
deleted file mode 100644
index cdcefffc..00000000
--- a/app/jobs/account_sync_job.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class AccountSyncJob < ApplicationJob
-  queue_as :default
-
-  def perform(account, start_date: nil)
-    account.sync(start_date: start_date)
-  end
-end
diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
index d394c3d1..25727230 100644
--- a/app/jobs/application_job.rb
+++ b/app/jobs/application_job.rb
@@ -1,7 +1,5 @@
 class ApplicationJob < ActiveJob::Base
-  # Automatically retry jobs that encountered a deadlock
-  # retry_on ActiveRecord::Deadlocked
-
-  # Most jobs are safe to ignore if the underlying records are no longer available
-  # discard_on ActiveJob::DeserializationError
+  retry_on ActiveRecord::Deadlocked
+  discard_on ActiveJob::DeserializationError
+  queue_as :low_priority # default queue
 end
diff --git a/app/jobs/assistant_response_job.rb b/app/jobs/assistant_response_job.rb
new file mode 100644
index 00000000..70664f02
--- /dev/null
+++ b/app/jobs/assistant_response_job.rb
@@ -0,0 +1,7 @@
+class AssistantResponseJob < ApplicationJob
+  queue_as :high_priority
+
+  def perform(message)
+    message.request_response
+  end
+end
diff --git a/app/jobs/auto_categorize_job.rb b/app/jobs/auto_categorize_job.rb
new file mode 100644
index 00000000..c31917a8
--- /dev/null
+++ b/app/jobs/auto_categorize_job.rb
@@ -0,0 +1,7 @@
+class AutoCategorizeJob < ApplicationJob
+  queue_as :medium_priority
+
+  def perform(family, transaction_ids: [])
+    family.auto_categorize_transactions(transaction_ids)
+  end
+end
diff --git a/app/jobs/auto_detect_merchants_job.rb b/app/jobs/auto_detect_merchants_job.rb
new file mode 100644
index 00000000..eb3713a4
--- /dev/null
+++ b/app/jobs/auto_detect_merchants_job.rb
@@ -0,0 +1,7 @@
+class AutoDetectMerchantsJob < ApplicationJob
+  queue_as :medium_priority
+
+  def perform(family, transaction_ids: [])
+    family.auto_detect_transaction_merchants(transaction_ids)
+  end
+end
diff --git a/app/jobs/auto_upgrade_job.rb b/app/jobs/auto_upgrade_job.rb
deleted file mode 100644
index 30c10bc7..00000000
--- a/app/jobs/auto_upgrade_job.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-class AutoUpgradeJob < ApplicationJob
-  queue_as :default
-
-  def perform(*args)
-    raise_if_disabled
-
-    return Rails.logger.info "Skipping auto-upgrades because app is set to manual upgrades.  Please set UPGRADES_MODE=auto to enable auto-upgrades" if Setting.upgrades_mode == "manual"
-
-    Rails.logger.info "Searching for available auto-upgrades..."
-
-    candidate = Upgrader.available_upgrade_by_type(Setting.upgrades_target)
-
-    if candidate
-      if Rails.cache.read("last_auto_upgrade_commit_sha") == candidate.commit_sha
-        Rails.logger.info "Skipping auto upgrade: #{candidate.type} #{candidate.commit_sha} deploy in progress"
-        return
-      end
-
-      Rails.logger.info "Auto upgrading to #{candidate.type} #{candidate.commit_sha}..."
-      Upgrader.upgrade_to(candidate)
-      Rails.cache.write("last_auto_upgrade_commit_sha", candidate.commit_sha, expires_in: 1.day)
-    else
-      Rails.logger.info "No auto upgrade available at this time"
-    end
-  end
-
-  private
-    def raise_if_disabled
-      raise "Upgrades module is disabled.  Please set UPGRADES_ENABLED=true to enable upgrade features" unless ENV["UPGRADES_ENABLED"] == "true"
-    end
-end
diff --git a/app/jobs/data_cache_clear_job.rb b/app/jobs/data_cache_clear_job.rb
new file mode 100644
index 00000000..045e1e10
--- /dev/null
+++ b/app/jobs/data_cache_clear_job.rb
@@ -0,0 +1,16 @@
+class DataCacheClearJob < ApplicationJob
+  queue_as :low_priority
+
+  def perform(family)
+    ActiveRecord::Base.transaction do
+      ExchangeRate.delete_all
+      Security::Price.delete_all
+      family.accounts.each do |account|
+        account.balances.delete_all
+        account.holdings.delete_all
+      end
+
+      family.sync_later
+    end
+  end
+end
diff --git a/app/jobs/destroy_job.rb b/app/jobs/destroy_job.rb
new file mode 100644
index 00000000..692585de
--- /dev/null
+++ b/app/jobs/destroy_job.rb
@@ -0,0 +1,9 @@
+class DestroyJob < ApplicationJob
+  queue_as :low_priority
+
+  def perform(model)
+    model.destroy
+  rescue => e
+    model.update!(scheduled_for_deletion: false) # Let's the user try again by resetting the state
+  end
+end
diff --git a/app/jobs/family_reset_job.rb b/app/jobs/family_reset_job.rb
new file mode 100644
index 00000000..185df111
--- /dev/null
+++ b/app/jobs/family_reset_job.rb
@@ -0,0 +1,19 @@
+class FamilyResetJob < ApplicationJob
+  queue_as :low_priority
+
+  def perform(family)
+    # Delete all family data except users
+    ActiveRecord::Base.transaction do
+      # Delete accounts and related data
+      family.accounts.destroy_all
+      family.categories.destroy_all
+      family.tags.destroy_all
+      family.merchants.destroy_all
+      family.plaid_items.destroy_all
+      family.imports.destroy_all
+      family.budgets.destroy_all
+
+      family.sync_later
+    end
+  end
+end
diff --git a/app/jobs/import_job.rb b/app/jobs/import_job.rb
index f7fc2c01..2e45f508 100644
--- a/app/jobs/import_job.rb
+++ b/app/jobs/import_job.rb
@@ -1,5 +1,5 @@
 class ImportJob < ApplicationJob
-  queue_as :default
+  queue_as :high_priority
 
   def perform(import)
     import.publish
diff --git a/app/jobs/import_market_data_job.rb b/app/jobs/import_market_data_job.rb
new file mode 100644
index 00000000..7d146c68
--- /dev/null
+++ b/app/jobs/import_market_data_job.rb
@@ -0,0 +1,22 @@
+# This job runs daily at market close.  See config/schedule.yml for details.
+#
+# The primary purpose of this job is to:
+# 1. Determine what exchange rate pairs, security prices, and other market data all of our users need to view historical account balance data
+# 2. For each needed rate/price, fetch from our data provider and upsert to our database
+#
+# Each individual account sync will still fetch any missing market data that isn't yet synced, but by running
+# this job daily, we significantly reduce overlapping account syncs that both need the same market data (e.g. common security like `AAPL`)
+#
+class ImportMarketDataJob < ApplicationJob
+  queue_as :scheduled
+
+  def perform(opts)
+    return if Rails.env.development?
+
+    opts = opts.symbolize_keys
+    mode = opts.fetch(:mode, :full)
+    clear_cache = opts.fetch(:clear_cache, false)
+
+    MarketDataImporter.new(mode: mode, clear_cache: clear_cache).import_all
+  end
+end
diff --git a/app/jobs/revert_import_job.rb b/app/jobs/revert_import_job.rb
new file mode 100644
index 00000000..818244cb
--- /dev/null
+++ b/app/jobs/revert_import_job.rb
@@ -0,0 +1,7 @@
+class RevertImportJob < ApplicationJob
+  queue_as :medium_priority
+
+  def perform(import)
+    import.revert
+  end
+end
diff --git a/app/jobs/rule_job.rb b/app/jobs/rule_job.rb
new file mode 100644
index 00000000..fe446d0e
--- /dev/null
+++ b/app/jobs/rule_job.rb
@@ -0,0 +1,7 @@
+class RuleJob < ApplicationJob
+  queue_as :medium_priority
+
+  def perform(rule, ignore_attribute_locks: false)
+    rule.apply(ignore_attribute_locks: ignore_attribute_locks)
+  end
+end
diff --git a/app/jobs/security_health_check_job.rb b/app/jobs/security_health_check_job.rb
new file mode 100644
index 00000000..02a821be
--- /dev/null
+++ b/app/jobs/security_health_check_job.rb
@@ -0,0 +1,9 @@
+class SecurityHealthCheckJob < ApplicationJob
+  queue_as :scheduled
+
+  def perform
+    return if Rails.env.development?
+
+    Security::HealthChecker.check_all
+  end
+end
diff --git a/app/jobs/stripe_event_handler_job.rb b/app/jobs/stripe_event_handler_job.rb
new file mode 100644
index 00000000..ac385169
--- /dev/null
+++ b/app/jobs/stripe_event_handler_job.rb
@@ -0,0 +1,9 @@
+class StripeEventHandlerJob < ApplicationJob
+  queue_as :default
+
+  def perform(event_id)
+    stripe_provider = Provider::Registry.get_provider(:stripe)
+    Rails.logger.info "Processing Stripe event: #{event_id}"
+    stripe_provider.process_event(event_id)
+  end
+end
diff --git a/app/jobs/sync_cleaner_job.rb b/app/jobs/sync_cleaner_job.rb
new file mode 100644
index 00000000..f5e42551
--- /dev/null
+++ b/app/jobs/sync_cleaner_job.rb
@@ -0,0 +1,7 @@
+class SyncCleanerJob < ApplicationJob
+  queue_as :scheduled
+
+  def perform
+    Sync.clean
+  end
+end
diff --git a/app/jobs/sync_job.rb b/app/jobs/sync_job.rb
new file mode 100644
index 00000000..0d9b848c
--- /dev/null
+++ b/app/jobs/sync_job.rb
@@ -0,0 +1,7 @@
+class SyncJob < ApplicationJob
+  queue_as :high_priority
+
+  def perform(sync)
+    sync.perform
+  end
+end
diff --git a/app/jobs/user_purge_job.rb b/app/jobs/user_purge_job.rb
index ff997807..70b94be8 100644
--- a/app/jobs/user_purge_job.rb
+++ b/app/jobs/user_purge_job.rb
@@ -1,5 +1,5 @@
 class UserPurgeJob < ApplicationJob
-  queue_as :default
+  queue_as :low_priority
 
   def perform(user)
     user.purge
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 9305dad1..149b8a78 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -1,4 +1,4 @@
 class ApplicationMailer < ActionMailer::Base
-  default from: ENV["EMAIL_SENDER"] if ENV["EMAIL_SENDER"].present?
+  default from: email_address_with_name(ENV.fetch("EMAIL_SENDER", "sender@maybe.local"), "Maybe Finance")
   layout "mailer"
 end
diff --git a/app/mailers/email_confirmation_mailer.rb b/app/mailers/email_confirmation_mailer.rb
new file mode 100644
index 00000000..3ad99b96
--- /dev/null
+++ b/app/mailers/email_confirmation_mailer.rb
@@ -0,0 +1,15 @@
+class EmailConfirmationMailer < ApplicationMailer
+  # Subject can be set in your I18n file at config/locales/en.yml
+  # with the following lookup:
+  #
+  #   en.email_confirmation_mailer.confirmation_email.subject
+  #
+  def confirmation_email
+    @user = params[:user]
+    @subject = t(".subject")
+    @cta = t(".cta")
+    @confirmation_url = new_email_confirmation_url(token: @user.generate_token_for(:email_confirmation))
+
+    mail to: @user.unconfirmed_email, subject: @subject
+  end
+end
diff --git a/app/mailers/invitation_mailer.rb b/app/mailers/invitation_mailer.rb
new file mode 100644
index 00000000..d43a42fe
--- /dev/null
+++ b/app/mailers/invitation_mailer.rb
@@ -0,0 +1,11 @@
+class InvitationMailer < ApplicationMailer
+  def invite_email(invitation)
+    @invitation = invitation
+    @accept_url = accept_invitation_url(@invitation.token)
+
+    mail(
+      to: @invitation.email,
+      subject: t(".subject", inviter: @invitation.inviter.display_name)
+    )
+  end
+end
diff --git a/app/models/account.rb b/app/models/account.rb
index 61d473d8..6a21c3e3 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -1,131 +1,163 @@
 class Account < ApplicationRecord
-  include Syncable, Monetizable, Issuable
+  include AASM, Syncable, Monetizable, Chartable, Linkable, Enrichable, Anchorable, Reconcileable
 
   validates :name, :balance, :currency, presence: true
 
   belongs_to :family
-  belongs_to :institution, optional: true
   belongs_to :import, optional: true
 
   has_many :import_mappings, as: :mappable, dependent: :destroy, class_name: "Import::Mapping"
-  has_many :entries, dependent: :destroy, class_name: "Account::Entry"
-  has_many :transactions, through: :entries, source: :entryable, source_type: "Account::Transaction"
-  has_many :valuations, through: :entries, source: :entryable, source_type: "Account::Valuation"
-  has_many :trades, through: :entries, source: :entryable, source_type: "Account::Trade"
+  has_many :entries, dependent: :destroy
+  has_many :transactions, through: :entries, source: :entryable, source_type: "Transaction"
+  has_many :valuations, through: :entries, source: :entryable, source_type: "Valuation"
+  has_many :trades, through: :entries, source: :entryable, source_type: "Trade"
   has_many :holdings, dependent: :destroy
   has_many :balances, dependent: :destroy
-  has_many :syncs, dependent: :destroy
-  has_many :issues, as: :issuable, dependent: :destroy
 
-  monetize :balance
+  monetize :balance, :cash_balance
 
   enum :classification, { asset: "asset", liability: "liability" }, validate: { allow_nil: true }
 
-  scope :active, -> { where(is_active: true) }
+  scope :visible, -> { where(status: [ "draft", "active" ]) }
   scope :assets, -> { where(classification: "asset") }
   scope :liabilities, -> { where(classification: "liability") }
   scope :alphabetically, -> { order(:name) }
-  scope :ungrouped, -> { where(institution_id: nil) }
+  scope :manual, -> { where(plaid_account_id: nil) }
+
+  has_one_attached :logo
 
   delegated_type :accountable, types: Accountable::TYPES, dependent: :destroy
 
-  accepts_nested_attributes_for :accountable
+  accepts_nested_attributes_for :accountable, update_only: true
 
-  delegate :value, :series, to: :accountable
+  # Account state machine
+  aasm column: :status, timestamps: true do
+    state :active, initial: true
+    state :draft
+    state :disabled
+    state :pending_deletion
+
+    event :activate do
+      transitions from: [ :draft, :disabled ], to: :active
+    end
+
+    event :disable do
+      transitions from: [ :draft, :active ], to: :disabled
+    end
+
+    event :enable do
+      transitions from: :disabled, to: :active
+    end
+
+    event :mark_for_deletion do
+      transitions from: [ :draft, :active, :disabled ], to: :pending_deletion
+    end
+  end
 
   class << self
-    def by_group(period: Period.all, currency: Money.default_currency.iso_code)
-      grouped_accounts = { assets: ValueGroup.new("Assets", currency), liabilities: ValueGroup.new("Liabilities", currency) }
+    def create_and_sync(attributes)
+      attributes[:accountable_attributes] ||= {} # Ensure accountable is created, even if empty
+      account = new(attributes.merge(cash_balance: attributes[:balance]))
+      initial_balance = attributes.dig(:accountable_attributes, :initial_balance)&.to_d
 
-      Accountable.by_classification.each do |classification, types|
-        types.each do |type|
-          accounts = self.where(accountable_type: type)
-          if accounts.any?
-            group = grouped_accounts[classification.to_sym].add_child_group(type, currency)
-            accounts.each do |account|
-              group.add_value_node(
-                account,
-                account.balance_money.exchange_to(currency, fallback_rate: 0),
-                account.series(period: period, currency: currency)
-              )
-            end
-          end
-        end
-      end
-
-      grouped_accounts
-    end
-
-    def create_with_optional_start_balance!(attributes:, start_date: nil, start_balance: nil)
       transaction do
-        attributes[:accountable_attributes] ||= {} # Ensure accountable is created
-        account = new(attributes)
-
-        # Always initialize an account with a valuation entry to begin tracking value history
-        account.entries.build \
-          date: Date.current,
-          amount: account.balance,
-          currency: account.currency,
-          entryable: Account::Valuation.new
-
-        if start_date.present? && start_balance.present?
-          account.entries.build \
-            date: start_date,
-            amount: start_balance,
-            currency: account.currency,
-            entryable: Account::Valuation.new
-        end
-
         account.save!
-        account
+
+        manager = Account::OpeningBalanceManager.new(account)
+        result = manager.set_opening_balance(balance: initial_balance || account.balance)
+        raise result.error if result.error
       end
+
+      account.sync_later
+      account
     end
   end
 
-  def original_balance
-    balance_amount = balances.chronological.first&.balance || balance
-    Money.new(balance_amount, currency)
-  end
+  def institution_domain
+    url_string = plaid_account&.plaid_item&.institution_url
+    return nil unless url_string.present?
 
-  def owns_ticker?(ticker)
-    security_id = Security.find_by(ticker: ticker)&.id
-    entries.account_trades
-           .joins("JOIN account_trades ON account_entries.entryable_id = account_trades.id")
-           .where(account_trades: { security_id: security_id }).any?
-  end
-
-  def favorable_direction
-    classification == "asset" ? "up" : "down"
-  end
-
-  def update_with_sync!(attributes)
-    transaction do
-      update!(attributes)
-      update_balance!(attributes[:balance]) if attributes[:balance]
+    begin
+      uri = URI.parse(url_string)
+      # Use safe navigation on .host before calling gsub
+      uri.host&.gsub(/^www\./, "")
+    rescue URI::InvalidURIError
+      # Log a warning if the URL is invalid and return nil
+      Rails.logger.warn("Invalid institution URL encountered for account #{id}: #{url_string}")
+      nil
     end
-
-    sync_later
   end
 
-  def update_balance!(balance)
-    valuation = entries.account_valuations.find_by(date: Date.current)
+  def destroy_later
+    mark_for_deletion!
+    DestroyJob.perform_later(self)
+  end
 
-    if valuation
-      valuation.update! amount: balance
+  # Override destroy to handle error recovery for accounts
+  def destroy
+    super
+  rescue => e
+    # If destruction fails, transition back to disabled state
+    # This provides a cleaner recovery path than the generic scheduled_for_deletion flag
+    disable! if may_disable?
+    raise e
+  end
+
+  def current_holdings
+    holdings.where(currency: currency)
+            .where.not(qty: 0)
+            .where(
+              id: holdings.select("DISTINCT ON (security_id) id")
+                          .where(currency: currency)
+                          .order(:security_id, date: :desc)
+            )
+            .order(amount: :desc)
+  end
+
+  def start_date
+    first_entry_date = entries.minimum(:date) || Date.current
+    first_entry_date - 1.day
+  end
+
+  def lock_saved_attributes!
+    super
+    accountable.lock_saved_attributes!
+  end
+
+  def first_valuation
+    entries.valuations.order(:date).first
+  end
+
+  def first_valuation_amount
+    first_valuation&.amount_money || balance_money
+  end
+
+  # Get short version of the subtype label
+  def short_subtype_label
+    accountable_class.short_subtype_label_for(subtype) || accountable_class.display_name
+  end
+
+  # Get long version of the subtype label
+  def long_subtype_label
+    accountable_class.long_subtype_label_for(subtype) || accountable_class.display_name
+  end
+
+  # The balance type determines which "component" of balance is being tracked.
+  # This is primarily used for balance related calculations and updates.
+  #
+  # "Cash" = "Liquid"
+  # "Non-cash" = "Illiquid"
+  # "Investment" = A mix of both, including brokerage cash (liquid) and holdings (illiquid)
+  def balance_type
+    case accountable_type
+    when "Depository", "CreditCard"
+      :cash
+    when "Property", "Vehicle", "OtherAsset", "Loan", "OtherLiability"
+      :non_cash
+    when "Investment", "Crypto"
+      :investment
     else
-      entries.create! \
-        date: Date.current,
-        amount: balance,
-        currency: currency,
-        entryable: Account::Valuation.new
+      raise "Unknown account type: #{accountable_type}"
     end
   end
-
-  def holding_qty(security, date: Date.current)
-    entries.account_trades
-           .joins("JOIN account_trades ON account_entries.entryable_id = account_trades.id")
-           .where(account_trades: { security_id: security.id })
-           .where("account_entries.date <= ?", date)
-           .sum("account_trades.qty")
-  end
 end
diff --git a/app/models/account/activity_feed_data.rb b/app/models/account/activity_feed_data.rb
new file mode 100644
index 00000000..28f92a64
--- /dev/null
+++ b/app/models/account/activity_feed_data.rb
@@ -0,0 +1,219 @@
+# Data used to build the paginated feed of account "activity" (events like transfers, deposits, withdrawals, etc.)
+# This data object is useful for avoiding N+1 queries and having an easy way to pass around the required data to the
+# activity feed component in controllers and background jobs that refresh it.
+class Account::ActivityFeedData
+  ActivityDateData = Data.define(:date, :entries, :balance_trend, :cash_balance_trend, :holdings_value_trend, :transfers)
+
+  attr_reader :account, :entries
+
+  def initialize(account, entries)
+    @account = account
+    @entries = entries.to_a
+  end
+
+  def entries_by_date
+    @entries_by_date_objects ||= begin
+      grouped_entries.map do |date, date_entries|
+        ActivityDateData.new(
+          date: date,
+          entries: date_entries,
+          balance_trend: balance_trend_for_date(date),
+          cash_balance_trend: cash_balance_trend_for_date(date),
+          holdings_value_trend: holdings_value_trend_for_date(date),
+          transfers: transfers_for_date(date)
+        )
+      end
+    end
+  end
+
+  private
+    def balance_trend_for_date(date)
+      build_trend_for_date(date, :balance_money)
+    end
+
+    def cash_balance_trend_for_date(date)
+      date_entries = grouped_entries[date] || []
+      has_valuation = date_entries.any?(&:valuation?)
+
+      if has_valuation
+        # When there's a valuation, calculate cash change from transaction entries only
+        transactions = date_entries.select { |e| e.transaction? }
+        cash_change = sum_entries_with_exchange_rates(transactions, date) * -1
+
+        start_balance = start_balance_for_date(date)
+        Trend.new(
+          current: start_balance.cash_balance_money + cash_change,
+          previous: start_balance.cash_balance_money
+        )
+      else
+        build_trend_for_date(date, :cash_balance_money)
+      end
+    end
+
+    def holdings_value_trend_for_date(date)
+      date_entries = grouped_entries[date] || []
+      has_valuation = date_entries.any?(&:valuation?)
+
+      if has_valuation
+        # When there's a valuation, calculate holdings change from trade entries only
+        trades = date_entries.select { |e| e.trade? }
+        holdings_change = sum_entries_with_exchange_rates(trades, date)
+
+        start_balance = start_balance_for_date(date)
+        start_holdings = start_balance.balance_money - start_balance.cash_balance_money
+        Trend.new(
+          current: start_holdings + holdings_change,
+          previous: start_holdings
+        )
+      else
+        build_trend_for_date(date) do |balance|
+          balance.balance_money - balance.cash_balance_money
+        end
+      end
+    end
+
+    def transfers_for_date(date)
+      date_entries = grouped_entries[date] || []
+      return [] if date_entries.empty?
+
+      date_transaction_ids = date_entries.select(&:transaction?).map(&:entryable_id)
+      return [] if date_transaction_ids.empty?
+
+      # Convert to Set for O(1) lookups
+      date_transaction_id_set = Set.new(date_transaction_ids)
+
+      transfers.select { |txfr|
+        date_transaction_id_set.include?(txfr.inflow_transaction_id) ||
+        date_transaction_id_set.include?(txfr.outflow_transaction_id)
+      }
+    end
+
+    def build_trend_for_date(date, method = nil)
+      start_balance = start_balance_for_date(date)
+      end_balance = end_balance_for_date(date)
+
+      if block_given?
+        Trend.new(
+          current: yield(end_balance),
+          previous: yield(start_balance)
+        )
+      else
+        Trend.new(
+          current: end_balance.send(method),
+          previous: start_balance.send(method)
+        )
+      end
+    end
+
+    # Finds the balance on date, or the most recent balance before it ("last observation carried forward")
+    def start_balance_for_date(date)
+      @start_balance_for_date ||= {}
+      @start_balance_for_date[date] ||= last_observed_balance_before_date(date.prev_day) || generate_fallback_balance(date)
+    end
+
+    # Finds the balance on date, or the most recent balance before it ("last observation carried forward")
+    def end_balance_for_date(date)
+      @end_balance_for_date ||= {}
+      @end_balance_for_date[date] ||= last_observed_balance_before_date(date) || generate_fallback_balance(date)
+    end
+
+    RequiredExchangeRate = Data.define(:date, :from, :to)
+
+    def grouped_entries
+      @grouped_entries ||= entries.group_by(&:date)
+    end
+
+    def needs_exchange_rates?
+      entries.any? { |entry| entry.currency != account.currency }
+    end
+
+    def required_exchange_rates
+      multi_currency_entries = entries.select { |entry| entry.currency != account.currency }
+
+      multi_currency_entries.map do |entry|
+        RequiredExchangeRate.new(date: entry.date, from: entry.currency, to: account.currency)
+      end.uniq
+    end
+
+    # If the account has entries denominated in a different currency than the main account, we attach necessary
+    # exchange rates required to "roll up" the entry group balance into the normal account currency.
+    def exchange_rates
+      return [] unless needs_exchange_rates?
+
+      @exchange_rates ||= begin
+        rate_requirements = required_exchange_rates
+        return [] if rate_requirements.empty?
+
+        # Use ActiveRecord's or chain for better performance
+        conditions = rate_requirements.map do |req|
+          ExchangeRate.where(date: req.date, from_currency: req.from, to_currency: req.to)
+        end.reduce(:or)
+
+        conditions.to_a
+      end
+    end
+
+    def exchange_rate_for(date, from_currency, to_currency)
+      return 1.0 if from_currency == to_currency
+
+      rate = exchange_rates.find { |r| r.date == date && r.from_currency == from_currency && r.to_currency == to_currency }
+      rate&.rate || 1.0  # Fallback to 1:1 if no rate found
+    end
+
+    def sum_entries_with_exchange_rates(entries, date)
+      return Money.new(0, account.currency) if entries.empty?
+
+      entries.sum do |entry|
+        amount = entry.amount_money
+        if entry.currency != account.currency
+          rate = exchange_rate_for(date, entry.currency, account.currency)
+          Money.new(amount.amount * rate, account.currency)
+        else
+          amount
+        end
+      end
+    end
+
+    # We read balances so we can show "start of day" -> "end of day" balances for each entry date group in the feed
+    def balances
+      @balances ||= begin
+        return [] if entries.empty?
+
+        min_date = entries.min_by(&:date).date.prev_day
+        max_date = entries.max_by(&:date).date
+
+        account.balances.where(date: min_date..max_date, currency: account.currency).order(:date).to_a
+      end
+    end
+
+    def transaction_ids
+      entries.select { |entry| entry.transaction? }.map(&:entryable_id)
+    end
+
+    def transfers
+      return [] if entries.select { |e| e.transaction? && e.transaction.transfer? }.empty?
+      return [] if transaction_ids.empty?
+
+      @transfers ||= Transfer.where(inflow_transaction_id: transaction_ids).or(Transfer.where(outflow_transaction_id: transaction_ids)).to_a
+    end
+
+    # Use binary search since balances are sorted by date
+    def last_observed_balance_before_date(date)
+      idx = balances.bsearch_index { |b| b.date > date }
+
+      if idx
+        idx > 0 ? balances[idx - 1] : nil
+      else
+        balances.last
+      end
+    end
+
+    def generate_fallback_balance(date)
+      Balance.new(
+        account: account,
+        date: date,
+        balance: 0,
+        currency: account.currency
+      )
+    end
+end
diff --git a/app/models/account/anchorable.rb b/app/models/account/anchorable.rb
new file mode 100644
index 00000000..bb797c85
--- /dev/null
+++ b/app/models/account/anchorable.rb
@@ -0,0 +1,56 @@
+# All accounts are "anchored" with start/end valuation records, with transactions,
+# trades, and reconciliations between them.
+module Account::Anchorable
+  extend ActiveSupport::Concern
+
+  included do
+    include Monetizable
+
+    monetize :opening_balance
+  end
+
+  def set_opening_anchor_balance(**opts)
+    result = opening_balance_manager.set_opening_balance(**opts)
+    sync_later if result.success?
+    result
+  end
+
+  def opening_anchor_date
+    opening_balance_manager.opening_date
+  end
+
+  def opening_anchor_balance
+    opening_balance_manager.opening_balance
+  end
+
+  def has_opening_anchor?
+    opening_balance_manager.has_opening_anchor?
+  end
+
+  def set_current_balance(balance)
+    result = current_balance_manager.set_current_balance(balance)
+    sync_later if result.success?
+    result
+  end
+
+  def current_anchor_balance
+    current_balance_manager.current_balance
+  end
+
+  def current_anchor_date
+    current_balance_manager.current_date
+  end
+
+  def has_current_anchor?
+    current_balance_manager.has_current_anchor?
+  end
+
+  private
+    def opening_balance_manager
+      @opening_balance_manager ||= Account::OpeningBalanceManager.new(self)
+    end
+
+    def current_balance_manager
+      @current_balance_manager ||= Account::CurrentBalanceManager.new(self)
+    end
+end
diff --git a/app/models/account/balance.rb b/app/models/account/balance.rb
deleted file mode 100644
index cd361269..00000000
--- a/app/models/account/balance.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class Account::Balance < ApplicationRecord
-  include Monetizable
-
-  belongs_to :account
-  validates :account, :date, :balance, presence: true
-  monetize :balance
-  scope :in_period, ->(period) { period.date_range.nil? ? all : where(date: period.date_range) }
-  scope :chronological, -> { order(:date) }
-end
diff --git a/app/models/account/balance/syncer.rb b/app/models/account/balance/syncer.rb
deleted file mode 100644
index a937955d..00000000
--- a/app/models/account/balance/syncer.rb
+++ /dev/null
@@ -1,133 +0,0 @@
-class Account::Balance::Syncer
-  def initialize(account, start_date: nil)
-    @account = account
-    @sync_start_date = calculate_sync_start_date(start_date)
-  end
-
-  def run
-    daily_balances = calculate_daily_balances
-    daily_balances += calculate_converted_balances(daily_balances) if account.currency != account.family.currency
-
-    Account::Balance.transaction do
-      upsert_balances!(daily_balances)
-      purge_stale_balances!
-
-      if daily_balances.any?
-        account.reload
-        last_balance = daily_balances.select { |db| db.currency == account.currency }.last&.balance
-        account.update! balance: last_balance
-      end
-    end
-  rescue Money::ConversionError => e
-    account.observe_missing_exchange_rates(from: e.from_currency, to: e.to_currency, dates: [ e.date ])
-  end
-
-  private
-
-    attr_reader :sync_start_date, :account
-
-    def upsert_balances!(balances)
-      current_time = Time.now
-      balances_to_upsert = balances.map do |balance|
-        balance.attributes.slice("date", "balance", "currency").merge("updated_at" => current_time)
-      end
-
-      account.balances.upsert_all(balances_to_upsert, unique_by: %i[account_id date currency])
-    end
-
-    def purge_stale_balances!
-      account.balances.delete_by("date < ?", account_start_date)
-    end
-
-    def calculate_balance_for_date(date, entries:, prior_balance:)
-      valuation = entries.find { |e| e.date == date && e.account_valuation? }
-
-      return valuation.amount if valuation
-      return derived_sync_start_balance(entries) unless prior_balance
-
-      entries = entries.select { |e| e.date == date }
-
-      prior_balance - net_entry_flows(entries)
-    end
-
-    def calculate_daily_balances
-      entries = account.entries.where("date >= ?", sync_start_date).to_a
-      prior_balance = find_prior_balance
-
-      (sync_start_date..Date.current).map do |date|
-        current_balance = calculate_balance_for_date(date, entries:, prior_balance:)
-
-        prior_balance = current_balance
-
-        build_balance(date, current_balance)
-      end
-    end
-
-    def calculate_converted_balances(balances)
-      from_currency = account.currency
-      to_currency = account.family.currency
-
-      if ExchangeRate.exchange_rates_provider.nil?
-        account.observe_missing_exchange_rate_provider
-        return []
-      end
-
-      exchange_rates = ExchangeRate.find_rates from: from_currency,
-                                               to: to_currency,
-                                               start_date: sync_start_date
-
-      missing_exchange_rates = balances.map(&:date) - exchange_rates.map(&:date)
-
-      if missing_exchange_rates.any?
-        account.observe_missing_exchange_rates(from: from_currency, to: to_currency, dates: missing_exchange_rates)
-        return []
-      end
-
-      balances.map do |balance|
-        exchange_rate = exchange_rates.find { |er| er.date == balance.date }
-        build_balance(balance.date, exchange_rate.rate * balance.balance, to_currency)
-      end
-    end
-
-    def build_balance(date, balance, currency = nil)
-      account.balances.build \
-        date: date,
-        balance: balance,
-        currency: currency || account.currency
-    end
-
-    def derived_sync_start_balance(entries)
-      transactions_and_trades = entries.reject { |e| e.account_valuation? }.select { |e| e.date > sync_start_date }
-
-      account.balance + net_entry_flows(transactions_and_trades)
-    end
-
-    def find_prior_balance
-      account.balances.where(currency: account.currency).where("date < ?", sync_start_date).order(date: :desc).first&.balance
-    end
-
-    def net_entry_flows(entries, target_currency = account.currency)
-      converted_entry_amounts = entries.map { |t| t.amount_money.exchange_to(target_currency, date: t.date) }
-
-      flows = converted_entry_amounts.sum(&:amount)
-
-      account.liability? ? flows * -1 : flows
-    end
-
-    def account_start_date
-      @account_start_date ||= begin
-                                oldest_entry_date = account.entries.chronological.first.try(:date)
-
-                                return Date.current unless oldest_entry_date
-
-                                oldest_entry_is_valuation = account.entries.account_valuations.where(date: oldest_entry_date).exists?
-
-                                oldest_entry_date -= 1 unless oldest_entry_is_valuation
-                                oldest_entry_date
-                              end
-    end
-
-    def calculate_sync_start_date(provided_start_date)
-      [ provided_start_date, account_start_date ].compact.max
-    end
-end
diff --git a/app/models/account/chartable.rb b/app/models/account/chartable.rb
new file mode 100644
index 00000000..b4f2645e
--- /dev/null
+++ b/app/models/account/chartable.rb
@@ -0,0 +1,33 @@
+module Account::Chartable
+  extend ActiveSupport::Concern
+
+  def favorable_direction
+    classification == "asset" ? "up" : "down"
+  end
+
+  def balance_series(period: Period.last_30_days, view: :balance, interval: nil)
+    raise ArgumentError, "Invalid view type" unless [ :balance, :cash_balance, :holdings_balance ].include?(view.to_sym)
+
+    @balance_series ||= {}
+
+    memo_key = [ period.start_date, period.end_date, interval ].compact.join("_")
+
+    builder = (@balance_series[memo_key] ||= Balance::ChartSeriesBuilder.new(
+      account_ids: [ id ],
+      currency: self.currency,
+      period: period,
+      favorable_direction: favorable_direction,
+      interval: interval
+    ))
+
+    builder.send("#{view}_series")
+  end
+
+  def sparkline_series
+    cache_key = family.build_cache_key("#{id}_sparkline", invalidate_on_data_updates: true)
+
+    Rails.cache.fetch(cache_key, expires_in: 24.hours) do
+      balance_series
+    end
+  end
+end
diff --git a/app/models/account/current_balance_manager.rb b/app/models/account/current_balance_manager.rb
new file mode 100644
index 00000000..2b1ba630
--- /dev/null
+++ b/app/models/account/current_balance_manager.rb
@@ -0,0 +1,141 @@
+class Account::CurrentBalanceManager
+  InvalidOperation = Class.new(StandardError)
+
+  Result = Struct.new(:success?, :changes_made?, :error, keyword_init: true)
+
+  def initialize(account)
+    @account = account
+  end
+
+  def has_current_anchor?
+    current_anchor_valuation.present?
+  end
+
+  # Our system should always make sure there is a current anchor, and that it is up to date.
+  # The fallback is provided for backwards compatibility, but should not be relied on since account.balance is a "cached/derived" value.
+  def current_balance
+    if current_anchor_valuation
+      current_anchor_valuation.entry.amount
+    else
+      Rails.logger.warn "No current balance anchor found for account #{account.id}. Using cached balance instead, which may be out of date."
+      account.balance
+    end
+  end
+
+  def current_date
+    if current_anchor_valuation
+      current_anchor_valuation.entry.date
+    else
+      Date.current
+    end
+  end
+
+  def set_current_balance(balance)
+    if account.linked?
+      result = set_current_balance_for_linked_account(balance)
+    else
+      result = set_current_balance_for_manual_account(balance)
+    end
+
+    # Update cache field so changes appear immediately to the user
+    account.update!(balance: balance)
+
+    result
+  rescue => e
+    Result.new(success?: false, changes_made?: false, error: e.message)
+  end
+
+  private
+    attr_reader :account
+
+    def opening_balance_manager
+      @opening_balance_manager ||= Account::OpeningBalanceManager.new(account)
+    end
+
+    def reconciliation_manager
+      @reconciliation_manager ||= Account::ReconciliationManager.new(account)
+    end
+
+    # Manual accounts do not manage the `current_anchor` valuation (otherwise, user would need to continually update it, which is bad UX)
+    # Instead, we use a combination of "auto-update strategies" to set the current balance according to the user's intent.
+    #
+    # The "auto-update strategies" are:
+    # 1. Value tracking - If the account has a reconciliation already, we assume they are tracking the account value primarily with reconciliations, so we append a new one
+    # 2. Transaction adjustment - If the account doesn't have recons, we assume user is tracking with transactions, so we adjust the opening balance with a delta until it
+    #                             gets us to the desired balance. This ensures we don't append unnecessary reconciliations to the account, which "reset" the value from that
+    #                             date forward (not user's intent).
+    #
+    # For more documentation on these auto-update strategies, see the test cases.
+    def set_current_balance_for_manual_account(balance)
+      # If we're dealing with a cash account that has no reconciliations, use "Transaction adjustment" strategy (update opening balance to "back in" to the desired current balance)
+      if account.balance_type == :cash && account.valuations.reconciliation.empty?
+        adjust_opening_balance_with_delta(new_balance: balance, old_balance: account.balance)
+      else
+        existing_reconciliation = account.entries.valuations.find_by(date: Date.current)
+
+        result = reconciliation_manager.reconcile_balance(balance: balance, date: Date.current, existing_valuation_entry: existing_reconciliation)
+
+        # Normalize to expected result format
+        Result.new(success?: result.success?, changes_made?: true, error: result.error_message)
+      end
+    end
+
+    def adjust_opening_balance_with_delta(new_balance:, old_balance:)
+      delta = new_balance - old_balance
+
+      result = opening_balance_manager.set_opening_balance(balance: account.opening_anchor_balance + delta)
+
+      # Normalize to expected result format
+      Result.new(success?: result.success?, changes_made?: true, error: result.error)
+    end
+
+    # Linked accounts manage "current balance" via the special `current_anchor` valuation.
+    # This is NOT a user-facing feature, and is primarily used in "processors" while syncing
+    # linked account data (e.g. via Plaid)
+    def set_current_balance_for_linked_account(balance)
+      if current_anchor_valuation
+        changes_made = update_current_anchor(balance)
+        Result.new(success?: true, changes_made?: changes_made, error: nil)
+      else
+        create_current_anchor(balance)
+        Result.new(success?: true, changes_made?: true, error: nil)
+      end
+    end
+
+    def current_anchor_valuation
+      @current_anchor_valuation ||= account.valuations.current_anchor.includes(:entry).first
+    end
+
+    def create_current_anchor(balance)
+      account.entries.create!(
+        date: Date.current,
+        name: Valuation.build_current_anchor_name(account.accountable_type),
+        amount: balance,
+        currency: account.currency,
+        entryable: Valuation.new(kind: "current_anchor")
+      )
+    end
+
+    def update_current_anchor(balance)
+      changes_made = false
+
+      ActiveRecord::Base.transaction do
+        # Update associated entry attributes
+        entry = current_anchor_valuation.entry
+
+        if entry.amount != balance
+          entry.amount = balance
+          changes_made = true
+        end
+
+        if entry.date != Date.current
+          entry.date = Date.current
+          changes_made = true
+        end
+
+        entry.save! if entry.changed?
+      end
+
+      changes_made
+    end
+end
diff --git a/app/models/account/entry.rb b/app/models/account/entry.rb
deleted file mode 100644
index 5b5ada42..00000000
--- a/app/models/account/entry.rb
+++ /dev/null
@@ -1,226 +0,0 @@
-class Account::Entry < ApplicationRecord
-  include Monetizable
-
-  monetize :amount
-
-  belongs_to :account
-  belongs_to :transfer, optional: true
-  belongs_to :import, optional: true
-
-  delegated_type :entryable, types: Account::Entryable::TYPES, dependent: :destroy
-  accepts_nested_attributes_for :entryable
-
-  validates :date, :amount, :currency, presence: true
-  validates :date, uniqueness: { scope: [ :account_id, :entryable_type ] }, if: -> { account_valuation? }
-  validates :date, comparison: { greater_than: -> { min_supported_date } }
-
-  scope :chronological, -> { order(:date, :created_at) }
-  scope :reverse_chronological, -> { order(date: :desc, created_at: :desc) }
-  scope :without_transfers, -> { where(marked_as_transfer: false) }
-  scope :with_converted_amount, ->(currency) {
-    # Join with exchange rates to convert the amount to the given currency
-    # If no rate is available, exclude the transaction from the results
-    select(
-      "account_entries.*",
-      "account_entries.amount * COALESCE(er.rate, 1) AS converted_amount"
-    )
-      .joins(sanitize_sql_array([ "LEFT JOIN exchange_rates er ON account_entries.date = er.date AND account_entries.currency = er.from_currency AND er.to_currency = ?", currency ]))
-      .where("er.rate IS NOT NULL OR account_entries.currency = ?", currency)
-  }
-
-  def sync_account_later
-    if destroyed?
-      sync_start_date = previous_entry&.date
-    else
-      sync_start_date = [ date_previously_was, date ].compact.min
-    end
-
-    account.sync_later(start_date: sync_start_date)
-  end
-
-  def inflow?
-    amount <= 0 && account_transaction?
-  end
-
-  def outflow?
-    amount > 0 && account_transaction?
-  end
-
-  def first_of_type?
-    first_entry = account
-                    .entries
-                    .where("entryable_type = ?", entryable_type)
-                    .order(:date)
-                    .first
-
-    first_entry&.id == id
-  end
-
-  def entryable_name_short
-    entryable_type.demodulize.underscore
-  end
-
-  def trend
-    @trend ||= create_trend
-  end
-
-  class << self
-    # arbitrary cutoff date to avoid expensive sync operations
-    def min_supported_date
-      10.years.ago.to_date
-    end
-
-    def daily_totals(entries, currency, period: Period.last_30_days)
-      # Sum spending and income for each day in the period with the given currency
-      select(
-        "gs.date",
-        "COALESCE(SUM(converted_amount) FILTER (WHERE converted_amount > 0), 0) AS spending",
-        "COALESCE(SUM(-converted_amount) FILTER (WHERE converted_amount < 0), 0) AS income"
-      )
-        .from(entries.with_converted_amount(currency), :e)
-        .joins(sanitize_sql([ "RIGHT JOIN generate_series(?, ?, interval '1 day') AS gs(date) ON e.date = gs.date", period.date_range.first, period.date_range.last ]))
-        .group("gs.date")
-    end
-
-    def daily_rolling_totals(entries, currency, period: Period.last_30_days)
-      # Extend the period to include the rolling window
-      period_with_rolling = period.extend_backward(period.date_range.count.days)
-
-      # Aggregate the rolling sum of spending and income based on daily totals
-      rolling_totals = from(daily_totals(entries, currency, period: period_with_rolling))
-                         .select(
-                           "*",
-                           sanitize_sql_array([ "SUM(spending) OVER (ORDER BY date RANGE BETWEEN INTERVAL ? PRECEDING AND CURRENT ROW) as rolling_spend", "#{period.date_range.count} days" ]),
-                           sanitize_sql_array([ "SUM(income) OVER (ORDER BY date RANGE BETWEEN INTERVAL ? PRECEDING AND CURRENT ROW) as rolling_income", "#{period.date_range.count} days" ])
-                         )
-                         .order(:date)
-
-      # Trim the results to the original period
-      select("*").from(rolling_totals).where("date >= ?", period.date_range.first)
-    end
-
-    def mark_transfers!
-      update_all marked_as_transfer: true
-
-      # Attempt to "auto match" and save a transfer if 2 transactions selected
-      Account::Transfer.new(entries: all).save if all.count == 2
-    end
-
-    def bulk_update!(bulk_update_params)
-      bulk_attributes = {
-        date: bulk_update_params[:date],
-        notes: bulk_update_params[:notes],
-        entryable_attributes: {
-          category_id: bulk_update_params[:category_id],
-          merchant_id: bulk_update_params[:merchant_id]
-        }.compact_blank
-      }.compact_blank
-
-      return 0 if bulk_attributes.blank?
-
-      transaction do
-        all.each do |entry|
-          bulk_attributes[:entryable_attributes][:id] = entry.entryable_id if bulk_attributes[:entryable_attributes].present?
-          entry.update! bulk_attributes
-        end
-      end
-
-      all.size
-    end
-
-    def income_total(currency = "USD")
-      total = without_transfers.account_transactions.includes(:entryable)
-        .where("account_entries.amount <= 0")
-                       .map { |e| e.amount_money.exchange_to(currency, date: e.date, fallback_rate: 0) }
-                       .sum
-
-      Money.new(total, currency)
-    end
-
-    def expense_total(currency = "USD")
-      total = without_transfers.account_transactions.includes(:entryable)
-                       .where("account_entries.amount > 0")
-                       .map { |e| e.amount_money.exchange_to(currency, date: e.date, fallback_rate: 0) }
-                       .sum
-
-      Money.new(total, currency)
-    end
-
-    def search(params)
-      query = all
-      query = query.where("account_entries.name ILIKE ?", "%#{sanitize_sql_like(params[:search])}%") if params[:search].present?
-      query = query.where("account_entries.date >= ?", params[:start_date]) if params[:start_date].present?
-      query = query.where("account_entries.date <= ?", params[:end_date]) if params[:end_date].present?
-
-      if params[:types].present?
-        query = query.where(marked_as_transfer: false) unless params[:types].include?("transfer")
-
-        if params[:types].include?("income") && !params[:types].include?("expense")
-          query = query.where("account_entries.amount < 0")
-        elsif params[:types].include?("expense") && !params[:types].include?("income")
-          query = query.where("account_entries.amount >= 0")
-        end
-      end
-
-      if params[:amount].present? && params[:amount_operator].present?
-        case params[:amount_operator]
-        when "equal"
-          query = query.where("ABS(ABS(account_entries.amount) - ?) <= 0.01", params[:amount].to_f.abs)
-        when "less"
-          query = query.where("ABS(account_entries.amount) < ?", params[:amount].to_f.abs)
-        when "greater"
-          query = query.where("ABS(account_entries.amount) > ?", params[:amount].to_f.abs)
-        end
-      end
-
-      if params[:accounts].present? || params[:account_ids].present?
-        query = query.joins(:account)
-      end
-
-      query = query.where(accounts: { name: params[:accounts] }) if params[:accounts].present?
-      query = query.where(accounts: { id: params[:account_ids] }) if params[:account_ids].present?
-
-      # Search attributes on each entryable to further refine results
-      entryable_ids = entryable_search(params)
-      query = query.where(entryable_id: entryable_ids) unless entryable_ids.nil?
-
-      query
-    end
-
-    private
-
-      def entryable_search(params)
-        entryable_ids = []
-        entryable_search_performed = false
-
-        Account::Entryable::TYPES.map(&:constantize).each do |entryable|
-          next unless entryable.requires_search?(params)
-
-          entryable_search_performed = true
-          entryable_ids += entryable.search(params).pluck(:id)
-        end
-
-        return nil unless entryable_search_performed
-
-        entryable_ids
-      end
-  end
-
-  private
-
-    def previous_entry
-      @previous_entry ||= account
-                            .entries
-                            .where("date < ?", date)
-                            .where("entryable_type = ?", entryable_type)
-                            .order(date: :desc)
-                            .first
-    end
-
-    def create_trend
-      TimeSeries::Trend.new \
-        current: amount_money,
-        previous: previous_entry&.amount_money,
-        favorable_direction: account.favorable_direction
-    end
-end
diff --git a/app/models/account/entry_builder.rb b/app/models/account/entry_builder.rb
deleted file mode 100644
index 0cfa3189..00000000
--- a/app/models/account/entry_builder.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-class Account::EntryBuilder
-  include ActiveModel::Model
-
-  TYPES = %w[income expense buy sell interest transfer_in transfer_out].freeze
-
-  attr_accessor :type, :date, :qty, :ticker, :price, :amount, :currency, :account, :transfer_account_id
-
-  validates :type, inclusion: { in: TYPES }
-
-  def save
-    if valid?
-      create_builder.save
-    end
-  end
-
-  private
-
-    def create_builder
-      case type
-      when "buy", "sell"
-        create_trade_builder
-      else
-        create_transaction_builder
-      end
-    end
-
-    def create_trade_builder
-      Account::TradeBuilder.new \
-        type: type,
-        date: date,
-        qty: qty,
-        ticker: ticker,
-        price: price,
-        account: account
-    end
-
-    def create_transaction_builder
-      Account::TransactionBuilder.new \
-        type: type,
-        date: date,
-        amount: amount,
-        account: account,
-        transfer_account_id: transfer_account_id
-    end
-end
diff --git a/app/models/account/entryable.rb b/app/models/account/entryable.rb
deleted file mode 100644
index 79a47849..00000000
--- a/app/models/account/entryable.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module Account::Entryable
-  extend ActiveSupport::Concern
-
-  TYPES = %w[Account::Valuation Account::Transaction Account::Trade]
-
-  def self.from_type(entryable_type)
-    entryable_type.presence_in(TYPES).constantize
-  end
-
-  included do
-    has_one :entry, as: :entryable, touch: true
-  end
-end
diff --git a/app/models/account/holding/syncer.rb b/app/models/account/holding/syncer.rb
deleted file mode 100644
index 5dfa7644..00000000
--- a/app/models/account/holding/syncer.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-class Account::Holding::Syncer
-  def initialize(account, start_date: nil)
-    @account = account
-    @sync_date_range = calculate_sync_start_date(start_date)..Date.current
-    @portfolio = {}
-
-    load_prior_portfolio if start_date
-  end
-
-  def run
-    holdings = []
-
-    sync_date_range.each do |date|
-      holdings += build_holdings_for_date(date)
-    end
-
-    upsert_holdings holdings
-  end
-
-  private
-
-    attr_reader :account, :sync_date_range
-
-    def sync_entries
-      @sync_entries ||= account.entries
-                               .account_trades
-                               .includes(entryable: :security)
-                               .where("date >= ?", sync_date_range.begin)
-                               .order(:date)
-    end
-
-    def get_cached_price(ticker, date)
-      return nil unless security_prices.key?(ticker)
-
-      price = security_prices[ticker].find { |p| p.date == date }
-      price ? price[:price] : nil
-    end
-
-    def security_prices
-      @security_prices ||= begin
-                             prices = {}
-                             ticker_start_dates = {}
-
-                             sync_entries.each do |entry|
-                               unless ticker_start_dates[entry.account_trade.security.ticker]
-                                 ticker_start_dates[entry.account_trade.security.ticker] = entry.date
-                               end
-                             end
-
-                             ticker_start_dates.each do |ticker, date|
-                               fetched_prices = Security::Price.find_prices(ticker: ticker, start_date: date, end_date: Date.current)
-                               gapfilled_prices = Gapfiller.new(fetched_prices, start_date: date, end_date: Date.current, cache: false).run
-                               prices[ticker] = gapfilled_prices
-                             end
-
-                             prices
-                           end
-    end
-
-    def build_holdings_for_date(date)
-      trades = sync_entries.select { |trade| trade.date == date }
-
-      @portfolio = generate_next_portfolio(@portfolio, trades)
-
-      @portfolio.map do |ticker, holding|
-        trade = trades.find { |trade| trade.account_trade.security_id == holding[:security_id] }
-        trade_price = trade&.account_trade&.price
-
-        price = get_cached_price(ticker, date) || trade_price
-
-        account.observe_missing_price(ticker:, date:) unless price
-
-        account.holdings.build \
-          date: date,
-          security_id: holding[:security_id],
-          qty: holding[:qty],
-          price: price,
-          amount: price ? (price * holding[:qty]) : nil,
-          currency: holding[:currency]
-      end
-    end
-
-    def generate_next_portfolio(prior_portfolio, trade_entries)
-      trade_entries.each_with_object(prior_portfolio) do |entry, new_portfolio|
-        trade = entry.account_trade
-
-        price = trade.price
-        prior_qty = prior_portfolio.dig(trade.security.ticker, :qty) || 0
-        new_qty = prior_qty + trade.qty
-
-        new_portfolio[trade.security.ticker] = {
-          qty: new_qty,
-          price: price,
-          amount: new_qty * price,
-          currency: entry.currency,
-          security_id: trade.security_id
-        }
-      end
-    end
-
-    def upsert_holdings(holdings)
-      current_time = Time.now
-      holdings_to_upsert = holdings.map do |holding|
-        holding.attributes
-               .slice("date", "currency", "qty", "price", "amount", "security_id")
-               .merge("updated_at" => current_time)
-      end
-
-      account.holdings.upsert_all(holdings_to_upsert, unique_by: %i[account_id security_id date currency])
-    end
-
-    def load_prior_portfolio
-      prior_day_holdings = account.holdings.where(date: sync_date_range.begin - 1.day)
-
-      prior_day_holdings.each do |holding|
-        @portfolio[holding.security.ticker] = {
-          qty: holding.qty,
-          price: holding.price,
-          amount: holding.amount,
-          currency: holding.currency,
-          security_id: holding.security_id
-        }
-      end
-    end
-
-    def calculate_sync_start_date(start_date)
-      start_date || account.entries.account_trades.order(:date).first.try(:date) || Date.current
-    end
-end
diff --git a/app/models/account/linkable.rb b/app/models/account/linkable.rb
new file mode 100644
index 00000000..76b41bb1
--- /dev/null
+++ b/app/models/account/linkable.rb
@@ -0,0 +1,19 @@
+module Account::Linkable
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :plaid_account, optional: true
+  end
+
+  # A "linked" account gets transaction and balance data from a third party like Plaid
+  def linked?
+    plaid_account_id.present?
+  end
+
+  # An "offline" or "unlinked" account is one where the user tracks values and
+  # adds transactions manually, without the help of a data provider
+  def unlinked?
+    !linked?
+  end
+  alias_method :manual?, :unlinked?
+end
diff --git a/app/models/account/market_data_importer.rb b/app/models/account/market_data_importer.rb
new file mode 100644
index 00000000..af538314
--- /dev/null
+++ b/app/models/account/market_data_importer.rb
@@ -0,0 +1,82 @@
+class Account::MarketDataImporter
+  attr_reader :account
+
+  def initialize(account)
+    @account = account
+  end
+
+  def import_all
+    import_exchange_rates
+    import_security_prices
+  end
+
+  def import_exchange_rates
+    return unless needs_exchange_rates?
+    return unless ExchangeRate.provider
+
+    pair_dates = {}
+
+    # 1. ENTRY-BASED PAIRS – currencies that differ from the account currency
+    account.entries
+           .where.not(currency: account.currency)
+           .group(:currency)
+           .minimum(:date)
+           .each do |source_currency, date|
+      key = [ source_currency, account.currency ]
+      pair_dates[key] = [ pair_dates[key], date ].compact.min
+    end
+
+    # 2. ACCOUNT-BASED PAIR – convert the account currency to the family currency (if different)
+    if foreign_account?
+      key = [ account.currency, account.family.currency ]
+      pair_dates[key] = [ pair_dates[key], account.start_date ].compact.min
+    end
+
+    pair_dates.each do |(source, target), start_date|
+      ExchangeRate.import_provider_rates(
+        from: source,
+        to: target,
+        start_date: start_date,
+        end_date: Date.current
+      )
+    end
+  end
+
+  def import_security_prices
+    return unless Security.provider
+
+    account_securities = account.trades.map(&:security).uniq
+
+    return if account_securities.empty?
+
+    account_securities.each do |security|
+      security.import_provider_prices(
+        start_date: first_required_price_date(security),
+        end_date: Date.current
+      )
+
+      security.import_provider_details
+    end
+  end
+
+  private
+    # Calculates the first date we require a price for the given security scoped to this account
+    def first_required_price_date(security)
+      account.trades.with_entry
+                    .where(security: security)
+                    .where(entries: { account_id: account.id })
+                    .minimum("entries.date")
+    end
+
+    def needs_exchange_rates?
+      has_multi_currency_entries? || foreign_account?
+    end
+
+    def has_multi_currency_entries?
+      account.entries.where.not(currency: account.currency).exists?
+    end
+
+    def foreign_account?
+      account.currency != account.family.currency
+    end
+end
diff --git a/app/models/account/opening_balance_manager.rb b/app/models/account/opening_balance_manager.rb
new file mode 100644
index 00000000..95597cda
--- /dev/null
+++ b/app/models/account/opening_balance_manager.rb
@@ -0,0 +1,99 @@
+class Account::OpeningBalanceManager
+  Result = Struct.new(:success?, :changes_made?, :error, keyword_init: true)
+
+  def initialize(account)
+    @account = account
+  end
+
+  def has_opening_anchor?
+    opening_anchor_valuation.present?
+  end
+
+  # Most accounts should have an opening anchor. If not, we derive the opening date from the oldest entry date
+  def opening_date
+    return opening_anchor_valuation.entry.date if opening_anchor_valuation.present?
+
+    [
+      account.entries.valuations.order(:date).first&.date,
+      account.entries.where.not(entryable_type: "Valuation").order(:date).first&.date&.prev_day
+    ].compact.min || Date.current
+  end
+
+  def opening_balance
+    opening_anchor_valuation&.entry&.amount || 0
+  end
+
+  def set_opening_balance(balance:, date: nil)
+    resolved_date = date || default_date
+
+    # Validate date is before oldest entry
+    if date && oldest_entry_date && resolved_date >= oldest_entry_date
+      return Result.new(success?: false, changes_made?: false, error: "Opening balance date must be before the oldest entry date")
+    end
+
+    if opening_anchor_valuation.nil?
+      create_opening_anchor(
+        balance: balance,
+        date: resolved_date
+      )
+      Result.new(success?: true, changes_made?: true, error: nil)
+    else
+      changes_made = update_opening_anchor(balance: balance, date: date)
+      Result.new(success?: true, changes_made?: changes_made, error: nil)
+    end
+  end
+
+  private
+    attr_reader :account
+
+    def opening_anchor_valuation
+      @opening_anchor_valuation ||= account.valuations.opening_anchor.includes(:entry).first
+    end
+
+    def oldest_entry_date
+      @oldest_entry_date ||= account.entries.minimum(:date)
+    end
+
+    def default_date
+      if oldest_entry_date
+        [ oldest_entry_date - 1.day, 2.years.ago.to_date ].min
+      else
+        2.years.ago.to_date
+      end
+    end
+
+    def create_opening_anchor(balance:, date:)
+      account.entries.create!(
+        date: date,
+        name: Valuation.build_opening_anchor_name(account.accountable_type),
+        amount: balance,
+        currency: account.currency,
+        entryable: Valuation.new(
+          kind: "opening_anchor"
+        )
+      )
+    end
+
+    def update_opening_anchor(balance:, date: nil)
+      changes_made = false
+
+      ActiveRecord::Base.transaction do
+        # Update associated entry attributes
+        entry = opening_anchor_valuation.entry
+
+        if entry.amount != balance
+          entry.amount = balance
+          changes_made = true
+        end
+
+        if date.present? && entry.date != date
+          entry.date = date
+          changes_made = true
+        end
+
+        entry.save! if entry.changed?
+      end
+
+      changes_made
+    end
+end
diff --git a/app/models/account/reconcileable.rb b/app/models/account/reconcileable.rb
new file mode 100644
index 00000000..67a6b52c
--- /dev/null
+++ b/app/models/account/reconcileable.rb
@@ -0,0 +1,20 @@
+module Account::Reconcileable
+  extend ActiveSupport::Concern
+
+  def create_reconciliation(balance:, date:, dry_run: false)
+    result = reconciliation_manager.reconcile_balance(balance: balance, date: date, dry_run: dry_run)
+    sync_later if result.success? && !dry_run
+    result
+  end
+
+  def update_reconciliation(existing_valuation_entry, balance:, date:, dry_run: false)
+    result = reconciliation_manager.reconcile_balance(balance: balance, date: date, existing_valuation_entry: existing_valuation_entry, dry_run: dry_run)
+    sync_later if result.success? && !dry_run
+    result
+  end
+
+  private
+    def reconciliation_manager
+      @reconciliation_manager ||= Account::ReconciliationManager.new(self)
+    end
+end
diff --git a/app/models/account/reconciliation_manager.rb b/app/models/account/reconciliation_manager.rb
new file mode 100644
index 00000000..aac821b2
--- /dev/null
+++ b/app/models/account/reconciliation_manager.rb
@@ -0,0 +1,89 @@
+class Account::ReconciliationManager
+  attr_reader :account
+
+  def initialize(account)
+    @account = account
+  end
+
+  # Reconciles balance by creating a Valuation entry. If existing valuation is provided, it will be updated instead of creating a new one.
+  def reconcile_balance(balance:, date: Date.current, dry_run: false, existing_valuation_entry: nil)
+    old_balance_components = old_balance_components(reconciliation_date: date, existing_valuation_entry: existing_valuation_entry)
+    prepared_valuation = prepare_reconciliation(balance, date, existing_valuation_entry)
+
+    unless dry_run
+      prepared_valuation.save!
+    end
+
+    ReconciliationResult.new(
+      success?: true,
+      old_cash_balance: old_balance_components[:cash_balance],
+      old_balance: old_balance_components[:balance],
+      new_cash_balance: derived_cash_balance(date: date, total_balance: prepared_valuation.amount),
+      new_balance: prepared_valuation.amount,
+      error_message: nil
+    )
+  rescue => e
+    ReconciliationResult.new(
+      success?: false,
+      error_message: e.message
+    )
+  end
+
+  private
+    # Returns before -> after OR error message
+    ReconciliationResult = Struct.new(
+      :success?,
+      :old_cash_balance,
+      :old_balance,
+      :new_cash_balance,
+      :new_balance,
+      :error_message,
+      keyword_init: true
+    )
+
+    def prepare_reconciliation(balance, date, existing_valuation)
+      valuation_record = existing_valuation ||
+                         account.entries.valuations.find_by(date: date) || # In case of conflict, where existing valuation is not passed as arg, but one exists
+                         account.entries.build(
+                                  name: Valuation.build_reconciliation_name(account.accountable_type),
+                                  entryable: Valuation.new(kind: "reconciliation")
+                                )
+
+      valuation_record.assign_attributes(
+        date: date,
+        amount: balance,
+        currency: account.currency
+      )
+
+      valuation_record
+    end
+
+    def derived_cash_balance(date:, total_balance:)
+      balance_components_for_reconciliation_date = get_balance_components_for_date(date)
+
+      return nil unless balance_components_for_reconciliation_date[:balance] && balance_components_for_reconciliation_date[:cash_balance]
+
+      # We calculate the existing non-cash balance, which for investments would represents "holdings" for the date of reconciliation
+      # Since the user is setting "total balance", we have to subtract the existing non-cash balance from the total balance to get the new cash balance
+      existing_non_cash_balance = balance_components_for_reconciliation_date[:balance] - balance_components_for_reconciliation_date[:cash_balance]
+
+      total_balance - existing_non_cash_balance
+    end
+
+    def old_balance_components(reconciliation_date:, existing_valuation_entry: nil)
+      if existing_valuation_entry
+        get_balance_components_for_date(existing_valuation_entry.date)
+      else
+        get_balance_components_for_date(reconciliation_date)
+      end
+    end
+
+    def get_balance_components_for_date(date)
+      balance_record = account.balances.find_by(date: date, currency: account.currency)
+
+      {
+        cash_balance: balance_record&.cash_balance,
+        balance: balance_record&.balance
+      }
+    end
+end
diff --git a/app/models/account/sync.rb b/app/models/account/sync.rb
deleted file mode 100644
index 28ae251a..00000000
--- a/app/models/account/sync.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-class Account::Sync < ApplicationRecord
-  belongs_to :account
-
-  enum :status, { pending: "pending", syncing: "syncing", completed: "completed", failed: "failed" }
-
-  class << self
-    def for(account, start_date: nil)
-      create! account: account, start_date: start_date
-    end
-
-    def latest
-      order(created_at: :desc).first
-    end
-  end
-
-  def run
-    start!
-
-    account.resolve_stale_issues
-
-    sync_balances
-    sync_holdings
-
-    complete!
-  rescue StandardError => error
-    account.observe_unknown_issue(error)
-    fail! error
-
-    raise error if Rails.env.development?
-  end
-
-  private
-
-    def sync_balances
-      Account::Balance::Syncer.new(account, start_date: start_date).run
-    end
-
-    def sync_holdings
-      Account::Holding::Syncer.new(account, start_date: start_date).run
-    end
-
-    def start!
-      update! status: "syncing", last_ran_at: Time.now
-      broadcast_start
-    end
-
-    def complete!
-      update! status: "completed"
-
-      if account.has_issues?
-        broadcast_result type: "alert", message: account.highest_priority_issue.title
-      else
-        broadcast_result type: "notice", message: "Sync complete"
-      end
-    end
-
-    def fail!(error)
-      update! status: "failed", error: error.message
-      broadcast_result type: "alert", message: I18n.t("account.sync.failed")
-    end
-
-    def broadcast_start
-      broadcast_append_to(
-        [ account.family, :notifications ],
-        target: "notification-tray",
-        partial: "shared/notification",
-        locals: { id: id, type: "processing", message: "Syncing account balances" }
-      )
-    end
-
-    def broadcast_result(type:, message:)
-      broadcast_remove_to account.family, :notifications, target: id # Remove persistent syncing notification
-      broadcast_append_to(
-        [ account.family, :notifications ],
-        target: "notification-tray",
-        partial: "shared/notification",
-        locals: { type: type, message: message }
-      )
-
-      account.family.broadcast_refresh
-    end
-end
diff --git a/app/models/account/sync_complete_event.rb b/app/models/account/sync_complete_event.rb
new file mode 100644
index 00000000..d26b62f8
--- /dev/null
+++ b/app/models/account/sync_complete_event.rb
@@ -0,0 +1,63 @@
+class Account::SyncCompleteEvent
+  attr_reader :account
+
+  Error = Class.new(StandardError)
+
+  def initialize(account)
+    @account = account
+  end
+
+  def broadcast
+    # Replace account row in accounts list
+    account.broadcast_replace_to(
+      account.family,
+      target: "account_#{account.id}",
+      partial: "accounts/account",
+      locals: { account: account }
+    )
+
+    # Replace the groups this account belongs to in both desktop and mobile sidebars
+    sidebar_targets.each do |(tab, mobile_flag)|
+      account.broadcast_replace_to(
+        account.family,
+        target: account_group.dom_id(tab: tab, mobile: mobile_flag),
+        partial: "accounts/accountable_group",
+        locals: { account_group: account_group, open: true, all_tab: tab == :all, mobile: mobile_flag }
+      )
+    end
+
+    # If this is a manual, unlinked account (i.e. not part of a Plaid Item),
+    # trigger the family sync complete broadcast so net worth graph is updated
+    unless account.linked?
+      account.family.broadcast_sync_complete
+    end
+
+    # Refresh entire account page (only applies if currently viewing this account)
+    account.broadcast_refresh
+  end
+
+  private
+    # Returns an array of [tab, mobile?] tuples that should receive an update.
+    # We broadcast to both the classification-specific tab and the "all" tab,
+    # for desktop (mobile: false) and mobile (mobile: true) variants.
+    def sidebar_targets
+      return [] unless account_group.present?
+
+      [
+        [ account_group.classification.to_sym, false ],
+        [ :all, false ],
+        [ account_group.classification.to_sym, true ],
+        [ :all, true ]
+      ]
+    end
+
+    def account_group
+      family_balance_sheet.account_groups.find do |group|
+        group.accounts.any? { |a| a.id == account.id }
+      end
+    end
+
+    def family_balance_sheet
+      account.family.balance_sheet
+    end
+end
diff --git a/app/models/account/syncable.rb b/app/models/account/syncable.rb
deleted file mode 100644
index 382d401f..00000000
--- a/app/models/account/syncable.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-module Account::Syncable
-  extend ActiveSupport::Concern
-
-  class_methods do
-    def sync(start_date: nil)
-      all.each { |a| a.sync_later(start_date: start_date) }
-    end
-  end
-
-  def syncing?
-    syncs.syncing.any?
-  end
-
-  def latest_sync_date
-    syncs.where.not(last_ran_at: nil).pluck(:last_ran_at).max&.to_date
-  end
-
-  def needs_sync?
-    latest_sync_date.nil? || latest_sync_date < Date.current
-  end
-
-  def sync_later(start_date: nil)
-    AccountSyncJob.perform_later(self, start_date: start_date)
-  end
-
-  def sync(start_date: nil)
-    Account::Sync.for(self, start_date: start_date).run
-  end
-end
diff --git a/app/models/account/syncer.rb b/app/models/account/syncer.rb
new file mode 100644
index 00000000..ab198a95
--- /dev/null
+++ b/app/models/account/syncer.rb
@@ -0,0 +1,37 @@
+class Account::Syncer
+  attr_reader :account
+
+  def initialize(account)
+    @account = account
+  end
+
+  def perform_sync(sync)
+    Rails.logger.info("Processing balances (#{account.linked? ? 'reverse' : 'forward'})")
+    import_market_data
+    materialize_balances
+  end
+
+  def perform_post_sync
+    account.family.auto_match_transfers!
+  end
+
+  private
+    def materialize_balances
+      strategy = account.linked? ? :reverse : :forward
+      Balance::Materializer.new(account, strategy: strategy).materialize_balances
+    end
+
+    # Syncs all the exchange rates + security prices this account needs to display historical chart data
+    #
+    # This is a *supplemental* sync.  The daily market data sync should have already populated
+    # a majority or all of this data, so this is often a no-op.
+    #
+    # We rescue errors here because if this operation fails, we don't want to fail the entire sync since
+    # we have reasonable fallbacks for missing market data.
+    def import_market_data
+      Account::MarketDataImporter.new(account).import_all
+    rescue => e
+      Rails.logger.error("Error syncing market data for account #{account.id}: #{e.message}")
+      Sentry.capture_exception(e)
+    end
+end
diff --git a/app/models/account/trade.rb b/app/models/account/trade.rb
deleted file mode 100644
index a594ee16..00000000
--- a/app/models/account/trade.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-class Account::Trade < ApplicationRecord
-  include Account::Entryable, Monetizable
-
-  monetize :price
-
-  belongs_to :security
-
-  validates :qty, presence: true, numericality: { other_than: 0 }
-  validates :price, :currency, presence: true
-
-  class << self
-    def search(_params)
-      all
-    end
-
-    def requires_search?(_params)
-      false
-    end
-  end
-
-  def sell?
-    qty < 0
-  end
-
-  def buy?
-    qty > 0
-  end
-
-  def unrealized_gain_loss
-    return nil if sell?
-    current_price = security.current_price
-    return nil if current_price.nil?
-
-    current_value = current_price * qty.abs
-    cost_basis = price_money * qty.abs
-
-    TimeSeries::Trend.new(current: current_value, previous: cost_basis)
-  end
-end
diff --git a/app/models/account/trade_builder.rb b/app/models/account/trade_builder.rb
deleted file mode 100644
index 1dfad971..00000000
--- a/app/models/account/trade_builder.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-class Account::TradeBuilder < Account::EntryBuilder
-  include ActiveModel::Model
-
-  TYPES = %w[buy sell].freeze
-
-  attr_accessor :type, :qty, :price, :ticker, :date, :account
-
-  validates :type, :qty, :price, :ticker, :date, presence: true
-  validates :price, numericality: { greater_than: 0 }
-  validates :type, inclusion: { in: TYPES }
-
-  def save
-    if valid?
-      create_entry
-    end
-  end
-
-  private
-
-    def create_entry
-      account.entries.account_trades.create! \
-        date: date,
-        amount: amount,
-        currency: account.currency,
-        entryable: Account::Trade.new(
-          security: security,
-          qty: signed_qty,
-          price: price.to_d,
-          currency: account.currency
-        )
-    end
-
-    def security
-      Security.find_or_create_by(ticker: ticker)
-    end
-
-    def amount
-      price.to_d * signed_qty
-    end
-
-    def signed_qty
-      _qty = qty.to_d
-      _qty = _qty * -1 if type == "sell"
-      _qty
-    end
-end
diff --git a/app/models/account/transaction.rb b/app/models/account/transaction.rb
deleted file mode 100644
index bf08ef0c..00000000
--- a/app/models/account/transaction.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-class Account::Transaction < ApplicationRecord
-  include Account::Entryable
-
-  belongs_to :category, optional: true
-  belongs_to :merchant, optional: true
-  has_many :taggings, as: :taggable, dependent: :destroy
-  has_many :tags, through: :taggings
-
-  accepts_nested_attributes_for :taggings, allow_destroy: true
-
-  scope :active, -> { where(excluded: false) }
-
-  class << self
-    def search(params)
-      query = all
-      query = query.joins(:category).where(categories: { name: params[:categories] }) if params[:categories].present?
-      query = query.joins(:merchant).where(merchants: { name: params[:merchants] }) if params[:merchants].present?
-
-      if params[:tags].present?
-        query = query.joins(:tags)
-                     .where(tags: { name: params[:tags] })
-                     .distinct
-      end
-
-      query
-    end
-
-    def requires_search?(params)
-      searchable_keys.any? { |key| params.key?(key) }
-    end
-
-    private
-
-      def searchable_keys
-        %i[categories merchants tags]
-      end
-  end
-
-  private
-    def previous_transaction_date
-      self.account
-          .transactions
-          .where("date < ?", date)
-          .order(date: :desc)
-          .first&.date
-    end
-end
diff --git a/app/models/account/transaction_builder.rb b/app/models/account/transaction_builder.rb
deleted file mode 100644
index b6968443..00000000
--- a/app/models/account/transaction_builder.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-class Account::TransactionBuilder
-  include ActiveModel::Model
-
-  TYPES = %w[income expense interest transfer_in transfer_out].freeze
-
-  attr_accessor :type, :amount, :date, :account, :transfer_account_id
-
-  validates :type, :amount, :date, presence: true
-  validates :type, inclusion: { in: TYPES }
-
-  def save
-    if valid?
-      transfer? ? create_transfer : create_transaction
-    end
-  end
-
-  private
-
-    def transfer?
-      %w[transfer_in transfer_out].include?(type)
-    end
-
-    def create_transfer
-      return create_unlinked_transfer(account.id, signed_amount) if transfer_account_id.blank?
-
-      from_account_id = type == "transfer_in" ? transfer_account_id : account.id
-      to_account_id = type == "transfer_in" ? account.id : transfer_account_id
-
-      outflow = create_unlinked_transfer(from_account_id, signed_amount.abs)
-      inflow = create_unlinked_transfer(to_account_id, signed_amount.abs * -1)
-
-      Account::Transfer.create! entries: [ outflow, inflow ]
-
-      inflow
-    end
-
-    def create_unlinked_transfer(account_id, amount)
-      build_entry(account_id, amount, marked_as_transfer: true).tap(&:save!)
-    end
-
-    def create_transaction
-      build_entry(account.id, signed_amount).tap(&:save!)
-    end
-
-    def build_entry(account_id, amount, marked_as_transfer: false)
-      Account::Entry.new \
-        account_id: account_id,
-        amount: amount,
-        currency: account.currency,
-        date: date,
-        marked_as_transfer: marked_as_transfer,
-        entryable: Account::Transaction.new
-    end
-
-    def signed_amount
-      case type
-      when "expense", "transfer_out"
-        amount.to_d
-      else
-        amount.to_d * -1
-      end
-    end
-end
diff --git a/app/models/account/transfer.rb b/app/models/account/transfer.rb
deleted file mode 100644
index 370d53a2..00000000
--- a/app/models/account/transfer.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-class Account::Transfer < ApplicationRecord
-  has_many :entries, dependent: :nullify
-
-  validate :net_zero_flows, if: :single_currency_transfer?
-  validate :transaction_count, :from_different_accounts, :all_transactions_marked
-
-  def date
-    outflow_transaction&.date
-  end
-
-  def amount_money
-    entries.first&.amount_money&.abs || Money.new(0)
-  end
-
-  def from_name
-    outflow_transaction&.account&.name || I18n.t("account/transfer.from_fallback_name")
-  end
-
-  def to_name
-    inflow_transaction&.account&.name || I18n.t("account/transfer.to_fallback_name")
-  end
-
-  def name
-    I18n.t("account/transfer.name", from_account: from_name, to_account: to_name)
-  end
-
-  def inflow_transaction
-    entries.find { |e| e.inflow? }
-  end
-
-  def outflow_transaction
-    entries.find { |e| e.outflow? }
-  end
-
-  def destroy_and_remove_marks!
-    transaction do
-      entries.each do |e|
-        e.update! marked_as_transfer: false
-      end
-
-      destroy!
-    end
-  end
-
-  class << self
-    def build_from_accounts(from_account, to_account, date:, amount:, currency:, name:)
-      outflow = from_account.entries.build \
-        amount: amount.abs,
-        currency: from_account.currency,
-        date: date,
-        name: name,
-        marked_as_transfer: true,
-        entryable: Account::Transaction.new
-
-      inflow = to_account.entries.build \
-        amount: amount.abs * -1,
-        currency: from_account.currency,
-        date: date,
-        name: name,
-        marked_as_transfer: true,
-        entryable: Account::Transaction.new
-
-      new entries: [ outflow, inflow ]
-    end
-  end
-
-  private
-
-    def single_currency_transfer?
-      entries.map { |e| e.currency }.uniq.size == 1
-    end
-
-    def transaction_count
-      unless entries.size == 2
-        errors.add :entries, :must_have_exactly_2_entries
-      end
-    end
-
-    def from_different_accounts
-      accounts = entries.map { |e| e.account_id }.uniq
-      errors.add :entries, :must_be_from_different_accounts if accounts.size < entries.size
-    end
-
-    def net_zero_flows
-      unless entries.sum(&:amount).zero?
-        errors.add :entries, :must_have_an_inflow_and_outflow_that_net_to_zero
-      end
-    end
-
-    def all_transactions_marked
-      unless entries.all?(&:marked_as_transfer)
-        errors.add :entries, :must_be_marked_as_transfer
-      end
-    end
-end
diff --git a/app/models/account/valuation.rb b/app/models/account/valuation.rb
deleted file mode 100644
index 93ebf5ff..00000000
--- a/app/models/account/valuation.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Account::Valuation < ApplicationRecord
-  include Account::Entryable
-
-  class << self
-    def search(_params)
-      all
-    end
-
-    def requires_search?(_params)
-      false
-    end
-  end
-end
diff --git a/app/models/account_import.rb b/app/models/account_import.rb
index 3987a1ff..0ffdcec4 100644
--- a/app/models/account_import.rb
+++ b/app/models/account_import.rb
@@ -1,4 +1,6 @@
 class AccountImport < Import
+  OpeningBalanceError = Class.new(StandardError)
+
   def import!
     transaction do
       rows.each do |row|
@@ -14,6 +16,14 @@ class AccountImport < Import
         )
 
         account.save!
+
+        manager = Account::OpeningBalanceManager.new(account)
+        result = manager.set_opening_balance(balance: row.amount.to_d)
+
+        # Re-raise since we should never have an error here
+        if result.error
+          raise OpeningBalanceError, result.error
+        end
       end
     end
   end
@@ -46,4 +56,8 @@ class AccountImport < Import
 
     CSV.parse(template, headers: true)
   end
+
+  def max_row_count
+    50
+  end
 end
diff --git a/app/models/address.rb b/app/models/address.rb
index 42b8a2fc..60ea58c4 100644
--- a/app/models/address.rb
+++ b/app/models/address.rb
@@ -2,7 +2,7 @@ class Address < ApplicationRecord
   belongs_to :addressable, polymorphic: true
 
   def to_s
-    I18n.t("address.format",
+    string = I18n.t("address.format",
       line1: line1,
       line2: line2,
       county: county,
@@ -11,5 +11,8 @@ class Address < ApplicationRecord
       country: country,
       postal_code: postal_code
     )
+
+    # Clean up the string to maintain I18n comma formatting
+    string.split(",").map(&:strip).reject(&:empty?).join(", ")
   end
 end
diff --git a/app/models/api_key.rb b/app/models/api_key.rb
new file mode 100644
index 00000000..e966c7f6
--- /dev/null
+++ b/app/models/api_key.rb
@@ -0,0 +1,94 @@
+class ApiKey < ApplicationRecord
+  belongs_to :user
+
+  # Use Rails built-in encryption for secure storage
+  encrypts :display_key, deterministic: true
+
+  # Constants
+  SOURCES = [ "web", "mobile" ].freeze
+
+  # Validations
+  validates :display_key, presence: true, uniqueness: true
+  validates :name, presence: true
+  validates :scopes, presence: true
+  validates :source, presence: true, inclusion: { in: SOURCES }
+  validate :scopes_not_empty
+  validate :one_active_key_per_user_per_source, on: :create
+
+  # Callbacks
+  before_validation :set_display_key
+
+  # Scopes
+  scope :active, -> { where(revoked_at: nil).where("expires_at IS NULL OR expires_at > ?", Time.current) }
+
+  # Class methods
+  def self.find_by_value(plain_key)
+    return nil unless plain_key
+
+    # Find by encrypted display_key (deterministic encryption allows querying)
+    find_by(display_key: plain_key)&.tap do |api_key|
+      return api_key if api_key.active?
+    end
+  end
+
+  def self.generate_secure_key
+    SecureRandom.hex(32)
+  end
+
+  # Instance methods
+  def active?
+    !revoked? && !expired?
+  end
+
+  def revoked?
+    revoked_at.present?
+  end
+
+  def expired?
+    expires_at.present? && expires_at < Time.current
+  end
+
+  def key_matches?(plain_key)
+    display_key == plain_key
+  end
+
+  def revoke!
+    update!(revoked_at: Time.current)
+  end
+
+  def update_last_used!
+    update_column(:last_used_at, Time.current)
+  end
+
+  # Get the plain text API key for display (automatically decrypted by Rails)
+  def plain_key
+    display_key
+  end
+
+  # Temporarily store the plain key for creation flow
+  attr_accessor :key
+
+  private
+
+    def set_display_key
+      if key.present?
+        self.display_key = key
+      end
+    end
+
+    def scopes_not_empty
+      if scopes.blank? || (scopes.is_a?(Array) && (scopes.empty? || scopes.all?(&:blank?)))
+        errors.add(:scopes, "must include at least one permission")
+      elsif scopes.is_a?(Array) && scopes.length > 1
+        errors.add(:scopes, "can only have one permission level")
+      elsif scopes.is_a?(Array) && !%w[read read_write].include?(scopes.first)
+        errors.add(:scopes, "must be either 'read' or 'read_write'")
+      end
+    end
+
+    def one_active_key_per_user_per_source
+      if user&.api_keys&.active&.where(source: source)&.where&.not(id: id)&.exists?
+        errors.add(:user, "can only have one active API key per source (#{source})")
+      end
+    end
+end
diff --git a/app/models/assistant.rb b/app/models/assistant.rb
new file mode 100644
index 00000000..c077c2f0
--- /dev/null
+++ b/app/models/assistant.rb
@@ -0,0 +1,75 @@
+class Assistant
+  include Provided, Configurable, Broadcastable
+
+  attr_reader :chat, :instructions
+
+  class << self
+    def for_chat(chat)
+      config = config_for(chat)
+      new(chat, instructions: config[:instructions], functions: config[:functions])
+    end
+  end
+
+  def initialize(chat, instructions: nil, functions: [])
+    @chat = chat
+    @instructions = instructions
+    @functions = functions
+  end
+
+  def respond_to(message)
+    assistant_message = AssistantMessage.new(
+      chat: chat,
+      content: "",
+      ai_model: message.ai_model
+    )
+
+    responder = Assistant::Responder.new(
+      message: message,
+      instructions: instructions,
+      function_tool_caller: function_tool_caller,
+      llm: get_model_provider(message.ai_model)
+    )
+
+    latest_response_id = chat.latest_assistant_response_id
+
+    responder.on(:output_text) do |text|
+      if assistant_message.content.blank?
+        stop_thinking
+
+        Chat.transaction do
+          assistant_message.append_text!(text)
+          chat.update_latest_response!(latest_response_id)
+        end
+      else
+        assistant_message.append_text!(text)
+      end
+    end
+
+    responder.on(:response) do |data|
+      update_thinking("Analyzing your data...")
+
+      if data[:function_tool_calls].present?
+        assistant_message.tool_calls = data[:function_tool_calls]
+        latest_response_id = data[:id]
+      else
+        chat.update_latest_response!(data[:id])
+      end
+    end
+
+    responder.respond(previous_response_id: latest_response_id)
+  rescue => e
+    stop_thinking
+    chat.add_error(e)
+  end
+
+  private
+    attr_reader :functions
+
+    def function_tool_caller
+      function_instances = functions.map do |fn|
+        fn.new(chat.user)
+      end
+
+      @function_tool_caller ||= FunctionToolCaller.new(function_instances)
+    end
+end
diff --git a/app/models/assistant/broadcastable.rb b/app/models/assistant/broadcastable.rb
new file mode 100644
index 00000000..7fd2507b
--- /dev/null
+++ b/app/models/assistant/broadcastable.rb
@@ -0,0 +1,12 @@
+module Assistant::Broadcastable
+  extend ActiveSupport::Concern
+
+  private
+    def update_thinking(thought)
+      chat.broadcast_update target: "thinking-indicator", partial: "chats/thinking_indicator", locals: { chat: chat, message: thought }
+    end
+
+    def stop_thinking
+      chat.broadcast_remove target: "thinking-indicator"
+    end
+end
diff --git a/app/models/assistant/configurable.rb b/app/models/assistant/configurable.rb
new file mode 100644
index 00000000..b28fc523
--- /dev/null
+++ b/app/models/assistant/configurable.rb
@@ -0,0 +1,82 @@
+module Assistant::Configurable
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def config_for(chat)
+      preferred_currency = Money::Currency.new(chat.user.family.currency)
+      preferred_date_format = chat.user.family.date_format
+
+      {
+        instructions: default_instructions(preferred_currency, preferred_date_format),
+        functions: default_functions
+      }
+    end
+
+    private
+      def default_functions
+        [
+          Assistant::Function::GetTransactions,
+          Assistant::Function::GetAccounts,
+          Assistant::Function::GetBalanceSheet,
+          Assistant::Function::GetIncomeStatement
+        ]
+      end
+
+      def default_instructions(preferred_currency, preferred_date_format)
+        <<~PROMPT
+          ## Your identity
+
+          You are a friendly financial assistant for an open source personal finance application called "Maybe", which is short for "Maybe Finance".
+
+          ## Your purpose
+
+          You help users understand their financial data by answering questions about their accounts, transactions, income, expenses, net worth, forecasting and more.
+
+          ## Your rules
+
+          Follow all rules below at all times.
+
+          ### General rules
+
+          - Provide ONLY the most important numbers and insights
+          - Eliminate all unnecessary words and context
+          - Ask follow-up questions to keep the conversation going. Help educate the user about their own data and entice them to ask more questions.
+          - Do NOT add introductions or conclusions
+          - Do NOT apologize or explain limitations
+
+          ### Formatting rules
+
+          - Format all responses in markdown
+          - Format all monetary values according to the user's preferred currency
+          - Format dates in the user's preferred format: #{preferred_date_format}
+
+          #### User's preferred currency
+
+          Maybe is a multi-currency app where each user has a "preferred currency" setting.
+
+          When no currency is specified, use the user's preferred currency for formatting and displaying monetary values.
+
+          - Symbol: #{preferred_currency.symbol}
+          - ISO code: #{preferred_currency.iso_code}
+          - Default precision: #{preferred_currency.default_precision}
+          - Default format: #{preferred_currency.default_format}
+            - Separator: #{preferred_currency.separator}
+            - Delimiter: #{preferred_currency.delimiter}
+
+          ### Rules about financial advice
+
+          You should focus on educating the user about personal finance using their own data so they can make informed decisions.
+
+          - Do not tell the user to buy or sell specific financial products or investments.
+          - Do not make assumptions about the user's financial situation. Use the functions available to get the data you need.
+
+          ### Function calling rules
+
+          - Use the functions available to you to get user financial data and enhance your responses
+          - For functions that require dates, use the current date as your reference point: #{Date.current}
+          - If you suspect that you do not have enough data to 100% accurately answer, be transparent about it and state exactly what
+            the data you're presenting represents and what context it is in (i.e. date range, account, etc.)
+        PROMPT
+      end
+  end
+end
diff --git a/app/models/assistant/function.rb b/app/models/assistant/function.rb
new file mode 100644
index 00000000..97f069cc
--- /dev/null
+++ b/app/models/assistant/function.rb
@@ -0,0 +1,92 @@
+class Assistant::Function
+  class << self
+    def name
+      raise NotImplementedError, "Subclasses must implement the name class method"
+    end
+
+    def description
+      raise NotImplementedError, "Subclasses must implement the description class method"
+    end
+  end
+
+  def initialize(user)
+    @user = user
+  end
+
+  def call(params = {})
+    raise NotImplementedError, "Subclasses must implement the call method"
+  end
+
+  def name
+    self.class.name
+  end
+
+  def description
+    self.class.description
+  end
+
+  def params_schema
+    build_schema
+  end
+
+  # (preferred) when in strict mode, the schema needs to include all properties in required array
+  def strict_mode?
+    true
+  end
+
+  def to_definition
+    {
+      name: name,
+      description: description,
+      params_schema: params_schema,
+      strict: strict_mode?
+    }
+  end
+
+  private
+    attr_reader :user
+
+    def build_schema(properties: {}, required: [])
+      {
+        type: "object",
+        properties: properties,
+        required: required,
+        additionalProperties: false
+      }
+    end
+
+    def family_account_names
+      @family_account_names ||= family.accounts.visible.pluck(:name)
+    end
+
+    def family_category_names
+      @family_category_names ||= begin
+        names = family.categories.pluck(:name)
+        names << "Uncategorized"
+        names
+      end
+    end
+
+    def family_merchant_names
+      @family_merchant_names ||= family.merchants.pluck(:name)
+    end
+
+    def family_tag_names
+      @family_tag_names ||= family.tags.pluck(:name)
+    end
+
+    def family
+      user.family
+    end
+
+    # To save tokens, we provide the AI metadata about the series and a flat array of
+    # raw, formatted values which it can infer dates from
+    def to_ai_time_series(series)
+      {
+        start_date: series.start_date,
+        end_date: series.end_date,
+        interval: series.interval,
+        values: series.values.map { |v| v.trend.current.format }
+      }
+    end
+end
diff --git a/app/models/assistant/function/get_accounts.rb b/app/models/assistant/function/get_accounts.rb
new file mode 100644
index 00000000..f8c6a6db
--- /dev/null
+++ b/app/models/assistant/function/get_accounts.rb
@@ -0,0 +1,40 @@
+class Assistant::Function::GetAccounts < Assistant::Function
+  class << self
+    def name
+      "get_accounts"
+    end
+
+    def description
+      "Use this to see what accounts the user has along with their current and historical balances"
+    end
+  end
+
+  def call(params = {})
+    {
+      as_of_date: Date.current,
+      accounts: family.accounts.includes(:balances).map do |account|
+        {
+          name: account.name,
+          balance: account.balance,
+          currency: account.currency,
+          balance_formatted: account.balance_money.format,
+          classification: account.classification,
+          type: account.accountable_type,
+          start_date: account.start_date,
+          is_plaid_linked: account.plaid_account_id.present?,
+          status: account.status,
+          historical_balances: historical_balances(account)
+        }
+      end
+    }
+  end
+
+  private
+    def historical_balances(account)
+      start_date = [ account.start_date, 5.years.ago.to_date ].max
+      period = Period.custom(start_date: start_date, end_date: Date.current)
+      balance_series = account.balance_series(period: period, interval: "1 month")
+
+      to_ai_time_series(balance_series)
+    end
+end
diff --git a/app/models/assistant/function/get_balance_sheet.rb b/app/models/assistant/function/get_balance_sheet.rb
new file mode 100644
index 00000000..b0e1f0e0
--- /dev/null
+++ b/app/models/assistant/function/get_balance_sheet.rb
@@ -0,0 +1,76 @@
+class Assistant::Function::GetBalanceSheet < Assistant::Function
+  include ActiveSupport::NumberHelper
+
+  class << self
+    def name
+      "get_balance_sheet"
+    end
+
+    def description
+      <<~INSTRUCTIONS
+        Use this to get the user's balance sheet with varying amounts of historical data.
+
+        This is great for answering questions like:
+        - What is the user's net worth?  What is it composed of?
+        - How has the user's wealth changed over time?
+      INSTRUCTIONS
+    end
+  end
+
+  def call(params = {})
+    observation_start_date = [ 5.years.ago.to_date, family.oldest_entry_date ].max
+
+    period = Period.custom(start_date: observation_start_date, end_date: Date.current)
+
+    {
+      as_of_date: Date.current,
+      oldest_account_start_date: family.oldest_entry_date,
+      currency: family.currency,
+      net_worth: {
+        current: family.balance_sheet.net_worth_money.format,
+        monthly_history: historical_data(period)
+      },
+      assets: {
+        current: family.balance_sheet.assets.total_money.format,
+        monthly_history: historical_data(period, classification: "asset")
+      },
+      liabilities: {
+        current: family.balance_sheet.liabilities.total_money.format,
+        monthly_history: historical_data(period, classification: "liability")
+      },
+      insights: insights_data
+    }
+  end
+
+  private
+    def historical_data(period, classification: nil)
+      scope = family.accounts.visible
+      scope = scope.where(classification: classification) if classification.present?
+
+      if period.start_date == Date.current
+        []
+      else
+        account_ids = scope.pluck(:id)
+
+        builder = Balance::ChartSeriesBuilder.new(
+          account_ids: account_ids,
+          currency: family.currency,
+          period: period,
+          favorable_direction: "up",
+          interval: "1 month"
+        )
+
+        to_ai_time_series(builder.balance_series)
+      end
+    end
+
+    def insights_data
+      assets = family.balance_sheet.assets.total
+      liabilities = family.balance_sheet.liabilities.total
+      ratio = liabilities.zero? ? 0 : (liabilities / assets.to_f)
+
+      {
+        debt_to_asset_ratio: number_to_percentage(ratio * 100, precision: 0)
+      }
+    end
+end
diff --git a/app/models/assistant/function/get_income_statement.rb b/app/models/assistant/function/get_income_statement.rb
new file mode 100644
index 00000000..ba3100a9
--- /dev/null
+++ b/app/models/assistant/function/get_income_statement.rb
@@ -0,0 +1,125 @@
+class Assistant::Function::GetIncomeStatement < Assistant::Function
+  include ActiveSupport::NumberHelper
+
+  class << self
+    def name
+      "get_income_statement"
+    end
+
+    def description
+      <<~INSTRUCTIONS
+        Use this to get income and expense insights by category, for a specific time period
+
+        This is great for answering questions like:
+        - What is the user's net income for the current month?
+        - What are the user's spending habits?
+        - How much income or spending did the user have over a specific time period?
+
+        Simple example:
+
+        ```
+        get_income_statement({
+          start_date: "2024-01-01",
+          end_date: "2024-12-31"
+        })
+        ```
+      INSTRUCTIONS
+    end
+  end
+
+  def call(params = {})
+    period = Period.custom(start_date: Date.parse(params["start_date"]), end_date: Date.parse(params["end_date"]))
+    income_data = family.income_statement.income_totals(period: period)
+    expense_data = family.income_statement.expense_totals(period: period)
+
+    {
+      currency: family.currency,
+      period: {
+        start_date: period.start_date,
+        end_date: period.end_date
+      },
+      income: {
+        total: format_money(income_data.total),
+        by_category: to_ai_category_totals(income_data.category_totals)
+      },
+      expense: {
+        total: format_money(expense_data.total),
+        by_category: to_ai_category_totals(expense_data.category_totals)
+      },
+      insights: get_insights(income_data, expense_data)
+    }
+  end
+
+  def params_schema
+    build_schema(
+      required: [ "start_date", "end_date" ],
+      properties: {
+        start_date: {
+          type: "string",
+          description: "Start date for aggregation period in YYYY-MM-DD format"
+        },
+        end_date: {
+          type: "string",
+          description: "End date for aggregation period in YYYY-MM-DD format"
+        }
+      }
+    )
+  end
+
+  private
+    def format_money(value)
+      Money.new(value, family.currency).format
+    end
+
+    def calculate_savings_rate(total_income, total_expenses)
+      return 0 if total_income.zero?
+      savings = total_income - total_expenses
+      rate = (savings / total_income.to_f) * 100
+      rate.round(2)
+    end
+
+    def to_ai_category_totals(category_totals)
+      hierarchical_groups = category_totals.group_by { |ct| ct.category.parent_id }.then do |grouped|
+        root_category_totals = grouped[nil] || []
+
+        root_category_totals.each_with_object({}) do |ct, hash|
+          subcategory_totals = ct.category.name == "Uncategorized" ? [] : (grouped[ct.category.id] || [])
+          hash[ct.category.name] = {
+            category_total: ct,
+            subcategory_totals: subcategory_totals
+          }
+        end
+      end
+
+      hierarchical_groups.sort_by { |name, data| -data.dig(:category_total).total }.map do |name, data|
+        {
+          name: name,
+          total: format_money(data.dig(:category_total).total),
+          percentage_of_total: number_to_percentage(data.dig(:category_total).weight, precision: 1),
+          subcategory_totals: data.dig(:subcategory_totals).map do |st|
+            {
+              name: st.category.name,
+              total: format_money(st.total),
+              percentage_of_total: number_to_percentage(st.weight, precision: 1)
+            }
+          end
+        }
+      end
+    end
+
+    def get_insights(income_data, expense_data)
+      net_income = income_data.total - expense_data.total
+      savings_rate = calculate_savings_rate(income_data.total, expense_data.total)
+      median_monthly_income = family.income_statement.median_income
+      median_monthly_expenses = family.income_statement.median_expense
+      avg_monthly_expenses = family.income_statement.avg_expense
+
+      {
+        net_income: format_money(net_income),
+        savings_rate: number_to_percentage(savings_rate),
+        median_monthly_income: format_money(median_monthly_income),
+        median_monthly_expenses: format_money(median_monthly_expenses),
+        avg_monthly_expenses: format_money(avg_monthly_expenses)
+      }
+    end
+end
diff --git a/app/models/assistant/function/get_transactions.rb b/app/models/assistant/function/get_transactions.rb
new file mode 100644
index 00000000..9b0da316
--- /dev/null
+++ b/app/models/assistant/function/get_transactions.rb
@@ -0,0 +1,185 @@
+class Assistant::Function::GetTransactions < Assistant::Function
+  include Pagy::Backend
+
+  class << self
+    def default_page_size
+      50
+    end
+
+    def name
+      "get_transactions"
+    end
+
+    def description
+      <<~INSTRUCTIONS
+        Use this to search user's transactions by using various optional filters.
+
+        This function is great for things like:
+        - Finding specific transactions
+        - Getting basic stats about a small group of transactions
+
+        This function is not great for:
+        - Large time periods (use the get_income_statement function for this)
+
+        Note on pagination:
+
+        This function can be paginated.  You can expect the following properties in the response:
+
+        - `total_pages`: The total number of pages of results
+        - `page`: The current page of results
+        - `page_size`: The number of results per page (this will always be #{default_page_size})
+        - `total_results`: The total number of results for the given filters
+        - `total_income`: The total income for the given filters
+        - `total_expenses`: The total expenses for the given filters
+
+        Simple example (transactions from the last 30 days):
+
+        ```
+        get_transactions({
+          page: 1,
+          start_date: "#{30.days.ago.to_date}",
+          end_date: "#{Date.current}"
+        })
+        ```
+
+        More complex example (various filters):
+
+        ```
+        get_transactions({
+          page: 1,
+          search: "mcdonalds",
+          accounts: ["Checking", "Savings"],
+          start_date: "#{30.days.ago.to_date}",
+          end_date: "#{Date.current}",
+          categories: ["Restaurants"],
+          merchants: ["McDonald's"],
+          tags: ["Food"],
+          amount: "100",
+          amount_operator: "less"
+        })
+        ```
+      INSTRUCTIONS
+    end
+  end
+
+  def strict_mode?
+    false
+  end
+
+  def params_schema
+    build_schema(
+      required: [ "order", "page", "page_size" ],
+      properties: {
+        page: {
+          type: "integer",
+          description: "Page number"
+        },
+        order: {
+          enum: [ "asc", "desc" ],
+          description: "Order of the transactions by date"
+        },
+        search: {
+          type: "string",
+          description: "Search for transactions by name"
+        },
+        amount: {
+          type: "string",
+          description: "Amount for transactions (must be used with amount_operator)"
+        },
+        amount_operator: {
+          type: "string",
+          description: "Operator for amount (must be used with amount)",
+          enum: [ "equal", "less", "greater" ]
+        },
+        start_date: {
+          type: "string",
+          description: "Start date for transactions in YYYY-MM-DD format"
+        },
+        end_date: {
+          type: "string",
+          description: "End date for transactions in YYYY-MM-DD format"
+        },
+        accounts: {
+          type: "array",
+          description: "Filter transactions by account name",
+          items: { enum: family_account_names },
+          minItems: 1,
+          uniqueItems: true
+        },
+        categories: {
+          type: "array",
+          description: "Filter transactions by category name",
+          items: { enum: family_category_names },
+          minItems: 1,
+          uniqueItems: true
+        },
+        merchants: {
+          type: "array",
+          description: "Filter transactions by merchant name",
+          items: { enum: family_merchant_names },
+          minItems: 1,
+          uniqueItems: true
+        },
+        tags: {
+          type: "array",
+          description: "Filter transactions by tag name",
+          items: { enum: family_tag_names },
+          minItems: 1,
+          uniqueItems: true
+        }
+      }
+    )
+  end
+
+  def call(params = {})
+    search_params = params.except("order", "page")
+
+    transactions_query = family.transactions.visible.search(search_params)
+    pagy_query = params["order"] == "asc" ? transactions_query.chronological : transactions_query.reverse_chronological
+
+    # By default, we give a small page size to force the AI to use filters effectively and save on tokens
+    pagy, paginated_transactions = pagy(
+      pagy_query.includes(
+        { entry: :account },
+        :category, :merchant, :tags,
+        transfer_as_outflow: { inflow_transaction: { entry: :account } },
+        transfer_as_inflow: { outflow_transaction: { entry: :account } }
+      ),
+      page: params["page"] || 1,
+      limit: default_page_size
+    )
+
+    totals = family.income_statement.totals(transactions_scope: transactions_query)
+
+    normalized_transactions = paginated_transactions.map do |txn|
+      entry = txn.entry
+      {
+        date: entry.date,
+        amount: entry.amount.abs,
+        currency: entry.currency,
+        formatted_amount: entry.amount_money.abs.format,
+        classification: entry.amount < 0 ? "income" : "expense",
+        account: entry.account.name,
+        category: txn.category&.name,
+        merchant: txn.merchant&.name,
+        tags: txn.tags.map(&:name),
+        is_transfer: txn.transfer?
+      }
+    end
+
+    {
+      transactions: normalized_transactions,
+      total_results: pagy.count,
+      page: pagy.page,
+      page_size: default_page_size,
+      total_pages: pagy.pages,
+      total_income: totals.income_money.format,
+      total_expenses: totals.expense_money.format
+    }
+  end
+
+  private
+    def default_page_size
+      self.class.default_page_size
+    end
+end
diff --git a/app/models/assistant/function_tool_caller.rb b/app/models/assistant/function_tool_caller.rb
new file mode 100644
index 00000000..4ed08102
--- /dev/null
+++ b/app/models/assistant/function_tool_caller.rb
@@ -0,0 +1,37 @@
+class Assistant::FunctionToolCaller
+  Error = Class.new(StandardError)
+  FunctionExecutionError = Class.new(Error)
+
+  attr_reader :functions
+
+  def initialize(functions = [])
+    @functions = functions
+  end
+
+  def fulfill_requests(function_requests)
+    function_requests.map do |function_request|
+      result = execute(function_request)
+
+      ToolCall::Function.from_function_request(function_request, result)
+    end
+  end
+
+  def function_definitions
+    functions.map(&:to_definition)
+  end
+
+  private
+    def execute(function_request)
+      fn = find_function(function_request)
+      fn_args = JSON.parse(function_request.function_args)
+      fn.call(fn_args)
+    rescue => e
+      raise FunctionExecutionError.new(
+        "Error calling function #{fn.name} with arguments #{fn_args}: #{e.message}"
+      )
+    end
+
+    def find_function(function_request)
+      functions.find { |f| f.name == function_request.function_name }
+    end
+end
diff --git a/app/models/assistant/provided.rb b/app/models/assistant/provided.rb
new file mode 100644
index 00000000..f33067c6
--- /dev/null
+++ b/app/models/assistant/provided.rb
@@ -0,0 +1,12 @@
+module Assistant::Provided
+  extend ActiveSupport::Concern
+
+  def get_model_provider(ai_model)
+    registry.providers.find { |provider| provider.supports_model?(ai_model) }
+  end
+
+  private
+    def registry
+      @registry ||= Provider::Registry.for_concept(:llm)
+    end
+end
diff --git a/app/models/assistant/responder.rb b/app/models/assistant/responder.rb
new file mode 100644
index 00000000..d79ac5a0
--- /dev/null
+++ b/app/models/assistant/responder.rb
@@ -0,0 +1,87 @@
+class Assistant::Responder
+  def initialize(message:, instructions:, function_tool_caller:, llm:)
+    @message = message
+    @instructions = instructions
+    @function_tool_caller = function_tool_caller
+    @llm = llm
+  end
+
+  def on(event_name, &block)
+    listeners[event_name.to_sym] << block
+  end
+
+  def respond(previous_response_id: nil)
+    # For the first response
+    streamer = proc do |chunk|
+      case chunk.type
+      when "output_text"
+        emit(:output_text, chunk.data)
+      when "response"
+        response = chunk.data
+
+        if response.function_requests.any?
+          handle_follow_up_response(response)
+        else
+          emit(:response, { id: response.id })
+        end
+      end
+    end
+
+    get_llm_response(streamer: streamer, previous_response_id: previous_response_id)
+  end
+
+  private
+    attr_reader :message, :instructions, :function_tool_caller, :llm
+
+    def handle_follow_up_response(response)
+      streamer = proc do |chunk|
+        case chunk.type
+        when "output_text"
+          emit(:output_text, chunk.data)
+        when "response"
+          # We do not currently support function executions for a follow-up response (avoid recursive LLM calls that could lead to high spend)
+          emit(:response, { id: chunk.data.id })
+        end
+      end
+
+      function_tool_calls = function_tool_caller.fulfill_requests(response.function_requests)
+
+      emit(:response, {
+        id: response.id,
+        function_tool_calls: function_tool_calls
+      })
+
+      # Get follow-up response with tool call results
+      get_llm_response(
+        streamer: streamer,
+        function_results: function_tool_calls.map(&:to_result),
+        previous_response_id: response.id
+      )
+    end
+
+    def get_llm_response(streamer:, function_results: [], previous_response_id: nil)
+      response = llm.chat_response(
+        message.content,
+        model: message.ai_model,
+        instructions: instructions,
+        functions: function_tool_caller.function_definitions,
+        function_results: function_results,
+        streamer: streamer,
+        previous_response_id: previous_response_id
+      )
+
+      unless response.success?
+        raise response.error
+      end
+
+      response.data
+    end
+
+    def emit(event_name, payload = nil)
+      listeners[event_name.to_sym].each { |block| block.call(payload) }
+    end
+
+    def listeners
+      @listeners ||= Hash.new { |h, k| h[k] = [] }
+    end
+end
diff --git a/app/models/assistant_message.rb b/app/models/assistant_message.rb
new file mode 100644
index 00000000..4b1a1404
--- /dev/null
+++ b/app/models/assistant_message.rb
@@ -0,0 +1,12 @@
+class AssistantMessage < Message
+  validates :ai_model, presence: true
+
+  def role
+    "assistant"
+  end
+
+  def append_text!(text)
+    self.content += text
+    save!
+  end
+end
diff --git a/app/models/balance.rb b/app/models/balance.rb
new file mode 100644
index 00000000..ff28db90
--- /dev/null
+++ b/app/models/balance.rb
@@ -0,0 +1,9 @@
+class Balance < ApplicationRecord
+  include Monetizable
+
+  belongs_to :account
+  validates :account, :date, :balance, presence: true
+  monetize :balance, :cash_balance
+  scope :in_period, ->(period) { period.nil? ? all : where(date: period.date_range) }
+  scope :chronological, -> { order(:date) }
+end
diff --git a/app/models/balance/base_calculator.rb b/app/models/balance/base_calculator.rb
new file mode 100644
index 00000000..92ef5d3e
--- /dev/null
+++ b/app/models/balance/base_calculator.rb
@@ -0,0 +1,69 @@
+class Balance::BaseCalculator
+  attr_reader :account
+
+  def initialize(account)
+    @account = account
+  end
+
+  def calculate
+    raise NotImplementedError, "Subclasses must implement this method"
+  end
+
+  private
+    def sync_cache
+      @sync_cache ||= Balance::SyncCache.new(account)
+    end
+
+    def holdings_value_for_date(date)
+      holdings = sync_cache.get_holdings(date)
+      holdings.sum(&:amount)
+    end
+
+    def derive_cash_balance_on_date_from_total(total_balance:, date:)
+      if account.balance_type == :investment
+        total_balance - holdings_value_for_date(date)
+      elsif account.balance_type == :cash
+        total_balance
+      else
+        0
+      end
+    end
+
+    def derive_cash_balance(cash_balance, date)
+      entries = sync_cache.get_entries(date)
+
+      if account.balance_type == :non_cash
+        0
+      else
+        cash_balance + signed_entry_flows(entries)
+      end
+    end
+
+    def derive_non_cash_balance(non_cash_balance, date, direction: :forward)
+      entries = sync_cache.get_entries(date)
+      # Loans are a special case (loan payment reducing principal, which is non-cash)
+      if account.balance_type == :non_cash && account.accountable_type == "Loan"
+        non_cash_balance + signed_entry_flows(entries)
+      elsif account.balance_type == :investment
+        # For reverse calculations, we need the previous day's holdings
+        target_date = direction == :forward ? date : date.prev_day
+        holdings_value_for_date(target_date)
+      else
+        non_cash_balance
+      end
+    end
+
+    def signed_entry_flows(entries)
+      raise NotImplementedError, "Directional calculators must implement this method"
+    end
+
+    def build_balance(date:, cash_balance:, non_cash_balance:)
+      Balance.new(
+        account_id: account.id,
+        date: date,
+        balance: non_cash_balance + cash_balance,
+        cash_balance: cash_balance,
+        currency: account.currency
+      )
+    end
+end
diff --git a/app/models/balance/chart_series_builder.rb b/app/models/balance/chart_series_builder.rb
new file mode 100644
index 00000000..0c367685
--- /dev/null
+++ b/app/models/balance/chart_series_builder.rb
@@ -0,0 +1,153 @@
+class Balance::ChartSeriesBuilder
+  def initialize(account_ids:, currency:, period: Period.last_30_days, interval: "1 day", favorable_direction: "up")
+    @account_ids = account_ids
+    @currency = currency
+    @period = period
+    @interval = interval
+    @favorable_direction = favorable_direction
+  end
+
+  def balance_series
+    build_series_for(:balance)
+  rescue => e
+    Rails.logger.error "Balance series error: #{e.message} for accounts #{@account_ids}"
+    raise
+  end
+
+  def cash_balance_series
+    build_series_for(:cash_balance)
+  rescue => e
+    Rails.logger.error "Cash balance series error: #{e.message} for accounts #{@account_ids}"
+    raise
+  end
+
+  def holdings_balance_series
+    build_series_for(:holdings_balance)
+  rescue => e
+    Rails.logger.error "Holdings balance series error: #{e.message} for accounts #{@account_ids}"
+    raise
+  end
+
+  private
+    attr_reader :account_ids, :currency, :period, :favorable_direction
+
+    def interval
+      @interval || period.interval
+    end
+
+    def build_series_for(column)
+      values = query_data.map do |datum|
+        Series::Value.new(
+          date: datum.date,
+          date_formatted: I18n.l(datum.date, format: :long),
+          value: Money.new(datum.send(column), currency),
+          trend: Trend.new(
+            current: Money.new(datum.send(column), currency),
+            previous: Money.new(datum.send("previous_#{column}"), currency),
+            favorable_direction: favorable_direction
+          )
+        )
+      end
+
+      Series.new(
+        start_date: period.start_date,
+        end_date: period.end_date,
+        interval: interval,
+        values: values,
+        favorable_direction: favorable_direction
+      )
+    end
+
+    def query_data
+      @query_data ||= Balance.find_by_sql([
+        query,
+        {
+          account_ids: account_ids,
+          target_currency: currency,
+          start_date: period.start_date,
+          end_date: period.end_date,
+          interval: interval,
+          sign_multiplier: sign_multiplier
+        }
+      ])
+    rescue => e
+      Rails.logger.error "Query data error: #{e.message} for accounts #{account_ids}, period #{period.start_date} to #{period.end_date}"
+      raise
+    end
+
+    # Since the query aggregates the *net* of assets - liabilities, this means that if we're looking at
+    # a single liability account, we'll get a negative set of values.  This is not what the user expects
+    # to see.  When favorable direction is "down" (i.e. liability, decrease is "good"), we need to invert
+    # the values by multiplying by -1.
+    def sign_multiplier
+      favorable_direction == "down" ? -1 : 1
+    end
+
+    def query
+      <<~SQL
+        WITH dates AS (
+          SELECT generate_series(DATE :start_date, DATE :end_date, :interval::interval)::date AS date
+          UNION DISTINCT
+          SELECT :end_date::date  -- Pass in date to ensure timezone-aware "today" date
+        ), aggregated_balances AS (
+          SELECT
+            d.date,
+            -- Total balance (assets positive, liabilities negative)
+            SUM(
+              CASE WHEN accounts.classification = 'asset'
+                THEN COALESCE(last_bal.balance, 0)
+                ELSE -COALESCE(last_bal.balance, 0)
+              END * COALESCE(er.rate, 1) * :sign_multiplier::integer
+            ) AS balance,
+            -- Cash-only balance
+            SUM(
+              CASE WHEN accounts.classification = 'asset'
+                THEN COALESCE(last_bal.cash_balance, 0)
+                ELSE -COALESCE(last_bal.cash_balance, 0)
+              END * COALESCE(er.rate, 1) * :sign_multiplier::integer
+            ) AS cash_balance,
+            -- Holdings value (balance ‑ cash)
+            SUM(
+              CASE WHEN accounts.classification = 'asset'
+                THEN COALESCE(last_bal.balance, 0) - COALESCE(last_bal.cash_balance, 0)
+                ELSE 0
+              END * COALESCE(er.rate, 1) * :sign_multiplier::integer
+            ) AS holdings_balance
+          FROM dates d
+          JOIN accounts ON accounts.id = ANY(array[:account_ids]::uuid[])
+
+          -- Last observation carried forward (LOCF), use the most recent balance on or before the chart date
+          LEFT JOIN LATERAL (
+            SELECT b.balance, b.cash_balance
+            FROM balances b
+            WHERE b.account_id = accounts.id
+              AND b.date <= d.date
+            ORDER BY b.date DESC
+            LIMIT 1
+          ) last_bal ON TRUE
+
+          -- Last observation carried forward (LOCF), use the most recent exchange rate on or before the chart date
+          LEFT JOIN LATERAL (
+            SELECT er.rate
+            FROM exchange_rates er
+            WHERE er.from_currency = accounts.currency
+              AND er.to_currency = :target_currency
+              AND er.date <= d.date
+            ORDER BY er.date DESC
+            LIMIT 1
+          ) er ON TRUE
+          GROUP BY d.date
+        )
+        SELECT
+          date,
+          balance,
+          cash_balance,
+          holdings_balance,
+          COALESCE(LAG(balance) OVER (ORDER BY date), 0) AS previous_balance,
+          COALESCE(LAG(cash_balance) OVER (ORDER BY date), 0) AS previous_cash_balance,
+          COALESCE(LAG(holdings_balance) OVER (ORDER BY date), 0) AS previous_holdings_balance
+        FROM aggregated_balances
+        ORDER BY date
+      SQL
+    end
+end
diff --git a/app/models/balance/forward_calculator.rb b/app/models/balance/forward_calculator.rb
new file mode 100644
index 00000000..bd9272b7
--- /dev/null
+++ b/app/models/balance/forward_calculator.rb
@@ -0,0 +1,66 @@
+class Balance::ForwardCalculator < Balance::BaseCalculator
+  def calculate
+    Rails.logger.tagged("Balance::ForwardCalculator") do
+      start_cash_balance = derive_cash_balance_on_date_from_total(
+        total_balance: account.opening_anchor_balance,
+        date: account.opening_anchor_date
+      )
+      start_non_cash_balance = account.opening_anchor_balance - start_cash_balance
+
+      calc_start_date.upto(calc_end_date).map do |date|
+        valuation = sync_cache.get_reconciliation_valuation(date)
+
+        if valuation
+          end_cash_balance = derive_cash_balance_on_date_from_total(
+            total_balance: valuation.amount,
+            date: date
+          )
+          end_non_cash_balance = valuation.amount - end_cash_balance
+        else
+          end_cash_balance = derive_end_cash_balance(start_cash_balance: start_cash_balance, date: date)
+          end_non_cash_balance = derive_end_non_cash_balance(start_non_cash_balance: start_non_cash_balance, date: date)
+        end
+
+        output_balance = build_balance(
+          date: date,
+          cash_balance: end_cash_balance,
+          non_cash_balance: end_non_cash_balance
+        )
+
+        # Set values for the next iteration
+        start_cash_balance = end_cash_balance
+        start_non_cash_balance = end_non_cash_balance
+
+        output_balance
+      end
+    end
+  end
+
+  private
+    def calc_start_date
+      account.opening_anchor_date
+    end
+
+    def calc_end_date
+      [ account.entries.order(:date).last&.date, account.holdings.order(:date).last&.date ].compact.max || Date.current
+    end
+
+    # Negative entries amount on an "asset" account means, "account value has increased"
+    # Negative entries amount on a "liability" account means, "account debt has decreased"
+    # Positive entries amount on an "asset" account means, "account value has decreased"
+    # Positive entries amount on a "liability" account means, "account debt has increased"
+    def signed_entry_flows(entries)
+      entry_flows = entries.sum(&:amount)
+      account.asset? ? -entry_flows : entry_flows
+    end
+
+    # Derives cash balance, starting from the start-of-day, applying entries in forward to get the end-of-day balance
+    def derive_end_cash_balance(start_cash_balance:, date:)
+      derive_cash_balance(start_cash_balance, date)
+    end
+
+    # Derives non-cash balance, starting from the start-of-day, applying entries in forward to get the end-of-day balance
+    def derive_end_non_cash_balance(start_non_cash_balance:, date:)
+      derive_non_cash_balance(start_non_cash_balance, date, direction: :forward)
+    end
+end
diff --git a/app/models/balance/materializer.rb b/app/models/balance/materializer.rb
new file mode 100644
index 00000000..75a98ffd
--- /dev/null
+++ b/app/models/balance/materializer.rb
@@ -0,0 +1,69 @@
+class Balance::Materializer
+  attr_reader :account, :strategy
+
+  def initialize(account, strategy:)
+    @account = account
+    @strategy = strategy
+  end
+
+  def materialize_balances
+    Balance.transaction do
+      materialize_holdings
+      calculate_balances
+
+      Rails.logger.info("Persisting #{@balances.size} balances")
+      persist_balances
+
+      purge_stale_balances
+
+      if strategy == :forward
+        update_account_info
+      end
+    end
+  end
+
+  private
+    def materialize_holdings
+      @holdings = Holding::Materializer.new(account, strategy: strategy).materialize_holdings
+    end
+
+    def update_account_info
+      calculated_balance = @balances.sort_by(&:date).last&.balance || 0
+      calculated_holdings_value = @holdings.select { |h| h.date == Date.current }.sum(&:amount) || 0
+      calculated_cash_balance = calculated_balance - calculated_holdings_value
+
+      Rails.logger.info("Balance update: cash=#{calculated_cash_balance}, total=#{calculated_balance}")
+
+      account.update!(
+        balance: calculated_balance,
+        cash_balance: calculated_cash_balance
+      )
+    end
+
+    def calculate_balances
+      @balances = calculator.calculate
+    end
+
+    def persist_balances
+      current_time = Time.now
+      account.balances.upsert_all(
+        @balances.map { |b| b.attributes
+               .slice("date", "balance", "cash_balance", "currency")
+               .merge("updated_at" => current_time) },
+        unique_by: %i[account_id date currency]
+      )
+    end
+
+    def purge_stale_balances
+      deleted_count = account.balances.delete_by("date < ?", account.start_date)
+      Rails.logger.info("Purged #{deleted_count} stale balances") if deleted_count > 0
+    end
+
+    def calculator
+      if strategy == :reverse
+        Balance::ReverseCalculator.new(account)
+      else
+        Balance::ForwardCalculator.new(account)
+      end
+    end
+end
diff --git a/app/models/balance/reverse_calculator.rb b/app/models/balance/reverse_calculator.rb
new file mode 100644
index 00000000..1e75d5e4
--- /dev/null
+++ b/app/models/balance/reverse_calculator.rb
@@ -0,0 +1,79 @@
+class Balance::ReverseCalculator < Balance::BaseCalculator
+  def calculate
+    Rails.logger.tagged("Balance::ReverseCalculator") do
+      # Since it's a reverse sync, we're starting with the "end of day" balance components and
+      # calculating backwards to derive the "start of day" balance components.
+      end_cash_balance = derive_cash_balance_on_date_from_total(
+        total_balance: account.current_anchor_balance,
+        date: account.current_anchor_date
+      )
+      end_non_cash_balance = account.current_anchor_balance - end_cash_balance
+
+      # Calculates in reverse-chronological order (End of day -> Start of day)
+      account.current_anchor_date.downto(account.opening_anchor_date).map do |date|
+        if use_opening_anchor_for_date?(date)
+          end_cash_balance = derive_cash_balance_on_date_from_total(
+            total_balance: account.opening_anchor_balance,
+            date: date
+          )
+          end_non_cash_balance = account.opening_anchor_balance - end_cash_balance
+
+          start_cash_balance = end_cash_balance
+          start_non_cash_balance = end_non_cash_balance
+
+          build_balance(
+            date: date,
+            cash_balance: end_cash_balance,
+            non_cash_balance: end_non_cash_balance
+          )
+        else
+          start_cash_balance = derive_start_cash_balance(end_cash_balance: end_cash_balance, date: date)
+          start_non_cash_balance = derive_start_non_cash_balance(end_non_cash_balance: end_non_cash_balance, date: date)
+
+          # Even though we've just calculated "start" balances, we set today equal to end of day, then use those
+          # in our next iteration (slightly confusing, but just the nature of a "reverse" sync)
+          output_balance = build_balance(
+            date: date,
+            cash_balance: end_cash_balance,
+            non_cash_balance: end_non_cash_balance
+          )
+
+          end_cash_balance = start_cash_balance
+          end_non_cash_balance = start_non_cash_balance
+
+          output_balance
+        end
+      end
+    end
+  end
+
+  private
+
+    # Negative entries amount on an "asset" account means, "account value has increased"
+    # Negative entries amount on a "liability" account means, "account debt has decreased"
+    # Positive entries amount on an "asset" account means, "account value has decreased"
+    # Positive entries amount on a "liability" account means, "account debt has increased"
+    def signed_entry_flows(entries)
+      entry_flows = entries.sum(&:amount)
+      account.asset? ? entry_flows : -entry_flows
+    end
+
+    # Reverse syncs are a bit different than forward syncs because we do not allow "reconciliation" valuations
+    # to be used at all. This is primarily to keep the code and the UI easy to understand. For a more detailed
+    # explanation, see the test suite.
+    def use_opening_anchor_for_date?(date)
+      account.has_opening_anchor? && date == account.opening_anchor_date
+    end
+
+    # Alias method, for algorithmic clarity
+    # Derives cash balance, starting from the end-of-day, applying entries in reverse to get the start-of-day balance
+    def derive_start_cash_balance(end_cash_balance:, date:)
+      derive_cash_balance(end_cash_balance, date)
+    end
+
+    # Alias method, for algorithmic clarity
+    # Derives non-cash balance, starting from the end-of-day, applying entries in reverse to get the start-of-day balance
+    def derive_start_non_cash_balance(end_non_cash_balance:, date:)
+      derive_non_cash_balance(end_non_cash_balance, date, direction: :reverse)
+    end
+end
diff --git a/app/models/balance/sync_cache.rb b/app/models/balance/sync_cache.rb
new file mode 100644
index 00000000..be2eaa19
--- /dev/null
+++ b/app/models/balance/sync_cache.rb
@@ -0,0 +1,46 @@
+class Balance::SyncCache
+  def initialize(account)
+    @account = account
+  end
+
+  def get_reconciliation_valuation(date)
+    converted_entries.find { |e| e.date == date && e.valuation? && e.valuation.reconciliation? }
+  end
+
+  def get_holdings(date)
+    converted_holdings.select { |h| h.date == date }
+  end
+
+  def get_entries(date)
+    converted_entries.select { |e| e.date == date && (e.transaction? || e.trade?) }
+  end
+
+  private
+    attr_reader :account
+
+    def converted_entries
+      @converted_entries ||= account.entries.order(:date).to_a.map do |e|
+        converted_entry = e.dup
+        converted_entry.amount = converted_entry.amount_money.exchange_to(
+          account.currency,
+          date: e.date,
+          fallback_rate: 1
+        ).amount
+        converted_entry.currency = account.currency
+        converted_entry
+      end
+    end
+
+    def converted_holdings
+      @converted_holdings ||= account.holdings.map do |h|
+        converted_holding = h.dup
+        converted_holding.amount = converted_holding.amount_money.exchange_to(
+          account.currency,
+          date: h.date,
+          fallback_rate: 1
+        ).amount
+        converted_holding.currency = account.currency
+        converted_holding
+      end
+    end
+end
diff --git a/app/models/balance_sheet.rb b/app/models/balance_sheet.rb
new file mode 100644
index 00000000..bc5aaf15
--- /dev/null
+++ b/app/models/balance_sheet.rb
@@ -0,0 +1,64 @@
+class BalanceSheet
+  include Monetizable
+
+  monetize :net_worth
+
+  attr_reader :family
+
+  def initialize(family)
+    @family = family
+  end
+
+  def assets
+    @assets ||= ClassificationGroup.new(
+      classification: "asset",
+      currency: family.currency,
+      accounts: account_totals.asset_accounts
+    )
+  end
+
+  def liabilities
+    @liabilities ||= ClassificationGroup.new(
+      classification: "liability",
+      currency: family.currency,
+      accounts: account_totals.liability_accounts
+    )
+  end
+
+  def classification_groups
+    [ assets, liabilities ]
+  end
+
+  def account_groups
+    [ assets.account_groups, liabilities.account_groups ].flatten
+  end
+
+  def net_worth
+    assets.total - liabilities.total
+  end
+
+  def net_worth_series(period: Period.last_30_days)
+    net_worth_series_builder.net_worth_series(period: period)
+  end
+
+  def currency
+    family.currency
+  end
+
+  def syncing?
+    sync_status_monitor.syncing?
+  end
+
+  private
+    def sync_status_monitor
+      @sync_status_monitor ||= SyncStatusMonitor.new(family)
+    end
+
+    def account_totals
+      @account_totals ||= AccountTotals.new(family, sync_status_monitor: sync_status_monitor)
+    end
+
+    def net_worth_series_builder
+      @net_worth_series_builder ||= NetWorthSeriesBuilder.new(family)
+    end
+end
diff --git a/app/models/balance_sheet/account_group.rb b/app/models/balance_sheet/account_group.rb
new file mode 100644
index 00000000..a4b23d1f
--- /dev/null
+++ b/app/models/balance_sheet/account_group.rb
@@ -0,0 +1,61 @@
+class BalanceSheet::AccountGroup
+  include Monetizable
+
+  monetize :total, as: :total_money
+
+  attr_reader :name, :color, :accountable_type, :accounts
+
+  def initialize(name:, color:, accountable_type:, accounts:, classification_group:)
+    @name = name
+    @color = color
+    @accountable_type = accountable_type
+    @accounts = accounts
+    @classification_group = classification_group
+  end
+
+  # A stable DOM id for this group.
+  # Example outputs:
+  #   dom_id(tab: :asset)               # => "asset_depository"
+  #   dom_id(tab: :all, mobile: true)   # => "mobile_all_depository"
+  #
+  # Keeping all of the logic here means the view layer and broadcaster only
+  # need to ask the object for its DOM id instead of rebuilding string
+  # fragments in multiple places.
+  def dom_id(tab: nil, mobile: false)
+    parts = []
+    parts << "mobile" if mobile
+    parts << (tab ? tab.to_s : classification.to_s)
+    parts << key
+    parts.compact.join("_")
+  end
+
+  def key
+    accountable_type.to_s.underscore
+  end
+
+  def total
+    accounts.sum(&:converted_balance)
+  end
+
+  def weight
+    return 0 if classification_group.total.zero?
+
+    total / classification_group.total.to_d * 100
+  end
+
+  def syncing?
+    accounts.any?(&:syncing?)
+  end
+
+  # "asset" or "liability"
+  def classification
+    classification_group.classification
+  end
+
+  def currency
+    classification_group.currency
+  end
+
+  private
+    attr_reader :classification_group
+end
diff --git a/app/models/balance_sheet/account_totals.rb b/app/models/balance_sheet/account_totals.rb
new file mode 100644
index 00000000..31708f24
--- /dev/null
+++ b/app/models/balance_sheet/account_totals.rb
@@ -0,0 +1,63 @@
+class BalanceSheet::AccountTotals
+  def initialize(family, sync_status_monitor:)
+    @family = family
+    @sync_status_monitor = sync_status_monitor
+  end
+
+  def asset_accounts
+    @asset_accounts ||= account_rows.filter { |t| t.classification == "asset" }
+  end
+
+  def liability_accounts
+    @liability_accounts ||= account_rows.filter { |t| t.classification == "liability" }
+  end
+
+  private
+    attr_reader :family, :sync_status_monitor
+
+    AccountRow = Data.define(:account, :converted_balance, :is_syncing) do
+      def syncing? = is_syncing
+
+      # Allows Rails path helpers to generate URLs from the wrapper
+      def to_param = account.to_param
+      delegate_missing_to :account
+    end
+
+    def visible_accounts
+      @visible_accounts ||= family.accounts.visible.with_attached_logo
+    end
+
+    def account_rows
+      @account_rows ||= query.map do |account_row|
+        AccountRow.new(
+          account: account_row,
+          converted_balance: account_row.converted_balance,
+          is_syncing: sync_status_monitor.account_syncing?(account_row)
+        )
+      end
+    end
+
+    def cache_key
+      family.build_cache_key(
+        "balance_sheet_account_rows",
+        invalidate_on_data_updates: true
+      )
+    end
+
+    def query
+      @query ||= Rails.cache.fetch(cache_key) do
+        visible_accounts
+          .joins(ActiveRecord::Base.sanitize_sql_array([
+            "LEFT JOIN exchange_rates ON exchange_rates.date = ? AND accounts.currency = exchange_rates.from_currency AND exchange_rates.to_currency = ?",
+            Date.current,
+            family.currency
+          ]))
+          .select(
+            "accounts.*",
+            "SUM(accounts.balance * COALESCE(exchange_rates.rate, 1)) as converted_balance"
+          )
+          .group(:classification, :accountable_type, :id)
+          .to_a
+      end
+    end
+end
diff --git a/app/models/balance_sheet/classification_group.rb b/app/models/balance_sheet/classification_group.rb
new file mode 100644
index 00000000..a6d82bb3
--- /dev/null
+++ b/app/models/balance_sheet/classification_group.rb
@@ -0,0 +1,61 @@
+class BalanceSheet::ClassificationGroup
+  include Monetizable
+
+  monetize :total, as: :total_money
+
+  attr_reader :classification, :currency
+
+  def initialize(classification:, currency:, accounts:)
+    @classification = normalize_classification!(classification)
+    @name = name
+    @currency = currency
+    @accounts = accounts
+  end
+
+  def name
+    classification.titleize.pluralize
+  end
+
+  def icon
+    classification == "asset" ? "plus" : "minus"
+  end
+
+  def total
+    accounts.sum(&:converted_balance)
+  end
+
+  def syncing?
+    accounts.any?(&:syncing?)
+  end
+
+  # For now, we group by accountable type. This can be extended in the future to support arbitrary user groupings.
+  def account_groups
+    groups = accounts.group_by(&:accountable_type)
+                     .transform_keys { |at| Accountable.from_type(at) }
+                     .map do |accountable, account_rows|
+                       BalanceSheet::AccountGroup.new(
+                         name: accountable.display_name,
+                         color: accountable.color,
+                         accountable_type: accountable,
+                         accounts: account_rows,
+                         classification_group: self
+                       )
+                     end
+
+    # Sort the groups using the manual order defined by Accountable::TYPES so that
+    # the UI displays account groups in a predictable, domain-specific sequence.
+    groups.sort_by do |group|
+      manual_order = Accountable::TYPES
+      type_name    = group.key.camelize
+      manual_order.index(type_name) || Float::INFINITY
+    end
+  end
+
+  private
+    attr_reader :accounts
+
+    def normalize_classification!(classification)
+      raise ArgumentError, "Invalid classification: #{classification}" unless %w[asset liability].include?(classification)
+      classification
+    end
+end
diff --git a/app/models/balance_sheet/net_worth_series_builder.rb b/app/models/balance_sheet/net_worth_series_builder.rb
new file mode 100644
index 00000000..f3e61a99
--- /dev/null
+++ b/app/models/balance_sheet/net_worth_series_builder.rb
@@ -0,0 +1,38 @@
+class BalanceSheet::NetWorthSeriesBuilder
+  def initialize(family)
+    @family = family
+  end
+
+  def net_worth_series(period: Period.last_30_days)
+    Rails.cache.fetch(cache_key(period)) do
+      builder = Balance::ChartSeriesBuilder.new(
+        account_ids: visible_account_ids,
+        currency: family.currency,
+        period: period,
+        favorable_direction: "up"
+      )
+
+      builder.balance_series
+    end
+  end
+
+  private
+    attr_reader :family
+
+    def visible_account_ids
+      @visible_account_ids ||= family.accounts.visible.with_attached_logo.pluck(:id)
+    end
+
+    def cache_key(period)
+      key = [
+        "balance_sheet_net_worth_series",
+        period.start_date,
+        period.end_date
+      ].compact.join("_")
+
+      family.build_cache_key(
+        key,
+        invalidate_on_data_updates: true
+      )
+    end
+end
diff --git a/app/models/balance_sheet/sync_status_monitor.rb b/app/models/balance_sheet/sync_status_monitor.rb
new file mode 100644
index 00000000..475454ee
--- /dev/null
+++ b/app/models/balance_sheet/sync_status_monitor.rb
@@ -0,0 +1,35 @@
+class BalanceSheet::SyncStatusMonitor
+  def initialize(family)
+    @family = family
+  end
+
+  def syncing?
+    syncing_account_ids.any?
+  end
+
+  def account_syncing?(account)
+    syncing_account_ids.include?(account.id)
+  end
+
+  private
+    attr_reader :family
+
+    def syncing_account_ids
+      Rails.cache.fetch(cache_key) do
+        Sync.visible
+            .where(syncable_type: "Account", syncable_id: family.accounts.visible.pluck(:id))
+            .pluck(:syncable_id)
+            .to_set
+      end
+    end
+
+    # We re-fetch the set of syncing IDs any time a sync that belongs to the family is started or completed.
+    # This ensures we're always fetching the latest sync statuses without re-querying on every page load in idle times (no syncs happening).
+    def cache_key
+      [
+        "balance_sheet_sync_status",
+        family.id,
+        family.latest_sync_activity_at
+      ].join("_")
+    end
+end
diff --git a/app/models/budget.rb b/app/models/budget.rb
new file mode 100644
index 00000000..f8cb991c
--- /dev/null
+++ b/app/models/budget.rb
@@ -0,0 +1,246 @@
+class Budget < ApplicationRecord
+  include Monetizable
+
+  PARAM_DATE_FORMAT = "%b-%Y"
+
+  belongs_to :family
+
+  has_many :budget_categories, -> { includes(:category) }, dependent: :destroy
+
+  validates :start_date, :end_date, presence: true
+  validates :start_date, :end_date, uniqueness: { scope: :family_id }
+
+  monetize :budgeted_spending, :expected_income, :allocated_spending,
+           :actual_spending, :available_to_spend, :available_to_allocate,
+           :estimated_spending, :estimated_income, :actual_income, :remaining_expected_income
+
+  class << self
+    def date_to_param(date)
+      date.strftime(PARAM_DATE_FORMAT).downcase
+    end
+
+    def param_to_date(param)
+      Date.strptime(param, PARAM_DATE_FORMAT).beginning_of_month
+    end
+
+    def budget_date_valid?(date, family:)
+      beginning_of_month = date.beginning_of_month
+
+      beginning_of_month >= oldest_valid_budget_date(family) && beginning_of_month <= Date.current.end_of_month
+    end
+
+    def find_or_bootstrap(family, start_date:)
+      return nil unless budget_date_valid?(start_date, family: family)
+
+      Budget.transaction do
+        budget = Budget.find_or_create_by!(
+          family: family,
+          start_date: start_date.beginning_of_month,
+          end_date: start_date.end_of_month
+        ) do |b|
+          b.currency = family.currency
+        end
+
+        budget.sync_budget_categories
+
+        budget
+      end
+    end
+
+    private
+      def oldest_valid_budget_date(family)
+        @oldest_valid_budget_date ||= family.oldest_entry_date.beginning_of_month
+      end
+  end
+
+  def period
+    Period.custom(start_date: start_date, end_date: end_date)
+  end
+
+  def to_param
+    self.class.date_to_param(start_date)
+  end
+
+  def sync_budget_categories
+    current_category_ids = family.categories.expenses.pluck(:id).to_set
+    existing_budget_category_ids = budget_categories.pluck(:category_id).to_set
+    categories_to_add = current_category_ids - existing_budget_category_ids
+    categories_to_remove = existing_budget_category_ids - current_category_ids
+
+    # Create missing categories
+    categories_to_add.each do |category_id|
+      budget_categories.create!(
+        category_id: category_id,
+        budgeted_spending: 0,
+        currency: family.currency
+      )
+    end
+
+    # Remove old categories
+    budget_categories.where(category_id: categories_to_remove).destroy_all if categories_to_remove.any?
+  end
+
+  def uncategorized_budget_category
+    budget_categories.uncategorized.tap do |bc|
+      bc.budgeted_spending = [ available_to_allocate, 0 ].max
+      bc.currency = family.currency
+    end
+  end
+
+  def transactions
+    family.transactions.visible.in_period(period)
+  end
+
+  def name
+    start_date.strftime("%B %Y")
+  end
+
+  def initialized?
+    budgeted_spending.present?
+  end
+
+  def income_category_totals
+    income_totals.category_totals.reject { |ct| ct.category.subcategory? || ct.total.zero? }.sort_by(&:weight).reverse
+  end
+
+  def expense_category_totals
+    expense_totals.category_totals.reject { |ct| ct.category.subcategory? || ct.total.zero? }.sort_by(&:weight).reverse
+  end
+
+  def current?
+    start_date == Date.today.beginning_of_month && end_date == Date.today.end_of_month
+  end
+
+  def previous_budget_param
+    previous_date = start_date - 1.month
+    return nil unless self.class.budget_date_valid?(previous_date, family: family)
+
+    self.class.date_to_param(previous_date)
+  end
+
+  def next_budget_param
+    return nil if current?
+
+    next_date = start_date + 1.month
+    return nil unless self.class.budget_date_valid?(next_date, family: family)
+
+    self.class.date_to_param(next_date)
+  end
+
+  def to_donut_segments_json
+    unused_segment_id = "unused"
+
+    # Continuous gray segment for empty budgets
+    return [ { color: "var(--budget-unallocated-fill)", amount: 1, id: unused_segment_id } ] unless allocations_valid?
+
+    segments = budget_categories.map do |bc|
+      { color: bc.category.color, amount: budget_category_actual_spending(bc), id: bc.id }
+    end
+
+    if available_to_spend.positive?
+      segments.push({ color: "var(--budget-unallocated-fill)", amount: available_to_spend, id: unused_segment_id })
+    end
+
+    segments
+  end
+
+  # =============================================================================
+  # Actuals: How much user has spent on each budget category
+  # =============================================================================
+  def estimated_spending
+    income_statement.median_expense(interval: "month")
+  end
+
+  def actual_spending
+    expense_totals.total
+  end
+
+  def budget_category_actual_spending(budget_category)
+    expense_totals.category_totals.find { |ct| ct.category.id == budget_category.category.id }&.total || 0
+  end
+
+  def category_median_monthly_expense(category)
+    income_statement.median_expense(category: category)
+  end
+
+  def category_avg_monthly_expense(category)
+    income_statement.avg_expense(category: category)
+  end
+
+  def available_to_spend
+    (budgeted_spending || 0) - actual_spending
+  end
+
+  def percent_of_budget_spent
+    return 0 unless budgeted_spending > 0
+
+    (actual_spending / budgeted_spending.to_f) * 100
+  end
+
+  def overage_percent
+    return 0 unless available_to_spend.negative?
+
+    available_to_spend.abs / actual_spending.to_f * 100
+  end
+
+  # =============================================================================
+  # Budget allocations: How much user has budgeted for all parent categories combined
+  # =============================================================================
+  def allocated_spending
+    budget_categories.reject { |bc| bc.subcategory? }.sum(&:budgeted_spending)
+  end
+
+  def allocated_percent
+    return 0 unless budgeted_spending && budgeted_spending > 0
+
+    (allocated_spending / budgeted_spending.to_f) * 100
+  end
+
+  def available_to_allocate
+    (budgeted_spending || 0) - allocated_spending
+  end
+
+  def allocations_valid?
+    initialized? && available_to_allocate >= 0 && allocated_spending > 0
+  end
+
+  # =============================================================================
+  # Income: How much user earned relative to what they expected to earn
+  # =============================================================================
+  def estimated_income
+    family.income_statement.median_income(interval: "month")
+  end
+
+  def actual_income
+    family.income_statement.income_totals(period: self.period).total
+  end
+
+  def actual_income_percent
+    return 0 unless expected_income > 0
+
+    (actual_income / expected_income.to_f) * 100
+  end
+
+  def remaining_expected_income
+    expected_income - actual_income
+  end
+
+  def surplus_percent
+    return 0 unless remaining_expected_income.negative?
+
+    remaining_expected_income.abs / expected_income.to_f * 100
+  end
+
+  private
+    def income_statement
+      @income_statement ||= family.income_statement
+    end
+
+    def expense_totals
+      @expense_totals ||= income_statement.expense_totals(period: period)
+    end
+
+    def income_totals
+      @income_totals ||= family.income_statement.income_totals(period: period)
+    end
+end
diff --git a/app/models/budget_category.rb b/app/models/budget_category.rb
new file mode 100644
index 00000000..a2a84850
--- /dev/null
+++ b/app/models/budget_category.rb
@@ -0,0 +1,119 @@
+class BudgetCategory < ApplicationRecord
+  include Monetizable
+
+  belongs_to :budget
+  belongs_to :category
+
+  validates :budget_id, uniqueness: { scope: :category_id }
+
+  monetize :budgeted_spending, :available_to_spend, :avg_monthly_expense, :median_monthly_expense, :actual_spending
+
+  class Group
+    attr_reader :budget_category, :budget_subcategories
+
+    delegate :category, to: :budget_category
+    delegate :name, :color, to: :category
+
+    def self.for(budget_categories)
+      top_level_categories = budget_categories.select { |budget_category| budget_category.category.parent_id.nil? }
+      top_level_categories.map do |top_level_category|
+        subcategories = budget_categories.select { |bc| bc.category.parent_id == top_level_category.category_id && top_level_category.category_id.present? }
+        new(top_level_category, subcategories.sort_by { |subcategory| subcategory.category.name })
+      end.sort_by { |group| group.category.name }
+    end
+
+    def initialize(budget_category, budget_subcategories = [])
+      @budget_category = budget_category
+      @budget_subcategories = budget_subcategories
+    end
+  end
+
+  class << self
+    def uncategorized
+      new(
+        id: Digest::UUID.uuid_v5(Digest::UUID::URL_NAMESPACE, "uncategorized"),
+        category: nil,
+      )
+    end
+  end
+
+  def initialized?
+    budget.initialized?
+  end
+
+  def category
+    super || budget.family.categories.uncategorized
+  end
+
+  def name
+    category.name
+  end
+
+  def actual_spending
+    budget.budget_category_actual_spending(self)
+  end
+
+  def avg_monthly_expense
+    budget.category_avg_monthly_expense(category)
+  end
+
+  def median_monthly_expense
+    budget.category_median_monthly_expense(category)
+  end
+
+  def subcategory?
+    category.parent_id.present?
+  end
+
+  def available_to_spend
+    (budgeted_spending || 0) - actual_spending
+  end
+
+  def percent_of_budget_spent
+    return 0 unless budgeted_spending > 0
+
+    (actual_spending / budgeted_spending) * 100
+  end
+
+  def to_donut_segments_json
+    unused_segment_id = "unused"
+    overage_segment_id = "overage"
+
+    return [ { color: "var(--budget-unallocated-fill)", amount: 1, id: unused_segment_id } ] unless actual_spending > 0
+
+    segments = [ { color: category.color, amount: actual_spending, id: id } ]
+
+    if available_to_spend.negative?
+      segments.push({ color: "var(--color-destructive)", amount: available_to_spend.abs, id: overage_segment_id })
+    else
+      segments.push({ color: "var(--budget-unallocated-fill)", amount: available_to_spend, id: unused_segment_id })
+    end
+
+    segments
+  end
+
+  def siblings
+    budget.budget_categories.select { |bc| bc.category.parent_id == category.parent_id && bc.id != id }
+  end
+
+  def max_allocation
+    return nil unless subcategory?
+
+    parent_budget = budget.budget_categories.find { |bc| bc.category.id == category.parent_id }&.budgeted_spending
+    siblings_budget = siblings.sum(&:budgeted_spending)
+
+    [ parent_budget - siblings_budget, 0 ].max
+  end
+
+  def subcategories
+    return BudgetCategory.none unless category.parent_id.nil?
+
+    budget.budget_categories
+      .joins(:category)
+      .where(categories: { parent_id: category.id })
+  end
+
+  def subcategory?
+    category.parent_id.present?
+  end
+end
diff --git a/app/models/category.rb b/app/models/category.rb
index 3744295a..3c63c45a 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -1,42 +1,98 @@
 class Category < ApplicationRecord
-  has_many :transactions, dependent: :nullify, class_name: "Account::Transaction"
+  has_many :transactions, dependent: :nullify, class_name: "Transaction"
   has_many :import_mappings, as: :mappable, dependent: :destroy, class_name: "Import::Mapping"
+
   belongs_to :family
 
-  validates :name, :color, :family, presence: true
+  has_many :budget_categories, dependent: :destroy
+  has_many :subcategories, class_name: "Category", foreign_key: :parent_id, dependent: :nullify
+  belongs_to :parent, class_name: "Category", optional: true
 
-  before_update :clear_internal_category, if: :name_changed?
+  validates :name, :color, :lucide_icon, :family, presence: true
+  validates :name, uniqueness: { scope: :family_id }
+
+  validate :category_level_limit
+  validate :nested_category_matches_parent_classification
+
+  before_save :inherit_color_from_parent
 
   scope :alphabetically, -> { order(:name) }
+  scope :roots, -> { where(parent_id: nil) }
+  scope :incomes, -> { where(classification: "income") }
+  scope :expenses, -> { where(classification: "expense") }
 
   COLORS = %w[#e99537 #4da568 #6471eb #db5a54 #df4e92 #c44fe9 #eb5429 #61c9ea #805dee #6ad28a]
 
   UNCATEGORIZED_COLOR = "#737373"
+  TRANSFER_COLOR = "#444CE7"
+  PAYMENT_COLOR = "#db5a54"
+  TRADE_COLOR = "#e99537"
 
-  DEFAULT_CATEGORIES = [
-    { internal_category: "income", color: COLORS[0] },
-    { internal_category: "food_and_drink", color: COLORS[1] },
-    { internal_category: "entertainment", color: COLORS[2] },
-    { internal_category: "personal_care", color: COLORS[3] },
-    { internal_category: "general_services", color: COLORS[4] },
-    { internal_category: "auto_and_transport", color: COLORS[5] },
-    { internal_category: "rent_and_utilities", color: COLORS[6] },
-    { internal_category: "home_improvement", color: COLORS[7] }
-  ]
+  class Group
+    attr_reader :category, :subcategories
 
-  def self.create_default_categories(family)
-    if family.categories.size > 0
-      raise ArgumentError, "Family already has some categories"
+    delegate :name, :color, to: :category
+
+    def self.for(categories)
+      categories.select { |category| category.parent_id.nil? }.map do |category|
+        new(category, category.subcategories)
+      end
     end
 
-    family_id = family.id
-    categories = self::DEFAULT_CATEGORIES.map { |c| {
-      name: I18n.t("transaction.default_category.#{c[:internal_category]}"),
-      internal_category: c[:internal_category],
-      color: c[:color],
-      family_id:
-    } }
-    self.insert_all(categories)
+    def initialize(category, subcategories = nil)
+      @category = category
+      @subcategories = subcategories || []
+    end
+  end
+
+  class << self
+    def icon_codes
+      %w[bus circle-dollar-sign ambulance apple award baby battery lightbulb bed-single beer bluetooth book briefcase building credit-card camera utensils cooking-pot cookie dices drama dog drill drum dumbbell gamepad-2 graduation-cap house hand-helping ice-cream-cone phone piggy-bank pill pizza printer puzzle ribbon shopping-cart shield-plus ticket trees]
+    end
+
+    def bootstrap!
+      default_categories.each do |name, color, icon, classification|
+        find_or_create_by!(name: name) do |category|
+          category.color = color
+          category.classification = classification
+          category.lucide_icon = icon
+        end
+      end
+    end
+
+    def uncategorized
+      new(
+        name: "Uncategorized",
+        color: UNCATEGORIZED_COLOR,
+        lucide_icon: "circle-dashed"
+      )
+    end
+
+    private
+      def default_categories
+        [
+          [ "Income", "#e99537", "circle-dollar-sign", "income" ],
+          [ "Loan Payments", "#6471eb", "credit-card", "expense" ],
+          [ "Fees", "#6471eb", "credit-card", "expense" ],
+          [ "Entertainment", "#df4e92", "drama", "expense" ],
+          [ "Food & Drink", "#eb5429", "utensils", "expense" ],
+          [ "Shopping", "#e99537", "shopping-cart", "expense" ],
+          [ "Home Improvement", "#6471eb", "house", "expense" ],
+          [ "Healthcare", "#4da568", "pill", "expense" ],
+          [ "Personal Care", "#4da568", "pill", "expense" ],
+          [ "Services", "#4da568", "briefcase", "expense" ],
+          [ "Gifts & Donations", "#61c9ea", "hand-helping", "expense" ],
+          [ "Transportation", "#df4e92", "bus", "expense" ],
+          [ "Travel", "#df4e92", "plane", "expense" ],
+          [ "Rent & Utilities", "#db5a54", "lightbulb", "expense" ]
+        ]
+      end
+  end
+
+  def inherit_color_from_parent
+    if subcategory?
+      self.color = parent.color
+    end
   end
 
   def replace_and_destroy!(replacement)
@@ -46,9 +102,28 @@ class Category < ApplicationRecord
     end
   end
 
-  private
+  def parent?
+    subcategories.any?
+  end
 
-    def clear_internal_category
-      self.internal_category = nil
+  def subcategory?
+    parent.present?
+  end
+
+  private
+    def category_level_limit
+      if (subcategory? && parent.subcategory?) || (parent? && subcategory?)
+        errors.add(:parent, "can't have more than 2 levels of subcategories")
+      end
+    end
+
+    def nested_category_matches_parent_classification
+      if subcategory? && parent.classification != classification
+        errors.add(:parent, "must have the same classification as its parent")
+      end
+    end
+
+    def monetizable_currency
+      family.currency
     end
 end
diff --git a/app/models/chat.rb b/app/models/chat.rb
new file mode 100644
index 00000000..e403a15e
--- /dev/null
+++ b/app/models/chat.rb
@@ -0,0 +1,75 @@
+class Chat < ApplicationRecord
+  include Debuggable
+
+  belongs_to :user
+
+  has_one :viewer, class_name: "User", foreign_key: :last_viewed_chat_id, dependent: :nullify # "Last chat user has viewed"
+  has_many :messages, dependent: :destroy
+
+  validates :title, presence: true
+
+  scope :ordered, -> { order(created_at: :desc) }
+
+  class << self
+    def start!(prompt, model:)
+      create!(
+        title: generate_title(prompt),
+        messages: [ UserMessage.new(content: prompt, ai_model: model) ]
+      )
+    end
+
+    def generate_title(prompt)
+      prompt.first(80)
+    end
+  end
+
+  def needs_assistant_response?
+    conversation_messages.ordered.last.role != "assistant"
+  end
+
+  def retry_last_message!
+    update!(error: nil)
+
+    last_message = conversation_messages.ordered.last
+
+    if last_message.present? && last_message.role == "user"
+
+      ask_assistant_later(last_message)
+    end
+  end
+
+  def update_latest_response!(provider_response_id)
+    update!(latest_assistant_response_id: provider_response_id)
+  end
+
+  def add_error(e)
+    update! error: e.to_json
+    broadcast_append target: "messages", partial: "chats/error", locals: { chat: self }
+  end
+
+  def clear_error
+    update! error: nil
+    broadcast_remove target: "chat-error"
+  end
+
+  def assistant
+    @assistant ||= Assistant.for_chat(self)
+  end
+
+  def ask_assistant_later(message)
+    clear_error
+    AssistantResponseJob.perform_later(message)
+  end
+
+  def ask_assistant(message)
+    assistant.respond_to(message)
+  end
+
+  def conversation_messages
+    if debug_mode?
+      messages
+    else
+      messages.where(type: [ "UserMessage", "AssistantMessage" ])
+    end
+  end
+end
diff --git a/app/models/chat/debuggable.rb b/app/models/chat/debuggable.rb
new file mode 100644
index 00000000..05bf8335
--- /dev/null
+++ b/app/models/chat/debuggable.rb
@@ -0,0 +1,7 @@
+module Chat::Debuggable
+  extend ActiveSupport::Concern
+
+  def debug_mode?
+    ENV["AI_DEBUG_MODE"] == "true"
+  end
+end
diff --git a/app/models/concerns/accountable.rb b/app/models/concerns/accountable.rb
index a7a10284..d7f2a331 100644
--- a/app/models/concerns/accountable.rb
+++ b/app/models/concerns/accountable.rb
@@ -1,36 +1,94 @@
 module Accountable
   extend ActiveSupport::Concern
 
-  ASSET_TYPES = %w[Depository Investment Crypto Property Vehicle OtherAsset]
-  LIABILITY_TYPES = %w[CreditCard Loan OtherLiability]
-  TYPES = ASSET_TYPES + LIABILITY_TYPES
+  TYPES = %w[Depository Investment Crypto Property Vehicle OtherAsset CreditCard Loan OtherLiability]
+
+  # Define empty hash to ensure all accountables have this defined
+  SUBTYPES = {}.freeze
 
   def self.from_type(type)
     return nil unless TYPES.include?(type)
     type.constantize
   end
 
-  def self.by_classification
-    { assets: ASSET_TYPES, liabilities: LIABILITY_TYPES }
-  end
-
   included do
+    include Enrichable
+
     has_one :account, as: :accountable, touch: true
   end
 
-  def value
-    account.balance_money
+  class_methods do
+    def classification
+      raise NotImplementedError, "Accountable must implement #classification"
+    end
+
+    def icon
+      raise NotImplementedError, "Accountable must implement #icon"
+    end
+
+    def color
+      raise NotImplementedError, "Accountable must implement #color"
+    end
+
+    # Given a subtype, look up the label for this accountable type
+    def subtype_label_for(subtype, format: :short)
+      return nil if subtype.nil?
+
+      label_type = format == :long ? :long : :short
+      self::SUBTYPES[subtype]&.fetch(label_type, nil)
+    end
+
+    # Convenience method for getting the short label
+    def short_subtype_label_for(subtype)
+      subtype_label_for(subtype, format: :short)
+    end
+
+    # Convenience method for getting the long label
+    def long_subtype_label_for(subtype)
+      subtype_label_for(subtype, format: :long)
+    end
+
+    def favorable_direction
+      classification == "asset" ? "up" : "down"
+    end
+
+    def display_name
+      self.name.pluralize.titleize
+    end
+
+    def balance_money(family)
+      family.accounts
+            .active
+            .joins(sanitize_sql_array([
+              "LEFT JOIN exchange_rates ON exchange_rates.date = :current_date AND accounts.currency = exchange_rates.from_currency AND exchange_rates.to_currency = :family_currency",
+              { current_date: Date.current.to_s, family_currency: family.currency }
+            ]))
+            .where(accountable_type: self.name)
+            .sum("accounts.balance * COALESCE(exchange_rates.rate, 1)")
+    end
   end
 
-  def series(period: Period.all, currency: account.currency)
-    balance_series = account.balances.in_period(period).where(currency: currency)
+  def display_name
+    self.class.display_name
+  end
 
-    if balance_series.empty? && period.date_range.end == Date.current
-      TimeSeries.new([ { date: Date.current, value: account.balance_money.exchange_to(currency) } ])
-    else
-      TimeSeries.from_collection(balance_series, :balance_money, favorable_direction: account.asset? ? "up" : "down")
-    end
-  rescue Money::ConversionError
-    TimeSeries.new([])
+  def balance_display_name
+    "account value"
+  end
+
+  def opening_balance_display_name
+    "opening balance"
+  end
+
+  def icon
+    self.class.icon
+  end
+
+  def color
+    self.class.color
+  end
+
+  def classification
+    self.class.classification
   end
 end
diff --git a/app/models/concerns/enrichable.rb b/app/models/concerns/enrichable.rb
new file mode 100644
index 00000000..be813066
--- /dev/null
+++ b/app/models/concerns/enrichable.rb
@@ -0,0 +1,91 @@
+# Enrichable models can have 1+ of their fields enriched by various
+# external sources (i.e. Plaid) or internal sources (i.e. Rules)
+#
+# This module defines how models should, lock, unlock, and edit attributes
+# based on the source of the edit.  User edits always take highest precedence.
+#
+# For example:
+#
+# If a Rule tells us to set the category to "Groceries", but the user later overrides
+# a transaction with a category of "Food", we should not override the category again.
+#
+module Enrichable
+  extend ActiveSupport::Concern
+
+  InvalidAttributeError = Class.new(StandardError)
+
+  included do
+    scope :enrichable, ->(attrs) {
+      attrs = Array(attrs).map(&:to_s)
+      json_condition = attrs.each_with_object({}) { |attr, hash| hash[attr] = true }
+      where.not(Arel.sql("#{table_name}.locked_attributes ?| array[:keys]"), keys: attrs)
+    }
+  end
+
+  # Convenience method for a single attribute
+  def enrich_attribute(attr, value, source:, metadata: {})
+    enrich_attributes({ attr => value }, source:, metadata:)
+  end
+
+  # Enriches and logs all attributes that:
+  # - Are not locked
+  # - Are not ignored
+  # - Have changed value from the last saved value
+  def enrich_attributes(attrs, source:, metadata: {})
+    enrichable_attrs = Array(attrs).reject do |attr_key, attr_value|
+      locked?(attr_key) || ignored_enrichable_attributes.include?(attr_key) || self[attr_key.to_s] == attr_value
+    end
+
+    ActiveRecord::Base.transaction do
+      enrichable_attrs.each do |attr, value|
+        self.send("#{attr}=", value)
+
+        # If it's a new record, this isn't technically an "enrichment".  No logging necessary.
+        unless self.new_record?
+          log_enrichment(attribute_name: attr, attribute_value: value, source: source, metadata: metadata)
+        end
+      end
+
+      save
+    end
+  end
+
+  def locked?(attr)
+    locked_attributes[attr.to_s].present?
+  end
+
+  def enrichable?(attr)
+    !locked?(attr)
+  end
+
+  def lock_attr!(attr)
+    update!(locked_attributes: locked_attributes.merge(attr.to_s => Time.current))
+  end
+
+  def unlock_attr!(attr)
+    update!(locked_attributes: locked_attributes.except(attr.to_s))
+  end
+
+  def lock_saved_attributes!
+    saved_changes.keys.reject { |attr| ignored_enrichable_attributes.include?(attr) }.each do |attr|
+      lock_attr!(attr)
+    end
+  end
+
+  private
+    def log_enrichment(attribute_name:, attribute_value:, source:, metadata: {})
+      de = DataEnrichment.find_or_create_by(
+        enrichable: self,
+        attribute_name: attribute_name,
+        source: source,
+      )
+
+      de.value = attribute_value
+      de.metadata = metadata
+      de.save
+    end
+
+    def ignored_enrichable_attributes
+      %w[id updated_at created_at]
+    end
+end
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
deleted file mode 100644
index 8ffe87d3..00000000
--- a/app/models/concerns/issuable.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-module Issuable
-  extend ActiveSupport::Concern
-
-  included do
-    has_many :issues, dependent: :destroy, as: :issuable
-  end
-
-  def has_issues?
-    issues.active.any?
-  end
-
-  def resolve_stale_issues
-    issues.active.each do |issue|
-      issue.resolve! if issue.stale?
-    end
-  end
-
-  def observe_unknown_issue(error)
-    observe_issue(
-      Issue::Unknown.new(data: { error: error.message })
-    )
-  end
-
-  def observe_missing_exchange_rates(from:, to:, dates:)
-    observe_issue(
-      Issue::ExchangeRatesMissing.new(data: { from_currency: from, to_currency: to, dates: dates })
-    )
-  end
-
-  def observe_missing_exchange_rate_provider
-    observe_issue(
-      Issue::ExchangeRateProviderMissing.new
-    )
-  end
-
-  def observe_missing_price(ticker:, date:)
-    issue = issues.find_or_create_by(type: Issue::PricesMissing.name, resolved_at: nil)
-    issue.append_missing_price(ticker, date)
-    issue.save!
-  end
-
-  def highest_priority_issue
-    issues.active.ordered.first
-  end
-
-  private
-
-    def observe_issue(new_issue)
-      existing_issue = issues.find_by(type: new_issue.type, resolved_at: nil)
-
-      if existing_issue
-        existing_issue.update!(last_observed_at: Time.current, data: new_issue.data)
-      else
-        new_issue.issuable = self
-        new_issue.save!
-      end
-    end
-end
diff --git a/app/models/concerns/monetizable.rb b/app/models/concerns/monetizable.rb
index 8179271b..e80fcb5f 100644
--- a/app/models/concerns/monetizable.rb
+++ b/app/models/concerns/monetizable.rb
@@ -4,11 +4,19 @@ module Monetizable
   class_methods do
     def monetize(*fields)
       fields.each do |field|
-        define_method("#{field}_money") do
-          value = self.send(field)
-          value.nil? ? nil : Money.new(value, currency || Money.default_currency)
+        define_method("#{field}_money") do |**args|
+          value = self.send(field, **args)
+
+          return nil if value.nil? || monetizable_currency.nil?
+
+          Money.new(value, monetizable_currency)
         end
       end
     end
   end
+
+  private
+    def monetizable_currency
+      currency
+    end
 end
diff --git a/app/models/concerns/providable.rb b/app/models/concerns/providable.rb
deleted file mode 100644
index 5ba88932..00000000
--- a/app/models/concerns/providable.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# `Providable` serves as an extension point for integrating multiple providers.
-# For an example of a multi-provider, multi-concept implementation,
-# see: https://github.com/maybe-finance/maybe/pull/561
-
-module Providable
-  extend ActiveSupport::Concern
-
-  class_methods do
-    def security_prices_provider
-      synth_provider
-    end
-
-    def exchange_rates_provider
-      synth_provider
-    end
-
-    def git_repository_provider
-      Provider::Github.new
-    end
-
-    def synth_provider
-      api_key = self_hosted? ? Setting.synth_api_key : ENV["SYNTH_API_KEY"]
-      api_key.present? ? Provider::Synth.new(api_key) : nil
-    end
-
-    private
-      def self_hosted?
-        Rails.application.config.app_mode.self_hosted?
-      end
-  end
-end
diff --git a/app/models/concerns/syncable.rb b/app/models/concerns/syncable.rb
new file mode 100644
index 00000000..298aa620
--- /dev/null
+++ b/app/models/concerns/syncable.rb
@@ -0,0 +1,73 @@
+module Syncable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :syncs, as: :syncable, dependent: :destroy
+  end
+
+  def syncing?
+    syncs.visible.any?
+  end
+
+  # Schedules a sync for syncable.  If there is an existing sync pending/syncing for this syncable,
+  # we do not create a new sync, and attempt to expand the sync window if needed.
+  def sync_later(parent_sync: nil, window_start_date: nil, window_end_date: nil)
+    Sync.transaction do
+      with_lock do
+        sync = self.syncs.incomplete.first
+
+        if sync
+          Rails.logger.info("There is an existing sync, expanding window if needed (#{sync.id})")
+          sync.expand_window_if_needed(window_start_date, window_end_date)
+        else
+          sync = self.syncs.create!(
+            parent: parent_sync,
+            window_start_date: window_start_date,
+            window_end_date: window_end_date
+          )
+
+          SyncJob.perform_later(sync)
+        end
+
+        sync
+      end
+    end
+  end
+
+  def perform_sync(sync)
+    syncer.perform_sync(sync)
+  end
+
+  def perform_post_sync
+    syncer.perform_post_sync
+  end
+
+  def broadcast_sync_complete
+    sync_broadcaster.broadcast
+  end
+
+  def sync_error
+    latest_sync&.error || latest_sync&.children&.map(&:error)&.compact&.first
+  end
+
+  def last_synced_at
+    latest_sync&.completed_at
+  end
+
+  def last_sync_created_at
+    latest_sync&.created_at
+  end
+
+  private
+    def latest_sync
+      syncs.ordered.first
+    end
+
+    def syncer
+      self.class::Syncer.new(self)
+    end
+
+    def sync_broadcaster
+      self.class::SyncCompleteEvent.new(self)
+    end
+end
diff --git a/app/models/credit_card.rb b/app/models/credit_card.rb
index 5c8bb0ae..05bf7746 100644
--- a/app/models/credit_card.rb
+++ b/app/models/credit_card.rb
@@ -1,6 +1,24 @@
 class CreditCard < ApplicationRecord
   include Accountable
 
+  SUBTYPES = {
+    "credit_card" => { short: "Credit Card", long: "Credit Card" }
+  }.freeze
+
+  class << self
+    def color
+      "#F13636"
+    end
+
+    def icon
+      "credit-card"
+    end
+
+    def classification
+      "liability"
+    end
+  end
+
   def available_credit_money
     available_credit ? Money.new(available_credit, account.currency) : nil
   end
diff --git a/app/models/crypto.rb b/app/models/crypto.rb
index 5aec6157..7724a953 100644
--- a/app/models/crypto.rb
+++ b/app/models/crypto.rb
@@ -1,3 +1,21 @@
 class Crypto < ApplicationRecord
   include Accountable
+
+  class << self
+    def color
+      "#737373"
+    end
+
+    def classification
+      "asset"
+    end
+
+    def icon
+      "bitcoin"
+    end
+
+    def display_name
+      "Crypto"
+    end
+  end
 end
diff --git a/app/models/current.rb b/app/models/current.rb
index d12fc0a9..86b9e97a 100644
--- a/app/models/current.rb
+++ b/app/models/current.rb
@@ -1,7 +1,19 @@
 class Current < ActiveSupport::CurrentAttributes
-  attribute :session
   attribute :user_agent, :ip_address
 
-  delegate :user, to: :session, allow_nil: true
+  attribute :session
+
   delegate :family, to: :user, allow_nil: true
+
+  def user
+    impersonated_user || session&.user
+  end
+
+  def impersonated_user
+    session&.active_impersonator_session&.impersonated
+  end
+
+  def true_user
+    session&.user
+  end
 end
diff --git a/app/models/data_enrichment.rb b/app/models/data_enrichment.rb
new file mode 100644
index 00000000..df6a0d67
--- /dev/null
+++ b/app/models/data_enrichment.rb
@@ -0,0 +1,5 @@
+class DataEnrichment < ApplicationRecord
+  belongs_to :enrichable, polymorphic: true
+
+  enum :source, { rule: "rule", plaid: "plaid", synth: "synth", ai: "ai" }
+end
diff --git a/app/models/demo/data_cleaner.rb b/app/models/demo/data_cleaner.rb
new file mode 100644
index 00000000..fbcf08e2
--- /dev/null
+++ b/app/models/demo/data_cleaner.rb
@@ -0,0 +1,28 @@
+# SAFETY: Only operates in development/test environments to prevent data loss
+class Demo::DataCleaner
+  SAFE_ENVIRONMENTS = %w[development test]
+
+  def initialize
+    ensure_safe_environment!
+  end
+
+  # Main entry point for destroying all demo data
+  def destroy_everything!
+    Family.destroy_all
+    Setting.destroy_all
+    InviteCode.destroy_all
+    ExchangeRate.destroy_all
+    Security.destroy_all
+    Security::Price.destroy_all
+
+    puts "Data cleared"
+  end
+
+  private
+
+    def ensure_safe_environment!
+      unless SAFE_ENVIRONMENTS.include?(Rails.env)
+        raise SecurityError, "Demo::DataCleaner can only be used in #{SAFE_ENVIRONMENTS.join(', ')} environments. Current: #{Rails.env}"
+      end
+    end
+end
diff --git a/app/models/demo/generator.rb b/app/models/demo/generator.rb
index 20e5c01c..b530b273 100644
--- a/app/models/demo/generator.rb
+++ b/app/models/demo/generator.rb
@@ -1,359 +1,1219 @@
 class Demo::Generator
-  COLORS = %w[#e99537 #4da568 #6471eb #db5a54 #df4e92 #c44fe9 #eb5429 #61c9ea #805dee #6ad28a]
+  # @param seed [Integer, String, nil] Seed value used to initialise the internal PRNG. If nil, the ENV variable DEMO_DATA_SEED will
+  #   be honoured and default to a random seed when not present.
+  #
+  # Initialising an explicit PRNG gives us repeatable demo datasets while still
+  #   allowing truly random data when the caller does not care about
+  #   determinism.  The global `Kernel.rand` and helpers like `Array#sample`
+  #   will also be seeded so that *all* random behaviour inside this object –
+  #   including library helpers that rely on Ruby's global RNG – follow the
+  #   same deterministic sequence.
+  def initialize(seed: ENV.fetch("DEMO_DATA_SEED", nil))
+    # Convert the seed to an Integer if one was provided, otherwise fall back
+    # to a random, but memoised, seed so the generator instance can report it
+    # back to callers when needed (e.g. for debugging a specific run).
+    @seed = seed.present? ? seed.to_i : Random.new_seed
 
-  def initialize
-    @family = reset_family!
+    # Internal PRNG instance – use this instead of the global RNG wherever we
+    # explicitly call `rand` inside the class.  We override `rand` below so
+    # existing method bodies automatically delegate here without requiring
+    # widespread refactors.
+    @rng = Random.new(@seed)
+
+    # Also seed Ruby's global RNG so helpers that rely on it (e.g.
+    # Array#sample, Kernel.rand in invoked libraries, etc.) remain
+    # deterministic for the lifetime of this generator instance.
+    srand(@seed)
   end
 
-  def reset_and_clear_data!
-    reset_settings!
-    clear_data!
-    create_user!
+  # Expose the seed so callers can reproduce a run if necessary.
+  attr_reader :seed
 
-    puts "user reset"
+  # Generate empty family - no financial data
+  def generate_empty_data!(skip_clear: false)
+    with_timing(__method__) do
+      unless skip_clear
+        puts "🧹 Clearing existing data..."
+        clear_all_data!
+      end
+
+      puts "👥 Creating empty family..."
+      create_family_and_users!("Demo Family", "user@maybe.local", onboarded: true, subscribed: true)
+
+      puts "✅ Empty demo data loaded successfully!"
+    end
   end
 
-  def reset_data!
-    Family.transaction do
-      reset_settings!
-      clear_data!
-      create_user!
+  # Generate new user family - no financial data, needs onboarding
+  def generate_new_user_data!(skip_clear: false)
+    with_timing(__method__) do
+      unless skip_clear
+        puts "🧹 Clearing existing data..."
+        clear_all_data!
+      end
 
-      puts "user reset"
+      puts "👥 Creating new user family..."
+      create_family_and_users!("Demo Family", "user@maybe.local", onboarded: false, subscribed: false)
 
-      create_tags!
-      create_categories!
-      create_merchants!
+      puts "✅ New user demo data loaded successfully!"
+    end
+  end
 
-      puts "tags, categories, merchants created"
+  # Generate comprehensive realistic demo data with multi-currency
+  def generate_default_data!(skip_clear: false, email: "user@maybe.local")
+    if skip_clear
+      puts "⏭️  Skipping data clearing (appending new family)..."
+    else
+      puts "🧹 Clearing existing data..."
+      clear_all_data!
+    end
 
-      create_credit_card_account!
-      create_checking_account!
-      create_savings_account!
+    with_timing(__method__, max_seconds: 1000) do
+      puts "👥 Creating demo family..."
+      family = create_family_and_users!("Demo Family", email, onboarded: true, subscribed: true)
 
-      create_investment_account!
-      create_house_and_mortgage!
-      create_car_and_loan!
+      puts "📊 Creating realistic financial data..."
+      create_realistic_categories!(family)
+      create_realistic_accounts!(family)
+      create_realistic_transactions!(family)
+      # Auto-fill current-month budget based on recent spending averages
+      generate_budget_auto_fill!(family)
 
-      puts "accounts created"
-      puts "Demo data loaded successfully!"
+      puts "✅ Realistic demo data loaded successfully!"
     end
   end
 
   private
 
-    attr_reader :family
+    # Simple timing helper. Pass a descriptive label and a block; the runtime
+    # will be printed automatically when the block completes.
+    # If max_seconds is provided, raise RuntimeError when the block exceeds that
+    # duration.  Useful to keep CI/dev machines honest about demo-data perf.
+    def with_timing(label, max_seconds: nil)
+      start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      result = yield
+      duration = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+      puts "⏱️  #{label} completed in #{duration.round(2)}s"
 
-    def reset_family!
-      family_id = "d99e3c6e-d513-4452-8f24-dc263f8528c0" # deterministic demo id
+      if max_seconds && duration > max_seconds
+        raise "Demo::Generator ##{label} exceeded #{max_seconds}s (#{duration.round(2)}s)"
+      end
 
-      family = Family.find_by(id: family_id)
-      family.destroy! if family
-
-      Family.create!(id: family_id, name: "Demo Family").tap(&:reload)
+      result
     end
 
-    def clear_data!
-      InviteCode.destroy_all
-      User.find_by_email("user@maybe.local")&.destroy
-      ExchangeRate.destroy_all
-      Security.destroy_all
-      Security::Price.destroy_all
+    # Override Kernel#rand so *all* `rand` calls inside this instance (including
+    # those already present in the file) are routed through the seeded PRNG.
+    def rand(*args)
+      @rng.rand(*args)
     end
 
-    def reset_settings!
-      Setting.destroy_all
+
+
+    def clear_all_data!
+      family_count = Family.count
+      if family_count > 50
+        raise "Too much data to clear efficiently (#{family_count} families). Run 'rails db:reset' instead."
+      end
+      Demo::DataCleaner.new.destroy_everything!
     end
 
-    def create_user!
-      family.users.create! \
-        email: "user@maybe.local",
-        first_name: "Demo",
-        last_name: "User",
+    def create_family_and_users!(family_name, email, onboarded:, subscribed:)
+      family = Family.create!(
+        name: family_name,
+        currency: "USD",
+        locale: "en",
+        country: "US",
+        timezone: "America/New_York",
+        date_format: "%m-%d-%Y"
+      )
+
+      family.start_subscription!("sub_demo_123") if subscribed
+
+      # Admin user
+      family.users.create!(
+        email: email,
+        first_name: "Demo (admin)",
+        last_name: "Maybe",
         role: "admin",
-        password: "password"
+        password: "password",
+        onboarded_at: onboarded ? Time.current : nil
+      )
+
+      # Member user
+      family.users.create!(
+        email: "partner_#{email}",
+        first_name: "Demo (member)",
+        last_name: "Maybe",
+        role: "member",
+        password: "password",
+        onboarded_at: onboarded ? Time.current : nil
+      )
+
+      family
     end
 
-    def create_tags!
-      [ "Trips", "Emergency Fund", "Demo Tag" ].each do |tag|
-        family.tags.create!(name: tag)
-      end
+    def create_realistic_categories!(family)
+      # Income categories (3 total)
+      @salary_cat = family.categories.create!(name: "Salary", color: "#10b981", classification: "income")
+      @freelance_cat = family.categories.create!(name: "Freelance", color: "#059669", classification: "income")
+      @investment_income_cat = family.categories.create!(name: "Investment Income", color: "#047857", classification: "income")
+
+      # Expense categories with subcategories (12 total)
+      @housing_cat = family.categories.create!(name: "Housing", color: "#dc2626", classification: "expense")
+      @rent_cat = family.categories.create!(name: "Rent/Mortgage", parent: @housing_cat, color: "#b91c1c", classification: "expense")
+      @utilities_cat = family.categories.create!(name: "Utilities", parent: @housing_cat, color: "#991b1b", classification: "expense")
+
+      @food_cat = family.categories.create!(name: "Food & Dining", color: "#ea580c", classification: "expense")
+      @groceries_cat = family.categories.create!(name: "Groceries", parent: @food_cat, color: "#c2410c", classification: "expense")
+      @restaurants_cat = family.categories.create!(name: "Restaurants", parent: @food_cat, color: "#9a3412", classification: "expense")
+      @coffee_cat = family.categories.create!(name: "Coffee & Takeout", parent: @food_cat, color: "#7c2d12", classification: "expense")
+
+      @transportation_cat = family.categories.create!(name: "Transportation", color: "#2563eb", classification: "expense")
+      @gas_cat = family.categories.create!(name: "Gas", parent: @transportation_cat, color: "#1d4ed8", classification: "expense")
+      @car_payment_cat = family.categories.create!(name: "Car Payment", parent: @transportation_cat, color: "#1e40af", classification: "expense")
+
+      @entertainment_cat = family.categories.create!(name: "Entertainment", color: "#7c3aed", classification: "expense")
+      @healthcare_cat = family.categories.create!(name: "Healthcare", color: "#db2777", classification: "expense")
+      @shopping_cat = family.categories.create!(name: "Shopping", color: "#059669", classification: "expense")
+      @travel_cat = family.categories.create!(name: "Travel", color: "#0891b2", classification: "expense")
+      @personal_care_cat = family.categories.create!(name: "Personal Care", color: "#be185d", classification: "expense")
+
+      # Additional high-level expense categories to reach 13 top-level items
+      @insurance_cat = family.categories.create!(name: "Insurance", color: "#6366f1", classification: "expense")
+      @misc_cat      = family.categories.create!(name: "Miscellaneous", color: "#6b7280", classification: "expense")
+
+      # Interest expense bucket
+      @interest_cat = family.categories.create!(name: "Loan Interest", color: "#475569", classification: "expense")
     end
 
-    def create_categories!
-      categories = [ "Income", "Food & Drink", "Entertainment", "Travel",
-                    "Personal Care", "General Services", "Auto & Transport",
-                    "Rent & Utilities", "Home Improvement", "Shopping" ]
+    def create_realistic_accounts!(family)
+      # Checking accounts (USD)
+      @chase_checking = family.accounts.create!(accountable: Depository.new, name: "Chase Premier Checking", balance: 0, currency: "USD")
+      @ally_checking = family.accounts.create!(accountable: Depository.new, name: "Ally Online Checking", balance: 0, currency: "USD")
 
-      categories.each do |category|
-        family.categories.create!(name: category, color: COLORS.sample)
-      end
+      # Savings account (USD)
+      @marcus_savings = family.accounts.create!(accountable: Depository.new, name: "Marcus High-Yield Savings", balance: 0, currency: "USD")
+
+      # EUR checking (EUR)
+      @eu_checking = family.accounts.create!(accountable: Depository.new, name: "Deutsche Bank EUR Account", balance: 0, currency: "EUR")
+
+      # Credit cards (USD)
+      @amex_gold = family.accounts.create!(accountable: CreditCard.new, name: "Amex Gold Card", balance: 0, currency: "USD")
+      @chase_sapphire = family.accounts.create!(accountable: CreditCard.new, name: "Chase Sapphire Reserve", balance: 0, currency: "USD")
+
+      # Investment accounts (USD + GBP)
+      @vanguard_401k     = family.accounts.create!(accountable: Investment.new, name: "Vanguard 401(k)", balance: 0, currency: "USD")
+      @schwab_brokerage  = family.accounts.create!(accountable: Investment.new, name: "Charles Schwab Brokerage", balance: 0, currency: "USD")
+      @fidelity_roth_ira = family.accounts.create!(accountable: Investment.new, name: "Fidelity Roth IRA", balance: 0, currency: "USD")
+      @hsa_investment    = family.accounts.create!(accountable: Investment.new, name: "Fidelity HSA Investment", balance: 0, currency: "USD")
+      @uk_isa           = family.accounts.create!(accountable: Investment.new, name: "Vanguard UK ISA", balance: 0, currency: "GBP")
+
+      # Property (USD)
+      @home = family.accounts.create!(accountable: Property.new, name: "Primary Residence", balance: 0, currency: "USD")
+
+      # Vehicles (USD)
+      @honda_accord = family.accounts.create!(accountable: Vehicle.new, name: "2016 Honda Accord", balance: 0, currency: "USD")
+      @tesla_model3 = family.accounts.create!(accountable: Vehicle.new, name: "2021 Tesla Model 3", balance: 0, currency: "USD")
+
+      # Crypto (USD)
+      @coinbase_usdc = family.accounts.create!(accountable: Crypto.new, name: "Coinbase USDC", balance: 0, currency: "USD")
+
+      # Loans / Liabilities (USD)
+      @mortgage      = family.accounts.create!(accountable: Loan.new, name: "Home Mortgage", balance: 0, currency: "USD")
+      @car_loan      = family.accounts.create!(accountable: Loan.new, name: "Car Loan", balance: 0, currency: "USD")
+      @student_loan  = family.accounts.create!(accountable: Loan.new, name: "Student Loan", balance: 0, currency: "USD")
+
+      @personal_loc  = family.accounts.create!(accountable: OtherLiability.new, name: "Personal Line of Credit", balance: 0, currency: "USD")
+
+      # Other asset (USD)
+      @jewelry = family.accounts.create!(accountable: OtherAsset.new, name: "Jewelry Collection", balance: 0, currency: "USD")
     end
 
-    def create_merchants!
-      merchants = [ "Amazon", "Starbucks", "McDonald's", "Target", "Costco",
-                   "Home Depot", "Shell", "Whole Foods", "Walgreens", "Nike",
-                   "Uber", "Netflix", "Spotify", "Delta Airlines", "Airbnb", "Sephora" ]
+    def create_realistic_transactions!(family)
+      load_securities!
 
-      merchants.each do |merchant|
-        family.merchants.create!(name: merchant, color: COLORS.sample)
-      end
+      puts "   📈 Generating salary history (12 years)..."
+      generate_salary_history!
+
+      puts "   🏠 Generating housing transactions..."
+      generate_housing_transactions!
+
+      puts "   🍕 Generating food & dining transactions..."
+      generate_food_transactions!
+
+      puts "   🚗 Generating transportation transactions..."
+      generate_transportation_transactions!
+
+      puts "   🎬 Generating entertainment transactions..."
+      generate_entertainment_transactions!
+
+      puts "   🛒 Generating shopping transactions..."
+      generate_shopping_transactions!
+
+      puts "   ⚕️ Generating healthcare transactions..."
+      generate_healthcare_transactions!
+
+      puts "   ✈️ Generating travel transactions..."
+      generate_travel_transactions!
+
+      puts "   💅 Generating personal care transactions..."
+      generate_personal_care_transactions!
+
+      puts "   💰 Generating investment transactions..."
+      generate_investment_transactions!
+
+      puts "   🏡 Generating major purchases..."
+      generate_major_purchases!
+
+      puts "   💳 Generating transfers and payments..."
+      generate_transfers_and_payments!
+
+      puts "   🏦 Generating loan payments..."
+      generate_loan_payments!
+
+      puts "   🧾 Generating regular expense baseline..."
+      generate_regular_expenses!
+
+      puts "   🗄️  Generating legacy historical data..."
+      generate_legacy_transactions!
+
+      puts "   🔒 Generating crypto & misc asset transactions..."
+      generate_crypto_and_misc_assets!
+
+      puts "   ✅ Reconciling balances to target snapshot..."
+      reconcile_balances!(family)
+
+      puts "   📊 Generated approximately #{Entry.joins(:account).where(accounts: { family_id: family.id }).count} transactions"
+
+      puts "🔄 Final sync to calculate adjusted balances..."
+      sync_family_accounts!(family)
     end
 
-    def create_credit_card_account!
-      cc = family.accounts.create! \
-        accountable: CreditCard.new,
-        name: "Chase Credit Card",
-        balance: 2300,
+    # Auto-fill current-month budget based on recent spending averages
+    def generate_budget_auto_fill!(family)
+      current_month   = Date.current.beginning_of_month
+      analysis_start  = (current_month - 3.months).beginning_of_month
+      analysis_period = analysis_start..(current_month - 1.day)
+
+      # Fetch expense transactions in the analysis period
+      txns = Entry.joins("INNER JOIN transactions ON transactions.id = entries.entryable_id")
+                  .joins("INNER JOIN categories ON categories.id = transactions.category_id")
+                  .where(entries: { entryable_type: "Transaction", date: analysis_period })
+                  .where(categories: { classification: "expense" })
+
+      spend_per_cat = txns.group("categories.id").sum("entries.amount")
+
+      budget = family.budgets.where(start_date: current_month).first_or_initialize
+      budget.update!(
+        end_date: current_month.end_of_month,
         currency: "USD",
-        institution: family.institutions.find_or_create_by(name: "Chase")
+        budgeted_spending: spend_per_cat.values.sum / 3.0, # placeholder, refine below
+        expected_income: 0 # Could compute similarly if desired
+      )
 
-      50.times do
-        merchant = random_family_record(Merchant)
-        create_transaction! \
-          account: cc,
-          name: merchant.name,
-          amount: Faker::Number.positive(to: 200),
-          tags: [ tag_for_merchant(merchant) ],
-          category: category_for_merchant(merchant),
-          merchant: merchant
+      spend_per_cat.each do |cat_id, total|
+        avg = total / 3.0
+        rounded = ((avg / 25.0).round) * 25
+        category = Category.find(cat_id)
+        budget.budget_categories.find_or_create_by!(category: category) do |bc|
+          bc.budgeted_spending = rounded
+          bc.currency = "USD"
+        end
       end
 
-      5.times do
-        create_transaction! \
-          account: cc,
-          amount: Faker::Number.negative(from: -1000),
-          name: "CC Payment"
+      # Update aggregate budgeted_spending to sum of categories
+      budget.update!(budgeted_spending: budget.budget_categories.sum(:budgeted_spending))
+    end
+
+    # Helper method to get weighted random date (favoring recent years)
+    def weighted_random_date
+      # Focus on last 3 years for transaction generation
+      rand(3.years.ago.to_date..Date.current)
+    end
+
+    # Helper method to get random accounts for transactions
+    def random_checking_account
+      [ @chase_checking, @ally_checking ].sample
+    end
+
+    # ---------------------------------------------------------------------------
+    # Payroll system — 156 deterministic deposits (bi-weekly, six years)
+    # ---------------------------------------------------------------------------
+    def generate_salary_history!
+      deposit_amount = 8_500  # Increased from 4,200 to ~$200k annually
+      total_deposits = 78     # Reduced from 156 (only 3 years instead of 6)
+
+      # Find first Friday ≥ 3.years.ago so the cadence remains bi-weekly.
+      first_date = 3.years.ago.to_date
+      first_date += 1 until first_date.friday?
+
+      total_deposits.times do |i|
+        date = first_date + (14 * i)
+        break if date > Date.current # safety
+
+        amount = -jitter(deposit_amount, 0.02).round # negative inflow per conventions
+        create_transaction!(@chase_checking, amount, "Acme Corp Payroll", @salary_cat, date)
+
+        # 10 % automated savings transfer to Marcus Savings same day
+        savings_amount = (-amount * 0.10).round
+        create_transfer!(@chase_checking, @marcus_savings, savings_amount, "Auto-Save 10% of Paycheck", date)
+      end
+
+      # Add freelance income to help balance expenses
+      15.times do
+        date = weighted_random_date
+        amount = -rand(1500..4000)  # Negative for income
+        create_transaction!(@chase_checking, amount, "Freelance Project", @freelance_cat, date)
+      end
+
+      # Add quarterly investment dividends
+      (3.years.ago.to_date..Date.current).each do |date|
+        next unless date.day == 15 && [ 3, 6, 9, 12 ].include?(date.month) # Quarterly
+        dividend_amount = -rand(800..1500)  # Negative for income
+        create_transaction!(@chase_checking, dividend_amount, "Investment Dividends", @investment_income_cat, date)
+      end
+
+      # Add more regular freelance income to maintain positive checking balance
+      40.times do  # Increased from 15
+        date = weighted_random_date
+        amount = -rand(800..2500)  # More frequent, smaller freelance income
+        create_transaction!(@chase_checking, amount, "Freelance Payment", @freelance_cat, date)
+      end
+
+      # Add side income streams
+      25.times do
+        date = weighted_random_date
+        amount = -rand(200..800)
+        income_types = [ "Cash Tips", "Selling Items", "Refund", "Rebate", "Gift Card Cash Out" ]
+        create_transaction!(@chase_checking, amount, income_types.sample, @freelance_cat, date)
       end
     end
 
-    def create_checking_account!
-      checking = family.accounts.create! \
-        accountable: Depository.new,
-        name: "Chase Checking",
-        balance: 15000,
-        currency: "USD",
-        institution: family.institutions.find_or_create_by(name: "Chase")
+    def generate_housing_transactions!
+      start_date = 3.years.ago.to_date  # Reduced from 12 years
+      base_rent = 2500 # Higher starting amount for higher income family
 
-      10.times do
-        create_transaction! \
-          account: checking,
-          name: "Expense",
-          amount: Faker::Number.positive(from: 100, to: 1000)
+      # Monthly rent/mortgage payments
+      (start_date..Date.current).each do |date|
+        next unless date.day == 1 # First of month
+
+        # Mortgage payment from checking account (positive expense)
+        create_transaction!(@chase_checking, 2800, "Mortgage Payment", @rent_cat, date)
+        # Principal payment reduces mortgage debt (negative transaction)
+        principal_payment = 800 # ~$800 goes to principal
+        create_transaction!(@mortgage, -principal_payment, "Principal Payment", nil, date)
       end
 
-      10.times do
-        create_transaction! \
-          account: checking,
-          amount: Faker::Number.negative(from: -2000),
-          name: "Income",
-          category: income_category
-      end
-    end
-
-    def create_savings_account!
-      savings = family.accounts.create! \
-        accountable: Depository.new,
-        name: "Demo Savings",
-        balance: 40000,
-        currency: "USD",
-        subtype: "savings",
-        institution: family.institutions.find_or_create_by(name: "Chase")
-
-      income_category = categories.find { |c| c.name == "Income" }
-      income_tag = tags.find { |t| t.name == "Emergency Fund" }
-
-      20.times do
-        create_transaction! \
-          account: savings,
-          amount: Faker::Number.negative(from: -2000),
-          tags: [ income_tag ],
-          category: income_category,
-          name: "Income"
-      end
-    end
-
-    def load_securities!
-      # Create an unknown security to simulate edge cases
-      Security.create! ticker: "UNKNOWN", name: "Unknown Demo Stock"
-
-      securities = [
-        { ticker: "AAPL", name: "Apple Inc.", reference_price: 210 },
-        { ticker: "TM", name: "Toyota Motor Corporation", reference_price: 202 },
-        { ticker: "MSFT", name: "Microsoft Corporation", reference_price: 455 }
+      # Monthly utilities (reduced frequency)
+      utilities = [
+        { name: "ConEd Electric", range: 150..300 },
+        { name: "Verizon Internet", range: 85..105 },
+        { name: "Water & Sewer", range: 60..90 },
+        { name: "Gas Bill", range: 80..220 }
       ]
 
-      securities.each do |security_attributes|
-        security = Security.create! security_attributes.except(:reference_price)
-
-        # Load prices for last 2 years
-        (730.days.ago.to_date..Date.current).each do |date|
-          reference = security_attributes[:reference_price]
-          low_price = reference - 20
-          high_price = reference + 20
-          Security::Price.create! \
-            ticker: security.ticker,
-            date: date,
-            price: Faker::Number.positive(from: low_price, to: high_price)
+      utilities.each do |utility|
+        (start_date..Date.current).each do |date|
+          next unless date.day.between?(5, 15) && rand < 0.9 # Monthly with higher frequency
+          amount = rand(utility[:range])
+          create_transaction!(@chase_checking, amount, utility[:name], @utilities_cat, date)
         end
       end
     end
 
-    def create_investment_account!
-      load_securities!
+    def generate_food_transactions!
+      # Weekly groceries (increased volume but kept amounts reasonable)
+      120.times do  # Increased from 60
+        date = weighted_random_date
+        amount = rand(60..180) # Reduced max from 220
+        stores = [ "Whole Foods", "Trader Joe's", "Safeway", "Stop & Shop", "Fresh Market" ]
+        create_transaction!(@chase_checking, amount, "#{stores.sample} Market", @groceries_cat, date)
+      end
 
-      account = family.accounts.create! \
-        accountable: Investment.new,
-        name: "Robinhood",
-        balance: 100000,
-        currency: "USD",
-        institution: family.institutions.find_or_create_by(name: "Robinhood")
+      # Restaurant dining (increased volume)
+      100.times do  # Increased from 50
+        date = weighted_random_date
+        amount = rand(25..65) # Reduced max from 80
+        restaurants = [ "Pizza Corner", "Sushi Place", "Italian Kitchen", "Mexican Grill", "Greek Taverna" ]
+        create_transaction!(@chase_checking, amount, restaurants.sample, @restaurants_cat, date)
+      end
 
-      aapl = Security.find_by(ticker: "AAPL")
-      tm = Security.find_by(ticker: "TM")
-      msft = Security.find_by(ticker: "MSFT")
-      unknown = Security.find_by(ticker: "UNKNOWN")
-
-      # Buy 20 shares of the unknown stock to simulate a stock where we can't fetch security prices
-      account.entries.create! date: 10.days.ago.to_date, amount: 100, currency: "USD", name: "Buy unknown stock", entryable: Account::Trade.new(qty: 20, price: 5, security: unknown, currency: "USD")
-
-      trades = [
-        { security: aapl, qty: 20 }, { security: msft, qty: 10 }, { security: aapl, qty: -5 },
-        { security: msft, qty: -5 }, { security: tm, qty: 10 }, { security: msft, qty: 5 },
-        { security: tm, qty: 10 }, { security: aapl, qty: -5 }, { security: msft, qty: -5 },
-        { security: tm, qty: 10 }, { security: msft, qty: 5 }, { security: aapl, qty: -10 }
-      ]
-
-      trades.each do |trade|
-        date = Faker::Number.positive(to: 730).days.ago.to_date
-        security = trade[:security]
-        qty = trade[:qty]
-        price = Security::Price.find_by(ticker: security.ticker, date: date)&.price || 1
-        name_prefix = qty < 0 ? "Sell " : "Buy "
-
-        account.entries.create! \
-          date: date,
-          amount: qty * price,
-          currency: "USD",
-          name: name_prefix + "#{qty} shares of #{security.ticker}",
-          entryable: Account::Trade.new(qty: qty, price: price, currency: "USD", security: security)
+      # Coffee & takeout (increased volume)
+      80.times do  # Increased from 40
+        date = weighted_random_date
+        amount = rand(8..20) # Reduced from 10-25
+        places = [ "Local Coffee", "Dunkin'", "Corner Deli", "Food Truck" ]
+        create_transaction!(@chase_checking, amount, places.sample, @coffee_cat, date)
       end
     end
 
-    def create_house_and_mortgage!
-      house = family.accounts.create! \
-        accountable: Property.new,
-        name: "123 Maybe Way",
-        balance: 560000,
-        currency: "USD"
+    def generate_transportation_transactions!
+      # Gas stations (checking account only)
+      60.times do
+        date = weighted_random_date
+        amount = rand(35..75)
+        stations = [ "Shell", "Exxon", "BP", "Chevron", "Mobil", "Sunoco" ]
+        create_transaction!(@chase_checking, amount, "#{stations.sample} Gas", @gas_cat, date)
+      end
 
-      create_valuation!(house, 3.years.ago.to_date, 520000)
-      create_valuation!(house, 2.years.ago.to_date, 540000)
-      create_valuation!(house, 1.years.ago.to_date, 550000)
+      # Car payment (monthly for 6 years)
+      car_payment_start = 6.years.ago.to_date
+      car_payment_end = 1.year.ago.to_date
 
-      family.accounts.create! \
-        accountable: Loan.new,
-        name: "Mortgage",
-        balance: 495000,
-        currency: "USD"
+      (car_payment_start..car_payment_end).each do |date|
+        next unless date.day == 15 # 15th of month
+        create_transaction!(@chase_checking, 385, "Auto Loan Payment", @car_payment_cat, date)
+      end
     end
 
-    def create_car_and_loan!
-      family.accounts.create! \
-        accountable: Vehicle.new,
-        name: "Honda Accord",
-        balance: 18000,
-        currency: "USD"
+    def generate_entertainment_transactions!
+      # Monthly subscriptions (increased timeframe)
+      subscriptions = [
+        { name: "Netflix", amount: 15 },
+        { name: "Spotify Premium", amount: 12 },
+        { name: "Disney+", amount: 8 },
+        { name: "HBO Max", amount: 16 },
+        { name: "Amazon Prime", amount: 14 }
+      ]
 
-      family.accounts.create! \
-        accountable: Loan.new,
-        name: "Car Loan",
-        balance: 8000,
-        currency: "USD"
+      subscriptions.each do |sub|
+        (3.years.ago.to_date..Date.current).each do |date| # Reduced from 12 years
+          next unless date.day == rand(1..28) && rand < 0.9 # Higher frequency for active subscriptions
+          create_transaction!(@chase_checking, sub[:amount], sub[:name], @entertainment_cat, date)
+        end
+      end
+
+      # Random entertainment (increased volume)
+      60.times do  # Increased from 25
+        date = weighted_random_date
+        amount = rand(15..60) # Reduced from 20-80
+        activities = [ "Movie Theater", "Sports Game", "Museum", "Comedy Club", "Bowling", "Mini Golf", "Arcade" ]
+        create_transaction!(@chase_checking, amount, activities.sample, @entertainment_cat, date)
+      end
     end
 
-    def create_transaction!(attributes = {})
-      entry_attributes = attributes.except(:category, :tags, :merchant)
-      transaction_attributes = attributes.slice(:category, :tags, :merchant)
+    def generate_shopping_transactions!
+      # Online shopping (increased volume)
+      80.times do  # Increased from 40
+        date = weighted_random_date
+        amount = rand(30..90) # Reduced max from 120
+        stores = [ "Target.com", "Walmart", "Costco" ]
+        create_transaction!(@chase_checking, amount, "#{stores.sample} Purchase", @shopping_cat, date)
+      end
 
-      entry_defaults = {
-        date: Faker::Number.between(from: 0, to: 90).days.ago.to_date,
-        currency: "USD",
-        entryable: Account::Transaction.new(transaction_attributes)
-      }
-
-      Account::Entry.create! entry_defaults.merge(entry_attributes)
+      # In-store shopping (increased volume)
+      60.times do  # Increased from 25
+        date = weighted_random_date
+        amount = rand(35..80) # Reduced max from 100
+        stores = [ "Target", "REI", "Barnes & Noble", "GameStop" ]
+        create_transaction!(@chase_checking, amount, stores.sample, @shopping_cat, date)
+      end
     end
 
-    def create_valuation!(account, date, amount)
-      Account::Entry.create! \
-        account: account,
-        date: date,
+    def generate_healthcare_transactions!
+      # Doctor visits (increased volume)
+      45.times do  # Increased from 25
+        date = weighted_random_date
+        amount = rand(150..350) # Reduced from 180-450
+        providers = [ "Dr. Smith", "Dr. Johnson", "Dr. Williams", "Specialist Visit", "Urgent Care" ]
+        create_transaction!(@chase_checking, amount, providers.sample, @healthcare_cat, date)
+      end
+
+      # Pharmacy (increased volume)
+      80.times do  # Increased from 40
+        date = weighted_random_date
+        amount = rand(12..65) # Reduced from 15-85
+        pharmacies = [ "CVS Pharmacy", "Walgreens", "Rite Aid", "Local Pharmacy" ]
+        create_transaction!(@chase_checking, amount, pharmacies.sample, @healthcare_cat, date)
+      end
+    end
+
+    def generate_travel_transactions!
+      # Major vacations (reduced count - premium travel handled in credit card cycles)
+      8.times do
+        date = weighted_random_date
+
+        # Smaller local trips from checking
+        hotel_amount = rand(200..500)
+        hotels = [ "Local Hotel", "B&B", "Nearby Resort" ]
+        if rand < 0.3 && date > 3.years.ago.to_date # Some EUR transactions
+          create_transaction!(@eu_checking, hotel_amount, hotels.sample, @travel_cat, date)
+        else
+          create_transaction!(@chase_checking, hotel_amount, hotels.sample, @travel_cat, date)
+        end
+
+        # Domestic flights (smaller amounts)
+        flight_amount = rand(200..400)
+        create_transaction!(@chase_checking, flight_amount, "Domestic Flight", @travel_cat, date + rand(1..5).days)
+
+        # Local activities
+        activity_amount = rand(50..150)
+        activities = [ "Local Tour", "Museum Tickets", "Activity Pass" ]
+        create_transaction!(@chase_checking, activity_amount, activities.sample, @travel_cat, date + rand(1..7).days)
+      end
+    end
+
+    def generate_personal_care_transactions!
+      # Gym membership
+      (12.years.ago.to_date..Date.current).each do |date|
+        next unless date.day == 1 && rand < 0.8 # Monthly
+        create_transaction!(@chase_checking, 45, "Gym Membership", @personal_care_cat, date)
+      end
+
+      # Beauty/grooming (checking account only)
+      40.times do
+        date = weighted_random_date
+        amount = rand(25..80)
+        services = [ "Hair Salon", "Barber Shop", "Nail Salon" ]
+        create_transaction!(@chase_checking, amount, services.sample, @personal_care_cat, date)
+      end
+    end
+
+    def generate_investment_transactions!
+      security = Security.first || Security.create!(ticker: "VTI", name: "Vanguard Total Stock Market ETF", country_code: "US")
+
+      generate_401k_trades!(security)
+      generate_brokerage_trades!(security)
+      generate_roth_trades!(security)
+      generate_uk_isa_trades!(security)
+    end
+
+    # ---------------------------------------------------- 401k (180 trades) --
+    def generate_401k_trades!(security)
+      payroll_dates = collect_payroll_dates.first(90) # 90 paydays ⇒ 180 trades
+
+      payroll_dates.each do |date|
+        # Employee contribution $1 200
+        create_trade_for(@vanguard_401k, security, 1_200, date, "401k Employee")
+
+        # Employer match $300
+        create_trade_for(@vanguard_401k, security, 300, date, "401k Employer Match")
+      end
+    end
+
+    # -------------------------------------------- Brokerage (144 trades) -----
+    def generate_brokerage_trades!(security)
+      date_cursor = 36.months.ago.beginning_of_month
+      while date_cursor <= Date.current
+        4.times do |i|
+          trade_date = date_cursor + i * 7.days # roughly spread within month
+          create_trade_for(@schwab_brokerage, security, rand(400..1_000), trade_date, "Brokerage Purchase")
+        end
+        date_cursor = date_cursor.next_month.beginning_of_month
+      end
+    end
+
+    # ----------------------------------------------- Roth IRA (108 trades) ---
+    def generate_roth_trades!(security)
+      date_cursor = 36.months.ago.beginning_of_month
+      while date_cursor <= Date.current
+        # Split $500 monthly across 3 staggered trades
+        3.times do |i|
+          trade_date = date_cursor + i * 10.days
+          create_trade_for(@fidelity_roth_ira, security, (500 / 3.0), trade_date, "Roth IRA Contribution")
+        end
+        date_cursor = date_cursor.next_month.beginning_of_month
+      end
+    end
+
+    # ------------------------------------------------- UK ISA (108 trades) ----
+    def generate_uk_isa_trades!(security)
+      date_cursor = 36.months.ago.beginning_of_month
+      while date_cursor <= Date.current
+        3.times do |i|
+          trade_date = date_cursor + i * 10.days
+          create_trade_for(@uk_isa, security, (400 / 3.0), trade_date, "ISA Investment", price_range: 60..150)
+        end
+        date_cursor = date_cursor.next_month.beginning_of_month
+      end
+    end
+
+    # --------------------------- Helpers for investment trade generation -----
+    def collect_payroll_dates
+      dates = []
+      d = 36.months.ago.to_date
+      d += 1 until d.friday?
+      while d <= Date.current
+        dates << d if d.cweek.even?
+        d += 14 # next bi-weekly
+      end
+      dates
+    end
+
+    def create_trade_for(account, security, investment_amount, date, memo, price_range: 80..200)
+      price = rand(price_range)
+      qty   = (investment_amount.to_f / price).round(2)
+      create_investment_transaction!(account, security, qty, price, date, memo)
+    end
+
+    def generate_major_purchases!
+      # Home purchase (5 years ago) - only record the down payment, not full value
+      # Property value will be set by valuation in reconcile_balances!
+      home_date = 5.years.ago.to_date
+      create_transaction!(@chase_checking, 70_000, "Home Down Payment", @housing_cat, home_date)
+      create_transaction!(@mortgage, 320_000, "Mortgage Principal", nil, home_date) # Initial mortgage debt
+
+      # Initial account funding (realistic amounts)
+      create_transaction!(@chase_checking, -5_000, "Initial Deposit", @salary_cat, 12.years.ago.to_date)
+      create_transaction!(@ally_checking, -2_000, "Initial Deposit", @salary_cat, 12.years.ago.to_date)
+      create_transaction!(@marcus_savings, -10_000, "Initial Savings", @salary_cat, 12.years.ago.to_date)
+      create_transaction!(@eu_checking, -5_000, "EUR Account Opening", nil, 4.years.ago.to_date)
+
+      # Car purchases (realistic amounts)
+      create_transaction!(@chase_checking, 3_000, "Car Down Payment", @transportation_cat, 6.years.ago.to_date)
+      create_transaction!(@chase_checking, 2_500, "Second Car Down Payment", @transportation_cat, 8.years.ago.to_date)
+
+      # Major but realistic expenses
+      create_transaction!(@chase_checking, 8_000, "Kitchen Renovation", @utilities_cat, 2.years.ago.to_date)
+      create_transaction!(@chase_checking, 5_000, "Bathroom Remodel", @utilities_cat, 1.year.ago.to_date)
+      create_transaction!(@chase_checking, 12_000, "Roof Replacement", @utilities_cat, 3.years.ago.to_date)
+      create_transaction!(@chase_checking, 8_000, "Family Emergency", @healthcare_cat, 4.years.ago.to_date)
+      create_transaction!(@chase_checking, 15_000, "Wedding Expenses", @entertainment_cat, 9.years.ago.to_date)
+    end
+
+    def generate_transfers_and_payments!
+      generate_credit_card_cycles!
+
+      generate_monthly_ally_transfers!
+      generate_quarterly_fx_transfers!
+      generate_additional_savings_transfers!
+    end
+
+    # Additional savings transfers to improve income/expense balance
+    def generate_additional_savings_transfers!
+      # Monthly extra savings transfers
+      (3.years.ago.to_date..Date.current).each do |date|
+        next unless date.day == 15 && rand < 0.7 # Semi-monthly savings
+        amount = rand(500..1500)
+        create_transfer!(@chase_checking, @marcus_savings, amount, "Extra Savings Transfer", date)
+      end
+
+      # Quarterly HSA contributions
+      (3.years.ago.to_date..Date.current).each do |date|
+        next unless date.day == 1 && [ 1, 4, 7, 10 ].include?(date.month) # Quarterly
+        amount = rand(1000..2000)
+        create_transfer!(@chase_checking, @hsa_investment, amount, "HSA Contribution", date)
+      end
+
+      # Occasional windfalls (tax refunds, bonuses, etc.)
+      8.times do
+        date = weighted_random_date
+        amount = rand(2000..8000)
+        create_transaction!(@chase_checking, -amount, "Tax Refund/Bonus", @salary_cat, date)
+      end
+
+      # CRITICAL: Regular transfers FROM savings TO checking to maintain positive balance
+      # This is realistic - people move money from savings to checking regularly
+      (3.years.ago.to_date..Date.current).each do |date|
+        next unless date.day == rand(20..28) && rand < 0.8 # Monthly transfers from savings
+        amount = rand(2000..5000)
+        create_transfer!(@marcus_savings, @chase_checking, amount, "Transfer from Savings", date)
+      end
+
+      # Weekly smaller transfers from savings for cash flow
+      (3.years.ago.to_date..Date.current).each do |date|
+        next unless date.wday == 1 && rand < 0.4 # Some Mondays
+        amount = rand(500..1200)
+        create_transfer!(@marcus_savings, @chase_checking, amount, "Weekly Cash Flow", date)
+      end
+    end
+
+    # $300 from Chase Checking to Ally Checking on the first business day of each
+    # month for the past 36 months.
+    def generate_monthly_ally_transfers!
+      date_cursor = 36.months.ago.beginning_of_month
+      while date_cursor <= Date.current
+        transfer_date = first_business_day(date_cursor)
+        create_transfer!(@chase_checking, @ally_checking, 300, "Monthly Ally Transfer", transfer_date)
+        date_cursor = date_cursor.next_month.beginning_of_month
+      end
+    end
+
+    # Quarterly $2 000 FX transfer from Chase Checking to EUR account
+    def generate_quarterly_fx_transfers!
+      date_cursor = 36.months.ago.beginning_of_quarter
+      while date_cursor <= Date.current
+        transfer_date = date_cursor + 2.days # arbitrary within quarter start
+        create_transfer!(@chase_checking, @eu_checking, 2_000, "Quarterly FX Transfer", transfer_date)
+        date_cursor = date_cursor.next_quarter.beginning_of_quarter
+      end
+    end
+
+    # Returns the first weekday (Mon-Fri) of the month containing +date+.
+    def first_business_day(date)
+      d = date.beginning_of_month
+      d += 1.day while d.saturday? || d.sunday?
+      d
+    end
+
+    def generate_credit_card_cycles!
+      # REDUCED: 30-45 charges per month across both cards for 36 months (≈1,400 total)
+      # This is still significant but more realistic than 80-120/month
+      # Pay 90-95 % of new balance 5 days post-cycle; final balances should
+      # be ~$2 500 (Amex) and ~$4 200 (Sapphire).
+
+      start_date = 36.months.ago.beginning_of_month
+      end_date   = Date.current.end_of_month
+
+      amex_balance      = 0
+      sapphire_balance  = 0
+
+      charges_this_run  = 0
+      payments_this_run = 0
+
+      date_cursor = start_date
+      while date_cursor <= end_date
+        # --- Charge generation (REDUCED FOR BALANCE) -------------------------
+        month_charge_target = rand(30..45)  # Reduced from 80-120 to 30-45
+        # Split roughly evenly but add a little variance.
+        amex_count     = (month_charge_target * rand(0.45..0.55)).to_i
+        sapphire_count = month_charge_target - amex_count
+
+        amex_total     = generate_credit_card_charges(@amex_gold,     date_cursor, amex_count)
+        sapphire_total = generate_credit_card_charges(@chase_sapphire, date_cursor, sapphire_count)
+
+        amex_balance     += amex_total
+        sapphire_balance += sapphire_total
+
+        charges_this_run += (amex_count + sapphire_count)
+
+        # --- Monthly payments (5 days after month end) ------------------------
+        payment_date = (date_cursor.end_of_month + 5.days)
+
+        if amex_total.positive?
+          amex_payment = (amex_total * rand(0.90..0.95)).round
+          create_transfer!(@chase_checking, @amex_gold, amex_payment, "Amex Payment", payment_date)
+          amex_balance -= amex_payment
+          payments_this_run += 1
+        end
+
+        if sapphire_total.positive?
+          sapphire_payment = (sapphire_total * rand(0.90..0.95)).round
+          create_transfer!(@chase_checking, @chase_sapphire, sapphire_payment, "Sapphire Payment", payment_date)
+          sapphire_balance -= sapphire_payment
+          payments_this_run += 1
+        end
+
+        date_cursor = date_cursor.next_month.beginning_of_month
+      end
+
+      # -----------------------------------------------------------------------
+      # Re-balance to hit target ending balances (tolerance ±$250)
+      # -----------------------------------------------------------------------
+      target_amex     = 2_500
+      target_sapphire = 4_200
+
+      diff_amex     = amex_balance - target_amex
+      diff_sapphire = sapphire_balance - target_sapphire
+
+      if diff_amex.abs > 250
+        adjust_payment = diff_amex.positive? ? diff_amex : 0
+        create_transfer!(@chase_checking, @amex_gold, adjust_payment, "Amex Balance Adjust", Date.current)
+        amex_balance -= adjust_payment
+      end
+
+      if diff_sapphire.abs > 250
+        adjust_payment = diff_sapphire.positive? ? diff_sapphire : 0
+        create_transfer!(@chase_checking, @chase_sapphire, adjust_payment, "Sapphire Balance Adjust", Date.current)
+        sapphire_balance -= adjust_payment
+      end
+
+      puts "   💳 Charges generated: #{charges_this_run} | Payments: #{payments_this_run}"
+      puts "   💳 Final Amex balance: ~$#{amex_balance} | target ~$#{target_amex}"
+      puts "   💳 Final Sapphire balance: ~$#{sapphire_balance} | target ~$#{target_sapphire}"
+    end
+
+    # Generate exactly +count+ charges on +account+ within the month of +base_date+.
+    # Returns total charge amount.
+    def generate_credit_card_charges(account, base_date, count)
+      total = 0
+
+      count.times do
+        charge_date = base_date + rand(0..27).days
+
+        amount = rand(15..80) # Reduced from 25..150 due to higher frequency
+        # bias amounts to achieve reasonable monthly totals
+        amount = jitter(amount, 0.15).round
+
+        merchant = if account == @amex_gold
+          pick(%w[WholeFoods Starbucks UberEats Netflix LocalBistro AirBnB])
+        else
+          pick([ "Delta Airlines", "Hilton Hotels", "Expedia", "Apple", "BestBuy", "Amazon" ])
+        end
+
+        create_transaction!(account, amount, merchant, random_expense_category, charge_date)
+        total += amount
+      end
+
+      total
+    end
+
+    def random_expense_category
+      [ @food_cat, @entertainment_cat, @shopping_cat, @travel_cat, @transportation_cat ].sample
+    end
+
+    def create_transaction!(account, amount, name, category, date)
+      # For credit cards (liabilities), positive amounts = charges (increase debt)
+      # For checking accounts (assets), positive amounts = expenses (decrease balance)
+      # The amount is already signed correctly by the caller
+      account.entries.create!(
+        entryable: Transaction.new(category: category),
         amount: amount,
+        name: name,
+        currency: account.currency,
+        date: date
+      )
+    end
+
+    def create_investment_transaction!(account, security, qty, price, date, name)
+      account.entries.create!(
+        entryable: Trade.new(security: security, qty: qty, price: price, currency: account.currency),
+        amount: -(qty * price),
+        name: name,
+        currency: account.currency,
+        date: date
+      )
+    end
+
+    def create_transfer!(from_account, to_account, amount, name, date)
+      outflow = from_account.entries.create!(
+        entryable: Transaction.new,
+        amount: amount,
+        name: name,
+        currency: from_account.currency,
+        date: date
+      )
+      inflow = to_account.entries.create!(
+        entryable: Transaction.new,
+        amount: -amount,
+        name: name,
+        currency: to_account.currency,
+        date: date
+      )
+      Transfer.create!(inflow_transaction: inflow.entryable, outflow_transaction: outflow.entryable)
+    end
+
+    def load_securities!
+      return if Security.exists?
+
+      Security.create!([
+        { ticker: "VTI", name: "Vanguard Total Stock Market ETF", country_code: "US" },
+        { ticker: "VXUS", name: "Vanguard Total International Stock ETF", country_code: "US" },
+        { ticker: "BND", name: "Vanguard Total Bond Market ETF", country_code: "US" }
+      ])
+    end
+
+    def sync_family_accounts!(family)
+      family.accounts.each do |account|
+        sync = Sync.create!(syncable: account)
+        sync.perform
+      end
+    end
+
+    # ---------------------------------------------------------------------------
+    #                         Deterministic helper methods
+    # ---------------------------------------------------------------------------
+
+    # Deterministically walk through the elements of +array+, returning the next
+    # element each time it is called with the *same* array instance.
+    #
+    # Example:
+    #   colours = %w[red green blue]
+    #   4.times.map { pick(colours) } #=> ["red", "green", "blue", "red"]
+    def pick(array)
+      @pick_indices ||= Hash.new(0)
+      idx = @pick_indices[array.object_id]
+      @pick_indices[array.object_id] += 1
+      array[idx % array.length]
+    end
+
+    # Adds a small random variation (±pct, default 3%) to +num+.  Useful for
+    # making otherwise deterministic amounts look more natural while retaining
+    # overall reproducibility via the seeded RNG.
+    def jitter(num, pct = 0.03)
+      variation = num * pct * (rand * 2 - 1) # rand(-pct..pct)
+      (num + variation).round(2)
+    end
+
+    # ---------------------------------------------------------------------------
+    # Loan payments (Task 8)
+    # ---------------------------------------------------------------------------
+    def generate_loan_payments!
+      date_cursor = 36.months.ago.beginning_of_month
+      while date_cursor <= Date.current
+        payment_date = first_business_day(date_cursor)
+
+        # Mortgage
+        make_loan_payment!(
+          principal_account: @mortgage,
+          principal_amount: 600,
+          interest_amount: 1_100,
+          interest_category: @housing_cat,
+          date: payment_date,
+          memo: "Mortgage Payment"
+        )
+
+        # Student loan
+        make_loan_payment!(
+          principal_account: @student_loan,
+          principal_amount: 350,
+          interest_amount: 100,
+          interest_category: @interest_cat,
+          date: payment_date,
+          memo: "Student Loan Payment"
+        )
+
+        # Car loan – assume 300 principal / 130 interest
+        make_loan_payment!(
+          principal_account: @car_loan,
+          principal_amount: 300,
+          interest_amount: 130,
+          interest_category: @transportation_cat,
+          date: payment_date,
+          memo: "Auto Loan Payment"
+        )
+
+        date_cursor = date_cursor.next_month.beginning_of_month
+      end
+    end
+
+    def make_loan_payment!(principal_account:, principal_amount:, interest_amount:, interest_category:, date:, memo:)
+      # Principal portion – transfer from checking to loan account
+      create_transfer!(@chase_checking, principal_account, principal_amount, memo, date)
+
+      # Interest portion – expense from checking
+      create_transaction!(@chase_checking, interest_amount, "#{memo} Interest", interest_category, date)
+    end
+
+    # Generate additional baseline expenses to reach 8k-12k transaction target
+    def generate_regular_expenses!
+      expense_generators = [
+        ->(date) { create_transaction!(@chase_checking, jitter(rand(150..220), 0.05).round, pick([ "ConEd Electric", "National Grid", "Gas & Power" ]), @utilities_cat, date) },
+        ->(date) { create_transaction!(@chase_checking, jitter(rand(10..20), 0.1).round, pick([ "Spotify", "Netflix", "Hulu", "Apple One" ]), @entertainment_cat, date) },
+        ->(date) { create_transaction!(@chase_checking, jitter(rand(45..90), 0.1).round, pick([ "Whole Foods", "Trader Joe's", "Safeway" ])+" Market", @groceries_cat, date) },
+        ->(date) { create_transaction!(@chase_checking, jitter(rand(25..50), 0.1).round, pick([ "Shell Gas", "BP Gas", "Exxon" ]), @gas_cat, date) },
+        ->(date) { create_transaction!(@chase_checking, jitter(rand(15..40), 0.1).round, pick([ "Movie Streaming", "Book Purchase", "Mobile Game" ]), @entertainment_cat, date) }
+      ]
+
+      desired = 600  # Increased from 300 to help reach 8k
+      current = Entry.joins(:account).where(accounts: { id: [ @chase_checking.id ] }, entryable_type: "Transaction").count
+      to_create = [ desired - current, 0 ].max
+
+      to_create.times do
+        date = weighted_random_date
+        expense_generators.sample.call(date)
+      end
+
+      # Add high-volume, low-impact transactions to reach 8k minimum
+      generate_micro_transactions!
+    end
+
+    # Generate many small transactions to reach volume target
+    def generate_micro_transactions!
+      # ATM withdrawals and fees (reduced)
+      120.times do  # Reduced from 200
+        date = weighted_random_date
+        amount = rand(20..60)
+        create_transaction!(@chase_checking, amount, "ATM Withdrawal", @misc_cat, date)
+        # Small ATM fee
+        create_transaction!(@chase_checking, rand(2..4), "ATM Fee", @misc_cat, date)
+      end
+
+      # Small convenience store purchases (reduced)
+      200.times do  # Reduced from 300
+        date = weighted_random_date
+        amount = rand(3..15)
+        stores = [ "7-Eleven", "Wawa", "Circle K", "Quick Stop", "Corner Store" ]
+        create_transaction!(@chase_checking, amount, stores.sample, @shopping_cat, date)
+      end
+
+      # Small digital purchases (reduced)
+      120.times do  # Reduced from 200
+        date = weighted_random_date
+        amount = rand(1..10)
+        items = [ "App Store", "Google Play", "iTunes", "Steam", "Kindle Book" ]
+        create_transaction!(@chase_checking, amount, items.sample, @entertainment_cat, date)
+      end
+
+      # Parking meters and tolls (reduced)
+      100.times do  # Reduced from 150
+        date = weighted_random_date
+        amount = rand(2..8)
+        create_transaction!(@chase_checking, amount, pick([ "Parking Meter", "Bridge Toll", "Tunnel Toll" ]), @transportation_cat, date)
+      end
+
+      # Small cash transactions (reduced)
+      150.times do  # Reduced from 250
+        date = weighted_random_date
+        amount = rand(5..25)
+        vendors = [ "Food Truck", "Farmer's Market", "Street Vendor", "Tip", "Donation" ]
+        create_transaction!(@chase_checking, amount, vendors.sample, @misc_cat, date)
+      end
+
+      # Vending machine purchases (reduced)
+      60.times do  # Reduced from 100
+        date = weighted_random_date
+        amount = rand(1..5)
+        create_transaction!(@chase_checking, amount, "Vending Machine", @shopping_cat, date)
+      end
+
+      # Public transportation (reduced)
+      120.times do  # Reduced from 180
+        date = weighted_random_date
+        amount = rand(2..8)
+        transit = [ "Metro Card", "Bus Fare", "Train Ticket", "Uber/Lyft" ]
+        create_transaction!(@chase_checking, amount, transit.sample, @transportation_cat, date)
+      end
+
+      # Additional small transactions to ensure we reach 8k minimum (reduced)
+      400.times do  # Reduced from 600
+        date = weighted_random_date
+        amount = rand(1..12)
+        merchants = [
+          "Newsstand", "Coffee Cart", "Tip Jar", "Donation Box", "Laundromat",
+          "Car Wash", "Redbox", "PayPhone", "Photo Booth", "Arcade Game",
+          "Postage", "Newspaper", "Lottery Ticket", "Gumball Machine", "Ice Cream Truck"
+        ]
+        create_transaction!(@chase_checking, amount, merchants.sample, @misc_cat, date)
+      end
+
+      # Extra small transactions to ensure 8k+ volume
+      500.times do
+        date = weighted_random_date
+        amount = rand(1..8)
+        tiny_merchants = [
+          "Candy Machine", "Sticker Machine", "Penny Scale", "Charity Donation",
+          "Busker Tip", "Church Offering", "Lemonade Stand", "Girl Scout Cookies",
+          "Raffle Ticket", "Bake Sale", "Car Wash Tip", "Street Performer"
+        ]
+        create_transaction!(@chase_checking, amount, tiny_merchants.sample, @misc_cat, date)
+      end
+    end
+
+    # ---------------------------------------------------------------------------
+    # Legacy historical transactions (Task 11)
+    # ---------------------------------------------------------------------------
+    def generate_legacy_transactions!
+      # Small recent legacy transactions (3-6 years ago)
+      count = rand(40..60)  # Increased from 20-30
+      count.times do
+        years_ago = rand(3..6)
+        date = years_ago.years.ago.to_date - rand(0..364).days
+
+        base_amount = rand(12..45)  # Reduced from 15-60
+        discount    = (1 - 0.02 * [ years_ago - 3, 0 ].max)
+        amount      = (base_amount * discount).round
+
+        account = [ @chase_checking, @ally_checking ].sample
+        category = pick([ @groceries_cat, @utilities_cat, @gas_cat, @restaurants_cat, @shopping_cat ])
+
+        merchant = case category
+        when @groceries_cat then pick(%w[Walmart Kroger Safeway]) + " Market"
+        when @utilities_cat then pick([ "Local Electric", "City Water", "Gas Co." ])
+        when @gas_cat then pick(%w[Shell Exxon BP])
+        when @restaurants_cat then pick([ "Diner", "Burger Grill", "Pizza Place" ])
+        else pick([ "General Store", "Department Shop", "Outlet" ])
+        end
+
+        create_transaction!(account, amount, merchant, category, date)
+      end
+
+      # Very old transactions (7-15 years ago) - just scattered outliers
+      count = rand(25..40)  # Increased from 15-25
+      count.times do
+        years_ago = rand(7..15)
+        date = years_ago.years.ago.to_date - rand(0..364).days
+
+        base_amount = rand(8..30)  # Reduced from 10-40
+        discount    = (1 - 0.03 * [ years_ago - 7, 0 ].max)  # More discount for very old
+        amount      = (base_amount * discount).round.clamp(5, 25)  # Reduced max from 35
+
+        account = @chase_checking  # Just use main checking for simplicity
+        category = pick([ @groceries_cat, @gas_cat, @restaurants_cat ])
+
+        merchant = case category
+        when @groceries_cat then pick(%w[Walmart Kroger]) + " Market"
+        when @gas_cat then pick(%w[Shell Exxon])
+        else pick([ "Old Diner", "Local Restaurant" ])
+        end
+
+        create_transaction!(account, amount, "#{merchant} (#{years_ago}y ago)", category, date)
+      end
+
+      # Additional small transactions to reach 8k minimum if needed
+      additional_needed = [ 400, 0 ].max  # Increased from 200
+      additional_needed.times do
+        years_ago = rand(4..12)
+        date = years_ago.years.ago.to_date - rand(0..364).days
+        amount = rand(6..20)  # Reduced from 8-25
+
+        account = [ @chase_checking, @ally_checking ].sample
+        category = pick([ @groceries_cat, @gas_cat, @utilities_cat ])
+
+        merchant = "Legacy #{pick(%w[Store Gas Electric])}"
+        create_transaction!(account, amount, merchant, category, date)
+      end
+    end
+
+    # ---------------------------------------------------------------------------
+    # Crypto & misc assets (Task 12)
+    # ---------------------------------------------------------------------------
+    def generate_crypto_and_misc_assets!
+      # One-time USDC deposit 18 months ago
+      deposit_date = 18.months.ago.to_date
+      create_transaction!(@coinbase_usdc, -3_500, "Initial USDC Deposit", nil, deposit_date)
+    end
+
+    # ---------------------------------------------------------------------------
+    # Balance Reconciliation (Task 14)
+    # ---------------------------------------------------------------------------
+    def reconcile_balances!(family)
+      # Use valuations only for property/vehicle accounts that should have specific values
+      # All other accounts should reach target balances through natural transaction flow
+
+      # Property valuations (these accounts are valued, not transaction-driven)
+      @home.entries.create!(
+        entryable: Valuation.new(kind: "current_anchor"),
+        amount: 350_000,
+        name: Valuation.build_current_anchor_name(@home.accountable_type),
         currency: "USD",
-        entryable: Account::Valuation.new
-    end
+        date: Date.current
+      )
 
-    def random_family_record(model)
-      family_records = model.where(family_id: family.id)
-      model.offset(rand(family_records.count)).first
-    end
+      # Vehicle valuations (these depreciate over time)
+      @honda_accord.entries.create!(
+        entryable: Valuation.new(kind: "current_anchor"),
+        amount: 18_000,
+        name: Valuation.build_current_anchor_name(@honda_accord.accountable_type),
+        currency: "USD",
+        date: Date.current
+      )
 
-    def category_for_merchant(merchant)
-      mapping = {
-        "Amazon" => "Shopping",
-        "Starbucks" => "Food & Drink",
-        "McDonald's" => "Food & Drink",
-        "Target" => "Shopping",
-        "Costco" => "Food & Drink",
-        "Home Depot" => "Home Improvement",
-        "Shell" => "Auto & Transport",
-        "Whole Foods" => "Food & Drink",
-        "Walgreens" => "Personal Care",
-        "Nike" => "Shopping",
-        "Uber" => "Auto & Transport",
-        "Netflix" => "Entertainment",
-        "Spotify" => "Entertainment",
-        "Delta Airlines" => "Travel",
-        "Airbnb" => "Travel",
-        "Sephora" => "Personal Care"
-      }
+      @tesla_model3.entries.create!(
+        entryable: Valuation.new(kind: "current_anchor"),
+        amount: 4_500,
+        name: Valuation.build_current_anchor_name(@tesla_model3.accountable_type),
+        currency: "USD",
+        date: Date.current
+      )
 
-      categories.find { |c| c.name == mapping[merchant.name] }
-    end
+      @jewelry.entries.create!(
+        entryable: Valuation.new(kind: "reconciliation"),
+        amount: 2000,
+        name: Valuation.build_reconciliation_name(@jewelry.accountable_type),
+        currency: "USD",
+        date: 90.days.ago.to_date
+      )
 
-    def tag_for_merchant(merchant)
-      mapping = {
-        "Delta Airlines" => "Trips",
-        "Airbnb" => "Trips"
-      }
+      @personal_loc.entries.create!(
+        entryable: Valuation.new(kind: "reconciliation"),
+        amount: 800,
+        name: Valuation.build_reconciliation_name(@personal_loc.accountable_type),
+        currency: "USD",
+        date: 120.days.ago.to_date
+      )
 
-      tag_from_merchant = tags.find { |t| t.name == mapping[merchant.name] }
-
-      tag_from_merchant || tags.find { |t| t.name == "Demo Tag" }
-    end
-
-    def securities
-      @securities ||= Security.all.to_a
-    end
-
-    def merchants
-      @merchants ||= family.merchants
-    end
-
-    def categories
-      @categories ||= family.categories
-    end
-
-    def tags
-      @tags ||= family.tags
-    end
-
-    def income_tag
-      @income_tag ||= tags.find { |t| t.name == "Emergency Fund" }
-    end
-
-    def income_category
-      @income_category ||= categories.find { |c| c.name == "Income" }
+      puts "   ✅ Set property and vehicle valuations"
     end
 end
diff --git a/app/models/depository.rb b/app/models/depository.rb
index 8ae1924d..b788a6d4 100644
--- a/app/models/depository.rb
+++ b/app/models/depository.rb
@@ -1,3 +1,29 @@
 class Depository < ApplicationRecord
   include Accountable
+
+  SUBTYPES = {
+    "checking" => { short: "Checking", long: "Checking" },
+    "savings" => { short: "Savings", long: "Savings" },
+    "hsa" => { short: "HSA", long: "Health Savings Account" },
+    "cd" => { short: "CD", long: "Certificate of Deposit" },
+    "money_market" => { short: "MM", long: "Money Market" }
+  }.freeze
+
+  class << self
+    def display_name
+      "Cash"
+    end
+
+    def color
+      "#875BF7"
+    end
+
+    def classification
+      "asset"
+    end
+
+    def icon
+      "landmark"
+    end
+  end
 end
diff --git a/app/models/developer_message.rb b/app/models/developer_message.rb
new file mode 100644
index 00000000..3ba9b3ea
--- /dev/null
+++ b/app/models/developer_message.rb
@@ -0,0 +1,10 @@
+class DeveloperMessage < Message
+  def role
+    "developer"
+  end
+
+  private
+    def broadcast?
+      chat.debug_mode?
+    end
+end
diff --git a/app/models/entry.rb b/app/models/entry.rb
new file mode 100644
index 00000000..332cbee9
--- /dev/null
+++ b/app/models/entry.rb
@@ -0,0 +1,99 @@
+class Entry < ApplicationRecord
+  include Monetizable, Enrichable
+
+  monetize :amount
+
+  belongs_to :account
+  belongs_to :transfer, optional: true
+  belongs_to :import, optional: true
+
+  delegated_type :entryable, types: Entryable::TYPES, dependent: :destroy
+  accepts_nested_attributes_for :entryable
+
+  validates :date, :name, :amount, :currency, presence: true
+  validates :date, uniqueness: { scope: [ :account_id, :entryable_type ] }, if: -> { valuation? }
+  validates :date, comparison: { greater_than: -> { min_supported_date } }
+
+  scope :visible, -> {
+    joins(:account).where(accounts: { status: [ "draft", "active" ] })
+  }
+
+  scope :chronological, -> {
+    order(
+      date: :asc,
+      Arel.sql("CASE WHEN entries.entryable_type = 'Valuation' THEN 1 ELSE 0 END") => :asc,
+      created_at: :asc
+    )
+  }
+
+  scope :reverse_chronological, -> {
+    order(
+      date: :desc,
+      Arel.sql("CASE WHEN entries.entryable_type = 'Valuation' THEN 1 ELSE 0 END") => :desc,
+      created_at: :desc
+    )
+  }
+
+  def classification
+    amount.negative? ? "income" : "expense"
+  end
+
+  def lock_saved_attributes!
+    super
+    entryable.lock_saved_attributes!
+  end
+
+  def sync_account_later
+    sync_start_date = [ date_previously_was, date ].compact.min unless destroyed?
+    account.sync_later(window_start_date: sync_start_date)
+  end
+
+  def entryable_name_short
+    entryable_type.demodulize.underscore
+  end
+
+  def balance_trend(entries, balances)
+    Balance::TrendCalculator.new(self, entries, balances).trend
+  end
+
+  def linked?
+    plaid_id.present?
+  end
+
+  class << self
+    def search(params)
+      EntrySearch.new(params).build_query(all)
+    end
+
+    # arbitrary cutoff date to avoid expensive sync operations
+    def min_supported_date
+      30.years.ago.to_date
+    end
+
+    def bulk_update!(bulk_update_params)
+      bulk_attributes = {
+        date: bulk_update_params[:date],
+        notes: bulk_update_params[:notes],
+        entryable_attributes: {
+          category_id: bulk_update_params[:category_id],
+          merchant_id: bulk_update_params[:merchant_id],
+          tag_ids: bulk_update_params[:tag_ids]
+        }.compact_blank
+      }.compact_blank
+
+      return 0 if bulk_attributes.blank?
+
+      transaction do
+        all.each do |entry|
+          bulk_attributes[:entryable_attributes][:id] = entry.entryable_id if bulk_attributes[:entryable_attributes].present?
+          entry.update! bulk_attributes
+
+          entry.lock_saved_attributes!
+          entry.entryable.lock_attr!(:tag_ids) if entry.transaction? && entry.transaction.tags.any?
+        end
+      end
+
+      all.size
+    end
+  end
+end
diff --git a/app/models/entry_search.rb b/app/models/entry_search.rb
new file mode 100644
index 00000000..07793df4
--- /dev/null
+++ b/app/models/entry_search.rb
@@ -0,0 +1,69 @@
+class EntrySearch
+  include ActiveModel::Model
+  include ActiveModel::Attributes
+
+  attribute :search, :string
+  attribute :amount, :string
+  attribute :amount_operator, :string
+  attribute :types, :string
+  attribute :accounts, array: true
+  attribute :account_ids, array: true
+  attribute :start_date, :string
+  attribute :end_date, :string
+
+  class << self
+    def apply_search_filter(scope, search)
+      return scope if search.blank?
+
+      query = scope
+      query = query.where("entries.name ILIKE :search",
+        search: "%#{ActiveRecord::Base.sanitize_sql_like(search)}%"
+      )
+      query
+    end
+
+    def apply_date_filters(scope, start_date, end_date)
+      return scope if start_date.blank? && end_date.blank?
+
+      query = scope
+      query = query.where("entries.date >= ?", start_date) if start_date.present?
+      query = query.where("entries.date <= ?", end_date) if end_date.present?
+      query
+    end
+
+    def apply_amount_filter(scope, amount, amount_operator)
+      return scope if amount.blank? || amount_operator.blank?
+
+      query = scope
+
+      case amount_operator
+      when "equal"
+        query = query.where("ABS(ABS(entries.amount) - ?) <= 0.01", amount.to_f.abs)
+      when "less"
+        query = query.where("ABS(entries.amount) < ?", amount.to_f.abs)
+      when "greater"
+        query = query.where("ABS(entries.amount) > ?", amount.to_f.abs)
+      end
+
+      query
+    end
+
+    def apply_accounts_filter(scope, accounts, account_ids)
+      return scope if accounts.blank? && account_ids.blank?
+
+      query = scope
+      query = query.where(accounts: { name: accounts }) if accounts.present?
+      query = query.where(accounts: { id: account_ids }) if account_ids.present?
+      query
+    end
+  end
+
+  def build_query(scope)
+    query = scope.joins(:account)
+    query = self.class.apply_search_filter(query, search)
+    query = self.class.apply_date_filters(query, start_date, end_date)
+    query = self.class.apply_amount_filter(query, amount, amount_operator)
+    query = self.class.apply_accounts_filter(query, accounts, account_ids)
+    query
+  end
+end
diff --git a/app/models/entryable.rb b/app/models/entryable.rb
new file mode 100644
index 00000000..cf4d2282
--- /dev/null
+++ b/app/models/entryable.rb
@@ -0,0 +1,31 @@
+module Entryable
+  extend ActiveSupport::Concern
+
+  TYPES = %w[Valuation Transaction Trade]
+
+  def self.from_type(entryable_type)
+    entryable_type.presence_in(TYPES).constantize
+  end
+
+  included do
+    include Enrichable
+
+    has_one :entry, as: :entryable, touch: true
+
+    scope :with_entry, -> { joins(:entry) }
+
+    scope :visible, -> { with_entry.merge(Entry.visible) }
+
+    scope :in_period, ->(period) {
+      with_entry.where(entries: { date: period.start_date..period.end_date })
+    }
+
+    scope :reverse_chronological, -> {
+      with_entry.merge(Entry.reverse_chronological)
+    }
+
+    scope :chronological, -> {
+      with_entry.merge(Entry.chronological)
+    }
+  end
+end
diff --git a/app/models/exchange_rate.rb b/app/models/exchange_rate.rb
index 01b63e2b..cca0c41c 100644
--- a/app/models/exchange_rate.rb
+++ b/app/models/exchange_rate.rb
@@ -2,27 +2,5 @@ class ExchangeRate < ApplicationRecord
   include Provided
 
   validates :from_currency, :to_currency, :date, :rate, presence: true
-
-  class << self
-    def find_rate(from:, to:, date:, cache: true)
-      result = find_by \
-        from_currency: from,
-        to_currency: to,
-        date: date
-
-      result || fetch_rate_from_provider(from:, to:, date:, cache:)
-    end
-
-    def find_rates(from:, to:, start_date:, end_date: Date.current, cache: true)
-      rates = self.where(from_currency: from, to_currency: to, date: start_date..end_date).to_a
-      all_dates = (start_date..end_date).to_a
-      existing_dates = rates.map(&:date)
-      missing_dates = all_dates - existing_dates
-      if missing_dates.any?
-        rates += fetch_rates_from_provider(from:, to:, start_date: missing_dates.first, end_date: missing_dates.last, cache:)
-      end
-
-      rates
-    end
-  end
+  validates :date, uniqueness: { scope: %i[from_currency to_currency] }
 end
diff --git a/app/models/exchange_rate/importer.rb b/app/models/exchange_rate/importer.rb
new file mode 100644
index 00000000..0975f2ed
--- /dev/null
+++ b/app/models/exchange_rate/importer.rb
@@ -0,0 +1,156 @@
+class ExchangeRate::Importer
+  MissingExchangeRateError = Class.new(StandardError)
+  MissingStartRateError = Class.new(StandardError)
+
+  def initialize(exchange_rate_provider:, from:, to:, start_date:, end_date:, clear_cache: false)
+    @exchange_rate_provider = exchange_rate_provider
+    @from = from
+    @to = to
+    @start_date = start_date
+    @end_date = normalize_end_date(end_date)
+    @clear_cache = clear_cache
+  end
+
+  # Constructs a daily series of rates for the given currency pair for date range
+  def import_provider_rates
+    if !clear_cache && all_rates_exist?
+      Rails.logger.info("No new rates to sync for #{from} to #{to} between #{start_date} and #{end_date}, skipping")
+      return
+    end
+
+    if provider_rates.empty?
+      Rails.logger.warn("Could not fetch rates for #{from} to #{to} between #{start_date} and #{end_date} because provider returned no rates")
+      return
+    end
+
+    prev_rate_value = start_rate_value
+
+    unless prev_rate_value.present?
+      error = MissingStartRateError.new("Could not find a start rate for #{from} to #{to} between #{start_date} and #{end_date}")
+      Rails.logger.error(error.message)
+      Sentry.capture_exception(error)
+      return
+    end
+
+    gapfilled_rates = effective_start_date.upto(end_date).map do |date|
+      db_rate_value = db_rates[date]&.rate
+      provider_rate_value = provider_rates[date]&.rate
+
+      chosen_rate = if clear_cache
+        provider_rate_value || db_rate_value   # overwrite when possible
+      else
+        db_rate_value || provider_rate_value   # fill gaps
+      end
+
+      # Gapfill with LOCF strategy (last observation carried forward)
+      if chosen_rate.nil?
+        chosen_rate = prev_rate_value
+      end
+
+      prev_rate_value = chosen_rate
+
+      {
+        from_currency: from,
+        to_currency: to,
+        date: date,
+        rate: chosen_rate
+      }
+    end
+
+    upsert_rows(gapfilled_rates)
+  end
+
+  private
+    attr_reader :exchange_rate_provider, :from, :to, :start_date, :end_date, :clear_cache
+
+    def upsert_rows(rows)
+      batch_size = 200
+
+      total_upsert_count = 0
+
+      rows.each_slice(batch_size) do |batch|
+        upserted_ids = ExchangeRate.upsert_all(
+          batch,
+          unique_by: %i[from_currency to_currency date],
+          returning: [ "id" ]
+        )
+
+        total_upsert_count += upserted_ids.count
+      end
+
+      total_upsert_count
+    end
+
+    # Since provider may not return values on weekends and holidays, we grab the first rate from the provider that is on or before the start date
+    def start_rate_value
+      provider_rate_value = provider_rates.select { |date, _| date <= start_date }.max_by { |date, _| date }&.last
+      db_rate_value = db_rates[start_date]&.rate
+      provider_rate_value || db_rate_value
+    end
+
+    # No need to fetch/upsert rates for dates that we already have in the DB
+    def effective_start_date
+      return start_date if clear_cache
+
+      first_missing_date = nil
+
+      start_date.upto(end_date) do |date|
+        unless db_rates.key?(date)
+          first_missing_date = date
+          break
+        end
+      end
+
+      first_missing_date || end_date
+    end
+
+    def provider_rates
+      @provider_rates ||= begin
+        # Always fetch with a 5 day buffer to ensure we have a starting rate (for weekends and holidays)
+        provider_fetch_start_date = effective_start_date - 5.days
+
+        provider_response = exchange_rate_provider.fetch_exchange_rates(
+          from: from,
+          to: to,
+          start_date: provider_fetch_start_date,
+          end_date: end_date
+        )
+
+        if provider_response.success?
+          provider_response.data.index_by(&:date)
+        else
+          message = "#{exchange_rate_provider.class.name} could not fetch exchange rate pair from: #{from} to: #{to} between: #{effective_start_date} and: #{Date.current}.  Provider error: #{provider_response.error.message}"
+          Rails.logger.warn(message)
+          Sentry.capture_exception(MissingExchangeRateError.new(message), level: :warning)
+          {}
+        end
+      end
+    end
+
+    def all_rates_exist?
+      db_count == expected_count
+    end
+
+    def expected_count
+      (start_date..end_date).count
+    end
+
+    def db_count
+      db_rates.count
+    end
+
+    def db_rates
+      @db_rates ||= ExchangeRate.where(from_currency: from, to_currency: to, date: start_date..end_date)
+                  .order(:date)
+                  .to_a
+                  .index_by(&:date)
+    end
+
+    # Normalizes an end date so that it never exceeds today's date in the
+    # America/New_York timezone. If the caller passes a future date we clamp
+    # it to today so that upstream provider calls remain valid and predictable.
+    def normalize_end_date(requested_end_date)
+      today_est = Date.current.in_time_zone("America/New_York").to_date
+      [ requested_end_date, today_est ].min
+    end
+end
diff --git a/app/models/exchange_rate/provided.rb b/app/models/exchange_rate/provided.rb
index 1927e372..defee421 100644
--- a/app/models/exchange_rate/provided.rb
+++ b/app/models/exchange_rate/provided.rb
@@ -1,62 +1,47 @@
 module ExchangeRate::Provided
   extend ActiveSupport::Concern
 
-  include Providable
-
   class_methods do
-    def provider_healthy?
-      exchange_rates_provider.present? && exchange_rates_provider.healthy?
+    def provider
+      registry = Provider::Registry.for_concept(:exchange_rates)
+      registry.get_provider(:synth)
     end
 
-    private
+    def find_or_fetch_rate(from:, to:, date: Date.current, cache: true)
+      rate = find_by(from_currency: from, to_currency: to, date: date)
+      return rate if rate.present?
 
-      def fetch_rates_from_provider(from:, to:, start_date:, end_date: Date.current, cache: false)
-        return [] unless exchange_rates_provider.present?
+      return nil unless provider.present? # No provider configured (some self-hosted apps)
 
-        response = exchange_rates_provider.fetch_exchange_rates \
-          from: from,
-          to: to,
-          start_date: start_date,
-          end_date: end_date
+      response = provider.fetch_exchange_rate(from: from, to: to, date: date)
 
-        if response.success?
-          response.rates.map do |exchange_rate|
-            rate = ExchangeRate.new \
-              from_currency: from,
-              to_currency: to,
-              date: exchange_rate.dig(:date).to_date,
-              rate: exchange_rate.dig(:rate)
+      return nil unless response.success? # Provider error
 
-            rate.save! if cache
-            rate
-          rescue ActiveRecord::RecordNotUnique
-            next
-          end
-        else
-          []
-        end
+      rate = response.data
+      ExchangeRate.find_or_create_by!(
+        from_currency: rate.from,
+        to_currency: rate.to,
+        date: rate.date,
+        rate: rate.rate
+      ) if cache
+      rate
+    end
+
+    # @return [Integer] The number of exchange rates synced
+    def import_provider_rates(from:, to:, start_date:, end_date:, clear_cache: false)
+      unless provider.present?
+        Rails.logger.warn("No provider configured for ExchangeRate.import_provider_rates")
+        return 0
       end
 
-      def fetch_rate_from_provider(from:, to:, date:, cache: false)
-        return nil unless exchange_rates_provider.present?
-
-        response = exchange_rates_provider.fetch_exchange_rate \
-          from: from,
-          to: to,
-          date: date
-
-        if response.success?
-          rate = ExchangeRate.new \
-            from_currency: from,
-            to_currency: to,
-            rate: response.rate,
-            date: date
-
-          rate.save! if cache
-          rate
-        else
-          nil
-        end
-      end
+      ExchangeRate::Importer.new(
+        exchange_rate_provider: provider,
+        from: from,
+        to: to,
+        start_date: start_date,
+        end_date: end_date,
+        clear_cache: clear_cache
+      ).import_provider_rates
+    end
   end
 end
diff --git a/app/models/family.rb b/app/models/family.rb
index 24da7ddd..1f35488f 100644
--- a/app/models/family.rb
+++ b/app/models/family.rb
@@ -1,138 +1,119 @@
 class Family < ApplicationRecord
-  include Providable
+  include PlaidConnectable, Syncable, AutoTransferMatchable, Subscribeable
+
+  DATE_FORMATS = [
+    [ "MM-DD-YYYY", "%m-%d-%Y" ],
+    [ "DD.MM.YYYY", "%d.%m.%Y" ],
+    [ "DD-MM-YYYY", "%d-%m-%Y" ],
+    [ "YYYY-MM-DD", "%Y-%m-%d" ],
+    [ "DD/MM/YYYY", "%d/%m/%Y" ],
+    [ "YYYY/MM/DD", "%Y/%m/%d" ],
+    [ "MM/DD/YYYY", "%m/%d/%Y" ],
+    [ "D/MM/YYYY", "%e/%m/%Y" ],
+    [ "YYYY.MM.DD", "%Y.%m.%d" ]
+  ].freeze
 
   has_many :users, dependent: :destroy
-  has_many :tags, dependent: :destroy
   has_many :accounts, dependent: :destroy
-  has_many :institutions, dependent: :destroy
+  has_many :invitations, dependent: :destroy
+
   has_many :imports, dependent: :destroy
-  has_many :transactions, through: :accounts
+
   has_many :entries, through: :accounts
+  has_many :transactions, through: :accounts
+  has_many :rules, dependent: :destroy
+  has_many :trades, through: :accounts
+  has_many :holdings, through: :accounts
+
+  has_many :tags, dependent: :destroy
   has_many :categories, dependent: :destroy
-  has_many :merchants, dependent: :destroy
-  has_many :issues, through: :accounts
+  has_many :merchants, dependent: :destroy, class_name: "FamilyMerchant"
+
+  has_many :budgets, dependent: :destroy
+  has_many :budget_categories, through: :budgets
 
   validates :locale, inclusion: { in: I18n.available_locales.map(&:to_s) }
+  validates :date_format, inclusion: { in: DATE_FORMATS.map(&:last) }
 
-  def snapshot(period = Period.all)
-    query = accounts.active.joins(:balances)
-              .where("account_balances.currency = ?", self.currency)
-              .select(
-                "account_balances.currency",
-                "account_balances.date",
-                "SUM(CASE WHEN accounts.classification = 'liability' THEN account_balances.balance ELSE 0 END) AS liabilities",
-                "SUM(CASE WHEN accounts.classification = 'asset' THEN account_balances.balance ELSE 0 END) AS assets",
-                "SUM(CASE WHEN accounts.classification = 'asset' THEN account_balances.balance WHEN accounts.classification = 'liability' THEN -account_balances.balance ELSE 0 END) AS net_worth",
-              )
-              .group("account_balances.date, account_balances.currency")
-              .order("account_balances.date")
-
-    query = query.where("account_balances.date >= ?", period.date_range.begin) if period.date_range.begin
-    query = query.where("account_balances.date <= ?", period.date_range.end) if period.date_range.end
-    result = query.to_a
-
-    {
-      asset_series: TimeSeries.new(result.map { |r| { date: r.date, value: Money.new(r.assets, r.currency) } }),
-      liability_series: TimeSeries.new(result.map { |r| { date: r.date, value: Money.new(r.liabilities, r.currency) } }),
-      net_worth_series: TimeSeries.new(result.map { |r| { date: r.date, value: Money.new(r.net_worth, r.currency) } })
-    }
+  def assigned_merchants
+    merchant_ids = transactions.where.not(merchant_id: nil).pluck(:merchant_id).uniq
+    Merchant.where(id: merchant_ids)
   end
 
-  def snapshot_account_transactions
-    period = Period.last_30_days
-    results = accounts.active.joins(:entries)
-                      .select(
-                        "accounts.*",
-                        "COALESCE(SUM(account_entries.amount) FILTER (WHERE account_entries.amount > 0), 0) AS spending",
-                        "COALESCE(SUM(-account_entries.amount) FILTER (WHERE account_entries.amount < 0), 0) AS income"
-                      )
-                      .where("account_entries.date >= ?", period.date_range.begin)
-                      .where("account_entries.date <= ?", period.date_range.end)
-                      .where("account_entries.marked_as_transfer = ?", false)
-                      .where("account_entries.entryable_type = ?", "Account::Transaction")
-                      .group("accounts.id")
-                      .having("SUM(ABS(account_entries.amount)) > 0")
-                      .to_a
+  def auto_categorize_transactions_later(transactions)
+    AutoCategorizeJob.perform_later(self, transaction_ids: transactions.pluck(:id))
+  end
 
-    results.each do |r|
-      r.define_singleton_method(:savings_rate) do
-        (income - spending) / income
-      end
+  def auto_categorize_transactions(transaction_ids)
+    AutoCategorizer.new(self, transaction_ids: transaction_ids).auto_categorize
+  end
+
+  def auto_detect_transaction_merchants_later(transactions)
+    AutoDetectMerchantsJob.perform_later(self, transaction_ids: transactions.pluck(:id))
+  end
+
+  def auto_detect_transaction_merchants(transaction_ids)
+    AutoMerchantDetector.new(self, transaction_ids: transaction_ids).auto_detect
+  end
+
+  def balance_sheet
+    @balance_sheet ||= BalanceSheet.new(self)
+  end
+
+  def income_statement
+    @income_statement ||= IncomeStatement.new(self)
+  end
+
+  def eu?
+    country != "US" && country != "CA"
+  end
+
+  def requires_data_provider?
+    # If family has any trades, they need a provider for historical prices
+    return true if trades.any?
+
+    # If family has any accounts not denominated in the family's currency, they need a provider for historical exchange rates
+    return true if accounts.where.not(currency: self.currency).any?
+
+    # If family has any entries in different currencies, they need a provider for historical exchange rates
+    uniq_currencies = entries.pluck(:currency).uniq
+    return true if uniq_currencies.count > 1
+    return true if uniq_currencies.count > 0 && uniq_currencies.first != self.currency
+
+    false
+  end
+
+  def missing_data_provider?
+    requires_data_provider? && Provider::Registry.get_provider(:synth).nil?
+  end
+
+  def oldest_entry_date
+    entries.order(:date).first&.date || Date.current
+  end
+
+  # Used for invalidating family / balance sheet related aggregation queries
+  def build_cache_key(key, invalidate_on_data_updates: false)
+    # Our data sync process updates this timestamp whenever any family account successfully completes a data update.
+    # By including it in the cache key, we can expire caches every time family account data changes.
+    data_invalidation_key = invalidate_on_data_updates ? latest_sync_completed_at : nil
+
+    [
+      id,
+      key,
+      data_invalidation_key,
+      accounts.maximum(:updated_at)
+    ].compact.join("_")
+  end
+
+  # Used for invalidating entry related aggregation queries
+  def entries_cache_version
+    @entries_cache_version ||= begin
+      ts = entries.maximum(:updated_at)
+      ts.present? ? ts.to_i : 0
     end
-
-    {
-      top_spenders: results.sort_by(&:spending).select { |a| a.spending > 0 }.reverse,
-      top_earners: results.sort_by(&:income).select { |a| a.income > 0 }.reverse,
-      top_savers: results.sort_by { |a| a.savings_rate }.reverse
-    }
   end
 
-  def snapshot_transactions
-    candidate_entries = entries.account_transactions.without_transfers
-    rolling_totals = Account::Entry.daily_rolling_totals(candidate_entries, self.currency, period: Period.last_30_days)
-
-    spending = []
-    income = []
-    savings = []
-    rolling_totals.each do |r|
-      spending << {
-        date: r.date,
-        value: Money.new(r.rolling_spend, self.currency)
-      }
-
-      income << {
-        date: r.date,
-        value: Money.new(r.rolling_income, self.currency)
-      }
-
-      savings << {
-        date: r.date,
-        value: r.rolling_income != 0 ? (r.rolling_income - r.rolling_spend) / r.rolling_income : 0.to_d
-      }
-    end
-
-    {
-      income_series: TimeSeries.new(income, favorable_direction: "up"),
-      spending_series: TimeSeries.new(spending, favorable_direction: "down"),
-      savings_rate_series: TimeSeries.new(savings, favorable_direction: "up")
-    }
-  end
-
-  def net_worth
-    assets - liabilities
-  end
-
-  def assets
-    Money.new(accounts.active.assets.map { |account| account.balance_money.exchange_to(currency, fallback_rate: 0) }.sum, currency)
-  end
-
-  def liabilities
-    Money.new(accounts.active.liabilities.map { |account| account.balance_money.exchange_to(currency, fallback_rate: 0) }.sum, currency)
-  end
-
-  def sync(start_date: nil)
-    accounts.active.each do |account|
-      if account.needs_sync?
-        account.sync_later(start_date: start_date || account.last_sync_date)
-      end
-    end
-
-    update! last_synced_at: Time.now
-  end
-
-  def needs_sync?
-    last_synced_at.nil? || last_synced_at.to_date < Date.current
-  end
-
-  def synth_usage
-    self.class.synth_provider&.usage
-  end
-
-  def subscribed?
-    stripe_subscription_status.present? && stripe_subscription_status == "active"
-  end
-
-  def primary_user
-    users.order(:created_at).first
+  def self_hoster?
+    Rails.application.config.app_mode.self_hosted?
   end
 end
diff --git a/app/models/family/auto_categorizer.rb b/app/models/family/auto_categorizer.rb
new file mode 100644
index 00000000..1ac8b874
--- /dev/null
+++ b/app/models/family/auto_categorizer.rb
@@ -0,0 +1,83 @@
+class Family::AutoCategorizer
+  Error = Class.new(StandardError)
+
+  def initialize(family, transaction_ids: [])
+    @family = family
+    @transaction_ids = transaction_ids
+  end
+
+  def auto_categorize
+    raise Error, "No LLM provider for auto-categorization" unless llm_provider
+
+    if scope.none?
+      Rails.logger.info("No transactions to auto-categorize for family #{family.id}")
+      return
+    else
+      Rails.logger.info("Auto-categorizing #{scope.count} transactions for family #{family.id}")
+    end
+
+    result = llm_provider.auto_categorize(
+      transactions: transactions_input,
+      user_categories: user_categories_input
+    )
+
+    unless result.success?
+      Rails.logger.error("Failed to auto-categorize transactions for family #{family.id}: #{result.error.message}")
+      return
+    end
+
+    scope.each do |transaction|
+      auto_categorization = result.data.find { |c| c.transaction_id == transaction.id }
+
+      category_id = user_categories_input.find { |c| c[:name] == auto_categorization&.category_name }&.dig(:id)
+
+      if category_id.present?
+        transaction.enrich_attribute(
+          :category_id,
+          category_id,
+          source: "ai"
+        )
+      end
+
+      transaction.lock_attr!(:category_id)
+    end
+  end
+
+  private
+    attr_reader :family, :transaction_ids
+
+    # For now, OpenAI only, but this should work with any LLM concept provider
+    def llm_provider
+      Provider::Registry.get_provider(:openai)
+    end
+
+    def user_categories_input
+      family.categories.map do |category|
+        {
+          id: category.id,
+          name: category.name,
+          is_subcategory: category.subcategory?,
+          parent_id: category.parent_id,
+          classification: category.classification
+        }
+      end
+    end
+
+    def transactions_input
+      scope.map do |transaction|
+        {
+          id: transaction.id,
+          amount: transaction.entry.amount.abs,
+          classification: transaction.entry.classification,
+          description: transaction.entry.name,
+          merchant: transaction.merchant&.name
+        }
+      end
+    end
+
+    def scope
+      family.transactions.where(id: transaction_ids, category_id: nil)
+                         .enrichable(:category_id)
+                         .includes(:category, :merchant, :entry)
+    end
+end
diff --git a/app/models/family/auto_merchant_detector.rb b/app/models/family/auto_merchant_detector.rb
new file mode 100644
index 00000000..39e58a3a
--- /dev/null
+++ b/app/models/family/auto_merchant_detector.rb
@@ -0,0 +1,98 @@
+class Family::AutoMerchantDetector
+  Error = Class.new(StandardError)
+
+  def initialize(family, transaction_ids: [])
+    @family = family
+    @transaction_ids = transaction_ids
+  end
+
+  def auto_detect
+    raise "No LLM provider for auto-detecting merchants" unless llm_provider
+
+    if scope.none?
+      Rails.logger.info("No transactions to auto-detect merchants for family #{family.id}")
+      return
+    else
+      Rails.logger.info("Auto-detecting merchants for #{scope.count} transactions for family #{family.id}")
+    end
+
+    result = llm_provider.auto_detect_merchants(
+      transactions: transactions_input,
+      user_merchants: user_merchants_input
+    )
+
+    unless result.success?
+      Rails.logger.error("Failed to auto-detect merchants for family #{family.id}: #{result.error.message}")
+      return
+    end
+
+    scope.each do |transaction|
+      auto_detection = result.data.find { |c| c.transaction_id == transaction.id }
+
+      merchant_id = user_merchants_input.find { |m| m[:name] == auto_detection&.business_name }&.dig(:id)
+
+      if merchant_id.nil? && auto_detection&.business_url.present? && auto_detection&.business_name.present?
+        ai_provider_merchant = ProviderMerchant.find_or_create_by!(
+          source: "ai",
+          name: auto_detection.business_name,
+          website_url: auto_detection.business_url,
+        ) do |pm|
+          pm.logo_url = "#{default_logo_provider_url}/#{auto_detection.business_url}"
+        end
+      end
+
+      merchant_id = merchant_id || ai_provider_merchant&.id
+
+      if merchant_id.present?
+        transaction.enrich_attribute(
+          :merchant_id,
+          merchant_id,
+          source: "ai"
+        )
+
+      end
+
+      # We lock the attribute so that this Rule doesn't try to run again
+      transaction.lock_attr!(:merchant_id)
+    end
+  end
+
+  private
+    attr_reader :family, :transaction_ids
+
+    # For now, OpenAI only, but this should work with any LLM concept provider
+    def llm_provider
+      Provider::Registry.get_provider(:openai)
+    end
+
+    def default_logo_provider_url
+      "https://logo.synthfinance.com"
+    end
+
+    def user_merchants_input
+      family.merchants.map do |merchant|
+        {
+          id: merchant.id,
+          name: merchant.name
+        }
+      end
+    end
+
+    def transactions_input
+      scope.map do |transaction|
+        {
+          id: transaction.id,
+          amount: transaction.entry.amount.abs,
+          classification: transaction.entry.classification,
+          description: transaction.entry.name,
+          merchant: transaction.merchant&.name
+        }
+      end
+    end
+
+    def scope
+      family.transactions.where(id: transaction_ids, merchant_id: nil)
+                         .enrichable(:merchant_id)
+                         .includes(:merchant, :entry)
+    end
+end
diff --git a/app/models/family/auto_transfer_matchable.rb b/app/models/family/auto_transfer_matchable.rb
new file mode 100644
index 00000000..28d06f43
--- /dev/null
+++ b/app/models/family/auto_transfer_matchable.rb
@@ -0,0 +1,76 @@
+module Family::AutoTransferMatchable
+  def transfer_match_candidates
+    Entry.select([
+      "inflow_candidates.entryable_id as inflow_transaction_id",
+      "outflow_candidates.entryable_id as outflow_transaction_id",
+      "ABS(inflow_candidates.date - outflow_candidates.date) as date_diff"
+    ]).from("entries inflow_candidates")
+      .joins("
+        JOIN entries outflow_candidates ON (
+          inflow_candidates.amount < 0 AND
+          outflow_candidates.amount > 0 AND
+          inflow_candidates.account_id <> outflow_candidates.account_id AND
+          inflow_candidates.date BETWEEN outflow_candidates.date - 4 AND outflow_candidates.date + 4
+        )
+      ").joins("
+        LEFT JOIN transfers existing_transfers ON (
+          existing_transfers.inflow_transaction_id = inflow_candidates.entryable_id OR
+          existing_transfers.outflow_transaction_id = outflow_candidates.entryable_id
+        )
+      ")
+      .joins("LEFT JOIN rejected_transfers ON (
+        rejected_transfers.inflow_transaction_id = inflow_candidates.entryable_id AND
+        rejected_transfers.outflow_transaction_id = outflow_candidates.entryable_id
+      )")
+      .joins("LEFT JOIN exchange_rates ON (
+        exchange_rates.date = outflow_candidates.date AND
+        exchange_rates.from_currency = outflow_candidates.currency AND
+        exchange_rates.to_currency = inflow_candidates.currency
+      )")
+      .joins("JOIN accounts inflow_accounts ON inflow_accounts.id = inflow_candidates.account_id")
+      .joins("JOIN accounts outflow_accounts ON outflow_accounts.id = outflow_candidates.account_id")
+      .where("inflow_accounts.family_id = ? AND outflow_accounts.family_id = ?", self.id, self.id)
+      .where("inflow_accounts.status IN ('draft', 'active')")
+      .where("outflow_accounts.status IN ('draft', 'active')")
+      .where("inflow_candidates.entryable_type = 'Transaction' AND outflow_candidates.entryable_type = 'Transaction'")
+      .where("
+        (
+          inflow_candidates.currency = outflow_candidates.currency AND
+          inflow_candidates.amount = -outflow_candidates.amount
+        ) OR (
+          inflow_candidates.currency <> outflow_candidates.currency AND
+          ABS(inflow_candidates.amount / NULLIF(outflow_candidates.amount * exchange_rates.rate, 0)) BETWEEN 0.95 AND 1.05
+        )
+      ")
+      .where(existing_transfers: { id: nil })
+      .order("date_diff ASC") # Closest matches first
+  end
+
+  def auto_match_transfers!
+    # Exclude already matched transfers
+    candidates_scope = transfer_match_candidates.where(rejected_transfers: { id: nil })
+
+    # Track which transactions we've already matched to avoid duplicates
+    used_transaction_ids = Set.new
+
+    candidates = []
+
+    Transfer.transaction do
+      candidates_scope.each do |match|
+        next if used_transaction_ids.include?(match.inflow_transaction_id) ||
+               used_transaction_ids.include?(match.outflow_transaction_id)
+
+        Transfer.create!(
+          inflow_transaction_id: match.inflow_transaction_id,
+          outflow_transaction_id: match.outflow_transaction_id,
+        )
+
+        Transaction.find(match.inflow_transaction_id).update!(kind: "funds_movement")
+        Transaction.find(match.outflow_transaction_id).update!(kind: Transfer.kind_for_account(Transaction.find(match.outflow_transaction_id).entry.account))
+
+        used_transaction_ids << match.inflow_transaction_id
+        used_transaction_ids << match.outflow_transaction_id
+      end
+    end
+  end
+end
diff --git a/app/models/family/plaid_connectable.rb b/app/models/family/plaid_connectable.rb
new file mode 100644
index 00000000..b0f1f80d
--- /dev/null
+++ b/app/models/family/plaid_connectable.rb
@@ -0,0 +1,48 @@
+module Family::PlaidConnectable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :plaid_items, dependent: :destroy
+  end
+
+  def can_connect_plaid_us?
+    plaid(:us).present?
+  end
+
+  # If Plaid provider is configured and user is in the EU region
+  def can_connect_plaid_eu?
+    plaid(:eu).present? && self.eu?
+  end
+
+  def create_plaid_item!(public_token:, item_name:, region:)
+    public_token_response = plaid(region).exchange_public_token(public_token)
+
+    plaid_item = plaid_items.create!(
+      name: item_name,
+      plaid_id: public_token_response.item_id,
+      access_token: public_token_response.access_token,
+      plaid_region: region
+    )
+
+    plaid_item.sync_later
+
+    plaid_item
+  end
+
+  def get_link_token(webhooks_url:, redirect_url:, accountable_type: nil, region: :us, access_token: nil)
+    return nil unless plaid(region)
+
+    plaid(region).get_link_token(
+      user_id: self.id,
+      webhooks_url: webhooks_url,
+      redirect_url: redirect_url,
+      accountable_type: accountable_type,
+      access_token: access_token
+    ).link_token
+  end
+
+  private
+    def plaid(region)
+      Provider::Registry.plaid_provider_for_region(region)
+    end
+end
diff --git a/app/models/family/subscribeable.rb b/app/models/family/subscribeable.rb
new file mode 100644
index 00000000..94ee0971
--- /dev/null
+++ b/app/models/family/subscribeable.rb
@@ -0,0 +1,80 @@
+module Family::Subscribeable
+  extend ActiveSupport::Concern
+
+  included do
+    has_one :subscription, dependent: :destroy
+  end
+
+  def billing_email
+    primary_admin = users.admin.order(:created_at).first || users.super_admin.order(:created_at).first
+
+    unless primary_admin.present?
+      raise "No primary admin found for family #{id}.  This is an invalid data state and should never occur."
+    end
+
+    primary_admin.email
+  end
+
+  def upgrade_required?
+    return false if self_hoster?
+    return false if subscription&.active? || subscription&.trialing?
+
+    true
+  end
+
+  def can_start_trial?
+    subscription&.trial_ends_at.blank?
+  end
+
+  def start_trial_subscription!
+    create_subscription!(
+      status: "trialing",
+      trial_ends_at: Subscription.new_trial_ends_at
+    )
+  end
+
+  def trialing?
+    subscription&.trialing? && days_left_in_trial.positive?
+  end
+
+  def has_active_subscription?
+    subscription&.active?
+  end
+
+  def needs_subscription?
+    subscription.nil? && !self_hoster?
+  end
+
+  def next_billing_date
+    subscription&.current_period_ends_at
+  end
+
+  def start_subscription!(stripe_subscription_id)
+    if subscription.present?
+      subscription.update!(status: "active", stripe_id: stripe_subscription_id)
+    else
+      create_subscription!(status: "active", stripe_id: stripe_subscription_id)
+    end
+  end
+
+  def days_left_in_trial
+    return -1 unless subscription.present?
+    ((subscription.trial_ends_at - Time.current).to_i / 86400) + 1
+  end
+
+  def percentage_of_trial_remaining
+    return 0 unless subscription.present?
+    (days_left_in_trial.to_f / Subscription::TRIAL_DAYS) * 100
+  end
+
+  def percentage_of_trial_completed
+    return 0 unless subscription.present?
+    (1 - days_left_in_trial.to_f / Subscription::TRIAL_DAYS) * 100
+  end
+
+  def sync_trial_status!
+    if subscription&.status == "trialing" && days_left_in_trial < 0
+      subscription.update!(status: "paused")
+    end
+  end
+end
diff --git a/app/models/family/sync_complete_event.rb b/app/models/family/sync_complete_event.rb
new file mode 100644
index 00000000..628841d0
--- /dev/null
+++ b/app/models/family/sync_complete_event.rb
@@ -0,0 +1,21 @@
+class Family::SyncCompleteEvent
+  attr_reader :family
+
+  def initialize(family)
+    @family = family
+  end
+
+  def broadcast
+    family.broadcast_replace(
+      target: "balance-sheet",
+      partial: "pages/dashboard/balance_sheet",
+      locals: { balance_sheet: family.balance_sheet }
+    )
+
+    family.broadcast_replace(
+      target: "net-worth-chart",
+      partial: "pages/dashboard/net_worth_chart",
+      locals: { balance_sheet: family.balance_sheet, period: Period.last_30_days }
+    )
+  end
+end
diff --git a/app/models/family/syncer.rb b/app/models/family/syncer.rb
new file mode 100644
index 00000000..30ce2ad5
--- /dev/null
+++ b/app/models/family/syncer.rb
@@ -0,0 +1,31 @@
+class Family::Syncer
+  attr_reader :family
+
+  def initialize(family)
+    @family = family
+  end
+
+  def perform_sync(sync)
+    # We don't rely on this value to guard the app, but keep it eventually consistent
+    family.sync_trial_status!
+
+    Rails.logger.info("Applying rules for family #{family.id}")
+    family.rules.each do |rule|
+      rule.apply_later
+    end
+
+    # Schedule child syncs
+    child_syncables.each do |syncable|
+      syncable.sync_later(parent_sync: sync, window_start_date: sync.window_start_date, window_end_date: sync.window_end_date)
+    end
+  end
+
+  def perform_post_sync
+    family.auto_match_transfers!
+  end
+
+  private
+    def child_syncables
+      family.plaid_items + family.accounts.manual
+    end
+end
diff --git a/app/models/family_merchant.rb b/app/models/family_merchant.rb
new file mode 100644
index 00000000..eeb88188
--- /dev/null
+++ b/app/models/family_merchant.rb
@@ -0,0 +1,15 @@
+class FamilyMerchant < Merchant
+  COLORS = %w[#e99537 #4da568 #6471eb #db5a54 #df4e92 #c44fe9 #eb5429 #61c9ea #805dee #6ad28a]
+
+  belongs_to :family
+
+  before_validation :set_default_color
+
+  validates :color, presence: true
+  validates :name, uniqueness: { scope: :family }
+
+  private
+    def set_default_color
+      self.color = COLORS.sample
+    end
+end
diff --git a/app/models/gapfiller.rb b/app/models/gapfiller.rb
deleted file mode 100644
index f4f050f9..00000000
--- a/app/models/gapfiller.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-class Gapfiller
-  attr_reader :series
-
-  def initialize(series, start_date:, end_date:, cache:)
-    @series = series
-    @date_range = start_date..end_date
-    @cache = cache
-  end
-
-  def run
-    gapfilled_records = []
-
-    date_range.each do |date|
-      record = series.find { |r| r.date == date }
-
-      if should_gapfill?(date, record)
-        prev_record = gapfilled_records.find { |r| r.date == date - 1.day }
-
-        if prev_record
-          new_record = create_gapfilled_record(prev_record, date)
-          gapfilled_records << new_record
-        end
-      else
-        gapfilled_records << record if record
-      end
-    end
-
-    gapfilled_records
-  end
-
-  private
-    attr_reader :date_range, :cache
-
-    def should_gapfill?(date, record)
-      (date.on_weekend? || holiday?(date)) && record.nil?
-    end
-
-    def holiday?(date)
-      Holidays.on(date, :federalreserve, :us, :observed, :informal).any?
-    end
-
-    def create_gapfilled_record(prev_record, date)
-      new_record = prev_record.class.new(prev_record.attributes.except("id", "created_at", "updated_at"))
-      new_record.date = date
-      new_record.save! if cache
-      new_record
-    end
-end
diff --git a/app/models/account/holding.rb b/app/models/holding.rb
similarity index 51%
rename from app/models/account/holding.rb
rename to app/models/holding.rb
index 819cd5b2..af659f3e 100644
--- a/app/models/account/holding.rb
+++ b/app/models/holding.rb
@@ -1,17 +1,15 @@
-class Account::Holding < ApplicationRecord
-  include Monetizable
+class Holding < ApplicationRecord
+  include Monetizable, Gapfillable
 
   monetize :amount
 
   belongs_to :account
   belongs_to :security
 
-  validates :qty, :currency, presence: true
+  validates :qty, :currency, :date, :price, :amount, presence: true
+  validates :qty, :price, :amount, numericality: { greater_than_or_equal_to: 0 }
 
   scope :chronological, -> { order(:date) }
-  scope :current, -> { where(date: Date.current).order(amount: :desc) }
-  scope :in_period, ->(period) { period.date_range.nil? ? all : where(date: period.date_range) }
-  scope :known_value, -> { where.not(amount: nil) }
   scope :for, ->(security) { where(security_id: security).order(:date) }
 
   delegate :ticker, to: :security
@@ -22,15 +20,27 @@ class Account::Holding < ApplicationRecord
 
   def weight
     return nil unless amount
+    return 0 if amount.zero?
 
-    portfolio_value = account.holdings.current.known_value.sum(&:amount)
-    portfolio_value.zero? ? 1 : amount / portfolio_value * 100
+    account.balance.zero? ? 1 : amount / account.balance * 100
   end
 
   # Basic approximation of cost-basis
   def avg_cost
-    avg_cost = account.holdings.for(security).where("date <= ?", date).average(:price)
-    Money.new(avg_cost, currency)
+    avg_cost = account.trades
+      .with_entry
+      .joins(ActiveRecord::Base.sanitize_sql_array([
+        "LEFT JOIN exchange_rates ON (
+          exchange_rates.date = entries.date AND
+          exchange_rates.from_currency = trades.currency AND
+          exchange_rates.to_currency = ?
+        )", account.currency
+      ]))
+      .where(security_id: security.id)
+      .where("trades.qty > 0 AND entries.date <= ?", date)
+      .average("trades.price * COALESCE(exchange_rates.rate, 1)")
+
+    Money.new(avg_cost || price, currency)
   end
 
   def trend
@@ -51,13 +61,12 @@ class Account::Holding < ApplicationRecord
   end
 
   private
-
     def calculate_trend
       return nil unless amount_money
 
       start_amount = qty * avg_cost
 
-      TimeSeries::Trend.new \
+      Trend.new \
         current: amount_money,
         previous: start_amount
     end
diff --git a/app/models/holding/forward_calculator.rb b/app/models/holding/forward_calculator.rb
new file mode 100644
index 00000000..43f91f7a
--- /dev/null
+++ b/app/models/holding/forward_calculator.rb
@@ -0,0 +1,72 @@
+class Holding::ForwardCalculator
+  attr_reader :account
+
+  def initialize(account)
+    @account = account
+  end
+
+  def calculate
+    Rails.logger.tagged("Holding::ForwardCalculator") do
+      current_portfolio = generate_starting_portfolio
+      next_portfolio = {}
+      holdings = []
+
+      account.start_date.upto(Date.current).each do |date|
+        trades = portfolio_cache.get_trades(date: date)
+        next_portfolio = transform_portfolio(current_portfolio, trades, direction: :forward)
+        holdings += build_holdings(next_portfolio, date)
+        current_portfolio = next_portfolio
+      end
+
+      Holding.gapfill(holdings)
+    end
+  end
+
+  private
+    def portfolio_cache
+      @portfolio_cache ||= Holding::PortfolioCache.new(account)
+    end
+
+    def empty_portfolio
+      securities = portfolio_cache.get_securities
+      securities.each_with_object({}) { |security, hash| hash[security.id] = 0 }
+    end
+
+    def generate_starting_portfolio
+      empty_portfolio
+    end
+
+    def transform_portfolio(previous_portfolio, trade_entries, direction: :forward)
+      new_quantities = previous_portfolio.dup
+
+      trade_entries.each do |trade_entry|
+        trade = trade_entry.entryable
+        security_id = trade.security_id
+        qty_change = trade.qty
+        qty_change = qty_change * -1 if direction == :reverse
+        new_quantities[security_id] = (new_quantities[security_id] || 0) + qty_change
+      end
+
+      new_quantities
+    end
+
+    def build_holdings(portfolio, date, price_source: nil)
+      portfolio.map do |security_id, qty|
+        price = portfolio_cache.get_price(security_id, date, source: price_source)
+
+        if price.nil?
+          next
+        end
+
+        Holding.new(
+          account_id: account.id,
+          security_id: security_id,
+          date: date,
+          qty: qty,
+          price: price.price,
+          currency: price.currency,
+          amount: qty * price.price
+        )
+      end.compact
+    end
+end
diff --git a/app/models/holding/gapfillable.rb b/app/models/holding/gapfillable.rb
new file mode 100644
index 00000000..45c05089
--- /dev/null
+++ b/app/models/holding/gapfillable.rb
@@ -0,0 +1,38 @@
+module Holding::Gapfillable
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def gapfill(holdings)
+      filled_holdings = []
+
+      holdings.group_by { |h| h.security_id }.each do |security_id, security_holdings|
+        next if security_holdings.empty?
+
+        sorted = security_holdings.sort_by(&:date)
+        previous_holding = sorted.first
+
+        sorted.first.date.upto(Date.current) do |date|
+          holding = security_holdings.find { |h| h.date == date }
+
+          if holding
+            filled_holdings << holding
+            previous_holding = holding
+          else
+            # Create a new holding based on the previous day's data
+            filled_holdings << Holding.new(
+              account: previous_holding.account,
+              security: previous_holding.security,
+              date: date,
+              qty: previous_holding.qty,
+              price: previous_holding.price,
+              currency: previous_holding.currency,
+              amount: previous_holding.amount
+            )
+          end
+        end
+      end
+
+      filled_holdings
+    end
+  end
+end
diff --git a/app/models/holding/materializer.rb b/app/models/holding/materializer.rb
new file mode 100644
index 00000000..6c1e8db1
--- /dev/null
+++ b/app/models/holding/materializer.rb
@@ -0,0 +1,61 @@
+# "Materializes" holdings (similar to a DB materialized view, but done at the app level)
+# into a series of records we can easily query and join with other data.
+class Holding::Materializer
+  def initialize(account, strategy:)
+    @account = account
+    @strategy = strategy
+  end
+
+  def materialize_holdings
+    calculate_holdings
+
+    Rails.logger.info("Persisting #{@holdings.size} holdings")
+    persist_holdings
+
+    if strategy == :forward
+      purge_stale_holdings
+    end
+
+    @holdings
+  end
+
+  private
+    attr_reader :account, :strategy
+
+    def calculate_holdings
+      @holdings = calculator.calculate
+    end
+
+    def persist_holdings
+      current_time = Time.now
+
+      account.holdings.upsert_all(
+        @holdings.map { |h| h.attributes
+               .slice("date", "currency", "qty", "price", "amount", "security_id")
+               .merge("account_id" => account.id, "updated_at" => current_time) },
+        unique_by: %i[account_id security_id date currency]
+      )
+    end
+
+    def purge_stale_holdings
+      portfolio_security_ids = account.entries.trades.map { |entry| entry.entryable.security_id }.uniq
+
+      # If there are no securities in the portfolio, delete all holdings
+      if portfolio_security_ids.empty?
+        Rails.logger.info("Clearing all holdings (no securities)")
+        account.holdings.delete_all
+      else
+        deleted_count = account.holdings.delete_by("date < ? OR security_id NOT IN (?)", account.start_date, portfolio_security_ids)
+        Rails.logger.info("Purged #{deleted_count} stale holdings") if deleted_count > 0
+      end
+    end
+
+    def calculator
+      if strategy == :reverse
+        portfolio_snapshot = Holding::PortfolioSnapshot.new(account)
+        Holding::ReverseCalculator.new(account, portfolio_snapshot: portfolio_snapshot)
+      else
+        Holding::ForwardCalculator.new(account)
+      end
+    end
+end
diff --git a/app/models/holding/portfolio_cache.rb b/app/models/holding/portfolio_cache.rb
new file mode 100644
index 00000000..9ffed15b
--- /dev/null
+++ b/app/models/holding/portfolio_cache.rb
@@ -0,0 +1,135 @@
+class Holding::PortfolioCache
+  attr_reader :account, :use_holdings
+
+  class SecurityNotFound < StandardError
+    def initialize(security_id, account_id)
+      super("Security id=#{security_id} not found in portfolio cache for account #{account_id}.  This should not happen unless securities were preloaded incorrectly.")
+    end
+  end
+
+  def initialize(account, use_holdings: false)
+    @account = account
+    @use_holdings = use_holdings
+    load_prices
+  end
+
+  def get_trades(date: nil)
+    if date.blank?
+      trades
+    else
+      trades.select { |t| t.date == date }
+    end
+  end
+
+  def get_price(security_id, date, source: nil)
+    security = @security_cache[security_id]
+    raise SecurityNotFound.new(security_id, account.id) unless security
+
+    if source.present?
+      price = security[:prices].select { |p| p.price.date == date && p.source == source }.min_by(&:priority)&.price
+    else
+      price = security[:prices].select { |p| p.price.date == date }.min_by(&:priority)&.price
+    end
+
+    return nil unless price
+
+    price_money = Money.new(price.price, price.currency)
+
+    converted_amount = price_money.exchange_to(account.currency, fallback_rate: 1).amount
+
+    Security::Price.new(
+      security_id: security_id,
+      date: price.date,
+      price: converted_amount,
+      currency: account.currency
+    )
+  end
+
+  def get_securities
+    @security_cache.map { |_, v| v[:security] }
+  end
+
+  private
+    PriceWithPriority = Data.define(:price, :priority, :source)
+
+    def trades
+      @trades ||= account.entries.includes(entryable: :security).trades.chronological.to_a
+    end
+
+    def holdings
+      @holdings ||= account.holdings.chronological.to_a
+    end
+
+    def collect_unique_securities
+      unique_securities_from_trades = trades.map(&:entryable).map(&:security).uniq
+
+      return unique_securities_from_trades unless use_holdings
+
+      unique_securities_from_holdings = holdings.map(&:security).uniq
+
+      (unique_securities_from_trades + unique_securities_from_holdings).uniq
+    end
+
+    # Loads all known prices for all securities in the account with priority based on source:
+    # 1 - DB or provider prices
+    # 2 - Trade prices
+    # 3 - Holding prices
+    def load_prices
+      @security_cache = {}
+      securities = collect_unique_securities
+
+      Rails.logger.info "Preloading #{securities.size} securities for account #{account.id}"
+
+      securities.each do |security|
+        Rails.logger.info "Loading security: ID=#{security.id} Ticker=#{security.ticker}"
+
+        # High priority prices from DB (synced from provider)
+        db_prices = security.prices.where(date: account.start_date..Date.current).map do |price|
+          PriceWithPriority.new(
+            price: price,
+            priority: 1,
+            source: "db"
+          )
+        end
+
+        # Medium priority prices from trades
+        trade_prices = trades
+          .select { |t| t.entryable.security_id == security.id }
+          .map do |trade|
+            PriceWithPriority.new(
+              price: Security::Price.new(
+                security: security,
+                price: trade.entryable.price,
+                currency: trade.entryable.currency,
+                date: trade.date
+              ),
+              priority: 2,
+              source: "trade"
+            )
+          end
+
+        # Low priority prices from holdings (if applicable)
+        holding_prices = if use_holdings
+          holdings.select { |h| h.security_id == security.id }.map do |holding|
+            PriceWithPriority.new(
+              price: Security::Price.new(
+                security: security,
+                price: holding.price,
+                currency: holding.currency,
+                date: holding.date
+              ),
+              priority: 3,
+              source: "holding"
+            )
+          end
+        else
+          []
+        end
+
+        @security_cache[security.id] = {
+          security: security,
+          prices: db_prices + trade_prices + holding_prices
+        }
+      end
+    end
+end
diff --git a/app/models/holding/portfolio_snapshot.rb b/app/models/holding/portfolio_snapshot.rb
new file mode 100644
index 00000000..0c512873
--- /dev/null
+++ b/app/models/holding/portfolio_snapshot.rb
@@ -0,0 +1,32 @@
+# Captures the most recent holding quantities for each security in an account's portfolio.
+# Returns a portfolio hash compatible with the reverse calculator's format.
+class Holding::PortfolioSnapshot
+  attr_reader :account
+
+  def initialize(account)
+    @account = account
+  end
+
+  # Returns a hash of {security_id => qty} representing today's starting portfolio.
+  # Includes all securities from trades (with 0 qty if no holdings exist).
+  def to_h
+    @portfolio ||= build_portfolio
+  end
+
+  private
+    def build_portfolio
+      # Start with all securities from trades initialized to 0
+      portfolio = account.trades
+        .pluck(:security_id)
+        .uniq
+        .each_with_object({}) { |security_id, hash| hash[security_id] = 0 }
+
+      # Get the most recent holding for each security and update quantities
+      account.holdings
+        .select("DISTINCT ON (security_id) security_id, qty")
+        .order(:security_id, date: :desc)
+        .each { |holding| portfolio[holding.security_id] = holding.qty }
+
+      portfolio
+    end
+end
diff --git a/app/models/holding/reverse_calculator.rb b/app/models/holding/reverse_calculator.rb
new file mode 100644
index 00000000..656fc0d9
--- /dev/null
+++ b/app/models/holding/reverse_calculator.rb
@@ -0,0 +1,76 @@
+class Holding::ReverseCalculator
+  attr_reader :account, :portfolio_snapshot
+
+  def initialize(account, portfolio_snapshot:)
+    @account = account
+    @portfolio_snapshot = portfolio_snapshot
+  end
+
+  def calculate
+    Rails.logger.tagged("Holding::ReverseCalculator") do
+      holdings = calculate_holdings
+      Holding.gapfill(holdings)
+    end
+  end
+
+  private
+    # Reverse calculators will use the existing holdings as a source of security ids and prices
+    # since it is common for a provider to supply "current day" holdings but not all the historical
+    # trades that make up those holdings.
+    def portfolio_cache
+      @portfolio_cache ||= Holding::PortfolioCache.new(account, use_holdings: true)
+    end
+
+    def calculate_holdings
+      # Start with the portfolio snapshot passed in from the materializer
+      current_portfolio = portfolio_snapshot.to_h
+      previous_portfolio = {}
+
+      holdings = []
+
+      Date.current.downto(account.start_date).each do |date|
+        today_trades = portfolio_cache.get_trades(date: date)
+        previous_portfolio = transform_portfolio(current_portfolio, today_trades, direction: :reverse)
+
+        # If current day, always use holding prices (since that's what Plaid gives us).  For historical values, use market data (since Plaid doesn't supply historical prices)
+        holdings += build_holdings(current_portfolio, date, price_source: date == Date.current ? "holding" : nil)
+        current_portfolio = previous_portfolio
+      end
+
+      holdings
+    end
+
+    def transform_portfolio(previous_portfolio, trade_entries, direction: :forward)
+      new_quantities = previous_portfolio.dup
+
+      trade_entries.each do |trade_entry|
+        trade = trade_entry.entryable
+        security_id = trade.security_id
+        qty_change = trade.qty
+        qty_change = qty_change * -1 if direction == :reverse
+        new_quantities[security_id] = (new_quantities[security_id] || 0) + qty_change
+      end
+
+      new_quantities
+    end
+
+    def build_holdings(portfolio, date, price_source: nil)
+      portfolio.map do |security_id, qty|
+        price = portfolio_cache.get_price(security_id, date, source: price_source)
+
+        if price.nil?
+          next
+        end
+
+        Holding.new(
+          account_id: account.id,
+          security_id: security_id,
+          date: date,
+          qty: qty,
+          price: price.price,
+          currency: price.currency,
+          amount: qty * price.price
+        )
+      end.compact
+    end
+end
diff --git a/app/models/impersonation_session.rb b/app/models/impersonation_session.rb
new file mode 100644
index 00000000..0e0fd582
--- /dev/null
+++ b/app/models/impersonation_session.rb
@@ -0,0 +1,39 @@
+class ImpersonationSession < ApplicationRecord
+  belongs_to :impersonator, class_name: "User"
+  belongs_to :impersonated, class_name: "User"
+
+  has_many :logs, class_name: "ImpersonationSessionLog"
+
+  enum :status, { pending: "pending", in_progress: "in_progress", complete: "complete", rejected: "rejected" }
+
+  scope :initiated, -> { where(status: [ :pending, :in_progress ]) }
+
+  validate :impersonator_is_super_admin
+  validate :impersonated_is_not_super_admin
+  validate :impersonator_different_from_impersonated
+
+  def approve!
+    update! status: :in_progress
+  end
+
+  def reject!
+    update! status: :rejected
+  end
+
+  def complete!
+    update! status: :complete
+  end
+
+  private
+    def impersonator_is_super_admin
+      errors.add(:impersonator, "must be a super admin to impersonate") unless impersonator.super_admin?
+    end
+
+    def impersonated_is_not_super_admin
+      errors.add(:impersonated, "cannot be a super admin") if impersonated.super_admin?
+    end
+
+    def impersonator_different_from_impersonated
+      errors.add(:impersonator, "cannot be the same as the impersonated user") if impersonator == impersonated
+    end
+end
diff --git a/app/models/impersonation_session_log.rb b/app/models/impersonation_session_log.rb
new file mode 100644
index 00000000..d7fa5ac3
--- /dev/null
+++ b/app/models/impersonation_session_log.rb
@@ -0,0 +1,3 @@
+class ImpersonationSessionLog < ApplicationRecord
+  belongs_to :impersonation_session
+end
diff --git a/app/models/import.rb b/app/models/import.rb
index 15646d44..b0a02ea0 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -1,23 +1,60 @@
 class Import < ApplicationRecord
+  MaxRowCountExceededError = Class.new(StandardError)
+
   TYPES = %w[TransactionImport TradeImport AccountImport MintImport].freeze
   SIGNAGE_CONVENTIONS = %w[inflows_positive inflows_negative]
+  SEPARATORS = [ [ "Comma (,)", "," ], [ "Semicolon (;)", ";" ] ].freeze
+
+  NUMBER_FORMATS = {
+    "1,234.56" => { separator: ".", delimiter: "," },  # US/UK/Asia
+    "1.234,56" => { separator: ",", delimiter: "." },  # Most of Europe
+    "1 234,56" => { separator: ",", delimiter: " " },  # French/Scandinavian
+    "1,234"    => { separator: "",  delimiter: "," }   # Zero-decimal currencies like JPY
+  }.freeze
+
+  AMOUNT_TYPE_STRATEGIES = %w[signed_amount custom_column].freeze
 
   belongs_to :family
+  belongs_to :account, optional: true
+
+  before_validation :set_default_number_format
 
   scope :ordered, -> { order(created_at: :desc) }
 
-  enum :status, { pending: "pending", complete: "complete", importing: "importing", failed: "failed" }, validate: true
+  enum :status, {
+    pending: "pending",
+    complete: "complete",
+    importing: "importing",
+    reverting: "reverting",
+    revert_failed: "revert_failed",
+    failed: "failed"
+  }, validate: true, default: "pending"
 
   validates :type, inclusion: { in: TYPES }
-  validates :col_sep, inclusion: { in: [ ",", ";" ] }
-  validates :signage_convention, inclusion: { in: SIGNAGE_CONVENTIONS }
+  validates :amount_type_strategy, inclusion: { in: AMOUNT_TYPE_STRATEGIES }
+  validates :col_sep, inclusion: { in: SEPARATORS.map(&:last) }
+  validates :signage_convention, inclusion: { in: SIGNAGE_CONVENTIONS }, allow_nil: true
+  validates :number_format, presence: true, inclusion: { in: NUMBER_FORMATS.keys }
 
   has_many :rows, dependent: :destroy
   has_many :mappings, dependent: :destroy
   has_many :accounts, dependent: :destroy
-  has_many :entries, dependent: :destroy, class_name: "Account::Entry"
+  has_many :entries, dependent: :destroy
+
+  class << self
+    def parse_csv_str(csv_str, col_sep: ",")
+      CSV.parse(
+        (csv_str || "").strip,
+        headers: true,
+        col_sep: col_sep,
+        converters: [ ->(str) { str&.strip } ],
+        liberal_parsing: true
+      )
+    end
+  end
 
   def publish_later
+    raise MaxRowCountExceededError if row_count_exceeded?
     raise "Import is not publishable" unless publishable?
 
     update! status: :importing
@@ -26,15 +63,38 @@ class Import < ApplicationRecord
   end
 
   def publish
+    raise MaxRowCountExceededError if row_count_exceeded?
+
     import!
 
-    family.sync
+    family.sync_later
 
     update! status: :complete
   rescue => error
     update! status: :failed, error: error.message
   end
 
+  def revert_later
+    raise "Import is not revertable" unless revertable?
+
+    update! status: :reverting
+
+    RevertImportJob.perform_later(self)
+  end
+
+  def revert
+    Import.transaction do
+      accounts.destroy_all
+      entries.destroy_all
+    end
+
+    family.sync
+
+    update! status: :pending
+  rescue => error
+    update! status: :revert_failed, error: error.message
+  end
+
   def csv_rows
     @csv_rows ||= parsed_csv
   end
@@ -48,12 +108,17 @@ class Import < ApplicationRecord
   end
 
   def dry_run
-    {
+    mappings = {
       transactions: rows.count,
-      accounts: Import::AccountMapping.for_import(self).creational.count,
       categories: Import::CategoryMapping.for_import(self).creational.count,
       tags: Import::TagMapping.for_import(self).creational.count
     }
+
+    mappings.merge(
+      accounts: Import::AccountMapping.for_import(self).creational.count,
+    ) if account.nil?
+
+    mappings
   end
 
   def required_column_keys
@@ -73,6 +138,7 @@ class Import < ApplicationRecord
         date: row[date_col_label].to_s,
         qty: sanitize_number(row[qty_col_label]).to_s,
         ticker: row[ticker_col_label].to_s,
+        exchange_operating_mic: row[exchange_operating_mic_col_label].to_s,
         price: sanitize_number(row[price_col_label]).to_s,
         amount: sanitize_number(row[amount_col_label]).to_s,
         currency: (row[currency_col_label] || default_currency).to_s,
@@ -88,8 +154,20 @@ class Import < ApplicationRecord
   end
 
   def sync_mappings
-    mapping_steps.each do |mapping|
-      mapping.sync(self)
+    transaction do
+      mapping_steps.each do |mapping_class|
+        mappables_by_key = mapping_class.mappables_by_key(self)
+
+        updated_mappings = mappables_by_key.map do |key, mappable|
+          mapping = mappings.find_or_initialize_by(key: key, import: self, type: mapping_class.name)
+          mapping.mappable = mappable
+          mapping.create_when_empty = key.present? && mappable.nil?
+          mapping
+        end
+
+        updated_mappings.each { |m| m.save(validate: false) }
+        mapping_class.where.not(id: updated_mappings.map(&:id)).destroy_all
+      end
     end
   end
 
@@ -113,6 +191,10 @@ class Import < ApplicationRecord
     cleaned? && mappings.all?(&:valid?)
   end
 
+  def revertable?
+    complete? || revert_failed?
+  end
+
   def has_unassigned_account?
     mappings.accounts.where(key: "").any?
   end
@@ -121,7 +203,37 @@ class Import < ApplicationRecord
     family.accounts.empty? && has_unassigned_account?
   end
 
+  # Used to optionally pre-fill the configuration for the current import
+  def suggested_template
+    family.imports
+          .complete
+          .where(account: account, type: type)
+          .order(created_at: :desc)
+          .first
+  end
+
+  def apply_template!(import_template)
+    update!(
+      import_template.attributes.slice(
+        "date_col_label", "amount_col_label", "name_col_label",
+        "category_col_label", "tags_col_label", "account_col_label",
+        "qty_col_label", "ticker_col_label", "price_col_label",
+        "entity_type_col_label", "notes_col_label", "currency_col_label",
+        "date_format", "signage_convention", "number_format",
+        "exchange_operating_mic_col_label"
+      )
+    )
+  end
+
+  def max_row_count
+    10000
+  end
+
   private
+    def row_count_exceeded?
+      rows.count > max_row_count
+    end
+
     def import!
       # no-op, subclasses can implement for customization of algorithm
     end
@@ -135,16 +247,44 @@ class Import < ApplicationRecord
     end
 
     def parsed_csv
-      @parsed_csv ||= CSV.parse(
-        (raw_file_str || "").strip,
-        headers: true,
-        col_sep: col_sep,
-        converters: [ ->(str) { str&.strip } ]
-      )
+      @parsed_csv ||= self.class.parse_csv_str(raw_file_str, col_sep: col_sep)
     end
 
     def sanitize_number(value)
       return "" if value.nil?
-      value.gsub(/[^\d.\-]/, "")
+
+      format = NUMBER_FORMATS[number_format]
+      return "" unless format
+
+      # First, normalize spaces and remove any characters that aren't numbers, delimiters, separators, or minus signs
+      sanitized = value.to_s.strip
+
+      # Handle French/Scandinavian format specially
+      if format[:delimiter] == " "
+        sanitized = sanitized.gsub(/\s+/, "") # Remove all spaces first
+      else
+        sanitized = sanitized.gsub(/[^\d#{Regexp.escape(format[:delimiter])}#{Regexp.escape(format[:separator])}\-]/, "")
+
+        # Replace delimiter with empty string
+        if format[:delimiter].present?
+          sanitized = sanitized.gsub(format[:delimiter], "")
+        end
+      end
+
+      # Replace separator with period for proper float parsing
+      if format[:separator].present?
+        sanitized = sanitized.gsub(format[:separator], ".")
+      end
+
+      # Return empty string if not a valid number
+      unless sanitized =~ /\A-?\d+\.?\d*\z/
+        return ""
+      end
+
+      sanitized
+    end
+
+    def set_default_number_format
+      self.number_format ||= "1,234.56" # Default to US/UK format
     end
 end
diff --git a/app/models/import/account_mapping.rb b/app/models/import/account_mapping.rb
index 67b11ba5..67280da4 100644
--- a/app/models/import/account_mapping.rb
+++ b/app/models/import/account_mapping.rb
@@ -1,14 +1,17 @@
 class Import::AccountMapping < Import::Mapping
-  validates :mappable, presence: true, if: -> { key.blank? || !create_when_empty }
+  validates :mappable, presence: true, if: :requires_mapping?
 
   class << self
-    def mapping_values(import)
-      import.rows.map(&:account).uniq
+    def mappables_by_key(import)
+      unique_values = import.rows.map(&:account).uniq
+      accounts = import.family.accounts.where(name: unique_values).index_by(&:name)
+
+      unique_values.index_with { |value| accounts[value] }
     end
   end
 
   def selectable_values
-    family_accounts = import.family.accounts.alphabetically.map { |account| [ account.name, account.id ] }
+    family_accounts = import.family.accounts.manual.alphabetically.map { |account| [ account.name, account.id ] }
 
     unless key.blank?
       family_accounts.unshift [ "Add as new account", CREATE_NEW_KEY ]
@@ -42,4 +45,9 @@ class Import::AccountMapping < Import::Mapping
     self.mappable = account
     save!
   end
+
+  private
+    def requires_mapping?
+      (key.blank? || !create_when_empty) && import.account.nil?
+    end
 end
diff --git a/app/models/import/account_type_mapping.rb b/app/models/import/account_type_mapping.rb
index 8b60edcd..2d4b5431 100644
--- a/app/models/import/account_type_mapping.rb
+++ b/app/models/import/account_type_mapping.rb
@@ -2,8 +2,8 @@ class Import::AccountTypeMapping < Import::Mapping
   validates :value, presence: true
 
   class << self
-    def mapping_values(import)
-      import.rows.map(&:entity_type).uniq
+    def mappables_by_key(import)
+      import.rows.map(&:entity_type).uniq.index_with { nil }
     end
   end
 
diff --git a/app/models/import/category_mapping.rb b/app/models/import/category_mapping.rb
index 12302603..4b633ea4 100644
--- a/app/models/import/category_mapping.rb
+++ b/app/models/import/category_mapping.rb
@@ -1,7 +1,10 @@
 class Import::CategoryMapping < Import::Mapping
   class << self
-    def mapping_values(import)
-      import.rows.map(&:category).uniq
+    def mappables_by_key(import)
+      unique_values = import.rows.map(&:category).uniq
+      categories = import.family.categories.where(name: unique_values).index_by(&:name)
+
+      unique_values.index_with { |value| categories[value] }
     end
   end
 
diff --git a/app/models/import/mapping.rb b/app/models/import/mapping.rb
index a0a4bc8b..b783ef95 100644
--- a/app/models/import/mapping.rb
+++ b/app/models/import/mapping.rb
@@ -18,19 +18,8 @@ class Import::Mapping < ApplicationRecord
       find_by(key: key)&.mappable
     end
 
-    def sync(import)
-      unique_values = mapping_values(import).uniq
-
-      unique_values.each do |value|
-        mapping = find_or_initialize_by(key: value, import: import, create_when_empty: value.present?)
-        mapping.save(validate: false) if mapping.new_record?
-      end
-
-      where(import: import).where.not(key: unique_values).destroy_all
-    end
-
-    def mapping_values(import)
-      raise NotImplementedError, "Subclass must implement mapping_values"
+    def mappables_by_key(import)
+      raise NotImplementedError, "Subclass must implement mappables_by_key"
     end
   end
 
diff --git a/app/models/import/row.rb b/app/models/import/row.rb
index d4316a60..0d8d9aba 100644
--- a/app/models/import/row.rb
+++ b/app/models/import/row.rb
@@ -30,11 +30,10 @@ class Import::Row < ApplicationRecord
     end
   end
 
-  def sync_mappings
-    Import::CategoryMapping.sync(import) if import.column_keys.include?(:category)
-    Import::TagMapping.sync(import) if import.column_keys.include?(:tags)
-    Import::AccountMapping.sync(import) if import.column_keys.include?(:account)
-    Import::AccountTypeMapping.sync(import) if import.column_keys.include?(:entity_type)
+  def update_and_sync(params)
+    assign_attributes(params)
+    save!(validate: false)
+    import.sync_mappings
   end
 
   private
@@ -45,7 +44,19 @@ class Import::Row < ApplicationRecord
 
     # In the Maybe system, positive amounts == "outflows", so we must reverse signage
     def apply_transaction_signage_convention(value)
-      value * (import.signage_convention == "inflows_positive" ? -1 : 1)
+      if import.amount_type_strategy == "signed_amount"
+        value * (import.signage_convention == "inflows_positive" ? -1 : 1)
+      elsif import.amount_type_strategy == "custom_column"
+        inflow_value = import.amount_type_inflow_value
+
+        if entity_type == inflow_value
+          value * -1
+        else
+          value
+        end
+      else
+        raise "Unknown amount type strategy for import: #{import.amount_type_strategy}"
+      end
     end
 
     def required_columns
@@ -64,7 +75,7 @@ class Import::Row < ApplicationRecord
         return
       end
 
-      min_date = Account::Entry.min_supported_date
+      min_date = Entry.min_supported_date
       max_date = Date.current
 
       if parsed_date < min_date || parsed_date > max_date
diff --git a/app/models/import/tag_mapping.rb b/app/models/import/tag_mapping.rb
index 899b4dc5..4b9a1be0 100644
--- a/app/models/import/tag_mapping.rb
+++ b/app/models/import/tag_mapping.rb
@@ -1,7 +1,11 @@
 class Import::TagMapping < Import::Mapping
   class << self
-    def mapping_values(import)
-      import.rows.map(&:tags_list).flatten.uniq
+    def mappables_by_key(import)
+      unique_values = import.rows.map(&:tags_list).flatten.uniq
+
+      tags = import.family.tags.where(name: unique_values).index_by(&:name)
+
+      unique_values.index_with { |value| tags[value] }
     end
   end
 
diff --git a/app/models/income_statement.rb b/app/models/income_statement.rb
new file mode 100644
index 00000000..cfa066fe
--- /dev/null
+++ b/app/models/income_statement.rb
@@ -0,0 +1,126 @@
+class IncomeStatement
+  include Monetizable
+
+  monetize :median_expense, :median_income
+
+  attr_reader :family
+
+  def initialize(family)
+    @family = family
+  end
+
+  def totals(transactions_scope: nil)
+    transactions_scope ||= family.transactions.visible
+
+    result = totals_query(transactions_scope: transactions_scope)
+
+    total_income = result.select { |t| t.classification == "income" }.sum(&:total)
+    total_expense = result.select { |t| t.classification == "expense" }.sum(&:total)
+
+    ScopeTotals.new(
+      transactions_count: result.sum(&:transactions_count),
+      income_money: Money.new(total_income, family.currency),
+      expense_money: Money.new(total_expense, family.currency)
+    )
+  end
+
+  def expense_totals(period: Period.current_month)
+    build_period_total(classification: "expense", period: period)
+  end
+
+  def income_totals(period: Period.current_month)
+    build_period_total(classification: "income", period: period)
+  end
+
+  def median_expense(interval: "month", category: nil)
+    if category.present?
+      category_stats(interval: interval).find { |stat| stat.classification == "expense" && stat.category_id == category.id }&.median || 0
+    else
+      family_stats(interval: interval).find { |stat| stat.classification == "expense" }&.median || 0
+    end
+  end
+
+  def avg_expense(interval: "month", category: nil)
+    if category.present?
+      category_stats(interval: interval).find { |stat| stat.classification == "expense" && stat.category_id == category.id }&.avg || 0
+    else
+      family_stats(interval: interval).find { |stat| stat.classification == "expense" }&.avg || 0
+    end
+  end
+
+  def median_income(interval: "month")
+    family_stats(interval: interval).find { |stat| stat.classification == "income" }&.median || 0
+  end
+
+  private
+    ScopeTotals = Data.define(:transactions_count, :income_money, :expense_money)
+    PeriodTotal = Data.define(:classification, :total, :currency, :category_totals)
+    CategoryTotal = Data.define(:category, :total, :currency, :weight)
+
+    def categories
+      @categories ||= family.categories.all.to_a
+    end
+
+    def build_period_total(classification:, period:)
+      totals = totals_query(transactions_scope: family.transactions.visible.in_period(period)).select { |t| t.classification == classification }
+      classification_total = totals.sum(&:total)
+
+      uncategorized_category = family.categories.uncategorized
+
+      category_totals = [ *categories, uncategorized_category ].map do |category|
+        subcategory = categories.find { |c| c.id == category.parent_id }
+
+        parent_category_total = totals.select { |t| t.category_id == category.id }&.sum(&:total) || 0
+
+        children_totals = if category == uncategorized_category
+          0
+        else
+          totals.select { |t| t.parent_category_id == category.id }&.sum(&:total) || 0
+        end
+
+        category_total = parent_category_total + children_totals
+
+        weight = (category_total.zero? ? 0 : category_total.to_f / classification_total) * 100
+
+        CategoryTotal.new(
+          category: category,
+          total: category_total,
+          currency: family.currency,
+          weight: weight,
+        )
+      end
+
+      PeriodTotal.new(
+        classification: classification,
+        total: category_totals.reject { |ct| ct.category.subcategory? }.sum(&:total),
+        currency: family.currency,
+        category_totals: category_totals
+      )
+    end
+
+    def family_stats(interval: "month")
+      @family_stats ||= {}
+      @family_stats[interval] ||= Rails.cache.fetch([
+        "income_statement", "family_stats", family.id, interval, family.entries_cache_version
+      ]) { FamilyStats.new(family, interval:).call }
+    end
+
+    def category_stats(interval: "month")
+      @category_stats ||= {}
+      @category_stats[interval] ||= Rails.cache.fetch([
+        "income_statement", "category_stats", family.id, interval, family.entries_cache_version
+      ]) { CategoryStats.new(family, interval:).call }
+    end
+
+    def totals_query(transactions_scope:)
+      sql_hash = Digest::MD5.hexdigest(transactions_scope.to_sql)
+
+      Rails.cache.fetch([
+        "income_statement", "totals_query", family.id, sql_hash, family.entries_cache_version
+      ]) { Totals.new(family, transactions_scope: transactions_scope).call }
+    end
+
+    def monetizable_currency
+      family.currency
+    end
+end
diff --git a/app/models/income_statement/category_stats.rb b/app/models/income_statement/category_stats.rb
new file mode 100644
index 00000000..3daf69c5
--- /dev/null
+++ b/app/models/income_statement/category_stats.rb
@@ -0,0 +1,63 @@
+class IncomeStatement::CategoryStats
+  def initialize(family, interval: "month")
+    @family = family
+    @interval = interval
+  end
+
+  def call
+    ActiveRecord::Base.connection.select_all(sanitized_query_sql).map do |row|
+      StatRow.new(
+        category_id: row["category_id"],
+        classification: row["classification"],
+        median: row["median"],
+        avg: row["avg"]
+      )
+    end
+  end
+
+  private
+    StatRow = Data.define(:category_id, :classification, :median, :avg)
+
+    def sanitized_query_sql
+      ActiveRecord::Base.sanitize_sql_array([
+        query_sql,
+        {
+          target_currency: @family.currency,
+          interval: @interval,
+          family_id: @family.id
+        }
+      ])
+    end
+
+    def query_sql
+      <<~SQL
+        WITH period_totals AS (
+          SELECT
+            c.id as category_id,
+            date_trunc(:interval, ae.date) as period,
+            CASE WHEN ae.amount < 0 THEN 'income' ELSE 'expense' END as classification,
+            SUM(ae.amount * COALESCE(er.rate, 1)) as total
+          FROM transactions t
+          JOIN entries ae ON ae.entryable_id = t.id AND ae.entryable_type = 'Transaction'
+          JOIN accounts a ON a.id = ae.account_id
+          LEFT JOIN categories c ON c.id = t.category_id
+          LEFT JOIN exchange_rates er ON (
+            er.date = ae.date AND
+            er.from_currency = ae.currency AND
+            er.to_currency = :target_currency
+          )
+          WHERE a.family_id = :family_id
+            AND t.kind NOT IN ('funds_movement', 'one_time', 'cc_payment')
+            AND ae.excluded = false
+          GROUP BY c.id, period, CASE WHEN ae.amount < 0 THEN 'income' ELSE 'expense' END
+        )
+        SELECT
+          category_id,
+          classification,
+          ABS(PERCENTILE_CONT(0.5) WITHIN GROUP (ORDER BY total)) as median,
+          ABS(AVG(total)) as avg
+        FROM period_totals
+        GROUP BY category_id, classification;
+      SQL
+    end
+end
diff --git a/app/models/income_statement/family_stats.rb b/app/models/income_statement/family_stats.rb
new file mode 100644
index 00000000..a2509b11
--- /dev/null
+++ b/app/models/income_statement/family_stats.rb
@@ -0,0 +1,59 @@
+class IncomeStatement::FamilyStats
+  def initialize(family, interval: "month")
+    @family = family
+    @interval = interval
+  end
+
+  def call
+    ActiveRecord::Base.connection.select_all(sanitized_query_sql).map do |row|
+      StatRow.new(
+        classification: row["classification"],
+        median: row["median"],
+        avg: row["avg"]
+      )
+    end
+  end
+
+  private
+    StatRow = Data.define(:classification, :median, :avg)
+
+    def sanitized_query_sql
+      ActiveRecord::Base.sanitize_sql_array([
+        query_sql,
+        {
+          target_currency: @family.currency,
+          interval: @interval,
+          family_id: @family.id
+        }
+      ])
+    end
+
+    def query_sql
+      <<~SQL
+        WITH period_totals AS (
+          SELECT
+            date_trunc(:interval, ae.date) as period,
+            CASE WHEN ae.amount < 0 THEN 'income' ELSE 'expense' END as classification,
+            SUM(ae.amount * COALESCE(er.rate, 1)) as total
+          FROM transactions t
+          JOIN entries ae ON ae.entryable_id = t.id AND ae.entryable_type = 'Transaction'
+          JOIN accounts a ON a.id = ae.account_id
+          LEFT JOIN exchange_rates er ON (
+            er.date = ae.date AND
+            er.from_currency = ae.currency AND
+            er.to_currency = :target_currency
+          )
+          WHERE a.family_id = :family_id
+            AND t.kind NOT IN ('funds_movement', 'one_time', 'cc_payment')
+            AND ae.excluded = false
+          GROUP BY period, CASE WHEN ae.amount < 0 THEN 'income' ELSE 'expense' END
+        )
+        SELECT
+          classification,
+          ABS(PERCENTILE_CONT(0.5) WITHIN GROUP (ORDER BY total)) as median,
+          ABS(AVG(total)) as avg
+        FROM period_totals
+        GROUP BY classification;
+      SQL
+    end
+end
diff --git a/app/models/income_statement/totals.rb b/app/models/income_statement/totals.rb
new file mode 100644
index 00000000..858093a7
--- /dev/null
+++ b/app/models/income_statement/totals.rb
@@ -0,0 +1,58 @@
+class IncomeStatement::Totals
+  def initialize(family, transactions_scope:)
+    @family = family
+    @transactions_scope = transactions_scope
+  end
+
+  def call
+    ActiveRecord::Base.connection.select_all(query_sql).map do |row|
+      TotalsRow.new(
+        parent_category_id: row["parent_category_id"],
+        category_id: row["category_id"],
+        classification: row["classification"],
+        total: row["total"],
+        transactions_count: row["transactions_count"]
+      )
+    end
+  end
+
+  private
+    TotalsRow = Data.define(:parent_category_id, :category_id, :classification, :total, :transactions_count)
+
+    def query_sql
+      ActiveRecord::Base.sanitize_sql_array([
+        optimized_query_sql,
+        sql_params
+      ])
+    end
+
+    # OPTIMIZED: Direct SUM aggregation without unnecessary time bucketing
+    # Eliminates CTE and intermediate date grouping for maximum performance
+    def optimized_query_sql
+      <<~SQL
+        SELECT
+          c.id as category_id,
+          c.parent_id as parent_category_id,
+          CASE WHEN ae.amount < 0 THEN 'income' ELSE 'expense' END as classification,
+          ABS(SUM(ae.amount * COALESCE(er.rate, 1))) as total,
+          COUNT(ae.id) as transactions_count
+        FROM (#{@transactions_scope.to_sql}) at
+        JOIN entries ae ON ae.entryable_id = at.id AND ae.entryable_type = 'Transaction'
+        LEFT JOIN categories c ON c.id = at.category_id
+        LEFT JOIN exchange_rates er ON (
+          er.date = ae.date AND
+          er.from_currency = ae.currency AND
+          er.to_currency = :target_currency
+        )
+        WHERE at.kind NOT IN ('funds_movement', 'one_time', 'cc_payment')
+          AND ae.excluded = false
+        GROUP BY c.id, c.parent_id, CASE WHEN ae.amount < 0 THEN 'income' ELSE 'expense' END;
+      SQL
+    end
+
+    def sql_params
+      {
+        target_currency: @family.currency
+      }
+    end
+end
diff --git a/app/models/institution.rb b/app/models/institution.rb
deleted file mode 100644
index d34ecd0e..00000000
--- a/app/models/institution.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-class Institution < ApplicationRecord
-  belongs_to :family
-  has_many :accounts, dependent: :nullify
-  has_one_attached :logo
-
-  scope :alphabetically, -> { order(name: :asc) }
-
-  def sync
-    accounts.active.each do |account|
-      if account.needs_sync?
-        account.sync
-      end
-    end
-
-    update! last_synced_at: Time.now
-  end
-
-  def syncing?
-    accounts.active.any? { |account| account.syncing? }
-  end
-
-  def has_issues?
-    accounts.active.any? { |account| account.has_issues? }
-  end
-end
diff --git a/app/models/investment.rb b/app/models/investment.rb
index d5c583fe..4e4c25c8 100644
--- a/app/models/investment.rb
+++ b/app/models/investment.rb
@@ -1,49 +1,31 @@
 class Investment < ApplicationRecord
   include Accountable
 
-  SUBTYPES = [
-    [ "Brokerage", "brokerage" ],
-    [ "Pension", "pension" ],
-    [ "Retirement", "retirement" ],
-    [ "401(k)", "401k" ],
-    [ "Traditional 401(k)", "traditional_401k" ],
-    [ "Roth 401(k)", "roth_401k" ],
-    [ "529 Plan", "529_plan" ],
-    [ "Health Savings Account", "hsa" ],
-    [ "Mutual Fund", "mutual_fund" ],
-    [ "Traditional IRA", "traditional_ira" ],
-    [ "Roth IRA", "roth_ira" ],
-    [ "Angel", "angel" ]
-  ].freeze
+  SUBTYPES = {
+    "brokerage" => { short: "Brokerage", long: "Brokerage" },
+    "pension" => { short: "Pension", long: "Pension" },
+    "retirement" => { short: "Retirement", long: "Retirement" },
+    "401k" => { short: "401(k)", long: "401(k)" },
+    "roth_401k" => { short: "Roth 401(k)", long: "Roth 401(k)" },
+    "529_plan" => { short: "529 Plan", long: "529 Plan" },
+    "hsa" => { short: "HSA", long: "Health Savings Account" },
+    "mutual_fund" => { short: "Mutual Fund", long: "Mutual Fund" },
+    "ira" => { short: "IRA", long: "Traditional IRA" },
+    "roth_ira" => { short: "Roth IRA", long: "Roth IRA" },
+    "angel" => { short: "Angel", long: "Angel" }
+  }.freeze
 
-  def value
-    account.balance_money + holdings_value
-  end
-
-  def holdings_value
-    account.holdings.current.known_value.sum(&:amount) || Money.new(0, account.currency)
-  end
-
-  def series(period: Period.all, currency: account.currency)
-    balance_series = account.balances.in_period(period).where(currency: currency)
-    holding_series = account.holdings.known_value.in_period(period).where(currency: currency)
-
-    holdings_by_date = holding_series.group_by(&:date).transform_values do |holdings|
-      holdings.sum(&:amount)
+  class << self
+    def color
+      "#1570EF"
     end
 
-    combined_series = balance_series.map do |balance|
-      holding_amount = holdings_by_date[balance.date] || 0
-
-      { date: balance.date, value: Money.new(balance.balance + holding_amount, currency) }
+    def classification
+      "asset"
     end
 
-    if combined_series.empty? && period.date_range.end == Date.current
-      TimeSeries.new([ { date: Date.current, value: self.value.exchange_to(currency) } ])
-    else
-      TimeSeries.new(combined_series)
+    def icon
+      "line-chart"
     end
-  rescue Money::ConversionError
-    TimeSeries.new([])
   end
 end
diff --git a/app/models/invitation.rb b/app/models/invitation.rb
new file mode 100644
index 00000000..caf3e543
--- /dev/null
+++ b/app/models/invitation.rb
@@ -0,0 +1,37 @@
+class Invitation < ApplicationRecord
+  belongs_to :family
+  belongs_to :inviter, class_name: "User"
+
+  validates :email, presence: true, format: { with: URI::MailTo::EMAIL_REGEXP }
+  validates :role, presence: true, inclusion: { in: %w[admin member] }
+  validates :token, presence: true, uniqueness: true
+  validates_uniqueness_of :email, scope: :family_id, message: "has already been invited to this family"
+  validate :inviter_is_admin
+
+  before_validation :generate_token, on: :create
+  before_create :set_expiration
+
+  scope :pending, -> { where(accepted_at: nil).where("expires_at > ?", Time.current) }
+  scope :accepted, -> { where.not(accepted_at: nil) }
+
+  def pending?
+    accepted_at.nil? && expires_at > Time.current
+  end
+
+  private
+
+    def generate_token
+      loop do
+        self.token = SecureRandom.hex(32)
+        break unless self.class.exists?(token: token)
+      end
+    end
+
+    def set_expiration
+      self.expires_at = 3.days.from_now
+    end
+
+    def inviter_is_admin
+      inviter.admin?
+    end
+end
diff --git a/app/models/issue.rb b/app/models/issue.rb
deleted file mode 100644
index 0f0cf2d2..00000000
--- a/app/models/issue.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-class Issue < ApplicationRecord
-  belongs_to :issuable, polymorphic: true
-
-  after_initialize :set_default_severity
-
-  enum :severity, { critical: 1, error: 2, warning: 3, info: 4 }
-
-  validates :severity, presence: true
-
-  scope :active, -> { where(resolved_at: nil) }
-  scope :ordered, -> { order(:severity) }
-
-  def title
-    model_name.human
-  end
-
-  # The conditions that must be met for an issue to be fixed
-  def stale?
-    raise NotImplementedError, "#{self.class} must implement #{__method__}"
-  end
-
-  def resolve!
-    update!(resolved_at: Time.current)
-  end
-
-  def default_severity
-    :warning
-  end
-
-  private
-
-    def set_default_severity
-      self.severity ||= default_severity
-    end
-end
diff --git a/app/models/issue/exchange_rate_provider_missing.rb b/app/models/issue/exchange_rate_provider_missing.rb
deleted file mode 100644
index 72411990..00000000
--- a/app/models/issue/exchange_rate_provider_missing.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class Issue::ExchangeRateProviderMissing < Issue
-  def default_severity
-    :error
-  end
-
-  def stale?
-    ExchangeRate.provider_healthy?
-  end
-end
diff --git a/app/models/issue/exchange_rates_missing.rb b/app/models/issue/exchange_rates_missing.rb
deleted file mode 100644
index 1527fec5..00000000
--- a/app/models/issue/exchange_rates_missing.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class Issue::ExchangeRatesMissing < Issue
-  store_accessor :data, :from_currency, :to_currency, :dates
-
-  validates :from_currency, :to_currency, :dates, presence: true
-
-  def stale?
-    if dates.length == 1
-      ExchangeRate.find_rate(from: from_currency, to: to_currency, date: dates.first).present?
-    else
-      sorted_dates = dates.sort
-      rates = ExchangeRate.find_rates(from: from_currency, to: to_currency, start_date: sorted_dates.first, end_date: sorted_dates.last)
-      rates.length == dates.length
-    end
-  end
-end
diff --git a/app/models/issue/prices_missing.rb b/app/models/issue/prices_missing.rb
deleted file mode 100644
index 6218a7de..00000000
--- a/app/models/issue/prices_missing.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-class Issue::PricesMissing < Issue
-  store_accessor :data, :missing_prices
-
-  after_initialize :initialize_missing_prices
-
-  validates :missing_prices, presence: true, allow_blank: true
-
-  def append_missing_price(ticker, date)
-    missing_prices[ticker] ||= []
-    missing_prices[ticker] << date unless missing_prices[ticker].include?(date.to_s)
-  end
-
-  def stale?
-    stale = true
-
-    missing_prices.each do |ticker, dates|
-      next unless issuable.owns_ticker?(ticker)
-
-      oldest_date = dates.min.to_date
-      expected_price_count = (oldest_date..Date.current).count
-      prices = Security::Price.find_prices(ticker: ticker, start_date: oldest_date)
-      stale = false if prices.count < expected_price_count
-    end
-
-    stale
-  end
-
-  private
-
-    def initialize_missing_prices
-      self.missing_prices ||= {}
-    end
-end
diff --git a/app/models/issue/unknown.rb b/app/models/issue/unknown.rb
deleted file mode 100644
index d232ebcb..00000000
--- a/app/models/issue/unknown.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class Issue::Unknown < Issue
-  def default_severity
-    :warning
-  end
-
-  # Unknown issues are always stale because we only want to show them
-  # to the user once.  If the same error occurs again, we'll create a new instance.
-  def stale?
-    true
-  end
-end
diff --git a/app/models/loan.rb b/app/models/loan.rb
index be8e8c2b..5a206e7a 100644
--- a/app/models/loan.rb
+++ b/app/models/loan.rb
@@ -1,19 +1,44 @@
 class Loan < ApplicationRecord
   include Accountable
 
+  SUBTYPES = {
+    "mortgage" => { short: "Mortgage", long: "Mortgage" },
+    "student" => { short: "Student", long: "Student Loan" },
+    "auto" => { short: "Auto", long: "Auto Loan" },
+    "other" => { short: "Other", long: "Other Loan" }
+  }.freeze
+
   def monthly_payment
     return nil if term_months.nil? || interest_rate.nil? || rate_type.nil? || rate_type != "fixed"
-    return Money.new(0, account.currency) if account.original_balance.amount.zero? || term_months.zero?
+    return Money.new(0, account.currency) if account.loan.original_balance.amount.zero? || term_months.zero?
 
     annual_rate = interest_rate / 100.0
     monthly_rate = annual_rate / 12.0
 
     if monthly_rate.zero?
-      payment = account.original_balance.amount / term_months
+      payment = account.loan.original_balance.amount / term_months
     else
-      payment = (account.original_balance.amount * monthly_rate * (1 + monthly_rate)**term_months) / ((1 + monthly_rate)**term_months - 1)
+      payment = (account.loan.original_balance.amount * monthly_rate * (1 + monthly_rate)**term_months) / ((1 + monthly_rate)**term_months - 1)
     end
 
     Money.new(payment.round, account.currency)
   end
+
+  def original_balance
+    Money.new(account.first_valuation_amount, account.currency)
+  end
+
+  class << self
+    def color
+      "#D444F1"
+    end
+
+    def icon
+      "hand-coins"
+    end
+
+    def classification
+      "liability"
+    end
+  end
 end
diff --git a/app/models/market_data_importer.rb b/app/models/market_data_importer.rb
new file mode 100644
index 00000000..86c3c235
--- /dev/null
+++ b/app/models/market_data_importer.rb
@@ -0,0 +1,133 @@
+class MarketDataImporter
+  # By default, our graphs show 1M as the view, so by fetching 31 days,
+  # we ensure we can always show an accurate default graph
+  SNAPSHOT_DAYS = 31
+
+  InvalidModeError = Class.new(StandardError)
+
+  def initialize(mode: :full, clear_cache: false)
+    @mode = set_mode!(mode)
+    @clear_cache = clear_cache
+  end
+
+  def import_all
+    import_security_prices
+    import_exchange_rates
+  end
+
+  # Syncs historical security prices (and details)
+  def import_security_prices
+    unless Security.provider
+      Rails.logger.warn("No provider configured for MarketDataImporter.import_security_prices, skipping sync")
+      return
+    end
+
+    # Import all securities that aren't marked as "offline" (i.e. they're available from the provider)
+    Security.online.find_each do |security|
+      security.import_provider_prices(
+        start_date: get_first_required_price_date(security),
+        end_date: end_date,
+        clear_cache: clear_cache
+      )
+
+      security.import_provider_details(clear_cache: clear_cache)
+    end
+  end
+
+  def import_exchange_rates
+    unless ExchangeRate.provider
+      Rails.logger.warn("No provider configured for MarketDataImporter.import_exchange_rates, skipping sync")
+      return
+    end
+
+    required_exchange_rate_pairs.each do |pair|
+      # pair is a Hash with keys :source, :target, and :start_date
+      start_date = snapshot? ? default_start_date : pair[:start_date]
+
+      ExchangeRate.import_provider_rates(
+        from: pair[:source],
+        to: pair[:target],
+        start_date: start_date,
+        end_date: end_date,
+        clear_cache: clear_cache
+      )
+    end
+  end
+
+  private
+    attr_reader :mode, :clear_cache
+
+    def snapshot?
+      mode.to_sym == :snapshot
+    end
+
+    # Builds a unique list of currency pairs with the earliest date we need
+    # exchange rates for.
+    #
+    # Returns: Array of Hashes – [{ source:, target:, start_date: }, ...]
+    def required_exchange_rate_pairs
+      pair_dates = {} # { [source, target] => earliest_date }
+
+      # 1. ENTRY-BASED PAIRS – we need rates from the first entry date
+      Entry.joins(:account)
+           .where.not("entries.currency = accounts.currency")
+           .group("entries.currency", "accounts.currency")
+           .minimum("entries.date")
+           .each do |(source, target), date|
+        key = [ source, target ]
+        pair_dates[key] = [ pair_dates[key], date ].compact.min
+      end
+
+      # 2. ACCOUNT-BASED PAIRS – use the account's oldest entry date
+      account_first_entry_dates = Entry.group(:account_id).minimum(:date)
+
+      Account.joins(:family)
+             .where.not("families.currency = accounts.currency")
+             .select("accounts.id, accounts.currency AS source, families.currency AS target")
+             .find_each do |account|
+        earliest_entry_date = account_first_entry_dates[account.id]
+
+        chosen_date = [ earliest_entry_date, default_start_date ].compact.min
+
+        key = [ account.source, account.target ]
+        pair_dates[key] = [ pair_dates[key], chosen_date ].compact.min
+      end
+
+      # Convert to array of hashes for ease of use
+      pair_dates.map do |(source, target), date|
+        { source: source, target: target, start_date: date }
+      end
+    end
+
+    def get_first_required_price_date(security)
+      return default_start_date if snapshot?
+
+      Trade.with_entry.where(security: security).minimum(:date) || default_start_date
+    end
+
+    # An approximation that grabs more than we likely need, but simplifies the logic
+    def get_first_required_exchange_rate_date(from_currency:)
+      return default_start_date if snapshot?
+
+      Entry.where(currency: from_currency).minimum(:date) || default_start_date
+    end
+
+    def default_start_date
+      SNAPSHOT_DAYS.days.ago.to_date
+    end
+
+    # Since we're querying market data from a US-based API, end date should always be today (EST)
+    def end_date
+      Date.current.in_time_zone("America/New_York").to_date
+    end
+
+    def set_mode!(mode)
+      valid_modes = [ :full, :snapshot ]
+
+      unless valid_modes.include?(mode.to_sym)
+        raise InvalidModeError, "Invalid mode for MarketDataImporter, can only be :full or :snapshot, but was #{mode}"
+      end
+
+      mode.to_sym
+    end
+end
diff --git a/app/models/merchant.rb b/app/models/merchant.rb
index 3d1448e2..4a4257bc 100644
--- a/app/models/merchant.rb
+++ b/app/models/merchant.rb
@@ -1,10 +1,10 @@
 class Merchant < ApplicationRecord
-  has_many :transactions, dependent: :nullify, class_name: "Account::Transaction"
-  belongs_to :family
+  TYPES = %w[FamilyMerchant ProviderMerchant].freeze
 
-  validates :name, :color, :family, presence: true
+  has_many :transactions, dependent: :nullify
+
+  validates :name, presence: true
+  validates :type, inclusion: { in: TYPES }
 
   scope :alphabetically, -> { order(:name) }
-
-  COLORS = %w[#e99537 #4da568 #6471eb #db5a54 #df4e92 #c44fe9 #eb5429 #61c9ea #805dee #6ad28a]
 end
diff --git a/app/models/message.rb b/app/models/message.rb
new file mode 100644
index 00000000..4bf5e9c0
--- /dev/null
+++ b/app/models/message.rb
@@ -0,0 +1,22 @@
+class Message < ApplicationRecord
+  belongs_to :chat
+  has_many :tool_calls, dependent: :destroy
+
+  enum :status, {
+    pending: "pending",
+    complete: "complete",
+    failed: "failed"
+  }
+
+  validates :content, presence: true
+
+  after_create_commit -> { broadcast_append_to chat, target: "messages" }, if: :broadcast?
+  after_update_commit -> { broadcast_update_to chat }, if: :broadcast?
+
+  scope :ordered, -> { order(created_at: :asc) }
+
+  private
+    def broadcast?
+      true
+    end
+end
diff --git a/app/models/mint_import.rb b/app/models/mint_import.rb
index 66e3bb69..da9ced2a 100644
--- a/app/models/mint_import.rb
+++ b/app/models/mint_import.rb
@@ -35,7 +35,7 @@ class MintImport < Import
           name: row.name,
           currency: row.currency,
           notes: row.notes,
-          entryable: Account::Transaction.new(category: category, tags: tags),
+          entryable: Transaction.new(category: category, tags: tags),
           import: self
 
         entry.save!
diff --git a/app/models/mobile_device.rb b/app/models/mobile_device.rb
new file mode 100644
index 00000000..e334e3a8
--- /dev/null
+++ b/app/models/mobile_device.rb
@@ -0,0 +1,55 @@
+class MobileDevice < ApplicationRecord
+  belongs_to :user
+  belongs_to :oauth_application, class_name: "Doorkeeper::Application", optional: true
+
+  validates :device_id, presence: true, uniqueness: { scope: :user_id }
+  validates :device_name, presence: true
+  validates :device_type, presence: true, inclusion: { in: %w[ios android] }
+
+  before_validation :set_last_seen_at, on: :create
+
+  scope :active, -> { where("last_seen_at > ?", 90.days.ago) }
+
+  def active?
+    last_seen_at > 90.days.ago
+  end
+
+  def update_last_seen!
+    update_column(:last_seen_at, Time.current)
+  end
+
+  def create_oauth_application!
+    return oauth_application if oauth_application.present?
+
+    app = Doorkeeper::Application.create!(
+      name: "Mobile App - #{device_id}",
+      redirect_uri: "maybe://oauth/callback", # Custom scheme for mobile
+      scopes: "read_write", # Use the configured scope
+      confidential: false # Public client for mobile
+    )
+
+    # Store the association
+    update!(oauth_application: app)
+    app
+  end
+
+  def active_tokens
+    return Doorkeeper::AccessToken.none unless oauth_application
+
+    Doorkeeper::AccessToken
+      .where(application: oauth_application)
+      .where(resource_owner_id: user_id)
+      .where(revoked_at: nil)
+      .where("expires_in IS NULL OR created_at + expires_in * interval '1 second' > ?", Time.current)
+  end
+
+  def revoke_all_tokens!
+    active_tokens.update_all(revoked_at: Time.current)
+  end
+
+  private
+
+    def set_last_seen_at
+      self.last_seen_at ||= Time.current
+    end
+end
diff --git a/app/models/other_asset.rb b/app/models/other_asset.rb
index d9434f6b..ad4d5c7c 100644
--- a/app/models/other_asset.rb
+++ b/app/models/other_asset.rb
@@ -1,3 +1,17 @@
 class OtherAsset < ApplicationRecord
   include Accountable
+
+  class << self
+    def color
+      "#12B76A"
+    end
+
+    def icon
+      "plus"
+    end
+
+    def classification
+      "asset"
+    end
+  end
 end
diff --git a/app/models/other_liability.rb b/app/models/other_liability.rb
index 83be97f5..03ef07ba 100644
--- a/app/models/other_liability.rb
+++ b/app/models/other_liability.rb
@@ -1,3 +1,17 @@
 class OtherLiability < ApplicationRecord
   include Accountable
+
+  class << self
+    def color
+      "#737373"
+    end
+
+    def icon
+      "minus"
+    end
+
+    def classification
+      "liability"
+    end
+  end
 end
diff --git a/app/models/period.rb b/app/models/period.rb
index 4a8a3ffa..a1a4dea2 100644
--- a/app/models/period.rb
+++ b/app/models/period.rb
@@ -1,35 +1,170 @@
 class Period
-  attr_reader :name, :date_range
+  include ActiveModel::Validations, Comparable
 
-  def self.find_by_name(name)
-    INDEX[name]
-  end
+  class InvalidKeyError < StandardError; end
 
-  def self.names
-    INDEX.keys.sort
-  end
+  attr_reader :key, :start_date, :end_date
 
-  def initialize(name: "custom", date_range:)
-    @name = name
-    @date_range = date_range
-  end
+  validates :start_date, :end_date, presence: true, if: -> { PERIODS[key].nil? }
+  validates :key, presence: true, if: -> { start_date.nil? || end_date.nil? }
+  validate :must_be_valid_date_range
 
-  def extend_backward(duration)
-    Period.new(name: name + "_extended", date_range: (date_range.first - duration)..date_range.last)
-  end
+  PERIODS = {
+    "last_day" => {
+      date_range: -> { [ 1.day.ago.to_date, Date.current ] },
+      label_short: "1D",
+      label: "Last Day",
+      comparison_label: "vs. yesterday"
+    },
+    "current_week" => {
+      date_range: -> { [ Date.current.beginning_of_week, Date.current ] },
+      label_short: "WTD",
+      label: "Current Week",
+      comparison_label: "vs. start of week"
+    },
+    "last_7_days" => {
+      date_range: -> { [ 7.days.ago.to_date, Date.current ] },
+      label_short: "7D",
+      label: "Last 7 Days",
+      comparison_label: "vs. last week"
+    },
+    "current_month" => {
+      date_range: -> { [ Date.current.beginning_of_month, Date.current ] },
+      label_short: "MTD",
+      label: "Current Month",
+      comparison_label: "vs. start of month"
+    },
+    "last_30_days" => {
+      date_range: -> { [ 30.days.ago.to_date, Date.current ] },
+      label_short: "30D",
+      label: "Last 30 Days",
+      comparison_label: "vs. last month"
+    },
+    "last_90_days" => {
+      date_range: -> { [ 90.days.ago.to_date, Date.current ] },
+      label_short: "90D",
+      label: "Last 90 Days",
+      comparison_label: "vs. last quarter"
+    },
+    "current_year" => {
+      date_range: -> { [ Date.current.beginning_of_year, Date.current ] },
+      label_short: "YTD",
+      label: "Current Year",
+      comparison_label: "vs. start of year"
+    },
+    "last_365_days" => {
+      date_range: -> { [ 365.days.ago.to_date, Date.current ] },
+      label_short: "365D",
+      label: "Last 365 Days",
+      comparison_label: "vs. 1 year ago"
+    },
+    "last_5_years" => {
+      date_range: -> { [ 5.years.ago.to_date, Date.current ] },
+      label_short: "5Y",
+      label: "Last 5 Years",
+      comparison_label: "vs. 5 years ago"
+    }
+  }
 
-  BUILTIN = [
-      new(name: "all", date_range: nil..Date.current),
-      new(name: "last_7_days", date_range: 7.days.ago.to_date..Date.current),
-      new(name: "last_30_days", date_range: 30.days.ago.to_date..Date.current),
-      new(name: "last_365_days", date_range: 365.days.ago.to_date..Date.current)
-  ]
+  class << self
+    def from_key(key)
+      unless PERIODS.key?(key)
+        raise InvalidKeyError, "Invalid period key: #{key}"
+      end
 
-  INDEX = BUILTIN.index_by(&:name)
+      start_date, end_date = PERIODS[key].fetch(:date_range).call
 
-  BUILTIN.each do |period|
-    define_singleton_method(period.name) do
-      period
+      new(key: key, start_date: start_date, end_date: end_date)
+    end
+
+    def custom(start_date:, end_date:)
+      new(start_date: start_date, end_date: end_date)
+    end
+
+    def all
+      PERIODS.map { |key, period| from_key(key) }
+    end
+
+    def as_options
+      all.map { |period| [ period.label_short, period.key ] }
     end
   end
+
+  PERIODS.each do |key, period|
+    define_singleton_method(key) do
+      from_key(key)
+    end
+  end
+
+  def initialize(start_date: nil, end_date: nil, key: nil, date_format: "%b %d, %Y")
+    @key = key
+    @start_date = start_date
+    @end_date = end_date
+    @date_format = date_format
+    validate!
+  end
+
+  def <=>(other)
+    [ start_date, end_date ] <=> [ other.start_date, other.end_date ]
+  end
+
+  def date_range
+    start_date..end_date
+  end
+
+  def days
+    (end_date - start_date).to_i + 1
+  end
+
+  def within?(other)
+    start_date >= other.start_date && end_date <= other.end_date
+  end
+
+  def interval
+    if days > 366
+      "1 week"
+    else
+      "1 day"
+    end
+  end
+
+  def label
+    if key_metadata
+      key_metadata.fetch(:label)
+    else
+      "Custom Period"
+    end
+  end
+
+  def label_short
+    if key_metadata
+      key_metadata.fetch(:label_short)
+    else
+      "Custom"
+    end
+  end
+
+  def comparison_label
+    if key_metadata
+      key_metadata.fetch(:comparison_label)
+    else
+      "#{start_date.strftime(@date_format)} to #{end_date.strftime(@date_format)}"
+    end
+  end
+
+  private
+    def key_metadata
+      @key_metadata ||= PERIODS[key]
+    end
+
+    def must_be_valid_date_range
+      return if start_date.nil? || end_date.nil?
+      unless start_date.is_a?(Date) && end_date.is_a?(Date)
+        errors.add(:start_date, "must be a valid date, got #{start_date.inspect}")
+        errors.add(:end_date, "must be a valid date, got #{end_date.inspect}")
+        return
+      end
+
+      errors.add(:start_date, "must be before end date") if start_date > end_date
+    end
 end
diff --git a/app/models/plaid_account.rb b/app/models/plaid_account.rb
new file mode 100644
index 00000000..949167ce
--- /dev/null
+++ b/app/models/plaid_account.rb
@@ -0,0 +1,54 @@
+class PlaidAccount < ApplicationRecord
+  belongs_to :plaid_item
+
+  has_one :account, dependent: :destroy
+
+  validates :name, :plaid_type, :currency, presence: true
+  validate :has_balance
+
+  def upsert_plaid_snapshot!(account_snapshot)
+    assign_attributes(
+      current_balance: account_snapshot.balances.current,
+      available_balance: account_snapshot.balances.available,
+      currency: account_snapshot.balances.iso_currency_code,
+      plaid_type: account_snapshot.type,
+      plaid_subtype: account_snapshot.subtype,
+      name: account_snapshot.name,
+      mask: account_snapshot.mask,
+      raw_payload: account_snapshot
+    )
+
+    save!
+  end
+
+  def upsert_plaid_transactions_snapshot!(transactions_snapshot)
+    assign_attributes(
+      raw_transactions_payload: transactions_snapshot
+    )
+
+    save!
+  end
+
+  def upsert_plaid_investments_snapshot!(investments_snapshot)
+    assign_attributes(
+      raw_investments_payload: investments_snapshot
+    )
+
+    save!
+  end
+
+  def upsert_plaid_liabilities_snapshot!(liabilities_snapshot)
+    assign_attributes(
+      raw_liabilities_payload: liabilities_snapshot
+    )
+
+    save!
+  end
+
+  private
+    # Plaid guarantees at least one of these.  This validation is a sanity check for that guarantee.
+    def has_balance
+      return if current_balance.present? || available_balance.present?
+      errors.add(:base, "Plaid account must have either current or available balance")
+    end
+end
diff --git a/app/models/plaid_account/importer.rb b/app/models/plaid_account/importer.rb
new file mode 100644
index 00000000..10ae1084
--- /dev/null
+++ b/app/models/plaid_account/importer.rb
@@ -0,0 +1,32 @@
+class PlaidAccount::Importer
+  def initialize(plaid_account, account_snapshot:)
+    @plaid_account = plaid_account
+    @account_snapshot = account_snapshot
+  end
+
+  def import
+    import_account_info
+    import_transactions if account_snapshot.transactions_data.present?
+    import_investments if account_snapshot.investments_data.present?
+    import_liabilities if account_snapshot.liabilities_data.present?
+  end
+
+  private
+    attr_reader :plaid_account, :account_snapshot
+
+    def import_account_info
+      plaid_account.upsert_plaid_snapshot!(account_snapshot.account_data)
+    end
+
+    def import_transactions
+      plaid_account.upsert_plaid_transactions_snapshot!(account_snapshot.transactions_data)
+    end
+
+    def import_investments
+      plaid_account.upsert_plaid_investments_snapshot!(account_snapshot.investments_data)
+    end
+
+    def import_liabilities
+      plaid_account.upsert_plaid_liabilities_snapshot!(account_snapshot.liabilities_data)
+    end
+end
diff --git a/app/models/plaid_account/investments/balance_calculator.rb b/app/models/plaid_account/investments/balance_calculator.rb
new file mode 100644
index 00000000..ba713c19
--- /dev/null
+++ b/app/models/plaid_account/investments/balance_calculator.rb
@@ -0,0 +1,71 @@
+# Plaid Investment balances have a ton of edge cases.  This processor is responsible
+# for deriving "brokerage cash" vs. "total value" based on Plaid's reported balances and holdings.
+class PlaidAccount::Investments::BalanceCalculator
+  NegativeCashBalanceError = Class.new(StandardError)
+  NegativeTotalValueError = Class.new(StandardError)
+
+  def initialize(plaid_account, security_resolver:)
+    @plaid_account = plaid_account
+    @security_resolver = security_resolver
+  end
+
+  def balance
+    total_value = total_investment_account_value
+
+    if total_value.negative?
+      Sentry.capture_exception(
+        NegativeTotalValueError.new("Total value is negative for plaid investment account"),
+        level: :warning
+      )
+    end
+
+    total_value
+  end
+
+  # Plaid considers "brokerage cash" and "cash equivalent holdings" to all be part of "cash balance"
+  #
+  # Internally, we DO NOT.  Maybe clearly distinguishes between "brokerage cash" vs. "holdings (i.e. invested cash)"
+  # For this reason, we must manually calculate the cash balance based on "total value" and "holdings value"
+  # See PlaidAccount::Investments::SecurityResolver for more details.
+  def cash_balance
+    cash_balance = calculate_investment_brokerage_cash
+
+    if cash_balance.negative?
+      Sentry.capture_exception(
+        NegativeCashBalanceError.new("Cash balance is negative for plaid investment account"),
+        level: :warning
+      )
+    end
+
+    cash_balance
+  end
+
+  private
+    attr_reader :plaid_account, :security_resolver
+
+    def holdings
+      plaid_account.raw_investments_payload["holdings"] || []
+    end
+
+    def calculate_investment_brokerage_cash
+      total_investment_account_value - true_holdings_value
+    end
+
+    # This is our source of truth.  We assume Plaid's `current_balance` reporting is 100% accurate
+    # Plaid guarantees `current_balance` AND/OR `available_balance` is always present, and based on the docs,
+    # `current_balance` should represent "total account value".
+    def total_investment_account_value
+      plaid_account.current_balance || plaid_account.available_balance
+    end
+
+    # Plaid holdings summed up, LESS "brokerage cash" holdings (that we've manually identified)
+    def true_holdings_value
+      # True holdings are holdings *less* Plaid's "pseudo-securities" (e.g. `CUR:USD` brokerage cash "holding")
+      true_holdings = holdings.reject do |h|
+        security = security_resolver.resolve(plaid_security_id: h["security_id"])
+        security.brokerage_cash?
+      end
+
+      true_holdings.sum { |h| h["quantity"] * h["institution_price"] }
+    end
+end
diff --git a/app/models/plaid_account/investments/holdings_processor.rb b/app/models/plaid_account/investments/holdings_processor.rb
new file mode 100644
index 00000000..8dac6bae
--- /dev/null
+++ b/app/models/plaid_account/investments/holdings_processor.rb
@@ -0,0 +1,50 @@
+class PlaidAccount::Investments::HoldingsProcessor
+  def initialize(plaid_account, security_resolver:)
+    @plaid_account = plaid_account
+    @security_resolver = security_resolver
+  end
+
+  def process
+    holdings.each do |plaid_holding|
+      resolved_security_result = security_resolver.resolve(plaid_security_id: plaid_holding["security_id"])
+
+      next unless resolved_security_result.security.present?
+
+      security = resolved_security_result.security
+      holding_date = plaid_holding["institution_price_as_of"] || Date.current
+
+      holding = account.holdings.find_or_initialize_by(
+        security: security,
+        date: holding_date,
+        currency: plaid_holding["iso_currency_code"]
+      )
+
+      holding.assign_attributes(
+        qty: plaid_holding["quantity"],
+        price: plaid_holding["institution_price"],
+        amount: plaid_holding["quantity"] * plaid_holding["institution_price"]
+      )
+
+      ActiveRecord::Base.transaction do
+        holding.save!
+
+        # Delete all holdings for this security after the institution price date
+        account.holdings
+          .where(security: security)
+          .where("date > ?", holding_date)
+          .destroy_all
+      end
+    end
+  end
+
+  private
+    attr_reader :plaid_account, :security_resolver
+
+    def account
+      plaid_account.account
+    end
+
+    def holdings
+      plaid_account.raw_investments_payload["holdings"] || []
+    end
+end
diff --git a/app/models/plaid_account/investments/security_resolver.rb b/app/models/plaid_account/investments/security_resolver.rb
new file mode 100644
index 00000000..a6b0515b
--- /dev/null
+++ b/app/models/plaid_account/investments/security_resolver.rb
@@ -0,0 +1,93 @@
+# Resolves a Plaid security to an internal Security record, or nil
+class PlaidAccount::Investments::SecurityResolver
+  UnresolvablePlaidSecurityError = Class.new(StandardError)
+
+  def initialize(plaid_account)
+    @plaid_account = plaid_account
+    @security_cache = {}
+  end
+
+  # Resolves an internal Security record for a given Plaid security ID
+  def resolve(plaid_security_id:)
+    response = @security_cache[plaid_security_id]
+    return response if response.present?
+
+    plaid_security = get_plaid_security(plaid_security_id)
+
+    if plaid_security.nil?
+      report_unresolvable_security(plaid_security_id)
+      response = Response.new(security: nil, cash_equivalent?: false, brokerage_cash?: false)
+    elsif brokerage_cash?(plaid_security)
+      response = Response.new(security: nil, cash_equivalent?: true, brokerage_cash?: true)
+    else
+      security = Security::Resolver.new(
+        plaid_security["ticker_symbol"],
+        exchange_operating_mic: plaid_security["market_identifier_code"]
+      ).resolve
+
+      response = Response.new(
+        security: security,
+        cash_equivalent?: cash_equivalent?(plaid_security),
+        brokerage_cash?: false
+      )
+    end
+
+    @security_cache[plaid_security_id] = response
+
+    response
+  end
+
+  private
+    attr_reader :plaid_account, :security_cache
+
+    Response = Struct.new(:security, :cash_equivalent?, :brokerage_cash?, keyword_init: true)
+
+    def securities
+      plaid_account.raw_investments_payload["securities"] || []
+    end
+
+    # Tries to find security, or returns the "proxy security" (common with options contracts that have underlying securities)
+    def get_plaid_security(plaid_security_id)
+      security = securities.find { |s| s["security_id"] == plaid_security_id && s["ticker_symbol"].present? }
+
+      return security if security.present?
+
+      securities.find { |s| s["proxy_security_id"] == plaid_security_id }
+    end
+
+    def report_unresolvable_security(plaid_security_id)
+      Sentry.capture_exception(UnresolvablePlaidSecurityError.new("Could not resolve Plaid security from provided data")) do |scope|
+        scope.set_context("plaid_security", {
+          plaid_security_id: plaid_security_id
+        })
+      end
+    end
+
+    # Plaid treats "brokerage cash" differently than us.  Internally, Maybe treats "brokerage cash"
+    # as "uninvested cash" (i.e. cash that doesn't have a corresponding Security and can be withdrawn).
+    #
+    # Plaid treats everything as a "holding" with a corresponding Security.  For example, "brokerage cash" (USD)
+    # in Plaids data model would be represented as:
+    #
+    # - A Security with ticker `CUR:USD`
+    # - A holding, linked to the `CUR:USD` Security, with an institution price of $1
+    #
+    # Internally, we store brokerage cash balance as `account.cash_balance`, NOT as a holding + security.
+    # This allows us to properly build historical cash balances and holdings values separately and accurately.
+    #
+    # These help identify these "special case" securities for various calculations.
+    #
+    def known_plaid_brokerage_cash_tickers
+      [ "CUR:USD" ]
+    end
+
+    def brokerage_cash?(plaid_security)
+      return false unless plaid_security["ticker_symbol"].present?
+      known_plaid_brokerage_cash_tickers.include?(plaid_security["ticker_symbol"])
+    end
+
+    def cash_equivalent?(plaid_security)
+      return false unless plaid_security["type"].present?
+      plaid_security["type"] == "cash" || plaid_security["is_cash_equivalent"] == true
+    end
+end
diff --git a/app/models/plaid_account/investments/transactions_processor.rb b/app/models/plaid_account/investments/transactions_processor.rb
new file mode 100644
index 00000000..df494504
--- /dev/null
+++ b/app/models/plaid_account/investments/transactions_processor.rb
@@ -0,0 +1,107 @@
+class PlaidAccount::Investments::TransactionsProcessor
+  SecurityNotFoundError = Class.new(StandardError)
+
+  def initialize(plaid_account, security_resolver:)
+    @plaid_account = plaid_account
+    @security_resolver = security_resolver
+  end
+
+  def process
+    transactions.each do |transaction|
+      if cash_transaction?(transaction)
+        find_or_create_cash_entry(transaction)
+      else
+        find_or_create_trade_entry(transaction)
+      end
+    end
+  end
+
+  private
+    attr_reader :plaid_account, :security_resolver
+
+    def account
+      plaid_account.account
+    end
+
+    def cash_transaction?(transaction)
+      transaction["type"] == "cash" || transaction["type"] == "fee" || transaction["type"] == "transfer"
+    end
+
+    def find_or_create_trade_entry(transaction)
+      resolved_security_result = security_resolver.resolve(plaid_security_id: transaction["security_id"])
+
+      unless resolved_security_result.security.present?
+        Sentry.capture_exception(SecurityNotFoundError.new("Could not find security for plaid trade")) do |scope|
+          scope.set_tags(plaid_account_id: plaid_account.id)
+        end
+
+        return # We can't process a non-cash transaction without a security
+      end
+
+      entry = account.entries.find_or_initialize_by(plaid_id: transaction["investment_transaction_id"]) do |e|
+        e.entryable = Trade.new
+      end
+
+      entry.assign_attributes(
+        amount: derived_qty(transaction) * transaction["price"],
+        currency: transaction["iso_currency_code"],
+        date: transaction["date"]
+      )
+
+      entry.trade.assign_attributes(
+        security: resolved_security_result.security,
+        qty: derived_qty(transaction),
+        price: transaction["price"],
+        currency: transaction["iso_currency_code"]
+      )
+
+      entry.enrich_attribute(
+        :name,
+        transaction["name"],
+        source: "plaid"
+      )
+
+      entry.save!
+    end
+
+    def find_or_create_cash_entry(transaction)
+      entry = account.entries.find_or_initialize_by(plaid_id: transaction["investment_transaction_id"]) do |e|
+        e.entryable = Transaction.new
+      end
+
+      entry.assign_attributes(
+        amount: transaction["amount"],
+        currency: transaction["iso_currency_code"],
+        date: transaction["date"]
+      )
+
+      entry.enrich_attribute(
+        :name,
+        transaction["name"],
+        source: "plaid"
+      )
+
+      entry.save!
+    end
+
+    def transactions
+      plaid_account.raw_investments_payload["transactions"] || []
+    end
+
+    # Plaid unfortunately returns incorrect signage on some `quantity` values. They claim all "sell" transactions
+    # are negative signage, but we have found multiple instances of production data where this is not the case.
+    #
+    # This method attempts to use several Plaid data points to derive the true quantity with the correct signage.
+    def derived_qty(transaction)
+      reported_qty = transaction["quantity"]
+      abs_qty = reported_qty.abs
+
+      if transaction["type"] == "sell" || transaction["amount"] < 0
+        -abs_qty
+      elsif transaction["type"] == "buy" || transaction["amount"] > 0
+        abs_qty
+      else
+        reported_qty
+      end
+    end
+end
diff --git a/app/models/plaid_account/liabilities/credit_processor.rb b/app/models/plaid_account/liabilities/credit_processor.rb
new file mode 100644
index 00000000..cc487295
--- /dev/null
+++ b/app/models/plaid_account/liabilities/credit_processor.rb
@@ -0,0 +1,25 @@
+class PlaidAccount::Liabilities::CreditProcessor
+  def initialize(plaid_account)
+    @plaid_account = plaid_account
+  end
+
+  def process
+    return unless credit_data.present?
+
+    account.credit_card.update!(
+      minimum_payment: credit_data.dig("minimum_payment_amount"),
+      apr: credit_data.dig("aprs", 0, "apr_percentage")
+    )
+  end
+
+  private
+    attr_reader :plaid_account
+
+    def account
+      plaid_account.account
+    end
+
+    def credit_data
+      plaid_account.raw_liabilities_payload["credit"]
+    end
+end
diff --git a/app/models/plaid_account/liabilities/mortgage_processor.rb b/app/models/plaid_account/liabilities/mortgage_processor.rb
new file mode 100644
index 00000000..d4610362
--- /dev/null
+++ b/app/models/plaid_account/liabilities/mortgage_processor.rb
@@ -0,0 +1,25 @@
+class PlaidAccount::Liabilities::MortgageProcessor
+  def initialize(plaid_account)
+    @plaid_account = plaid_account
+  end
+
+  def process
+    return unless mortgage_data.present?
+
+    account.loan.update!(
+      rate_type: mortgage_data.dig("interest_rate", "type"),
+      interest_rate: mortgage_data.dig("interest_rate", "percentage")
+    )
+  end
+
+  private
+    attr_reader :plaid_account
+
+    def account
+      plaid_account.account
+    end
+
+    def mortgage_data
+      plaid_account.raw_liabilities_payload["mortgage"]
+    end
+end
diff --git a/app/models/plaid_account/liabilities/student_loan_processor.rb b/app/models/plaid_account/liabilities/student_loan_processor.rb
new file mode 100644
index 00000000..c3c3b4f2
--- /dev/null
+++ b/app/models/plaid_account/liabilities/student_loan_processor.rb
@@ -0,0 +1,50 @@
+class PlaidAccount::Liabilities::StudentLoanProcessor
+  def initialize(plaid_account)
+    @plaid_account = plaid_account
+  end
+
+  def process
+    return unless student_loan_data.present?
+
+    account.loan.update!(
+      rate_type: "fixed",
+      interest_rate: student_loan_data["interest_rate_percentage"],
+      initial_balance: student_loan_data["origination_principal_amount"],
+      term_months: term_months
+    )
+  end
+
+  private
+    attr_reader :plaid_account
+
+    def account
+      plaid_account.account
+    end
+
+    def term_months
+      return nil unless origination_date && expected_payoff_date
+
+      ((expected_payoff_date - origination_date).to_i / 30).to_i
+    end
+
+    def origination_date
+      parse_date(student_loan_data["origination_date"])
+    end
+
+    def expected_payoff_date
+      parse_date(student_loan_data["expected_payoff_date"])
+    end
+
+    def parse_date(value)
+      return value if value.is_a?(Date)
+      return nil unless value.present?
+
+      Date.parse(value.to_s)
+    rescue ArgumentError
+      nil
+    end
+
+    def student_loan_data
+      plaid_account.raw_liabilities_payload["student"]
+    end
+end
diff --git a/app/models/plaid_account/processor.rb b/app/models/plaid_account/processor.rb
new file mode 100644
index 00000000..b42bdf3b
--- /dev/null
+++ b/app/models/plaid_account/processor.rb
@@ -0,0 +1,109 @@
+class PlaidAccount::Processor
+  include PlaidAccount::TypeMappable
+
+  attr_reader :plaid_account
+
+  def initialize(plaid_account)
+    @plaid_account = plaid_account
+  end
+
+  # Each step represents a different Plaid API endpoint / "product"
+  #
+  # Processing the account is the first step and if it fails, we halt the entire processor
+  # Each subsequent step can fail independently, but we continue processing the rest of the steps
+  def process
+    process_account!
+    process_transactions
+    process_investments
+    process_liabilities
+  end
+
+  private
+    def family
+      plaid_account.plaid_item.family
+    end
+
+    # Shared securities reader and resolver
+    def security_resolver
+      @security_resolver ||= PlaidAccount::Investments::SecurityResolver.new(plaid_account)
+    end
+
+    def process_account!
+      PlaidAccount.transaction do
+        account = family.accounts.find_or_initialize_by(
+          plaid_account_id: plaid_account.id
+        )
+
+        # Name and subtype are the only attributes a user can override for Plaid accounts
+        account.enrich_attributes(
+          {
+            name: plaid_account.name,
+            subtype: map_subtype(plaid_account.plaid_type, plaid_account.plaid_subtype)
+          },
+          source: "plaid"
+        )
+
+        account.assign_attributes(
+          accountable: map_accountable(plaid_account.plaid_type),
+          balance: balance_calculator.balance,
+          currency: plaid_account.currency,
+          cash_balance: balance_calculator.cash_balance
+        )
+
+        account.save!
+
+        # Create or update the current balance anchor valuation for event-sourced ledger
+        # Note: This is a partial implementation. In the future, we'll introduce HoldingValuation
+        # to properly track the holdings vs. cash breakdown, but for now we're only tracking
+        # the total balance in the current anchor. The cash_balance field on the account model
+        # is still being used for the breakdown.
+        account.set_current_balance(balance_calculator.balance)
+      end
+    end
+
+    def process_transactions
+      PlaidAccount::Transactions::Processor.new(plaid_account).process
+    rescue => e
+      report_exception(e)
+    end
+
+    def process_investments
+      PlaidAccount::Investments::TransactionsProcessor.new(plaid_account, security_resolver: security_resolver).process
+      PlaidAccount::Investments::HoldingsProcessor.new(plaid_account, security_resolver: security_resolver).process
+    rescue => e
+      report_exception(e)
+    end
+
+    def process_liabilities
+      case [ plaid_account.plaid_type, plaid_account.plaid_subtype ]
+      when [ "credit", "credit card" ]
+        PlaidAccount::Liabilities::CreditProcessor.new(plaid_account).process
+      when [ "loan", "mortgage" ]
+        PlaidAccount::Liabilities::MortgageProcessor.new(plaid_account).process
+      when [ "loan", "student" ]
+        PlaidAccount::Liabilities::StudentLoanProcessor.new(plaid_account).process
+      end
+    rescue => e
+      report_exception(e)
+    end
+
+    def balance_calculator
+      if plaid_account.plaid_type == "investment"
+        @balance_calculator ||= PlaidAccount::Investments::BalanceCalculator.new(plaid_account, security_resolver: security_resolver)
+      else
+        balance = plaid_account.current_balance || plaid_account.available_balance || 0
+
+        # We don't currently distinguish "cash" vs. "non-cash" balances for non-investment accounts.
+        OpenStruct.new(
+          balance: balance,
+          cash_balance: balance
+        )
+      end
+    end
+
+    def report_exception(error)
+      Sentry.capture_exception(error) do |scope|
+        scope.set_tags(plaid_account_id: plaid_account.id)
+      end
+    end
+end
diff --git a/app/models/plaid_account/transactions/category_matcher.rb b/app/models/plaid_account/transactions/category_matcher.rb
new file mode 100644
index 00000000..c4081a68
--- /dev/null
+++ b/app/models/plaid_account/transactions/category_matcher.rb
@@ -0,0 +1,109 @@
+# The purpose of this matcher is to auto-match Plaid categories to
+# known internal user categories.  Since we allow users to define their own
+# categories we cannot directly assign Plaid categories as this would overwrite
+# user data and create a confusing experience.
+#
+# Automated category matching in the Maybe app has a hierarchy:
+# 1. Naive string matching via CategoryAliasMatcher
+# 2. Rules-based matching set by user
+# 3. AI-powered matching (also enabled by user via rules)
+#
+# This class is simply a FAST and CHEAP way to match categories that are high confidence.
+# Edge cases will be handled by user-defined rules.
+class PlaidAccount::Transactions::CategoryMatcher
+  include PlaidAccount::Transactions::CategoryTaxonomy
+
+  def initialize(user_categories = [])
+    @user_categories = user_categories
+  end
+
+  def match(plaid_detailed_category)
+    plaid_category_details = get_plaid_category_details(plaid_detailed_category)
+    return nil unless plaid_category_details
+
+    # Try exact name matches first
+    exact_match = normalized_user_categories.find do |category|
+      category[:name] == plaid_category_details[:key].to_s
+    end
+    return user_categories.find { |c| c.id == exact_match[:id] } if exact_match
+
+    # Try detailed aliases matches with fuzzy matching
+    alias_match = normalized_user_categories.find do |category|
+      name = category[:name]
+      plaid_category_details[:aliases].any? do |a|
+        alias_str = a.to_s
+
+        # Try exact match
+        next true if name == alias_str
+
+        # Try plural forms
+        next true if name.singularize == alias_str || name.pluralize == alias_str
+        next true if alias_str.singularize == name || alias_str.pluralize == name
+
+        # Try common forms
+        normalized_name = name.gsub(/(and|&|\s+)/, "").strip
+        normalized_alias = alias_str.gsub(/(and|&|\s+)/, "").strip
+        normalized_name == normalized_alias
+      end
+    end
+    return user_categories.find { |c| c.id == alias_match[:id] } if alias_match
+
+    # Try parent aliases matches with fuzzy matching
+    parent_match = normalized_user_categories.find do |category|
+      name = category[:name]
+      plaid_category_details[:parent_aliases].any? do |a|
+        alias_str = a.to_s
+
+        # Try exact match
+        next true if name == alias_str
+
+        # Try plural forms
+        next true if name.singularize == alias_str || name.pluralize == alias_str
+        next true if alias_str.singularize == name || alias_str.pluralize == name
+
+        # Try common forms
+        normalized_name = name.gsub(/(and|&|\s+)/, "").strip
+        normalized_alias = alias_str.gsub(/(and|&|\s+)/, "").strip
+        normalized_name == normalized_alias
+      end
+    end
+    return user_categories.find { |c| c.id == parent_match[:id] } if parent_match
+
+    nil
+  end
+
+  private
+    attr_reader :user_categories
+
+    def get_plaid_category_details(plaid_category_name)
+      detailed_plaid_categories.find { |c| c[:key] == plaid_category_name.downcase.to_sym }
+    end
+
+    def detailed_plaid_categories
+      CATEGORIES_MAP.flat_map do |parent_key, parent_data|
+        parent_data[:detailed_categories].map do |child_key, child_data|
+          {
+            key: child_key,
+            classification: child_data[:classification],
+            aliases: child_data[:aliases],
+            parent_key: parent_key,
+            parent_aliases: parent_data[:aliases]
+          }
+        end
+      end
+    end
+
+    def normalized_user_categories
+      user_categories.map do |user_category|
+        {
+          id: user_category.id,
+          classification: user_category.classification,
+          name: normalize_user_category_name(user_category.name)
+        }
+      end
+    end
+
+    def normalize_user_category_name(name)
+      name.to_s.downcase.gsub(/[^a-z0-9]/, " ").strip
+    end
+end
diff --git a/app/models/plaid_account/transactions/category_taxonomy.rb b/app/models/plaid_account/transactions/category_taxonomy.rb
new file mode 100644
index 00000000..84b4b8c1
--- /dev/null
+++ b/app/models/plaid_account/transactions/category_taxonomy.rb
@@ -0,0 +1,461 @@
+# https://plaid.com/documents/transactions-personal-finance-category-taxonomy.csv
+module PlaidAccount::Transactions::CategoryTaxonomy
+  CATEGORIES_MAP = {
+    income: {
+      classification: :income,
+      aliases: [ "income", "revenue", "earnings" ],
+      detailed_categories: {
+        income_dividends: {
+          classification: :income,
+          aliases: [ "dividend", "stock income", "dividend income", "dividend earnings" ]
+        },
+        income_interest_earned: {
+          classification: :income,
+          aliases: [ "interest", "bank interest", "interest earned", "interest income" ]
+        },
+        income_retirement_pension: {
+          classification: :income,
+          aliases: [ "retirement", "pension" ]
+        },
+        income_tax_refund: {
+          classification: :income,
+          aliases: [ "tax refund" ]
+        },
+        income_unemployment: {
+          classification: :income,
+          aliases: [ "unemployment" ]
+        },
+        income_wages: {
+          classification: :income,
+          aliases: [ "wage", "salary", "paycheck" ]
+        },
+        income_other_income: {
+          classification: :income,
+          aliases: [ "other income", "misc income" ]
+        }
+      }
+    },
+    loan_payments: {
+      classification: :expense,
+      aliases: [ "loan payment", "debt payment", "loan", "debt", "payment" ],
+      detailed_categories: {
+        loan_payments_car_payment: {
+          classification: :expense,
+          aliases: [ "car payment", "auto loan" ]
+        },
+        loan_payments_credit_card_payment: {
+          classification: :expense,
+          aliases: [ "credit card", "card payment" ]
+        },
+        loan_payments_personal_loan_payment: {
+          classification: :expense,
+          aliases: [ "personal loan", "loan payment" ]
+        },
+        loan_payments_mortgage_payment: {
+          classification: :expense,
+          aliases: [ "mortgage", "home loan" ]
+        },
+        loan_payments_student_loan_payment: {
+          classification: :expense,
+          aliases: [ "student loan", "education loan" ]
+        },
+        loan_payments_other_payment: {
+          classification: :expense,
+          aliases: [ "loan", "loan payment" ]
+        }
+      }
+    },
+    bank_fees: {
+      classification: :expense,
+      aliases: [ "bank fee", "service charge", "fee", "misc fees" ],
+      detailed_categories: {
+        bank_fees_atm_fees: {
+          classification: :expense,
+          aliases: [ "atm fee", "withdrawal fee" ]
+        },
+        bank_fees_foreign_transaction_fees: {
+          classification: :expense,
+          aliases: [ "foreign fee", "international fee" ]
+        },
+        bank_fees_insufficient_funds: {
+          classification: :expense,
+          aliases: [ "nsf fee", "overdraft" ]
+        },
+        bank_fees_interest_charge: {
+          classification: :expense,
+          aliases: [ "interest charge", "finance charge" ]
+        },
+        bank_fees_overdraft_fees: {
+          classification: :expense,
+          aliases: [ "overdraft fee" ]
+        },
+        bank_fees_other_bank_fees: {
+          classification: :expense,
+          aliases: [ "bank fee", "service charge" ]
+        }
+      }
+    },
+    entertainment: {
+      classification: :expense,
+      aliases: [ "entertainment", "recreation" ],
+      detailed_categories: {
+        entertainment_casinos_and_gambling: {
+          classification: :expense,
+          aliases: [ "casino", "gambling" ]
+        },
+        entertainment_music_and_audio: {
+          classification: :expense,
+          aliases: [ "music", "concert" ]
+        },
+        entertainment_sporting_events_amusement_parks_and_museums: {
+          classification: :expense,
+          aliases: [ "event", "amusement", "museum" ]
+        },
+        entertainment_tv_and_movies: {
+          classification: :expense,
+          aliases: [ "movie", "streaming" ]
+        },
+        entertainment_video_games: {
+          classification: :expense,
+          aliases: [ "game", "gaming" ]
+        },
+        entertainment_other_entertainment: {
+          classification: :expense,
+          aliases: [ "entertainment", "recreation" ]
+        }
+      }
+    },
+    food_and_drink: {
+      classification: :expense,
+      aliases: [ "food", "dining", "food and drink", "food & drink" ],
+      detailed_categories: {
+        food_and_drink_beer_wine_and_liquor: {
+          classification: :expense,
+          aliases: [ "alcohol", "liquor", "beer", "wine", "bar", "pub" ]
+        },
+        food_and_drink_coffee: {
+          classification: :expense,
+          aliases: [ "coffee", "cafe", "coffee shop" ]
+        },
+        food_and_drink_fast_food: {
+          classification: :expense,
+          aliases: [ "fast food", "takeout" ]
+        },
+        food_and_drink_groceries: {
+          classification: :expense,
+          aliases: [ "grocery", "supermarket", "grocery store" ]
+        },
+        food_and_drink_restaurant: {
+          classification: :expense,
+          aliases: [ "restaurant", "dining" ]
+        },
+        food_and_drink_vending_machines: {
+          classification: :expense,
+          aliases: [ "vending" ]
+        },
+        food_and_drink_other_food_and_drink: {
+          classification: :expense,
+          aliases: [ "food", "drink" ]
+        }
+      }
+    },
+    general_merchandise: {
+      classification: :expense,
+      aliases: [ "shopping", "retail" ],
+      detailed_categories: {
+        general_merchandise_bookstores_and_newsstands: {
+          classification: :expense,
+          aliases: [ "book", "newsstand" ]
+        },
+        general_merchandise_clothing_and_accessories: {
+          classification: :expense,
+          aliases: [ "clothing", "apparel" ]
+        },
+        general_merchandise_convenience_stores: {
+          classification: :expense,
+          aliases: [ "convenience" ]
+        },
+        general_merchandise_department_stores: {
+          classification: :expense,
+          aliases: [ "department store" ]
+        },
+        general_merchandise_discount_stores: {
+          classification: :expense,
+          aliases: [ "discount store" ]
+        },
+        general_merchandise_electronics: {
+          classification: :expense,
+          aliases: [ "electronic", "computer" ]
+        },
+        general_merchandise_gifts_and_novelties: {
+          classification: :expense,
+          aliases: [ "gift", "souvenir" ]
+        },
+        general_merchandise_office_supplies: {
+          classification: :expense,
+          aliases: [ "office supply" ]
+        },
+        general_merchandise_online_marketplaces: {
+          classification: :expense,
+          aliases: [ "online shopping" ]
+        },
+        general_merchandise_pet_supplies: {
+          classification: :expense,
+          aliases: [ "pet supply", "pet food" ]
+        },
+        general_merchandise_sporting_goods: {
+          classification: :expense,
+          aliases: [ "sporting good", "sport" ]
+        },
+        general_merchandise_superstores: {
+          classification: :expense,
+          aliases: [ "superstore", "retail" ]
+        },
+        general_merchandise_tobacco_and_vape: {
+          classification: :expense,
+          aliases: [ "tobacco", "smoke" ]
+        },
+        general_merchandise_other_general_merchandise: {
+          classification: :expense,
+          aliases: [ "shopping", "merchandise" ]
+        }
+      }
+    },
+    home_improvement: {
+      classification: :expense,
+      aliases: [ "home", "house", "house renovation", "home improvement", "renovation" ],
+      detailed_categories: {
+        home_improvement_furniture: {
+          classification: :expense,
+          aliases: [ "furniture", "furnishing" ]
+        },
+        home_improvement_hardware: {
+          classification: :expense,
+          aliases: [ "hardware", "tool" ]
+        },
+        home_improvement_repair_and_maintenance: {
+          classification: :expense,
+          aliases: [ "repair", "maintenance" ]
+        },
+        home_improvement_security: {
+          classification: :expense,
+          aliases: [ "security", "alarm" ]
+        },
+        home_improvement_other_home_improvement: {
+          classification: :expense,
+          aliases: [ "home improvement", "renovation" ]
+        }
+      }
+    },
+    medical: {
+      classification: :expense,
+      aliases: [ "medical", "healthcare", "health" ],
+      detailed_categories: {
+        medical_dental_care: {
+          classification: :expense,
+          aliases: [ "dental", "dentist" ]
+        },
+        medical_eye_care: {
+          classification: :expense,
+          aliases: [ "eye", "optometrist" ]
+        },
+        medical_nursing_care: {
+          classification: :expense,
+          aliases: [ "nursing", "care" ]
+        },
+        medical_pharmacies_and_supplements: {
+          classification: :expense,
+          aliases: [ "pharmacy", "prescription" ]
+        },
+        medical_primary_care: {
+          classification: :expense,
+          aliases: [ "doctor", "medical" ]
+        },
+        medical_veterinary_services: {
+          classification: :expense,
+          aliases: [ "vet", "veterinary" ]
+        },
+        medical_other_medical: {
+          classification: :expense,
+          aliases: [ "medical", "healthcare" ]
+        }
+      }
+    },
+    personal_care: {
+      classification: :expense,
+      aliases: [ "personal care", "grooming" ],
+      detailed_categories: {
+        personal_care_gyms_and_fitness_centers: {
+          classification: :expense,
+          aliases: [ "gym", "fitness", "exercise", "sport" ]
+        },
+        personal_care_hair_and_beauty: {
+          classification: :expense,
+          aliases: [ "salon", "beauty" ]
+        },
+        personal_care_laundry_and_dry_cleaning: {
+          classification: :expense,
+          aliases: [ "laundry", "cleaning" ]
+        },
+        personal_care_other_personal_care: {
+          classification: :expense,
+          aliases: [ "personal care", "grooming" ]
+        }
+      }
+    },
+    general_services: {
+      classification: :expense,
+      aliases: [ "service", "professional service" ],
+      detailed_categories: {
+        general_services_accounting_and_financial_planning: {
+          classification: :expense,
+          aliases: [ "accountant", "financial advisor" ]
+        },
+        general_services_automotive: {
+          classification: :expense,
+          aliases: [ "auto repair", "mechanic", "vehicle", "car", "car care", "car maintenance", "vehicle maintenance" ]
+        },
+        general_services_childcare: {
+          classification: :expense,
+          aliases: [ "childcare", "daycare" ]
+        },
+        general_services_consulting_and_legal: {
+          classification: :expense,
+          aliases: [ "legal", "attorney" ]
+        },
+        general_services_education: {
+          classification: :expense,
+          aliases: [ "education", "tuition" ]
+        },
+        general_services_insurance: {
+          classification: :expense,
+          aliases: [ "insurance", "premium" ]
+        },
+        general_services_postage_and_shipping: {
+          classification: :expense,
+          aliases: [ "shipping", "postage" ]
+        },
+        general_services_storage: {
+          classification: :expense,
+          aliases: [ "storage" ]
+        },
+        general_services_other_general_services: {
+          classification: :expense,
+          aliases: [ "service" ]
+        }
+      }
+    },
+    government_and_non_profit: {
+      classification: :expense,
+      aliases: [ "government", "non-profit" ],
+      detailed_categories: {
+        government_and_non_profit_donations: {
+          classification: :expense,
+          aliases: [ "donation", "charity", "charitable", "charitable donation", "giving", "gifts and donations", "gifts & donations" ]
+        },
+        government_and_non_profit_government_departments_and_agencies: {
+          classification: :expense,
+          aliases: [ "government", "agency" ]
+        },
+        government_and_non_profit_tax_payment: {
+          classification: :expense,
+          aliases: [ "tax payment", "tax" ]
+        },
+        government_and_non_profit_other_government_and_non_profit: {
+          classification: :expense,
+          aliases: [ "government", "non-profit" ]
+        }
+      }
+    },
+    transportation: {
+      classification: :expense,
+      aliases: [ "transportation", "travel" ],
+      detailed_categories: {
+        transportation_bikes_and_scooters: {
+          classification: :expense,
+          aliases: [ "bike", "scooter" ]
+        },
+        transportation_gas: {
+          classification: :expense,
+          aliases: [ "gas", "fuel" ]
+        },
+        transportation_parking: {
+          classification: :expense,
+          aliases: [ "parking" ]
+        },
+        transportation_public_transit: {
+          classification: :expense,
+          aliases: [ "transit", "bus" ]
+        },
+        transportation_taxis_and_ride_shares: {
+          classification: :expense,
+          aliases: [ "taxi", "rideshare" ]
+        },
+        transportation_tolls: {
+          classification: :expense,
+          aliases: [ "toll" ]
+        },
+        transportation_other_transportation: {
+          classification: :expense,
+          aliases: [ "transportation", "travel" ]
+        }
+      }
+    },
+    travel: {
+      classification: :expense,
+      aliases: [ "travel", "vacation", "trip", "sabbatical" ],
+      detailed_categories: {
+        travel_flights: {
+          classification: :expense,
+          aliases: [ "flight", "airfare" ]
+        },
+        travel_lodging: {
+          classification: :expense,
+          aliases: [ "hotel", "lodging" ]
+        },
+        travel_rental_cars: {
+          classification: :expense,
+          aliases: [ "rental car" ]
+        },
+        travel_other_travel: {
+          classification: :expense,
+          aliases: [ "travel", "trip" ]
+        }
+      }
+    },
+    rent_and_utilities: {
+      classification: :expense,
+      aliases: [ "utilities", "housing", "house", "home", "rent", "rent & utilities" ],
+      detailed_categories: {
+        rent_and_utilities_gas_and_electricity: {
+          classification: :expense,
+          aliases: [ "utility", "electric" ]
+        },
+        rent_and_utilities_internet_and_cable: {
+          classification: :expense,
+          aliases: [ "internet", "cable" ]
+        },
+        rent_and_utilities_rent: {
+          classification: :expense,
+          aliases: [ "rent", "lease" ]
+        },
+        rent_and_utilities_sewage_and_waste_management: {
+          classification: :expense,
+          aliases: [ "sewage", "waste" ]
+        },
+        rent_and_utilities_telephone: {
+          classification: :expense,
+          aliases: [ "phone", "telephone" ]
+        },
+        rent_and_utilities_water: {
+          classification: :expense,
+          aliases: [ "water" ]
+        },
+        rent_and_utilities_other_utilities: {
+          classification: :expense,
+          aliases: [ "utility" ]
+        }
+      }
+    }
+  }
+end
diff --git a/app/models/plaid_account/transactions/processor.rb b/app/models/plaid_account/transactions/processor.rb
new file mode 100644
index 00000000..8aa07162
--- /dev/null
+++ b/app/models/plaid_account/transactions/processor.rb
@@ -0,0 +1,60 @@
+class PlaidAccount::Transactions::Processor
+  def initialize(plaid_account)
+    @plaid_account = plaid_account
+  end
+
+  def process
+    # Each entry is processed inside a transaction, but to avoid locking up the DB when
+    # there are hundreds or thousands of transactions, we process them individually.
+    modified_transactions.each do |transaction|
+      PlaidEntry::Processor.new(
+        transaction,
+        plaid_account: plaid_account,
+        category_matcher: category_matcher
+      ).process
+    end
+
+    PlaidAccount.transaction do
+      removed_transactions.each do |transaction|
+        remove_plaid_transaction(transaction)
+      end
+    end
+  end
+
+  private
+    attr_reader :plaid_account
+
+    def category_matcher
+      @category_matcher ||= PlaidAccount::Transactions::CategoryMatcher.new(family_categories)
+    end
+
+    def family_categories
+      @family_categories ||= begin
+        if account.family.categories.none?
+          account.family.categories.bootstrap!
+        end
+
+        account.family.categories
+      end
+    end
+
+    def account
+      plaid_account.account
+    end
+
+    def remove_plaid_transaction(raw_transaction)
+      account.entries.find_by(plaid_id: raw_transaction["transaction_id"])&.destroy
+    end
+
+    # Since we find_or_create_by transactions, we don't need a distinction between added/modified
+    def modified_transactions
+      modified = plaid_account.raw_transactions_payload["modified"] || []
+      added = plaid_account.raw_transactions_payload["added"] || []
+
+      modified + added
+    end
+
+    def removed_transactions
+      plaid_account.raw_transactions_payload["removed"] || []
+    end
+end
diff --git a/app/models/plaid_account/type_mappable.rb b/app/models/plaid_account/type_mappable.rb
new file mode 100644
index 00000000..e91b66d8
--- /dev/null
+++ b/app/models/plaid_account/type_mappable.rb
@@ -0,0 +1,77 @@
+module PlaidAccount::TypeMappable
+  extend ActiveSupport::Concern
+
+  UnknownAccountTypeError = Class.new(StandardError)
+
+  def map_accountable(plaid_type)
+    accountable_class = TYPE_MAPPING.dig(
+      plaid_type.to_sym,
+      :accountable
+    )
+
+    unless accountable_class
+      raise UnknownAccountTypeError, "Unknown account type: #{plaid_type}"
+    end
+
+    accountable_class.new
+  end
+
+  def map_subtype(plaid_type, plaid_subtype)
+    TYPE_MAPPING.dig(
+      plaid_type.to_sym,
+      :subtype_mapping,
+      plaid_subtype
+    ) || "other"
+  end
+
+  # Plaid Account Types -> Accountable Types
+  # https://plaid.com/docs/api/accounts/#account-type-schema
+  TYPE_MAPPING = {
+    depository: {
+      accountable: Depository,
+      subtype_mapping: {
+        "checking" => "checking",
+        "savings" => "savings",
+        "hsa" => "hsa",
+        "cd" => "cd",
+        "money market" => "money_market"
+      }
+    },
+    credit: {
+      accountable: CreditCard,
+      subtype_mapping: {
+        "credit card" => "credit_card"
+      }
+    },
+    loan: {
+      accountable: Loan,
+      subtype_mapping: {
+        "mortgage" => "mortgage",
+        "student" => "student",
+        "auto" => "auto",
+        "business" => "business",
+        "home equity" => "home_equity",
+        "line of credit" => "line_of_credit"
+      }
+    },
+    investment: {
+      accountable: Investment,
+      subtype_mapping: {
+        "brokerage" => "brokerage",
+        "pension" => "pension",
+        "retirement" => "retirement",
+        "401k" => "401k",
+        "roth 401k" => "roth_401k",
+        "529" => "529_plan",
+        "hsa" => "hsa",
+        "mutual fund" => "mutual_fund",
+        "roth" => "roth_ira",
+        "ira" => "ira"
+      }
+    },
+    other: {
+      accountable: OtherAsset,
+      subtype_mapping: {}
+    }
+  }
+end
diff --git a/app/models/plaid_entry/processor.rb b/app/models/plaid_entry/processor.rb
new file mode 100644
index 00000000..182e382d
--- /dev/null
+++ b/app/models/plaid_entry/processor.rb
@@ -0,0 +1,95 @@
+class PlaidEntry::Processor
+  # plaid_transaction is the raw hash fetched from Plaid API and converted to JSONB
+  def initialize(plaid_transaction, plaid_account:, category_matcher:)
+    @plaid_transaction = plaid_transaction
+    @plaid_account = plaid_account
+    @category_matcher = category_matcher
+  end
+
+  def process
+    PlaidAccount.transaction do
+      entry = account.entries.find_or_initialize_by(plaid_id: plaid_id) do |e|
+        e.entryable = Transaction.new
+      end
+
+      entry.assign_attributes(
+        amount: amount,
+        currency: currency,
+        date: date
+      )
+
+      entry.enrich_attribute(
+        :name,
+        name,
+        source: "plaid"
+      )
+
+      if detailed_category
+        matched_category = category_matcher.match(detailed_category)
+
+        if matched_category
+          entry.transaction.enrich_attribute(
+            :category_id,
+            matched_category.id,
+            source: "plaid"
+          )
+        end
+      end
+
+      if merchant
+        entry.transaction.enrich_attribute(
+          :merchant_id,
+          merchant.id,
+          source: "plaid"
+        )
+      end
+    end
+  end
+
+  private
+    attr_reader :plaid_transaction, :plaid_account, :category_matcher
+
+    def account
+      plaid_account.account
+    end
+
+    def plaid_id
+      plaid_transaction["transaction_id"]
+    end
+
+    def name
+      plaid_transaction["merchant_name"] || plaid_transaction["original_description"]
+    end
+
+    def amount
+      plaid_transaction["amount"]
+    end
+
+    def currency
+      plaid_transaction["iso_currency_code"]
+    end
+
+    def date
+      plaid_transaction["date"]
+    end
+
+    def detailed_category
+      plaid_transaction.dig("personal_finance_category", "detailed")
+    end
+
+    def merchant
+      merchant_id = plaid_transaction["merchant_entity_id"]
+      merchant_name = plaid_transaction["merchant_name"]
+
+      return nil unless merchant_id.present? && merchant_name.present?
+
+      ProviderMerchant.find_or_create_by!(
+        source: "plaid",
+        name: merchant_name,
+      ) do |m|
+        m.provider_merchant_id = merchant_id
+        m.website_url = plaid_transaction["website"]
+        m.logo_url = plaid_transaction["logo_url"]
+      end
+    end
+end
diff --git a/app/models/plaid_item.rb b/app/models/plaid_item.rb
new file mode 100644
index 00000000..19970ce4
--- /dev/null
+++ b/app/models/plaid_item.rb
@@ -0,0 +1,120 @@
+class PlaidItem < ApplicationRecord
+  include Syncable, Provided
+
+  enum :plaid_region, { us: "us", eu: "eu" }
+  enum :status, { good: "good", requires_update: "requires_update" }, default: :good
+
+  if Rails.application.credentials.active_record_encryption.present?
+    encrypts :access_token, deterministic: true
+  end
+
+  validates :name, :access_token, presence: true
+
+  before_destroy :remove_plaid_item
+
+  belongs_to :family
+  has_one_attached :logo
+
+  has_many :plaid_accounts, dependent: :destroy
+  has_many :accounts, through: :plaid_accounts
+
+  scope :active, -> { where(scheduled_for_deletion: false) }
+  scope :ordered, -> { order(created_at: :desc) }
+  scope :needs_update, -> { where(status: :requires_update) }
+
+  def get_update_link_token(webhooks_url:, redirect_url:)
+    family.get_link_token(
+      webhooks_url: webhooks_url,
+      redirect_url: redirect_url,
+      region: plaid_region,
+      access_token: access_token
+    )
+  rescue Plaid::ApiError => e
+    error_body = JSON.parse(e.response_body)
+
+    if error_body["error_code"] == "ITEM_NOT_FOUND"
+      # Mark the connection as invalid but don't auto-delete
+      update!(status: :requires_update)
+    end
+
+    Sentry.capture_exception(e)
+    nil
+  end
+
+  def destroy_later
+    update!(scheduled_for_deletion: true)
+    DestroyJob.perform_later(self)
+  end
+
+  def import_latest_plaid_data
+    PlaidItem::Importer.new(self, plaid_provider: plaid_provider).import
+  end
+
+  # Reads the fetched data and updates internal domain objects
+  # Generally, this should only be called within a "sync", but can be called
+  # manually to "re-sync" the already fetched data
+  def process_accounts
+    plaid_accounts.each do |plaid_account|
+      PlaidAccount::Processor.new(plaid_account).process
+    end
+  end
+
+  # Once all the data is fetched, we can schedule account syncs to calculate historical balances
+  def schedule_account_syncs(parent_sync: nil, window_start_date: nil, window_end_date: nil)
+    accounts.each do |account|
+      account.sync_later(
+        parent_sync: parent_sync,
+        window_start_date: window_start_date,
+        window_end_date: window_end_date
+      )
+    end
+  end
+
+  # Saves the raw data fetched from Plaid API for this item
+  def upsert_plaid_snapshot!(item_snapshot)
+    assign_attributes(
+      available_products: item_snapshot.available_products,
+      billed_products: item_snapshot.billed_products,
+      raw_payload: item_snapshot,
+    )
+
+    save!
+  end
+
+  # Saves the raw data fetched from Plaid API for this item's institution
+  def upsert_plaid_institution_snapshot!(institution_snapshot)
+    assign_attributes(
+      institution_id: institution_snapshot.institution_id,
+      institution_url: institution_snapshot.url,
+      institution_color: institution_snapshot.primary_color,
+      raw_institution_payload: institution_snapshot
+    )
+
+    save!
+  end
+
+  def supports_product?(product)
+    supported_products.include?(product)
+  end
+
+  private
+    def remove_plaid_item
+      plaid_provider.remove_item(access_token)
+    rescue Plaid::ApiError => e
+      json_response = JSON.parse(e.response_body)
+
+      # If the item is not found, that means it was already deleted by the user on their
+      # Plaid portal OR by Plaid support.  Either way, we're not being billed, so continue
+      # with the deletion of our internal record.
+      unless json_response["error_code"] == "ITEM_NOT_FOUND"
+        raise e
+      end
+    end
+
+    # Plaid returns mutually exclusive arrays here.  If the item has made a request for a product,
+    # it is put in the billed_products array.  If it is supported, but not yet used, it goes in the
+    # available_products array.
+    def supported_products
+      available_products + billed_products
+    end
+end
diff --git a/app/models/plaid_item/accounts_snapshot.rb b/app/models/plaid_item/accounts_snapshot.rb
new file mode 100644
index 00000000..dc62d8ff
--- /dev/null
+++ b/app/models/plaid_item/accounts_snapshot.rb
@@ -0,0 +1,105 @@
+# All Plaid data is fetched at the item-level.  This class is a simple wrapper that
+# providers a convenience method, get_account_data which scopes the item-level payload
+# to each Plaid Account
+class PlaidItem::AccountsSnapshot
+  def initialize(plaid_item, plaid_provider:)
+    @plaid_item = plaid_item
+    @plaid_provider = plaid_provider
+  end
+
+  def accounts
+    @accounts ||= plaid_provider.get_item_accounts(plaid_item.access_token).accounts
+  end
+
+  def get_account_data(account_id)
+    AccountData.new(
+      account_data: accounts.find { |a| a.account_id == account_id },
+      transactions_data: account_scoped_transactions_data(account_id),
+      investments_data: account_scoped_investments_data(account_id),
+      liabilities_data: account_scoped_liabilities_data(account_id)
+    )
+  end
+
+  def transactions_cursor
+    return nil unless transactions_data
+    transactions_data.cursor
+  end
+
+  private
+    attr_reader :plaid_item, :plaid_provider
+
+    TransactionsData = Data.define(:added, :modified, :removed)
+    LiabilitiesData = Data.define(:credit, :mortgage, :student)
+    InvestmentsData = Data.define(:transactions, :holdings, :securities)
+    AccountData = Data.define(:account_data, :transactions_data, :investments_data, :liabilities_data)
+
+    def account_scoped_transactions_data(account_id)
+      return nil unless transactions_data
+
+      TransactionsData.new(
+        added: transactions_data.added.select { |t| t.account_id == account_id },
+        modified: transactions_data.modified.select { |t| t.account_id == account_id },
+        removed: transactions_data.removed.select { |t| t.account_id == account_id }
+      )
+    end
+
+    def account_scoped_investments_data(account_id)
+      return nil unless investments_data
+
+      transactions = investments_data.transactions.select { |t| t.account_id == account_id }
+      holdings = investments_data.holdings.select { |h| h.account_id == account_id }
+      securities = transactions.count > 0 && holdings.count > 0 ? investments_data.securities : []
+
+      InvestmentsData.new(
+        transactions: transactions,
+        holdings: holdings,
+        securities: securities
+      )
+    end
+
+    def account_scoped_liabilities_data(account_id)
+      return nil unless liabilities_data
+
+      LiabilitiesData.new(
+        credit: liabilities_data.credit&.find { |c| c.account_id == account_id },
+        mortgage: liabilities_data.mortgage&.find { |m| m.account_id == account_id },
+        student: liabilities_data.student&.find { |s| s.account_id == account_id }
+      )
+    end
+
+    def can_fetch_transactions?
+      plaid_item.supports_product?("transactions") && accounts.any?
+    end
+
+    def transactions_data
+      return nil unless can_fetch_transactions?
+
+      @transactions_data ||= plaid_provider.get_transactions(
+        plaid_item.access_token,
+        next_cursor: plaid_item.next_cursor
+      )
+    end
+
+    def can_fetch_investments?
+      plaid_item.supports_product?("investments") &&
+      accounts.any? { |a| a.type == "investment" }
+    end
+
+    def investments_data
+      return nil unless can_fetch_investments?
+      @investments_data ||= plaid_provider.get_item_investments(plaid_item.access_token)
+    end
+
+    def can_fetch_liabilities?
+      plaid_item.supports_product?("liabilities") &&
+      accounts.any? do |a|
+        a.type == "credit" && a.subtype == "credit card" ||
+        a.type == "loan" && (a.subtype == "mortgage" || a.subtype == "student")
+      end
+    end
+
+    def liabilities_data
+      return nil unless can_fetch_liabilities?
+      @liabilities_data ||= plaid_provider.get_item_liabilities(plaid_item.access_token)
+    end
+end
diff --git a/app/models/plaid_item/importer.rb b/app/models/plaid_item/importer.rb
new file mode 100644
index 00000000..dbc91f10
--- /dev/null
+++ b/app/models/plaid_item/importer.rb
@@ -0,0 +1,57 @@
+class PlaidItem::Importer
+  def initialize(plaid_item, plaid_provider:)
+    @plaid_item = plaid_item
+    @plaid_provider = plaid_provider
+  end
+
+  def import
+    fetch_and_import_item_data
+    fetch_and_import_accounts_data
+  rescue Plaid::ApiError => e
+    handle_plaid_error(e)
+  end
+
+  private
+    attr_reader :plaid_item, :plaid_provider
+
+    # All errors that should halt the import should be re-raised after handling
+    # These errors will propagate up to the Sync record and mark it as failed.
+    def handle_plaid_error(error)
+      error_body = JSON.parse(error.response_body)
+
+      case error_body["error_code"]
+      when "ITEM_LOGIN_REQUIRED"
+        plaid_item.update!(status: :requires_update)
+      else
+        raise error
+      end
+    end
+
+    def fetch_and_import_item_data
+      item_data = plaid_provider.get_item(plaid_item.access_token).item
+      institution_data = plaid_provider.get_institution(item_data.institution_id).institution
+
+      plaid_item.upsert_plaid_snapshot!(item_data)
+      plaid_item.upsert_plaid_institution_snapshot!(institution_data)
+    end
+
+    def fetch_and_import_accounts_data
+      snapshot = PlaidItem::AccountsSnapshot.new(plaid_item, plaid_provider: plaid_provider)
+
+      PlaidItem.transaction do
+        snapshot.accounts.each do |raw_account|
+          plaid_account = plaid_item.plaid_accounts.find_or_initialize_by(
+            plaid_id: raw_account.account_id
+          )
+
+          PlaidAccount::Importer.new(
+            plaid_account,
+            account_snapshot: snapshot.get_account_data(raw_account.account_id)
+          ).import
+        end
+
+        # Once we know all data has been imported, save the cursor to avoid re-fetching the same data next time
+        plaid_item.update!(next_cursor: snapshot.transactions_cursor)
+      end
+    end
+end
diff --git a/app/models/plaid_item/provided.rb b/app/models/plaid_item/provided.rb
new file mode 100644
index 00000000..dc370b23
--- /dev/null
+++ b/app/models/plaid_item/provided.rb
@@ -0,0 +1,7 @@
+module PlaidItem::Provided
+  extend ActiveSupport::Concern
+
+  def plaid_provider
+    @plaid_provider ||= Provider::Registry.plaid_provider_for_region(self.plaid_region)
+  end
+end
diff --git a/app/models/plaid_item/sync_complete_event.rb b/app/models/plaid_item/sync_complete_event.rb
new file mode 100644
index 00000000..ca008a0a
--- /dev/null
+++ b/app/models/plaid_item/sync_complete_event.rb
@@ -0,0 +1,22 @@
+class PlaidItem::SyncCompleteEvent
+  attr_reader :plaid_item
+
+  def initialize(plaid_item)
+    @plaid_item = plaid_item
+  end
+
+  def broadcast
+    plaid_item.accounts.each do |account|
+      account.broadcast_sync_complete
+    end
+
+    plaid_item.broadcast_replace_to(
+      plaid_item.family,
+      target: "plaid_item_#{plaid_item.id}",
+      partial: "plaid_items/plaid_item",
+      locals: { plaid_item: plaid_item }
+    )
+
+    plaid_item.family.broadcast_sync_complete
+  end
+end
diff --git a/app/models/plaid_item/syncer.rb b/app/models/plaid_item/syncer.rb
new file mode 100644
index 00000000..b76c37b6
--- /dev/null
+++ b/app/models/plaid_item/syncer.rb
@@ -0,0 +1,26 @@
+class PlaidItem::Syncer
+  attr_reader :plaid_item
+
+  def initialize(plaid_item)
+    @plaid_item = plaid_item
+  end
+
+  def perform_sync(sync)
+    # Loads item metadata, accounts, transactions, and other data to our DB
+    plaid_item.import_latest_plaid_data
+
+    # Processes the raw Plaid data and updates internal domain objects
+    plaid_item.process_accounts
+
+    # All data is synced, so we can now run an account sync to calculate historical balances and more
+    plaid_item.schedule_account_syncs(
+      parent_sync: sync,
+      window_start_date: sync.window_start_date,
+      window_end_date: sync.window_end_date
+    )
+  end
+
+  def perform_post_sync
+    # no-op
+  end
+end
diff --git a/app/models/plaid_item/webhook_processor.rb b/app/models/plaid_item/webhook_processor.rb
new file mode 100644
index 00000000..4d8b70c6
--- /dev/null
+++ b/app/models/plaid_item/webhook_processor.rb
@@ -0,0 +1,56 @@
+class PlaidItem::WebhookProcessor
+  MissingItemError = Class.new(StandardError)
+
+  def initialize(webhook_body)
+    parsed = JSON.parse(webhook_body)
+    @webhook_type = parsed["webhook_type"]
+    @webhook_code = parsed["webhook_code"]
+    @item_id = parsed["item_id"]
+    @error = parsed["error"]
+  end
+
+  def process
+    unless plaid_item
+      handle_missing_item
+      return
+    end
+
+    case [ webhook_type, webhook_code ]
+    when [ "TRANSACTIONS", "SYNC_UPDATES_AVAILABLE" ]
+      plaid_item.sync_later
+    when [ "INVESTMENTS_TRANSACTIONS", "DEFAULT_UPDATE" ]
+      plaid_item.sync_later
+    when [ "HOLDINGS", "DEFAULT_UPDATE" ]
+      plaid_item.sync_later
+    when [ "ITEM", "ERROR" ]
+      if error["error_code"] == "ITEM_LOGIN_REQUIRED"
+        plaid_item.update!(status: :requires_update)
+      end
+    else
+      Rails.logger.warn("Unhandled Plaid webhook type: #{webhook_type}:#{webhook_code}")
+    end
+  rescue => e
+    # To always ensure we return a 200 to Plaid (to keep endpoint healthy), silently capture and report all errors
+    Sentry.capture_exception(e)
+  end
+
+  private
+    attr_reader :webhook_type, :webhook_code, :item_id, :error
+
+    def plaid_item
+      @plaid_item ||= PlaidItem.find_by(plaid_id: item_id)
+    end
+
+    def handle_missing_item
+      return if plaid_item.present?
+
+      # If we cannot find an item in our DB, that means we've reached an invalid data state where
+      # the Plaid Item (upstream) still exists (and is being billed), but doesn't exist internally.
+      #
+      # Since we don't have the item which has the access token, there is nothing we can do programmatically
+      # here, so we just need to report it to Sentry and manually handle it.
+      Sentry.capture_exception(MissingItemError.new("Received Plaid webhook for item no longer in our DB.  Manual action required to resolve.")) do |scope|
+        scope.set_tags(plaid_item_id: item_id)
+      end
+    end
+end
diff --git a/app/models/property.rb b/app/models/property.rb
index a23519ed..6114a9f4 100644
--- a/app/models/property.rb
+++ b/app/models/property.rb
@@ -1,12 +1,35 @@
 class Property < ApplicationRecord
   include Accountable
 
+  SUBTYPES = {
+    "single_family_home" => { short: "Single Family Home", long: "Single Family Home" },
+    "multi_family_home" => { short: "Multi-Family Home", long: "Multi-Family Home" },
+    "condominium" => { short: "Condo", long: "Condominium" },
+    "townhouse" => { short: "Townhouse", long: "Townhouse" },
+    "investment_property" => { short: "Investment Property", long: "Investment Property" },
+    "second_home" => { short: "Second Home", long: "Second Home" }
+  }.freeze
+
   has_one :address, as: :addressable, dependent: :destroy
 
   accepts_nested_attributes_for :address
 
   attribute :area_unit, :string, default: "sqft"
 
+  class << self
+    def icon
+      "home"
+    end
+
+    def color
+      "#06AED4"
+    end
+
+    def classification
+      "asset"
+    end
+  end
+
   def area
     Measurement.new(area_value, area_unit) if area_value.present?
   end
@@ -16,11 +39,19 @@ class Property < ApplicationRecord
   end
 
   def trend
-    TimeSeries::Trend.new(current: account.balance_money, previous: first_valuation_amount)
+    Trend.new(current: account.balance_money, previous: first_valuation_amount)
+  end
+
+  def balance_display_name
+    "market value"
+  end
+
+  def opening_balance_display_name
+    "original purchase price"
   end
 
   private
     def first_valuation_amount
-      account.entries.account_valuations.order(:date).first&.amount_money || account.balance_money
+      account.entries.valuations.order(:date).first&.amount_money || account.balance_money
     end
 end
diff --git a/app/models/provider.rb b/app/models/provider.rb
new file mode 100644
index 00000000..e9702349
--- /dev/null
+++ b/app/models/provider.rb
@@ -0,0 +1,57 @@
+class Provider
+  Response = Data.define(:success?, :data, :error)
+
+  class Error < StandardError
+    attr_reader :details
+
+    def initialize(message, details: nil)
+      super(message)
+      @details = details
+    end
+
+    def as_json
+      {
+        message: message,
+        details: details
+      }
+    end
+  end
+
+  private
+    PaginatedData = Data.define(:paginated, :first_page, :total_pages)
+    UsageData = Data.define(:used, :limit, :utilization, :plan)
+
+    def with_provider_response(error_transformer: nil, &block)
+      data = yield
+
+      Response.new(
+        success?: true,
+        data: data,
+        error: nil,
+      )
+    rescue => error
+      transformed_error = if error_transformer
+        error_transformer.call(error)
+      else
+        default_error_transformer(error)
+      end
+
+      Response.new(
+        success?: false,
+        data: nil,
+        error: transformed_error
+      )
+    end
+
+    # Override to set class-level error transformation for methods using `with_provider_response`
+    def default_error_transformer(error)
+      if error.is_a?(Faraday::Error)
+        self.class::Error.new(
+          error.message,
+          details: error.response&.dig(:body),
+        )
+      else
+        self.class::Error.new(error.message)
+      end
+    end
+end
diff --git a/app/models/provider/base.rb b/app/models/provider/base.rb
deleted file mode 100644
index dcf438e5..00000000
--- a/app/models/provider/base.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-
-class Provider::Base
-  ProviderError = Class.new(StandardError)
-
-  TRANSIENT_NETWORK_ERRORS = [
-    Faraday::TimeoutError,
-    Faraday::ConnectionFailed,
-    Faraday::SSLError,
-    Faraday::ClientError,
-    Faraday::ServerError
-  ]
-
-  class << self
-    def known_transient_errors
-      TRANSIENT_NETWORK_ERRORS + [ ProviderError ]
-    end
-  end
-end
diff --git a/app/models/provider/exchange_rate_concept.rb b/app/models/provider/exchange_rate_concept.rb
new file mode 100644
index 00000000..744204a2
--- /dev/null
+++ b/app/models/provider/exchange_rate_concept.rb
@@ -0,0 +1,13 @@
+module Provider::ExchangeRateConcept
+  extend ActiveSupport::Concern
+
+  Rate = Data.define(:date, :from, :to, :rate)
+
+  def fetch_exchange_rate(from:, to:, date:)
+    raise NotImplementedError, "Subclasses must implement #fetch_exchange_rate"
+  end
+
+  def fetch_exchange_rates(from:, to:, start_date:, end_date:)
+    raise NotImplementedError, "Subclasses must implement #fetch_exchange_rates"
+  end
+end
diff --git a/app/models/provider/github.rb b/app/models/provider/github.rb
index 5aa8526a..208049c5 100644
--- a/app/models/provider/github.rb
+++ b/app/models/provider/github.rb
@@ -1,43 +1,10 @@
 class Provider::Github
   attr_reader :name, :owner, :branch
 
-  def initialize(config = {})
-    @name = config[:name] || ENV.fetch("GITHUB_REPO_NAME", "maybe")
-    @owner = config[:owner] || ENV.fetch("GITHUB_REPO_OWNER", "maybe-finance")
-    @branch = config[:branch] || ENV.fetch("GITHUB_REPO_BRANCH", "main")
-  end
-
-  def fetch_latest_upgrade_candidates
-    Rails.cache.fetch("latest_github_upgrade_candidates", expires_in: 2.minutes) do
-      Rails.logger.info "Fetching latest GitHub upgrade candidates from #{repo} on branch #{branch}..."
-      begin
-        latest_release = Octokit.releases(repo).first
-        latest_version = latest_release ? Semver.from_release_tag(latest_release.tag_name) : Semver.new(Maybe.version)
-        latest_commit = Octokit.branch(repo, branch)
-
-        release_info = if latest_release
-          {
-            version: latest_version,
-            url: latest_release.html_url,
-            commit_sha: Octokit.commit(repo, latest_release.tag_name).sha
-          }
-        end
-
-        commit_info = {
-          version: latest_version,
-          commit_sha: latest_commit.commit.sha,
-          url: latest_commit.commit.html_url
-        }
-
-        {
-          release: release_info,
-          commit: commit_info
-        }
-      rescue => e
-        Rails.logger.error "Failed to fetch latest GitHub commits: #{e.message}"
-        nil
-      end
-    end
+  def initialize
+    @name = "maybe"
+    @owner = "maybe-finance"
+    @branch = "main"
   end
 
   def fetch_latest_release_notes
diff --git a/app/models/provider/llm_concept.rb b/app/models/provider/llm_concept.rb
new file mode 100644
index 00000000..3459ab53
--- /dev/null
+++ b/app/models/provider/llm_concept.rb
@@ -0,0 +1,24 @@
+module Provider::LlmConcept
+  extend ActiveSupport::Concern
+
+  AutoCategorization = Data.define(:transaction_id, :category_name)
+
+  def auto_categorize(transactions)
+    raise NotImplementedError, "Subclasses must implement #auto_categorize"
+  end
+
+  AutoDetectedMerchant = Data.define(:transaction_id, :business_name, :business_url)
+
+  def auto_detect_merchants(transactions)
+    raise NotImplementedError, "Subclasses must implement #auto_detect_merchants"
+  end
+
+  ChatMessage = Data.define(:id, :output_text)
+  ChatStreamChunk = Data.define(:type, :data)
+  ChatResponse = Data.define(:id, :model, :messages, :function_requests)
+  ChatFunctionRequest = Data.define(:id, :call_id, :function_name, :function_args)
+
+  def chat_response(prompt, model:, instructions: nil, functions: [], function_results: [], streamer: nil, previous_response_id: nil)
+    raise NotImplementedError, "Subclasses must implement #chat_response"
+  end
+end
diff --git a/app/models/provider/openai.rb b/app/models/provider/openai.rb
new file mode 100644
index 00000000..8049f074
--- /dev/null
+++ b/app/models/provider/openai.rb
@@ -0,0 +1,86 @@
+class Provider::Openai < Provider
+  include LlmConcept
+
+  # Subclass so errors caught in this provider are raised as Provider::Openai::Error
+  Error = Class.new(Provider::Error)
+
+  MODELS = %w[gpt-4.1]
+
+  def initialize(access_token)
+    @client = ::OpenAI::Client.new(access_token: access_token)
+  end
+
+  def supports_model?(model)
+    MODELS.include?(model)
+  end
+
+  def auto_categorize(transactions: [], user_categories: [])
+    with_provider_response do
+      raise Error, "Too many transactions to auto-categorize. Max is 25 per request." if transactions.size > 25
+
+      AutoCategorizer.new(
+        client,
+        transactions: transactions,
+        user_categories: user_categories
+      ).auto_categorize
+    end
+  end
+
+  def auto_detect_merchants(transactions: [], user_merchants: [])
+    with_provider_response do
+      raise Error, "Too many transactions to auto-detect merchants. Max is 25 per request." if transactions.size > 25
+
+      AutoMerchantDetector.new(
+        client,
+        transactions: transactions,
+        user_merchants: user_merchants
+      ).auto_detect_merchants
+    end
+  end
+
+  def chat_response(prompt, model:, instructions: nil, functions: [], function_results: [], streamer: nil, previous_response_id: nil)
+    with_provider_response do
+      chat_config = ChatConfig.new(
+        functions: functions,
+        function_results: function_results
+      )
+
+      collected_chunks = []
+
+      # Proxy that converts raw stream to "LLM Provider concept" stream
+      stream_proxy = if streamer.present?
+        proc do |chunk|
+          parsed_chunk = ChatStreamParser.new(chunk).parsed
+
+          unless parsed_chunk.nil?
+            streamer.call(parsed_chunk)
+            collected_chunks << parsed_chunk
+          end
+        end
+      else
+        nil
+      end
+
+      raw_response = client.responses.create(parameters: {
+        model: model,
+        input: chat_config.build_input(prompt),
+        instructions: instructions,
+        tools: chat_config.tools,
+        previous_response_id: previous_response_id,
+        stream: stream_proxy
+      })
+
+      # If streaming, Ruby OpenAI does not return anything, so to normalize this method's API, we search
+      # for the "response chunk" in the stream and return it (it is already parsed)
+      if stream_proxy.present?
+        response_chunk = collected_chunks.find { |chunk| chunk.type == "response" }
+        response_chunk.data
+      else
+        ChatParser.new(raw_response).parsed
+      end
+    end
+  end
+
+  private
+    attr_reader :client
+end
diff --git a/app/models/provider/openai/auto_categorizer.rb b/app/models/provider/openai/auto_categorizer.rb
new file mode 100644
index 00000000..6d3e5e8a
--- /dev/null
+++ b/app/models/provider/openai/auto_categorizer.rb
@@ -0,0 +1,120 @@
+class Provider::Openai::AutoCategorizer
+  def initialize(client, transactions: [], user_categories: [])
+    @client = client
+    @transactions = transactions
+    @user_categories = user_categories
+  end
+
+  def auto_categorize
+    response = client.responses.create(parameters: {
+      model: "gpt-4.1-mini",
+      input: [ { role: "developer", content: developer_message } ],
+      text: {
+        format: {
+          type: "json_schema",
+          name: "auto_categorize_personal_finance_transactions",
+          strict: true,
+          schema: json_schema
+        }
+      },
+      instructions: instructions
+    })
+
+    Rails.logger.info("Tokens used to auto-categorize transactions: #{response.dig("usage").dig("total_tokens")}")
+
+    build_response(extract_categorizations(response))
+  end
+
+  private
+    attr_reader :client, :transactions, :user_categories
+
+    AutoCategorization = Provider::LlmConcept::AutoCategorization
+
+    def build_response(categorizations)
+      categorizations.map do |categorization|
+        AutoCategorization.new(
+          transaction_id: categorization.dig("transaction_id"),
+          category_name: normalize_category_name(categorization.dig("category_name")),
+        )
+      end
+    end
+
+    def normalize_category_name(category_name)
+      return nil if category_name == "null"
+
+      category_name
+    end
+
+    def extract_categorizations(response)
+      response_json = JSON.parse(response.dig("output")[0].dig("content")[0].dig("text"))
+      response_json.dig("categorizations")
+    end
+
+    def json_schema
+      {
+        type: "object",
+        properties: {
+          categorizations: {
+            type: "array",
+            description: "An array of auto-categorizations for each transaction",
+            items: {
+              type: "object",
+              properties: {
+                transaction_id: {
+                  type: "string",
+                  description: "The internal ID of the original transaction",
+                  enum: transactions.map { |t| t[:id] }
+                },
+                category_name: {
+                  type: "string",
+                  description: "The matched category name of the transaction, or null if no match",
+                  enum: [ *user_categories.map { |c| c[:name] }, "null" ]
+                }
+              },
+              required: [ "transaction_id", "category_name" ],
+              additionalProperties: false
+            }
+          }
+        },
+        required: [ "categorizations" ],
+        additionalProperties: false
+      }
+    end
+
+    def developer_message
+      <<~MESSAGE.strip_heredoc
+        Here are the user's available categories in JSON format:
+
+        ```json
+        #{user_categories.to_json}
+        ```
+
+        Use the available categories to auto-categorize the following transactions:
+
+        ```json
+        #{transactions.to_json}
+        ```
+      MESSAGE
+    end
+
+    def instructions
+      <<~INSTRUCTIONS.strip_heredoc
+        You are an assistant to a consumer personal finance app.  You will be provided a list
+        of the user's transactions and a list of the user's categories.  Your job is to auto-categorize
+        each transaction.
+
+        Closely follow ALL the rules below while auto-categorizing:
+
+        - Return 1 result per transaction
+        - Correlate each transaction by ID (transaction_id)
+        - Attempt to match the most specific category possible (i.e. subcategory over parent category)
+        - Category and transaction classifications should match (i.e. if transaction is an "expense", the category must have classification of "expense")
+        - If you don't know the category, return "null"
+          - You should always favor "null" over false positives
+          - Be slightly pessimistic.  Only match a category if you're 60%+ confident it is the correct one.
+        - Each transaction has varying metadata that can be used to determine the category
+          - Note: "hint" comes from 3rd party aggregators and typically represents a category name that
+            may or may not match any of the user-supplied categories
+      INSTRUCTIONS
+    end
+end
diff --git a/app/models/provider/openai/auto_merchant_detector.rb b/app/models/provider/openai/auto_merchant_detector.rb
new file mode 100644
index 00000000..f66ca2e7
--- /dev/null
+++ b/app/models/provider/openai/auto_merchant_detector.rb
@@ -0,0 +1,146 @@
+class Provider::Openai::AutoMerchantDetector
+  def initialize(client, transactions:, user_merchants:)
+    @client = client
+    @transactions = transactions
+    @user_merchants = user_merchants
+  end
+
+  def auto_detect_merchants
+    response = client.responses.create(parameters: {
+      model: "gpt-4.1-mini",
+      input: [ { role: "developer", content: developer_message } ],
+      text: {
+        format: {
+          type: "json_schema",
+          name: "auto_detect_personal_finance_merchants",
+          strict: true,
+          schema: json_schema
+        }
+      },
+      instructions: instructions
+    })
+
+    Rails.logger.info("Tokens used to auto-detect merchants: #{response.dig("usage").dig("total_tokens")}")
+
+    build_response(extract_categorizations(response))
+  end
+
+  private
+    attr_reader :client, :transactions, :user_merchants
+
+    AutoDetectedMerchant = Provider::LlmConcept::AutoDetectedMerchant
+
+    def build_response(categorizations)
+      categorizations.map do |categorization|
+        AutoDetectedMerchant.new(
+          transaction_id: categorization.dig("transaction_id"),
+          business_name: normalize_ai_value(categorization.dig("business_name")),
+          business_url: normalize_ai_value(categorization.dig("business_url")),
+        )
+      end
+    end
+
+    def normalize_ai_value(ai_value)
+      return nil if ai_value == "null"
+
+      ai_value
+    end
+
+    def extract_categorizations(response)
+      response_json = JSON.parse(response.dig("output")[0].dig("content")[0].dig("text"))
+      response_json.dig("merchants")
+    end
+
+    def json_schema
+      {
+        type: "object",
+        properties: {
+          merchants: {
+            type: "array",
+            description: "An array of auto-detected merchant businesses for each transaction",
+            items: {
+              type: "object",
+              properties: {
+                transaction_id: {
+                  type: "string",
+                  description: "The internal ID of the original transaction",
+                  enum: transactions.map { |t| t[:id] }
+                },
+                business_name: {
+                  type: [ "string", "null" ],
+                  description: "The detected business name of the transaction, or `null` if uncertain"
+                },
+                business_url: {
+                  type: [ "string", "null" ],
+                  description: "The URL of the detected business, or `null` if uncertain"
+                }
+              },
+              required: [ "transaction_id", "business_name", "business_url" ],
+              additionalProperties: false
+            }
+          }
+        },
+        required: [ "merchants" ],
+        additionalProperties: false
+      }
+    end
+
+    def developer_message
+      <<~MESSAGE.strip_heredoc
+        Here are the user's available merchants in JSON format:
+
+        ```json
+        #{user_merchants.to_json}
+        ```
+
+        Use BOTH your knowledge AND the user-generated merchants to auto-detect the following transactions:
+
+        ```json
+        #{transactions.to_json}
+        ```
+
+        Return "null" if you are not 80%+ confident in your answer.
+      MESSAGE
+    end
+
+    def instructions
+      <<~INSTRUCTIONS.strip_heredoc
+        You are an assistant to a consumer personal finance app.
+
+        Closely follow ALL the rules below while auto-detecting business names and website URLs:
+
+        - Return 1 result per transaction
+        - Correlate each transaction by ID (transaction_id)
+        - Do not include the subdomain in the business_url (i.e. "amazon.com" not "www.amazon.com")
+        - User merchants are considered "manual" user-generated merchants and should only be used in 100% clear cases
+        - Be slightly pessimistic.  We favor returning "null" over returning a false positive.
+        - NEVER return a name or URL for generic transaction names (e.g. "Paycheck", "Laundromat", "Grocery store", "Local diner")
+
+        Determining a value:
+
+        - First attempt to determine the name + URL from your knowledge of global businesses
+        - If no certain match, attempt to match one of the user-provided merchants
+        - If no match, return "null"
+
+        Example 1 (known business):
+
+        ```
+        Transaction name: "Some Amazon purchases"
+
+        Result:
+        - business_name: "Amazon"
+        - business_url: "amazon.com"
+        ```
+
+        Example 2 (generic business):
+
+        ```
+        Transaction name: "local diner"
+
+        Result:
+        - business_name: null
+        - business_url: null
+        ```
+      INSTRUCTIONS
+    end
+end
diff --git a/app/models/provider/openai/chat_config.rb b/app/models/provider/openai/chat_config.rb
new file mode 100644
index 00000000..5aca6aeb
--- /dev/null
+++ b/app/models/provider/openai/chat_config.rb
@@ -0,0 +1,36 @@
+class Provider::Openai::ChatConfig
+  def initialize(functions: [], function_results: [])
+    @functions = functions
+    @function_results = function_results
+  end
+
+  def tools
+    functions.map do |fn|
+      {
+        type: "function",
+        name: fn[:name],
+        description: fn[:description],
+        parameters: fn[:params_schema],
+        strict: fn[:strict]
+      }
+    end
+  end
+
+  def build_input(prompt)
+    results = function_results.map do |fn_result|
+      {
+        type: "function_call_output",
+        call_id: fn_result[:call_id],
+        output: fn_result[:output].to_json
+      }
+    end
+
+    [
+      { role: "user", content: prompt },
+      *results
+    ]
+  end
+
+  private
+    attr_reader :functions, :function_results
+end
diff --git a/app/models/provider/openai/chat_parser.rb b/app/models/provider/openai/chat_parser.rb
new file mode 100644
index 00000000..af7b6248
--- /dev/null
+++ b/app/models/provider/openai/chat_parser.rb
@@ -0,0 +1,59 @@
+class Provider::Openai::ChatParser
+  Error = Class.new(StandardError)
+
+  def initialize(object)
+    @object = object
+  end
+
+  def parsed
+    ChatResponse.new(
+      id: response_id,
+      model: response_model,
+      messages: messages,
+      function_requests: function_requests
+    )
+  end
+
+  private
+    attr_reader :object
+
+    ChatResponse = Provider::LlmConcept::ChatResponse
+    ChatMessage = Provider::LlmConcept::ChatMessage
+    ChatFunctionRequest = Provider::LlmConcept::ChatFunctionRequest
+
+    def response_id
+      object.dig("id")
+    end
+
+    def response_model
+      object.dig("model")
+    end
+
+    def messages
+      message_items = object.dig("output").filter { |item| item.dig("type") == "message" }
+
+      message_items.map do |message_item|
+        ChatMessage.new(
+          id: message_item.dig("id"),
+          output_text: message_item.dig("content").map do |content|
+            text = content.dig("text")
+            refusal = content.dig("refusal")
+            text || refusal
+          end.flatten.join("\n")
+        )
+      end
+    end
+
+    def function_requests
+      function_items = object.dig("output").filter { |item| item.dig("type") == "function_call" }
+
+      function_items.map do |function_item|
+        ChatFunctionRequest.new(
+          id: function_item.dig("id"),
+          call_id: function_item.dig("call_id"),
+          function_name: function_item.dig("name"),
+          function_args: function_item.dig("arguments")
+        )
+      end
+    end
+end
diff --git a/app/models/provider/openai/chat_stream_parser.rb b/app/models/provider/openai/chat_stream_parser.rb
new file mode 100644
index 00000000..0b91940c
--- /dev/null
+++ b/app/models/provider/openai/chat_stream_parser.rb
@@ -0,0 +1,28 @@
+class Provider::Openai::ChatStreamParser
+  Error = Class.new(StandardError)
+
+  def initialize(object)
+    @object = object
+  end
+
+  def parsed
+    type = object.dig("type")
+
+    case type
+    when "response.output_text.delta", "response.refusal.delta"
+      Chunk.new(type: "output_text", data: object.dig("delta"))
+    when "response.completed"
+      raw_response = object.dig("response")
+      Chunk.new(type: "response", data: parse_response(raw_response))
+    end
+  end
+
+  private
+    attr_reader :object
+
+    Chunk = Provider::LlmConcept::ChatStreamChunk
+
+    def parse_response(response)
+      Provider::Openai::ChatParser.new(response).parsed
+    end
+end
diff --git a/app/models/provider/plaid.rb b/app/models/provider/plaid.rb
new file mode 100644
index 00000000..44201074
--- /dev/null
+++ b/app/models/provider/plaid.rb
@@ -0,0 +1,212 @@
+class Provider::Plaid
+  attr_reader :client, :region
+
+  MAYBE_SUPPORTED_PLAID_PRODUCTS = %w[transactions investments liabilities].freeze
+  MAX_HISTORY_DAYS = Rails.env.development? ? 90 : 730
+
+  def initialize(config, region: :us)
+    @client = Plaid::PlaidApi.new(
+      Plaid::ApiClient.new(config)
+    )
+    @region = region
+  end
+
+  def validate_webhook!(verification_header, raw_body)
+    jwks_loader = ->(options) do
+      key_id = options[:kid]
+
+      jwk_response = client.webhook_verification_key_get(
+        Plaid::WebhookVerificationKeyGetRequest.new(key_id: key_id)
+      )
+
+      jwks = JWT::JWK::Set.new([ jwk_response.key.to_hash ])
+
+      jwks.filter! { |key| key[:use] == "sig" }
+      jwks
+    end
+
+    payload, _header = JWT.decode(
+      verification_header, nil, true,
+      {
+        algorithms: [ "ES256" ],
+        jwks: jwks_loader,
+        verify_expiration: false
+      }
+    )
+
+    issued_at = Time.at(payload["iat"])
+    raise JWT::VerificationError, "Webhook is too old" if Time.now - issued_at > 5.minutes
+
+    expected_hash = payload["request_body_sha256"]
+    actual_hash = Digest::SHA256.hexdigest(raw_body)
+    raise JWT::VerificationError, "Invalid webhook body hash" unless ActiveSupport::SecurityUtils.secure_compare(expected_hash, actual_hash)
+  end
+
+  def get_link_token(user_id:, webhooks_url:, redirect_url:, accountable_type: nil, access_token: nil)
+    request_params = {
+      user: { client_user_id: user_id },
+      client_name: "Maybe Finance",
+      country_codes: country_codes,
+      language: "en",
+      webhook: webhooks_url,
+      redirect_uri: redirect_url,
+      transactions: { days_requested: MAX_HISTORY_DAYS }
+    }
+
+    if access_token.present?
+      request_params[:access_token] = access_token
+    else
+      request_params[:products] = [ get_primary_product(accountable_type) ]
+      request_params[:additional_consented_products] = get_additional_consented_products(accountable_type)
+    end
+
+    request = Plaid::LinkTokenCreateRequest.new(request_params)
+
+    client.link_token_create(request)
+  end
+
+  def exchange_public_token(token)
+    request = Plaid::ItemPublicTokenExchangeRequest.new(
+      public_token: token
+    )
+
+    client.item_public_token_exchange(request)
+  end
+
+  def get_item(access_token)
+    request = Plaid::ItemGetRequest.new(access_token: access_token)
+    client.item_get(request)
+  end
+
+  def remove_item(access_token)
+    request = Plaid::ItemRemoveRequest.new(access_token: access_token)
+    client.item_remove(request)
+  end
+
+  def get_item_accounts(access_token)
+    request = Plaid::AccountsGetRequest.new(access_token: access_token)
+    client.accounts_get(request)
+  end
+
+  def get_transactions(access_token, next_cursor: nil)
+    cursor = next_cursor
+    added = []
+    modified = []
+    removed = []
+    has_more = true
+
+    while has_more
+      request = Plaid::TransactionsSyncRequest.new(
+        access_token: access_token,
+        cursor: cursor,
+        options: {
+          include_original_description: true
+        }
+      )
+
+      response = client.transactions_sync(request)
+
+      added += response.added
+      modified += response.modified
+      removed += response.removed
+      has_more = response.has_more
+      cursor = response.next_cursor
+    end
+
+    TransactionSyncResponse.new(added:, modified:, removed:, cursor:)
+  end
+
+  def get_item_investments(access_token, start_date: nil, end_date: Date.current)
+    start_date = start_date || MAX_HISTORY_DAYS.days.ago.to_date
+    holdings, holding_securities = get_item_holdings(access_token: access_token)
+    transactions, transaction_securities = get_item_investment_transactions(access_token: access_token, start_date:, end_date:)
+
+    merged_securities = ((holding_securities || []) + (transaction_securities || [])).uniq { |s| s.security_id }
+
+    InvestmentsResponse.new(holdings:, transactions:, securities: merged_securities)
+  end
+
+  def get_item_liabilities(access_token)
+    request = Plaid::LiabilitiesGetRequest.new({ access_token: access_token })
+    response = client.liabilities_get(request)
+    response.liabilities
+  end
+
+  def get_institution(institution_id)
+    request = Plaid::InstitutionsGetByIdRequest.new({
+      institution_id: institution_id,
+      country_codes: country_codes,
+      options: {
+        include_optional_metadata: true
+      }
+    })
+    client.institutions_get_by_id(request)
+  end
+
+  private
+    TransactionSyncResponse = Struct.new :added, :modified, :removed, :cursor, keyword_init: true
+    InvestmentsResponse = Struct.new :holdings, :transactions, :securities, keyword_init: true
+
+    def get_item_holdings(access_token:)
+      request = Plaid::InvestmentsHoldingsGetRequest.new({ access_token: access_token })
+      response = client.investments_holdings_get(request)
+
+      [ response.holdings, response.securities ]
+    end
+
+    def get_item_investment_transactions(access_token:, start_date:, end_date:)
+      transactions = []
+      securities = []
+      offset = 0
+
+      loop do
+        request = Plaid::InvestmentsTransactionsGetRequest.new(
+          access_token: access_token,
+          start_date: start_date.to_s,
+          end_date: end_date.to_s,
+          options: { offset: offset }
+        )
+
+        response = client.investments_transactions_get(request)
+
+        transactions += response.investment_transactions
+        securities += response.securities
+
+        break if transactions.length >= response.total_investment_transactions
+        offset = transactions.length
+      end
+
+      [ transactions, securities ]
+    end
+
+    def get_primary_product(accountable_type)
+      return "transactions" if eu?
+
+      case accountable_type
+      when "Investment"
+        "investments"
+      when "CreditCard", "Loan"
+        "liabilities"
+      else
+        "transactions"
+      end
+    end
+
+    def get_additional_consented_products(accountable_type)
+      return [] if eu?
+
+      MAYBE_SUPPORTED_PLAID_PRODUCTS - [ get_primary_product(accountable_type) ]
+    end
+
+    def eu?
+      region.to_sym == :eu
+    end
+
+    def country_codes
+      if eu?
+        [ "ES", "NL", "FR", "IE", "DE", "IT", "PL", "DK", "NO", "SE", "EE", "LT", "LV", "PT", "BE" ]  # EU supported countries
+      else
+        [ "US", "CA" ] # US + CA only
+      end
+    end
+end
diff --git a/app/models/provider/plaid_sandbox.rb b/app/models/provider/plaid_sandbox.rb
new file mode 100644
index 00000000..e4d7a347
--- /dev/null
+++ b/app/models/provider/plaid_sandbox.rb
@@ -0,0 +1,52 @@
+class Provider::PlaidSandbox < Provider::Plaid
+  attr_reader :client
+
+  def initialize
+    @client = create_client
+    @region = :us
+  end
+
+  def create_public_token(username: nil)
+    client.sandbox_public_token_create(
+      Plaid::SandboxPublicTokenCreateRequest.new(
+        institution_id: "ins_109508", # "First Platypus Bank" (Plaid's sandbox institution that works with all products)
+        initial_products: [ "transactions", "investments", "liabilities" ],
+        options: {
+          override_username: username || "custom_test"
+        }
+      )
+    ).public_token
+  end
+
+  def fire_webhook(item, type: "TRANSACTIONS", code: "SYNC_UPDATES_AVAILABLE")
+    client.sandbox_item_fire_webhook(
+      Plaid::SandboxItemFireWebhookRequest.new(
+        access_token: item.access_token,
+        webhook_type: type,
+        webhook_code: code,
+      )
+    )
+  end
+
+  def reset_login(item)
+    client.sandbox_item_reset_login(
+      Plaid::SandboxItemResetLoginRequest.new(
+        access_token: item.access_token
+      )
+    )
+  end
+
+  private
+    def create_client
+      raise "Plaid sandbox is not supported in production" if Rails.env.production?
+
+      api_client = Plaid::ApiClient.new(
+        Rails.application.config.plaid
+      )
+
+      # Force sandbox environment for PlaidSandbox regardless of Rails config
+      api_client.config.server_index = Plaid::Configuration::Environment["sandbox"]
+
+      Plaid::PlaidApi.new(api_client)
+    end
+end
diff --git a/app/models/provider/registry.rb b/app/models/provider/registry.rb
new file mode 100644
index 00000000..c2d37db0
--- /dev/null
+++ b/app/models/provider/registry.rb
@@ -0,0 +1,104 @@
+class Provider::Registry
+  include ActiveModel::Validations
+
+  Error = Class.new(StandardError)
+
+  CONCEPTS = %i[exchange_rates securities llm]
+
+  validates :concept, inclusion: { in: CONCEPTS }
+
+  class << self
+    def for_concept(concept)
+      new(concept.to_sym)
+    end
+
+    def get_provider(name)
+      send(name)
+    rescue NoMethodError
+      raise Error.new("Provider '#{name}' not found in registry")
+    end
+
+    def plaid_provider_for_region(region)
+      region.to_sym == :us ? plaid_us : plaid_eu
+    end
+
+    private
+      def stripe
+        secret_key = ENV["STRIPE_SECRET_KEY"]
+        webhook_secret = ENV["STRIPE_WEBHOOK_SECRET"]
+
+        return nil unless secret_key.present? && webhook_secret.present?
+
+        Provider::Stripe.new(secret_key:, webhook_secret:)
+      end
+
+      def synth
+        api_key = ENV.fetch("SYNTH_API_KEY", Setting.synth_api_key)
+
+        return nil unless api_key.present?
+
+        Provider::Synth.new(api_key)
+      end
+
+      def plaid_us
+        config = Rails.application.config.plaid
+
+        return nil unless config.present?
+
+        Provider::Plaid.new(config, region: :us)
+      end
+
+      def plaid_eu
+        config = Rails.application.config.plaid_eu
+
+        return nil unless config.present?
+
+        Provider::Plaid.new(config, region: :eu)
+      end
+
+      def github
+        Provider::Github.new
+      end
+
+      def openai
+        access_token = ENV.fetch("OPENAI_ACCESS_TOKEN", Setting.openai_access_token)
+
+        return nil unless access_token.present?
+
+        Provider::Openai.new(access_token)
+      end
+  end
+
+  def initialize(concept)
+    @concept = concept
+    validate!
+  end
+
+  def providers
+    available_providers.map { |p| self.class.send(p) }
+  end
+
+  def get_provider(name)
+    provider_method = available_providers.find { |p| p == name.to_sym }
+
+    raise Error.new("Provider '#{name}' not found for concept: #{concept}") unless provider_method.present?
+
+    self.class.send(provider_method)
+  end
+
+  private
+    attr_reader :concept
+
+    def available_providers
+      case concept
+      when :exchange_rates
+        %i[synth]
+      when :securities
+        %i[synth]
+      when :llm
+        %i[openai]
+      else
+        %i[synth plaid_us plaid_eu github openai]
+      end
+    end
+end
diff --git a/app/models/provider/security_concept.rb b/app/models/provider/security_concept.rb
new file mode 100644
index 00000000..fbc408c3
--- /dev/null
+++ b/app/models/provider/security_concept.rb
@@ -0,0 +1,23 @@
+module Provider::SecurityConcept
+  extend ActiveSupport::Concern
+
+  Security = Data.define(:symbol, :name, :logo_url, :exchange_operating_mic, :country_code)
+  SecurityInfo = Data.define(:symbol, :name, :links, :logo_url, :description, :kind, :exchange_operating_mic)
+  Price = Data.define(:symbol, :date, :price, :currency, :exchange_operating_mic)
+
+  def search_securities(symbol, country_code: nil, exchange_operating_mic: nil)
+    raise NotImplementedError, "Subclasses must implement #search_securities"
+  end
+
+  def fetch_security_info(symbol:, exchange_operating_mic:)
+    raise NotImplementedError, "Subclasses must implement #fetch_security_info"
+  end
+
+  def fetch_security_price(symbol:, exchange_operating_mic:, date:)
+    raise NotImplementedError, "Subclasses must implement #fetch_security_price"
+  end
+
+  def fetch_security_prices(symbol:, exchange_operating_mic:, start_date:, end_date:)
+    raise NotImplementedError, "Subclasses must implement #fetch_security_prices"
+  end
+end
diff --git a/app/models/provider/stripe.rb b/app/models/provider/stripe.rb
new file mode 100644
index 00000000..81fc3f96
--- /dev/null
+++ b/app/models/provider/stripe.rb
@@ -0,0 +1,88 @@
+class Provider::Stripe
+  Error = Class.new(StandardError)
+
+  def initialize(secret_key:, webhook_secret:)
+    @client = Stripe::StripeClient.new(secret_key)
+    @webhook_secret = webhook_secret
+  end
+
+  def process_event(event_id)
+    event = retrieve_event(event_id)
+
+    case event.type
+    when /^customer\.subscription\./
+      SubscriptionEventProcessor.new(event).process
+    else
+      Rails.logger.warn "Unhandled event type: #{event.type}"
+    end
+  end
+
+  def process_webhook_later(webhook_body, sig_header)
+    thin_event = client.parse_thin_event(webhook_body, sig_header, webhook_secret)
+    StripeEventHandlerJob.perform_later(thin_event.id)
+  end
+
+  def create_checkout_session(plan:, family_id:, family_email:, success_url:, cancel_url:)
+    customer = client.v1.customers.create(
+      email: family_email,
+      metadata: {
+        family_id: family_id
+      }
+    )
+
+    session = client.v1.checkout.sessions.create(
+      customer: customer.id,
+      line_items: [ { price: price_id_for(plan), quantity: 1 } ],
+      mode: "subscription",
+      allow_promotion_codes: true,
+      success_url: success_url,
+      cancel_url: cancel_url
+    )
+
+    NewCheckoutSession.new(url: session.url, customer_id: customer.id)
+  end
+
+  def get_checkout_result(session_id)
+    session = client.v1.checkout.sessions.retrieve(session_id)
+
+    unless session.status == "complete" && session.payment_status == "paid"
+      raise Error, "Checkout session not complete"
+    end
+
+    CheckoutSessionResult.new(success?: true, subscription_id: session.subscription)
+  rescue StandardError => e
+    Sentry.capture_exception(e)
+    Rails.logger.error "Error fetching checkout result for session #{session_id}: #{e.message}"
+    CheckoutSessionResult.new(success?: false, subscription_id: nil)
+  end
+
+  def create_billing_portal_session_url(customer_id:, return_url:)
+    client.v1.billing_portal.sessions.create(
+      customer: customer_id,
+      return_url: return_url
+    ).url
+  end
+
+  def update_customer_metadata(customer_id:, metadata:)
+    client.v1.customers.update(customer_id, metadata: metadata)
+  end
+
+  private
+    attr_reader :client, :webhook_secret
+
+    NewCheckoutSession = Data.define(:url, :customer_id)
+    CheckoutSessionResult = Data.define(:success?, :subscription_id)
+
+    def price_id_for(plan)
+      prices = {
+        monthly: ENV["STRIPE_MONTHLY_PRICE_ID"],
+        annual: ENV["STRIPE_ANNUAL_PRICE_ID"]
+      }
+
+      prices[plan.to_sym || :monthly]
+    end
+
+    def retrieve_event(event_id)
+      client.v1.events.retrieve(event_id)
+    end
+end
diff --git a/app/models/provider/stripe/event_processor.rb b/app/models/provider/stripe/event_processor.rb
new file mode 100644
index 00000000..f19c419f
--- /dev/null
+++ b/app/models/provider/stripe/event_processor.rb
@@ -0,0 +1,16 @@
+class Provider::Stripe::EventProcessor
+  def initialize(event)
+    @event = event
+  end
+
+  def process
+    raise NotImplementedError, "Subclasses must implement the process method"
+  end
+
+  private
+    attr_reader :event
+
+    def event_data
+      event.data.object
+    end
+end
diff --git a/app/models/provider/stripe/subscription_event_processor.rb b/app/models/provider/stripe/subscription_event_processor.rb
new file mode 100644
index 00000000..360a7f74
--- /dev/null
+++ b/app/models/provider/stripe/subscription_event_processor.rb
@@ -0,0 +1,29 @@
+class Provider::Stripe::SubscriptionEventProcessor < Provider::Stripe::EventProcessor
+  Error = Class.new(StandardError)
+
+  def process
+    raise Error, "Family not found for Stripe customer ID: #{subscription.customer}" unless family
+
+    family.subscription.update(
+      stripe_id: subscription.id,
+      status: subscription.status,
+      interval: subscription_details.plan.interval,
+      amount: subscription_details.plan.amount / 100.0, # Stripe returns cents, we report dollars
+      currency: subscription_details.plan.currency.upcase,
+      current_period_ends_at: Time.at(subscription_details.current_period_end)
+    )
+  end
+
+  private
+    def family
+      Family.find_by(stripe_customer_id: subscription.customer)
+    end
+
+    def subscription_details
+      event_data.items.data.first
+    end
+
+    def subscription
+      event_data
+    end
+end
diff --git a/app/models/provider/synth.rb b/app/models/provider/synth.rb
index 17d6954e..ed2514ac 100644
--- a/app/models/provider/synth.rb
+++ b/app/models/provider/synth.rb
@@ -1,137 +1,195 @@
-class Provider::Synth
-  include Retryable
+class Provider::Synth < Provider
+  include ExchangeRateConcept, SecurityConcept
+
+  # Subclass so errors caught in this provider are raised as Provider::Synth::Error
+  Error = Class.new(Provider::Error)
+  InvalidExchangeRateError = Class.new(Error)
+  InvalidSecurityPriceError = Class.new(Error)
 
   def initialize(api_key)
     @api_key = api_key
   end
 
   def healthy?
-    response = client.get("#{base_url}/user")
-    JSON.parse(response.body).dig("id").present?
+    with_provider_response do
+      response = client.get("#{base_url}/user")
+      JSON.parse(response.body).dig("id").present?
+    end
   end
-  def usage
-    response = client.get("#{base_url}/user")
 
-    if response.status == 401
-      return UsageResponse.new(
-        success?: false,
-        error: "Unauthorized: Invalid API key",
-        raw_response: response
+  def usage
+    with_provider_response do
+      response = client.get("#{base_url}/user")
+
+      parsed = JSON.parse(response.body)
+
+      remaining = parsed.dig("api_calls_remaining")
+      limit = parsed.dig("api_limit")
+      used = limit - remaining
+
+      UsageData.new(
+        used: used,
+        limit: limit,
+        utilization: used.to_f / limit * 100,
+        plan: parsed.dig("plan"),
       )
     end
-
-    parsed = JSON.parse(response.body)
-
-    remaining = parsed.dig("api_calls_remaining")
-    limit = parsed.dig("api_limit")
-    used = limit - remaining
-
-    UsageResponse.new(
-      used: used,
-      limit: limit,
-      utilization: used.to_f / limit * 100,
-      plan: parsed.dig("plan"),
-      success?: true,
-      raw_response: response
-    )
-  rescue StandardError => error
-    UsageResponse.new(
-      success?: false,
-      error: error,
-      raw_response: error
-    )
   end
 
-  def fetch_security_prices(ticker:, start_date:, end_date:)
-    prices = paginate(
-      "#{base_url}/tickers/#{ticker}/open-close",
-      start_date: start_date,
-      end_date: end_date
-    ) do |body|
-      body.dig("prices").map do |price|
-        {
-          date: price.dig("date"),
-          price: price.dig("close")&.to_f || price.dig("open")&.to_f,
-          currency: "USD"
-        }
-      end
-    end
-
-    SecurityPriceResponse.new \
-      prices: prices,
-      success?: true,
-      raw_response: prices.to_json
-  rescue StandardError => error
-    SecurityPriceResponse.new \
-      success?: false,
-      error: error,
-      raw_response: error
-  end
+  # ================================
+  #          Exchange Rates
+  # ================================
 
   def fetch_exchange_rate(from:, to:, date:)
-    retrying Provider::Base.known_transient_errors do |on_last_attempt|
+    with_provider_response do
       response = client.get("#{base_url}/rates/historical") do |req|
         req.params["date"] = date.to_s
         req.params["from"] = from
         req.params["to"] = to
       end
 
-      if response.success?
-        ExchangeRateResponse.new \
-          rate: JSON.parse(response.body).dig("data", "rates", to),
-          success?: true,
-          raw_response: response
-      else
-        if on_last_attempt
-          ExchangeRateResponse.new \
-            success?: false,
-            error: build_error(response),
-            raw_response: response
-        else
-          raise build_error(response)
-        end
-      end
+      rates = JSON.parse(response.body).dig("data", "rates")
+
+      Rate.new(date: date.to_date, from:, to:, rate: rates.dig(to))
     end
   end
 
   def fetch_exchange_rates(from:, to:, start_date:, end_date:)
-    exchange_rates = paginate(
-      "#{base_url}/rates/historical-range",
-      from: from,
-      to: to,
-      date_start: start_date.to_s,
-      date_end: end_date.to_s
-    ) do |body|
-      body.dig("data").map do |exchange_rate|
-        {
-          date: exchange_rate.dig("date"),
-          rate: exchange_rate.dig("rates", to)
-        }
+    with_provider_response do
+      data = paginate(
+        "#{base_url}/rates/historical-range",
+        from: from,
+        to: to,
+        date_start: start_date.to_s,
+        date_end: end_date.to_s
+      ) do |body|
+        body.dig("data")
+      end
+
+      data.paginated.map do |rate|
+        date = rate.dig("date")
+        rate = rate.dig("rates", to)
+
+        if date.nil? || rate.nil?
+          Rails.logger.warn("#{self.class.name} returned invalid rate data for pair from: #{from} to: #{to} on: #{date}.  Rate data: #{rate.inspect}")
+          Sentry.capture_exception(InvalidExchangeRateError.new("#{self.class.name} returned invalid rate data"), level: :warning) do |scope|
+            scope.set_context("rate", { from: from, to: to, date: date })
+          end
+
+          next
+        end
+
+        Rate.new(date: date.to_date, from:, to:, rate:)
+      end.compact
+    end
+  end
+
+  # ================================
+  #           Securities
+  # ================================
+
+  def search_securities(symbol, country_code: nil, exchange_operating_mic: nil)
+    with_provider_response do
+      response = client.get("#{base_url}/tickers/search") do |req|
+        req.params["name"] = symbol
+        req.params["dataset"] = "limited"
+        req.params["country_code"] = country_code if country_code.present?
+        # Synth uses mic_code, which encompasses both exchange_mic AND exchange_operating_mic (union)
+        req.params["mic_code"] = exchange_operating_mic if exchange_operating_mic.present?
+        req.params["limit"] = 25
+      end
+
+      parsed = JSON.parse(response.body)
+
+      parsed.dig("data").map do |security|
+        Security.new(
+          symbol: security.dig("symbol"),
+          name: security.dig("name"),
+          logo_url: security.dig("logo_url"),
+          exchange_operating_mic: security.dig("exchange", "operating_mic_code"),
+          country_code: security.dig("exchange", "country_code")
+        )
       end
     end
+  end
 
-    ExchangeRatesResponse.new \
-      rates: exchange_rates,
-      success?: true,
-      raw_response: exchange_rates.to_json
-  rescue StandardError => error
-    ExchangeRatesResponse.new \
-      success?: false,
-      error: error,
-      raw_response: error
+  def fetch_security_info(symbol:, exchange_operating_mic:)
+    with_provider_response do
+      response = client.get("#{base_url}/tickers/#{symbol}") do |req|
+        req.params["operating_mic"] = exchange_operating_mic
+      end
+
+      data = JSON.parse(response.body).dig("data")
+
+      SecurityInfo.new(
+        symbol: symbol,
+        name: data.dig("name"),
+        links: data.dig("links"),
+        logo_url: data.dig("logo_url"),
+        description: data.dig("description"),
+        kind: data.dig("kind"),
+        exchange_operating_mic: exchange_operating_mic
+      )
+    end
+  end
+
+  def fetch_security_price(symbol:, exchange_operating_mic: nil, date:)
+    with_provider_response do
+      historical_data = fetch_security_prices(symbol:, exchange_operating_mic:, start_date: date, end_date: date)
+
+      raise ProviderError, "No prices found for security #{symbol} on date #{date}" if historical_data.data.empty?
+
+      historical_data.data.first
+    end
+  end
+
+  def fetch_security_prices(symbol:, exchange_operating_mic: nil, start_date:, end_date:)
+    with_provider_response do
+      params = {
+        start_date: start_date,
+        end_date: end_date,
+        operating_mic_code: exchange_operating_mic
+      }.compact
+
+      data = paginate(
+        "#{base_url}/tickers/#{symbol}/open-close",
+        params
+      ) do |body|
+        body.dig("prices")
+      end
+
+      currency = data.first_page.dig("currency")
+      exchange_operating_mic = data.first_page.dig("exchange", "operating_mic_code")
+
+      data.paginated.map do |price|
+        date = price.dig("date")
+        price = price.dig("close") || price.dig("open")
+
+        if date.nil? || price.nil?
+          Rails.logger.warn("#{self.class.name} returned invalid price data for security #{symbol} on: #{date}.  Price data: #{price.inspect}")
+          Sentry.capture_exception(InvalidSecurityPriceError.new("#{self.class.name} returned invalid security price data"), level: :warning) do |scope|
+            scope.set_context("security", { symbol: symbol, date: date })
+          end
+
+          next
+        end
+
+        Price.new(
+          symbol: symbol,
+          date: date.to_date,
+          price: price,
+          currency: currency,
+          exchange_operating_mic: exchange_operating_mic
+        )
+      end.compact
+    end
   end
 
   private
-
     attr_reader :api_key
 
-    ExchangeRateResponse = Struct.new :rate, :success?, :error, :raw_response, keyword_init: true
-    SecurityPriceResponse = Struct.new :prices, :success?, :error, :raw_response, keyword_init: true
-    ExchangeRatesResponse = Struct.new :rates, :success?, :error, :raw_response, keyword_init: true
-    UsageResponse = Struct.new :used, :limit, :utilization, :plan, :success?, :error, :raw_response, keyword_init: true
-
     def base_url
-      "https://api.synthfinance.com"
+      ENV["SYNTH_URL"] || "https://api.synthfinance.com"
     end
 
     def app_name
@@ -144,26 +202,22 @@ class Provider::Synth
 
     def client
       @client ||= Faraday.new(url: base_url) do |faraday|
+        faraday.request(:retry, {
+          max: 2,
+          interval: 0.05,
+          interval_randomness: 0.5,
+          backoff_factor: 2
+        })
+
+        faraday.response :raise_error
         faraday.headers["Authorization"] = "Bearer #{api_key}"
         faraday.headers["X-Source"] = app_name
         faraday.headers["X-Source-Type"] = app_type
       end
     end
 
-    def build_error(response)
-      Provider::Base::ProviderError.new(<<~ERROR)
-        Failed to fetch data from #{self.class}
-          Status: #{response.status}
-          Body: #{response.body.inspect}
-      ERROR
-    end
-
     def fetch_page(url, page, params = {})
-      client.get(url) do |req|
-        req.headers["Authorization"] = "Bearer #{api_key}"
-        params.each { |k, v| req.params[k.to_s] = v.to_s }
-        req.params["page"] = page
-      end
+      client.get(url, params.merge(page: page))
     end
 
     def paginate(url, params = {})
@@ -171,24 +225,26 @@ class Provider::Synth
       page = 1
       current_page = 0
       total_pages = 1
+      first_page = nil
 
       while current_page < total_pages
         response = fetch_page(url, page, params)
 
-        if response.success?
-          body = JSON.parse(response.body)
-          page_results = yield(body)
-          results.concat(page_results)
+        body = JSON.parse(response.body)
+        first_page = body unless first_page
+        page_results = yield(body)
+        results.concat(page_results)
 
-          current_page = body.dig("paging", "current_page")
-          total_pages = body.dig("paging", "total_pages")
+        current_page = body.dig("paging", "current_page")
+        total_pages = body.dig("paging", "total_pages")
 
-          page += 1
-        else
-          raise build_error(response)
-        end
+        page += 1
       end
 
-      results
+      PaginatedData.new(
+        paginated: results,
+        first_page: first_page,
+        total_pages: total_pages
+      )
     end
 end
diff --git a/app/models/provider_merchant.rb b/app/models/provider_merchant.rb
new file mode 100644
index 00000000..7f677981
--- /dev/null
+++ b/app/models/provider_merchant.rb
@@ -0,0 +1,6 @@
+class ProviderMerchant < Merchant
+  enum :source, { plaid: "plaid", synth: "synth", ai: "ai" }
+
+  validates :name, uniqueness: { scope: [ :source ] }
+  validates :source, presence: true
+end
diff --git a/app/models/rejected_transfer.rb b/app/models/rejected_transfer.rb
new file mode 100644
index 00000000..4c66d44d
--- /dev/null
+++ b/app/models/rejected_transfer.rb
@@ -0,0 +1,4 @@
+class RejectedTransfer < ApplicationRecord
+  belongs_to :inflow_transaction, class_name: "Transaction"
+  belongs_to :outflow_transaction, class_name: "Transaction"
+end
diff --git a/app/models/rule.rb b/app/models/rule.rb
new file mode 100644
index 00000000..b0d405c2
--- /dev/null
+++ b/app/models/rule.rb
@@ -0,0 +1,109 @@
+class Rule < ApplicationRecord
+  UnsupportedResourceTypeError = Class.new(StandardError)
+
+  belongs_to :family
+  has_many :conditions, dependent: :destroy
+  has_many :actions, dependent: :destroy
+
+  accepts_nested_attributes_for :conditions, allow_destroy: true
+  accepts_nested_attributes_for :actions, allow_destroy: true
+
+  before_validation :normalize_name
+
+  validates :resource_type, presence: true
+  validates :name, length: { minimum: 1 }, allow_nil: true
+  validate :no_nested_compound_conditions
+
+  # Every rule must have at least 1 action
+  validate :min_actions
+  validate :no_duplicate_actions
+
+  def action_executors
+    registry.action_executors
+  end
+
+  def condition_filters
+    registry.condition_filters
+  end
+
+  def registry
+    @registry ||= case resource_type
+    when "transaction"
+      Rule::Registry::TransactionResource.new(self)
+    else
+      raise UnsupportedResourceTypeError, "Unsupported resource type: #{resource_type}"
+    end
+  end
+
+  def affected_resource_count
+    matching_resources_scope.count
+  end
+
+  def apply(ignore_attribute_locks: false)
+    actions.each do |action|
+      action.apply(matching_resources_scope, ignore_attribute_locks: ignore_attribute_locks)
+    end
+  end
+
+  def apply_later(ignore_attribute_locks: false)
+    RuleJob.perform_later(self, ignore_attribute_locks: ignore_attribute_locks)
+  end
+
+  def primary_condition_title
+    return "No conditions" if conditions.none?
+
+    first_condition = conditions.first
+    if first_condition.compound? && first_condition.sub_conditions.any?
+      first_sub_condition = first_condition.sub_conditions.first
+      "If #{first_sub_condition.filter.label.downcase} #{first_sub_condition.operator} #{first_sub_condition.value_display}"
+    else
+      "If #{first_condition.filter.label.downcase} #{first_condition.operator} #{first_condition.value_display}"
+    end
+  end
+
+  private
+    def matching_resources_scope
+      scope = registry.resource_scope
+
+      # 1. Prepare the query with joins required by conditions
+      conditions.each do |condition|
+        scope = condition.prepare(scope)
+      end
+
+      # 2. Apply the conditions to the query
+      conditions.each do |condition|
+        scope = condition.apply(scope)
+      end
+
+      scope
+    end
+
+    def min_actions
+      if actions.reject(&:marked_for_destruction?).empty?
+        errors.add(:base, "must have at least one action")
+      end
+    end
+
+    def no_duplicate_actions
+      action_types = actions.reject(&:marked_for_destruction?).map(&:action_type)
+
+      errors.add(:base, "Rule cannot have duplicate actions #{action_types.inspect}") if action_types.uniq.count != action_types.count
+    end
+
+    # Validation: To keep rules simple and easy to understand, we don't allow nested compound conditions.
+    def no_nested_compound_conditions
+      return true if conditions.none? { |condition| condition.compound? }
+
+      conditions.each do |condition|
+        if condition.compound?
+          if condition.sub_conditions.any? { |sub_condition| sub_condition.compound? }
+            errors.add(:base, "Compound conditions cannot be nested")
+          end
+        end
+      end
+    end
+
+    def normalize_name
+      self.name = nil if name.is_a?(String) && name.strip.empty?
+    end
+end
diff --git a/app/models/rule/action.rb b/app/models/rule/action.rb
new file mode 100644
index 00000000..5945503e
--- /dev/null
+++ b/app/models/rule/action.rb
@@ -0,0 +1,29 @@
+class Rule::Action < ApplicationRecord
+  belongs_to :rule, touch: true
+
+  validates :action_type, presence: true
+
+  def apply(resource_scope, ignore_attribute_locks: false)
+    executor.execute(resource_scope, value: value, ignore_attribute_locks: ignore_attribute_locks)
+  end
+
+  def options
+    executor.options
+  end
+
+  def value_display
+    if value.present?
+      if options
+        options.find { |option| option.last == value }&.first
+      else
+        ""
+      end
+    else
+      ""
+    end
+  end
+
+  def executor
+    rule.registry.get_executor!(action_type)
+  end
+end
diff --git a/app/models/rule/action_executor.rb b/app/models/rule/action_executor.rb
new file mode 100644
index 00000000..4a9a1185
--- /dev/null
+++ b/app/models/rule/action_executor.rb
@@ -0,0 +1,43 @@
+class Rule::ActionExecutor
+  TYPES = [ "select", "function", "text" ]
+
+  def initialize(rule)
+    @rule = rule
+  end
+
+  def key
+    self.class.name.demodulize.underscore
+  end
+
+  def label
+    key.humanize
+  end
+
+  def type
+    "function"
+  end
+
+  def options
+    nil
+  end
+
+  def execute(scope, value: nil, ignore_attribute_locks: false)
+    raise NotImplementedError, "Action executor #{self.class.name} must implement #execute"
+  end
+
+  def as_json
+    {
+      type: type,
+      key: key,
+      label: label,
+      options: options
+    }
+  end
+
+  private
+    attr_reader :rule
+
+    def family
+      rule.family
+    end
+end
diff --git a/app/models/rule/action_executor/auto_categorize.rb b/app/models/rule/action_executor/auto_categorize.rb
new file mode 100644
index 00000000..e1d8a50f
--- /dev/null
+++ b/app/models/rule/action_executor/auto_categorize.rb
@@ -0,0 +1,23 @@
+class Rule::ActionExecutor::AutoCategorize < Rule::ActionExecutor
+  def label
+    if rule.family.self_hoster?
+      "Auto-categorize transactions with AI ($$)"
+    else
+      "Auto-categorize transactions"
+    end
+  end
+
+  def execute(transaction_scope, value: nil, ignore_attribute_locks: false)
+    enrichable_transactions = transaction_scope.enrichable(:category_id)
+
+    if enrichable_transactions.empty?
+      Rails.logger.info("No transactions to auto-categorize for #{rule.id}")
+      return
+    end
+
+    enrichable_transactions.in_batches(of: 20).each_with_index do |transactions, idx|
+      Rails.logger.info("Scheduling auto-categorization for batch #{idx + 1} of #{enrichable_transactions.count}")
+      rule.family.auto_categorize_transactions_later(transactions)
+    end
+  end
+end
diff --git a/app/models/rule/action_executor/auto_detect_merchants.rb b/app/models/rule/action_executor/auto_detect_merchants.rb
new file mode 100644
index 00000000..87c04682
--- /dev/null
+++ b/app/models/rule/action_executor/auto_detect_merchants.rb
@@ -0,0 +1,23 @@
+class Rule::ActionExecutor::AutoDetectMerchants < Rule::ActionExecutor
+  def label
+    if rule.family.self_hoster?
+      "Auto-detect merchants with AI ($$)"
+    else
+      "Auto-detect merchants"
+    end
+  end
+
+  def execute(transaction_scope, value: nil, ignore_attribute_locks: false)
+    enrichable_transactions = transaction_scope.enrichable(:merchant_id)
+
+    if enrichable_transactions.empty?
+      Rails.logger.info("No transactions to auto-detect merchants for #{rule.id}")
+      return
+    end
+
+    enrichable_transactions.in_batches(of: 20).each_with_index do |transactions, idx|
+      Rails.logger.info("Scheduling auto-merchant-enrichment for batch #{idx + 1} of #{enrichable_transactions.count}")
+      rule.family.auto_detect_transaction_merchants_later(transactions)
+    end
+  end
+end
diff --git a/app/models/rule/action_executor/set_transaction_category.rb b/app/models/rule/action_executor/set_transaction_category.rb
new file mode 100644
index 00000000..6360e45a
--- /dev/null
+++ b/app/models/rule/action_executor/set_transaction_category.rb
@@ -0,0 +1,27 @@
+class Rule::ActionExecutor::SetTransactionCategory < Rule::ActionExecutor
+  def type
+    "select"
+  end
+
+  def options
+    family.categories.pluck(:name, :id)
+  end
+
+  def execute(transaction_scope, value: nil, ignore_attribute_locks: false)
+    category = family.categories.find_by_id(value)
+
+    scope = transaction_scope
+
+    unless ignore_attribute_locks
+      scope = scope.enrichable(:category_id)
+    end
+
+    scope.each do |txn|
+      txn.enrich_attribute(
+        :category_id,
+        category.id,
+        source: "rule"
+      )
+    end
+  end
+end
diff --git a/app/models/rule/action_executor/set_transaction_merchant.rb b/app/models/rule/action_executor/set_transaction_merchant.rb
new file mode 100644
index 00000000..f343a79f
--- /dev/null
+++ b/app/models/rule/action_executor/set_transaction_merchant.rb
@@ -0,0 +1,27 @@
+class Rule::ActionExecutor::SetTransactionMerchant < Rule::ActionExecutor
+  def type
+    "select"
+  end
+
+  def options
+    family.merchants.pluck(:name, :id)
+  end
+
+  def execute(transaction_scope, value: nil, ignore_attribute_locks: false)
+    merchant = family.merchants.find_by_id(value)
+    return unless merchant
+
+    scope = transaction_scope
+    unless ignore_attribute_locks
+      scope = scope.enrichable(:merchant_id)
+    end
+
+    scope.each do |txn|
+      txn.enrich_attribute(
+        :merchant_id,
+        merchant.id,
+        source: "rule"
+      )
+    end
+  end
+end
diff --git a/app/models/rule/action_executor/set_transaction_name.rb b/app/models/rule/action_executor/set_transaction_name.rb
new file mode 100644
index 00000000..1dd89fa3
--- /dev/null
+++ b/app/models/rule/action_executor/set_transaction_name.rb
@@ -0,0 +1,26 @@
+class Rule::ActionExecutor::SetTransactionName < Rule::ActionExecutor
+  def type
+    "text"
+  end
+
+  def options
+    nil
+  end
+
+  def execute(transaction_scope, value: nil, ignore_attribute_locks: false)
+    return if value.blank?
+
+    scope = transaction_scope
+    unless ignore_attribute_locks
+      scope = scope.enrichable(:name)
+    end
+
+    scope.each do |txn|
+      txn.entry.enrich_attribute(
+        :name,
+        value,
+        source: "rule"
+      )
+    end
+  end
+end
diff --git a/app/models/rule/action_executor/set_transaction_tags.rb b/app/models/rule/action_executor/set_transaction_tags.rb
new file mode 100644
index 00000000..d74029ca
--- /dev/null
+++ b/app/models/rule/action_executor/set_transaction_tags.rb
@@ -0,0 +1,27 @@
+class Rule::ActionExecutor::SetTransactionTags < Rule::ActionExecutor
+  def type
+    "select"
+  end
+
+  def options
+    family.tags.pluck(:name, :id)
+  end
+
+  def execute(transaction_scope, value: nil, ignore_attribute_locks: false)
+    tag = family.tags.find_by_id(value)
+
+    scope = transaction_scope
+
+    unless ignore_attribute_locks
+      scope = scope.enrichable(:tag_ids)
+    end
+
+    rows = scope.each do |txn|
+      txn.enrich_attribute(
+        :tag_ids,
+        [ tag.id ],
+        source: "rule"
+      )
+    end
+  end
+end
diff --git a/app/models/rule/condition.rb b/app/models/rule/condition.rb
new file mode 100644
index 00000000..b10d30ca
--- /dev/null
+++ b/app/models/rule/condition.rb
@@ -0,0 +1,74 @@
+class Rule::Condition < ApplicationRecord
+  belongs_to :rule, touch: true, optional: -> { where.not(parent_id: nil) }
+  belongs_to :parent, class_name: "Rule::Condition", optional: true, inverse_of: :sub_conditions
+
+  has_many :sub_conditions, class_name: "Rule::Condition", foreign_key: :parent_id, dependent: :destroy, inverse_of: :parent
+
+  validates :condition_type, presence: true
+  validates :operator, presence: true
+  validates :value, presence: true, unless: -> { compound? }
+
+  accepts_nested_attributes_for :sub_conditions, allow_destroy: true
+
+  # We don't store rule_id on sub_conditions, so "walk up" to the parent rule
+  def rule
+    parent&.rule || super
+  end
+
+  def compound?
+    condition_type == "compound"
+  end
+
+  def apply(scope)
+    if compound?
+      build_compound_scope(scope)
+    else
+      filter.apply(scope, operator, value)
+    end
+  end
+
+  def prepare(scope)
+    if compound?
+      sub_conditions.reduce(scope) { |s, sub| sub.prepare(s) }
+    else
+      filter.prepare(scope)
+    end
+  end
+
+  def value_display
+    if value.present?
+      if options
+        options.find { |option| option.last == value }&.first
+      else
+        value
+      end
+    else
+      ""
+    end
+  end
+
+  def options
+    filter.options
+  end
+
+  def operators
+    filter.operators
+  end
+
+  def filter
+    rule.registry.get_filter!(condition_type)
+  end
+
+  private
+    def build_compound_scope(scope)
+      if operator == "or"
+        combined_scope = sub_conditions
+          .map { |sub| sub.apply(scope) }
+          .reduce { |acc, s| acc.or(s) }
+
+        combined_scope || scope
+      else
+        sub_conditions.reduce(scope) { |s, sub| sub.apply(s) }
+      end
+    end
+end
diff --git a/app/models/rule/condition_filter.rb b/app/models/rule/condition_filter.rb
new file mode 100644
index 00000000..86d40ea2
--- /dev/null
+++ b/app/models/rule/condition_filter.rb
@@ -0,0 +1,87 @@
+class Rule::ConditionFilter
+  UnsupportedOperatorError = Class.new(StandardError)
+
+  TYPES = [ "text", "number", "select" ]
+
+  OPERATORS_MAP = {
+    "text" => [ [ "Contains", "like" ], [ "Equal to", "=" ] ],
+    "number" => [ [ "Greater than", ">" ], [ "Greater or equal to", ">=" ], [ "Less than", "<" ], [ "Less than or equal to", "<=" ], [ "Is equal to", "=" ] ],
+    "select" => [ [ "Equal to", "=" ] ]
+  }
+
+  def initialize(rule)
+    @rule = rule
+  end
+
+  def type
+    "text"
+  end
+
+  def number_step
+    family_currency = Money::Currency.new(family.currency)
+    family_currency.step
+  end
+
+  def key
+    self.class.name.demodulize.underscore
+  end
+
+  def label
+    key.humanize
+  end
+
+  def options
+    nil
+  end
+
+  def operators
+    OPERATORS_MAP.dig(type)
+  end
+
+  # Matchers can prepare the scope with joins by implementing this method
+  def prepare(scope)
+    scope
+  end
+
+  # Applies the condition to the scope
+  def apply(scope, operator, value)
+    raise NotImplementedError, "Condition #{self.class.name} must implement #apply"
+  end
+
+  def as_json
+    {
+      type: type,
+      key: key,
+      label: label,
+      operators: operators,
+      options: options,
+      number_step: number_step
+    }
+  end
+
+  private
+    attr_reader :rule
+
+    def family
+      rule.family
+    end
+
+    def build_sanitized_where_condition(field, operator, value)
+      sanitized_value = operator == "like" ? "%#{ActiveRecord::Base.sanitize_sql_like(value)}%" : value
+
+      ActiveRecord::Base.sanitize_sql_for_conditions([
+        "#{field} #{sanitize_operator(operator)} ?",
+        sanitized_value
+      ])
+    end
+
+    def sanitize_operator(operator)
+      raise UnsupportedOperatorError, "Unsupported operator: #{operator} for type: #{type}" unless operators.map(&:last).include?(operator)
+
+      if operator == "like"
+        "ILIKE"
+      else
+        operator
+      end
+    end
+end
diff --git a/app/models/rule/condition_filter/transaction_amount.rb b/app/models/rule/condition_filter/transaction_amount.rb
new file mode 100644
index 00000000..5be1a9fb
--- /dev/null
+++ b/app/models/rule/condition_filter/transaction_amount.rb
@@ -0,0 +1,14 @@
+class Rule::ConditionFilter::TransactionAmount < Rule::ConditionFilter
+  def type
+    "number"
+  end
+
+  def prepare(scope)
+    scope.with_entry
+  end
+
+  def apply(scope, operator, value)
+    expression = build_sanitized_where_condition("ABS(entries.amount)", operator, value.to_d)
+    scope.where(expression)
+  end
+end
diff --git a/app/models/rule/condition_filter/transaction_merchant.rb b/app/models/rule/condition_filter/transaction_merchant.rb
new file mode 100644
index 00000000..db152226
--- /dev/null
+++ b/app/models/rule/condition_filter/transaction_merchant.rb
@@ -0,0 +1,18 @@
+class Rule::ConditionFilter::TransactionMerchant < Rule::ConditionFilter
+  def type
+    "select"
+  end
+
+  def options
+    family.assigned_merchants.pluck(:name, :id)
+  end
+
+  def prepare(scope)
+    scope.left_joins(:merchant)
+  end
+
+  def apply(scope, operator, value)
+    expression = build_sanitized_where_condition("merchants.id", operator, value)
+    scope.where(expression)
+  end
+end
diff --git a/app/models/rule/condition_filter/transaction_name.rb b/app/models/rule/condition_filter/transaction_name.rb
new file mode 100644
index 00000000..c1b3baf7
--- /dev/null
+++ b/app/models/rule/condition_filter/transaction_name.rb
@@ -0,0 +1,10 @@
+class Rule::ConditionFilter::TransactionName < Rule::ConditionFilter
+  def prepare(scope)
+    scope.with_entry
+  end
+
+  def apply(scope, operator, value)
+    expression = build_sanitized_where_condition("entries.name", operator, value)
+    scope.where(expression)
+  end
+end
diff --git a/app/models/rule/registry.rb b/app/models/rule/registry.rb
new file mode 100644
index 00000000..4c3f80cf
--- /dev/null
+++ b/app/models/rule/registry.rb
@@ -0,0 +1,46 @@
+class Rule::Registry
+  UnsupportedActionError = Class.new(StandardError)
+  UnsupportedConditionError = Class.new(StandardError)
+
+  def initialize(rule)
+    @rule = rule
+  end
+
+  def resource_scope
+    raise NotImplementedError, "#{self.class.name} must implement #resource_scope"
+  end
+
+  def condition_filters
+    []
+  end
+
+  def action_executors
+    []
+  end
+
+  def get_filter!(key)
+    filter = condition_filters.find { |filter| filter.key == key }
+    raise UnsupportedConditionError, "Unsupported condition type: #{key}" unless filter
+    filter
+  end
+
+  def get_executor!(key)
+    executor = action_executors.find { |executor| executor.key == key }
+    raise UnsupportedActionError, "Unsupported action type: #{key}" unless executor
+    executor
+  end
+
+  def as_json
+    {
+      filters: condition_filters.map(&:as_json),
+      executors: action_executors.map(&:as_json)
+    }
+  end
+
+  private
+    attr_reader :rule
+
+    def family
+      rule.family
+    end
+end
diff --git a/app/models/rule/registry/transaction_resource.rb b/app/models/rule/registry/transaction_resource.rb
new file mode 100644
index 00000000..d00f2b1e
--- /dev/null
+++ b/app/models/rule/registry/transaction_resource.rb
@@ -0,0 +1,34 @@
+class Rule::Registry::TransactionResource < Rule::Registry
+  def resource_scope
+    family.transactions.visible.with_entry.where(entry: { date: rule.effective_date.. })
+  end
+
+  def condition_filters
+    [
+      Rule::ConditionFilter::TransactionName.new(rule),
+      Rule::ConditionFilter::TransactionAmount.new(rule),
+      Rule::ConditionFilter::TransactionMerchant.new(rule)
+    ]
+  end
+
+  def action_executors
+    enabled_executors = [
+      Rule::ActionExecutor::SetTransactionCategory.new(rule),
+      Rule::ActionExecutor::SetTransactionTags.new(rule),
+      Rule::ActionExecutor::SetTransactionMerchant.new(rule),
+      Rule::ActionExecutor::SetTransactionName.new(rule)
+    ]
+
+    if ai_enabled?
+      enabled_executors << Rule::ActionExecutor::AutoCategorize.new(rule)
+      enabled_executors << Rule::ActionExecutor::AutoDetectMerchants.new(rule)
+    end
+
+    enabled_executors
+  end
+
+  private
+    def ai_enabled?
+      Provider::Registry.get_provider(:openai).present?
+    end
+end
diff --git a/app/models/security.rb b/app/models/security.rb
index 784d0b68..b6e85295 100644
--- a/app/models/security.rb
+++ b/app/models/security.rb
@@ -1,19 +1,35 @@
 class Security < ApplicationRecord
-  before_save :upcase_ticker
+  include Provided
 
-  has_many :trades, dependent: :nullify, class_name: "Account::Trade"
+  before_validation :upcase_symbols
 
-  validates :ticker, presence: true, uniqueness: { case_sensitive: false }
+  has_many :trades, dependent: :nullify, class_name: "Trade"
+  has_many :prices, dependent: :destroy
+
+  validates :ticker, presence: true
+  validates :ticker, uniqueness: { scope: :exchange_operating_mic, case_sensitive: false }
+
+  scope :online, -> { where(offline: false) }
 
   def current_price
-    @current_price ||= Security::Price.find_price(ticker:, date: Date.current)
+    @current_price ||= find_or_fetch_price
     return nil if @current_price.nil?
     Money.new(@current_price.price, @current_price.currency)
   end
 
-  private
+  def to_combobox_option
+    SynthComboboxOption.new(
+      symbol: ticker,
+      name: name,
+      logo_url: logo_url,
+      exchange_operating_mic: exchange_operating_mic,
+      country_code: country_code
+    )
+  end
 
-    def upcase_ticker
+  private
+    def upcase_symbols
       self.ticker = ticker.upcase
+      self.exchange_operating_mic = exchange_operating_mic.upcase if exchange_operating_mic.present?
     end
 end
diff --git a/app/models/security/health_checker.rb b/app/models/security/health_checker.rb
new file mode 100644
index 00000000..241e3845
--- /dev/null
+++ b/app/models/security/health_checker.rb
@@ -0,0 +1,120 @@
+# There are hundreds of thousands of market securities that Maybe must handle.
+# Due to the always-changing nature of the market, the health checker is responsible
+# for periodically checking active securities to ensure we can still fetch prices for them.
+#
+# Each security goes through some basic health checks.  If failed, this class is responsible for:
+# - Marking failed attempts and incrementing the failed attempts counter
+# - Marking the security offline if enough consecutive failed checks occur
+# - When we move a security "offline", delete all prices for that security as we assume they are bad data
+#
+# The health checker is run daily through SecurityHealthCheckJob (see config/schedule.yml), but not all
+# securities will be checked every day (we run in batches)
+class Security::HealthChecker
+  MAX_CONSECUTIVE_FAILURES = 5
+  HEALTH_CHECK_INTERVAL = 7.days
+  DAILY_BATCH_SIZE = 1000
+
+  class << self
+    def check_all
+      # No daily limit for unchecked securities (they are prioritized)
+      never_checked_scope.find_each do |security|
+        new(security).run_check
+      end
+
+      # Daily limit for checked securities
+      due_for_check_scope.limit(DAILY_BATCH_SIZE).each do |security|
+        new(security).run_check
+      end
+    end
+
+    private
+      # If a security has never had a health check, we prioritize it, regardless of batch size
+      def never_checked_scope
+        Security.where(last_health_check_at: nil)
+      end
+
+      # Any securities not checked for 30 days are due
+      # We only process the batch size, which means some "due" securities will not be checked today
+      # This is by design, to prevent all securities from coming due at the same time
+      def due_for_check_scope
+        Security.where(last_health_check_at: ..HEALTH_CHECK_INTERVAL.ago)
+                .order(last_health_check_at: :asc)
+      end
+  end
+
+  def initialize(security)
+    @security = security
+  end
+
+  def run_check
+    Rails.logger.info("Running health check for #{security.ticker}")
+
+    if latest_provider_price
+      handle_success
+    else
+      handle_failure
+    end
+  rescue => e
+    Sentry.capture_exception(e) do |scope|
+      scope.set_tags(security_id: @security.id)
+    end
+  ensure
+    security.update!(last_health_check_at: Time.current)
+  end
+
+  private
+    attr_reader :security
+
+    def provider
+      Security.provider
+    end
+
+    def latest_provider_price
+      return nil unless provider.present?
+
+      response = provider.fetch_security_price(
+        symbol: security.ticker,
+        exchange_operating_mic: security.exchange_operating_mic,
+        date: Date.current
+      )
+
+      return nil unless response.success?
+
+      response.data.price
+    end
+
+    # On success, reset any failure counters and ensure it is "online"
+    def handle_success
+      security.update!(
+        offline: false,
+        failed_fetch_count: 0,
+        failed_fetch_at: nil
+      )
+    end
+
+    def handle_failure
+      new_failure_count = security.failed_fetch_count.to_i + 1
+      new_failure_at = Time.current
+
+      if new_failure_count > MAX_CONSECUTIVE_FAILURES
+        convert_to_offline_security!
+      else
+        security.update!(
+          failed_fetch_count: new_failure_count,
+          failed_fetch_at: new_failure_at
+        )
+      end
+    end
+
+    # The "offline" state tells our MarketDataImporter (daily cron) to skip this security when fetching prices
+    def convert_to_offline_security!
+      Security.transaction do
+        security.update!(
+          offline: true,
+          failed_fetch_count: MAX_CONSECUTIVE_FAILURES + 1,
+          failed_fetch_at: Time.current
+        )
+        security.prices.delete_all
+      end
+    end
+end
diff --git a/app/models/security/price.rb b/app/models/security/price.rb
index e1b90fb5..4143a0c8 100644
--- a/app/models/security/price.rb
+++ b/app/models/security/price.rb
@@ -1,33 +1,6 @@
 class Security::Price < ApplicationRecord
-  include Provided
+  belongs_to :security
 
-  before_save :upcase_ticker
-
-  validates :ticker, presence: true, uniqueness: { scope: :date, case_sensitive: false }
-
-  class << self
-    def find_price(ticker:, date:, cache: true)
-      result = find_by(ticker:, date:)
-
-      result || fetch_price_from_provider(ticker:, date:, cache:)
-    end
-
-    def find_prices(ticker:, start_date:, end_date: Date.current, cache: true)
-      prices = where(ticker:, date: start_date..end_date).to_a
-      all_dates = (start_date..end_date).to_a.to_set
-      existing_dates = prices.map(&:date).to_set
-      missing_dates = (all_dates - existing_dates).sort
-
-      if missing_dates.any?
-        prices += fetch_prices_from_provider(ticker:, start_date: missing_dates.first, end_date: missing_dates.last, cache:)
-      end
-
-      prices
-    end
-  end
-
-  private
-    def upcase_ticker
-      self.ticker = ticker.upcase
-    end
+  validates :date, :price, :currency, presence: true
+  validates :date, uniqueness: { scope: %i[security_id currency] }
 end
diff --git a/app/models/security/price/importer.rb b/app/models/security/price/importer.rb
new file mode 100644
index 00000000..bcee3762
--- /dev/null
+++ b/app/models/security/price/importer.rb
@@ -0,0 +1,155 @@
+class Security::Price::Importer
+  MissingSecurityPriceError = Class.new(StandardError)
+  MissingStartPriceError    = Class.new(StandardError)
+
+  def initialize(security:, security_provider:, start_date:, end_date:, clear_cache: false)
+    @security          = security
+    @security_provider = security_provider
+    @start_date        = start_date
+    @end_date          = normalize_end_date(end_date)
+    @clear_cache       = clear_cache
+  end
+
+  # Constructs a daily series of prices for a single security over the date range.
+  # Returns the number of rows upserted.
+  def import_provider_prices
+    if !clear_cache && all_prices_exist?
+      Rails.logger.info("No new prices to sync for #{security.ticker} between #{start_date} and #{end_date}, skipping")
+      return 0
+    end
+
+    if provider_prices.empty?
+      Rails.logger.warn("Could not fetch prices for #{security.ticker} between #{start_date} and #{end_date} because provider returned no prices")
+      return 0
+    end
+
+    prev_price_value = start_price_value
+
+    unless prev_price_value.present?
+      Rails.logger.error("Could not find a start price for #{security.ticker} on or before #{start_date}")
+
+      Sentry.capture_exception(MissingStartPriceError.new("Could not determine start price for ticker")) do |scope|
+        scope.set_tags(security_id: security.id)
+        scope.set_context("security", {
+          id: security.id,
+          start_date: start_date
+        })
+      end
+
+      return 0
+    end
+
+    gapfilled_prices = effective_start_date.upto(end_date).map do |date|
+      db_price_value       = db_prices[date]&.price
+      provider_price_value = provider_prices[date]&.price
+      provider_currency    = provider_prices[date]&.currency
+
+      chosen_price = if clear_cache
+        provider_price_value || db_price_value   # overwrite when possible
+      else
+        db_price_value || provider_price_value   # fill gaps
+      end
+
+      # Gap-fill using LOCF (last observation carried forward)
+      chosen_price ||= prev_price_value
+      prev_price_value = chosen_price
+
+      {
+        security_id: security.id,
+        date:        date,
+        price:       chosen_price,
+        currency:    provider_currency || prev_price_currency || db_price_currency || "USD"
+      }
+    end
+
+    upsert_rows(gapfilled_prices)
+  end
+
+  private
+    attr_reader :security, :security_provider, :start_date, :end_date, :clear_cache
+
+    def provider_prices
+      @provider_prices ||= begin
+        provider_fetch_start_date = effective_start_date - 5.days
+
+        response = security_provider.fetch_security_prices(
+          symbol: security.ticker,
+          exchange_operating_mic: security.exchange_operating_mic,
+          start_date: provider_fetch_start_date,
+          end_date:   end_date
+        )
+
+        if response.success?
+          response.data.index_by(&:date)
+        else
+          Rails.logger.warn("#{security_provider.class.name} could not fetch prices for #{security.ticker} between #{provider_fetch_start_date} and #{end_date}. Provider error: #{response.error.message}")
+          Sentry.capture_exception(MissingSecurityPriceError.new("Could not fetch prices for ticker"), level: :warning) do |scope|
+            scope.set_tags(security_id: security.id)
+            scope.set_context("security", { id: security.id, start_date: start_date, end_date: end_date })
+          end
+
+          {}
+        end
+      end
+    end
+
+    def db_prices
+      @db_prices ||= Security::Price.where(security_id: security.id, date: start_date..end_date)
+                                    .order(:date)
+                                    .to_a
+                                    .index_by(&:date)
+    end
+
+    def all_prices_exist?
+      db_prices.count == expected_count
+    end
+
+    def expected_count
+      (start_date..end_date).count
+    end
+
+    # Skip over ranges that already exist unless clearing cache
+    def effective_start_date
+      return start_date if clear_cache
+
+      (start_date..end_date).detect { |d| !db_prices.key?(d) } || end_date
+    end
+
+    def start_price_value
+      provider_price_value = provider_prices.select { |date, _| date <= start_date }
+                                            .max_by { |date, _| date }
+                                            &.last&.price
+      db_price_value       = db_prices[start_date]&.price
+      provider_price_value || db_price_value
+    end
+
+    def upsert_rows(rows)
+      batch_size         = 200
+      total_upsert_count = 0
+
+      rows.each_slice(batch_size) do |batch|
+        ids = Security::Price.upsert_all(
+          batch,
+          unique_by: %i[security_id date currency],
+          returning: [ "id" ]
+        )
+        total_upsert_count += ids.count
+      end
+
+      total_upsert_count
+    end
+
+    def db_price_currency
+      db_prices.values.first&.currency
+    end
+
+    def prev_price_currency
+      @prev_price_currency ||= provider_prices.values.first&.currency
+    end
+
+    # Clamp to today (EST) so we never call our price API for a future date (our API is in EST/EDT timezone)
+    def normalize_end_date(requested_end_date)
+      today_est = Date.current.in_time_zone("America/New_York").to_date
+      [ requested_end_date, today_est ].min
+    end
+end
diff --git a/app/models/security/price/provided.rb b/app/models/security/price/provided.rb
deleted file mode 100644
index 599f19ff..00000000
--- a/app/models/security/price/provided.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-module Security::Price::Provided
-  extend ActiveSupport::Concern
-
-  include Providable
-
-  class_methods do
-    private
-
-      def fetch_price_from_provider(ticker:, date:, cache: false)
-        return nil unless security_prices_provider.present?
-
-        response = security_prices_provider.fetch_security_prices \
-          ticker: ticker,
-          start_date: date,
-          end_date: date
-
-        if response.success? && response.prices.size > 0
-          price = Security::Price.new \
-            ticker: ticker,
-            date: response.prices.first[:date],
-            price: response.prices.first[:price],
-            currency: response.prices.first[:currency]
-
-          price.save! if cache
-          price
-        else
-          nil
-        end
-      end
-
-      def fetch_prices_from_provider(ticker:, start_date:, end_date:, cache: false)
-        return [] unless security_prices_provider.present?
-
-        response = security_prices_provider.fetch_security_prices \
-          ticker: ticker,
-          start_date: start_date,
-          end_date: end_date
-
-        if response.success?
-          response.prices.map do |price|
-            new_price = Security::Price.find_or_initialize_by(
-              ticker: ticker,
-              date: price[:date]
-            ) do |p|
-              p.price = price[:price]
-              p.currency = price[:currency]
-            end
-
-            new_price.save! if cache && new_price.new_record?
-            new_price
-          end
-        else
-          []
-        end
-      end
-  end
-end
diff --git a/app/models/security/provided.rb b/app/models/security/provided.rb
new file mode 100644
index 00000000..6f490a57
--- /dev/null
+++ b/app/models/security/provided.rb
@@ -0,0 +1,112 @@
+module Security::Provided
+  extend ActiveSupport::Concern
+
+  SecurityInfoMissingError = Class.new(StandardError)
+
+  class_methods do
+    def provider
+      registry = Provider::Registry.for_concept(:securities)
+      registry.get_provider(:synth)
+    end
+
+    def search_provider(symbol, country_code: nil, exchange_operating_mic: nil)
+      return [] if provider.nil? || symbol.blank?
+
+      params = {
+        country_code: country_code,
+        exchange_operating_mic: exchange_operating_mic
+      }.compact_blank
+
+      response = provider.search_securities(symbol, **params)
+
+      if response.success?
+        response.data.map do |provider_security|
+          # Need to map to domain model so Combobox can display via to_combobox_option
+          Security.new(
+            ticker: provider_security.symbol,
+            name: provider_security.name,
+            logo_url: provider_security.logo_url,
+            exchange_operating_mic: provider_security.exchange_operating_mic,
+            country_code: provider_security.country_code
+          )
+        end
+      else
+        []
+      end
+    end
+  end
+
+  def find_or_fetch_price(date: Date.current, cache: true)
+    price = prices.find_by(date: date)
+
+    return price if price.present?
+
+    # Make sure we have a data provider before fetching
+    return nil unless provider.present?
+    response = provider.fetch_security_price(
+      symbol: ticker,
+      exchange_operating_mic: exchange_operating_mic,
+      date: date
+    )
+
+    return nil unless response.success? # Provider error
+
+    price = response.data
+    Security::Price.find_or_create_by!(
+      security_id: self.id,
+      date: price.date,
+      price: price.price,
+      currency: price.currency
+    ) if cache
+    price
+  end
+
+  def import_provider_details(clear_cache: false)
+    unless provider.present?
+      Rails.logger.warn("No provider configured for Security.import_provider_details")
+      return
+    end
+
+    if self.name.present? && self.logo_url.present? && !clear_cache
+      return
+    end
+
+    response = provider.fetch_security_info(
+      symbol: ticker,
+      exchange_operating_mic: exchange_operating_mic
+    )
+
+    if response.success?
+      update(
+        name: response.data.name,
+        logo_url: response.data.logo_url,
+      )
+    else
+      Rails.logger.warn("Failed to fetch security info for #{ticker} from #{provider.class.name}: #{response.error.message}")
+      Sentry.capture_exception(SecurityInfoMissingError.new("Failed to get security info"), level: :warning) do |scope|
+        scope.set_tags(security_id: self.id)
+        scope.set_context("security", { id: self.id, provider_error: response.error.message })
+      end
+    end
+  end
+
+  def import_provider_prices(start_date:, end_date:, clear_cache: false)
+    unless provider.present?
+      Rails.logger.warn("No provider configured for Security.import_provider_prices")
+      return 0
+    end
+
+    Security::Price::Importer.new(
+      security: self,
+      security_provider: provider,
+      start_date: start_date,
+      end_date: end_date,
+      clear_cache: clear_cache
+    ).import_provider_prices
+  end
+
+  private
+    def provider
+      self.class.provider
+    end
+end
diff --git a/app/models/security/resolver.rb b/app/models/security/resolver.rb
new file mode 100644
index 00000000..2b0e13bc
--- /dev/null
+++ b/app/models/security/resolver.rb
@@ -0,0 +1,156 @@
+class Security::Resolver
+  def initialize(symbol, exchange_operating_mic: nil, country_code: nil)
+    @symbol = validate_symbol!(symbol)
+    @exchange_operating_mic = exchange_operating_mic
+    @country_code = country_code
+  end
+
+  # Attempts several paths to resolve a security:
+  # 1. Exact match in DB
+  # 2. Search provider for an exact match
+  # 3. Search provider for close match, ranked by relevance
+  # 4. Create offline security if no match is found in either DB or provider
+  def resolve
+    return nil if symbol.blank?
+
+    exact_match_from_db ||
+      exact_match_from_provider ||
+      close_match_from_provider ||
+      offline_security
+  end
+
+  private
+    attr_reader :symbol, :exchange_operating_mic, :country_code
+
+    def validate_symbol!(symbol)
+      raise ArgumentError, "Symbol is required and cannot be blank" if symbol.blank?
+      symbol.strip.upcase
+    end
+
+    def offline_security
+      security = Security.find_or_initialize_by(
+        ticker: symbol,
+        exchange_operating_mic: exchange_operating_mic,
+      )
+
+      security.assign_attributes(
+        country_code: country_code,
+        offline: true # This tells us that we shouldn't try to fetch prices later
+      )
+
+      security.save!
+
+      security
+    end
+
+    def exact_match_from_db
+      Security.find_by(
+        {
+          ticker: symbol,
+          exchange_operating_mic: exchange_operating_mic,
+          country_code: country_code.presence
+        }.compact
+      )
+    end
+
+    # If provided a ticker + exchange (and optionally, a country code), we can find exact matches
+    def exact_match_from_provider
+      # Without an exchange, we can never know if we have an exact match
+      return nil unless exchange_operating_mic.present?
+
+      match = provider_search_result.find do |s|
+        ticker_matches = s.ticker.upcase.to_s == symbol.upcase.to_s
+        exchange_matches = s.exchange_operating_mic.upcase.to_s == exchange_operating_mic.upcase.to_s
+
+        if country_code && exchange_operating_mic
+          ticker_matches && exchange_matches && s.country_code.upcase.to_s == country_code.upcase.to_s
+        else
+          ticker_matches && exchange_matches
+        end
+      end
+
+      return nil unless match
+
+      find_or_create_provider_match!(match)
+    end
+
+    def close_match_from_provider
+      filtered_candidates = provider_search_result
+
+      # If a country code is specified, we MUST find a match with the same code
+      if country_code.present?
+        filtered_candidates = filtered_candidates.select { |s| s.country_code.upcase.to_s == country_code.upcase.to_s }
+      end
+
+      # 1. Prefer exact exchange_operating_mic matches (if one was provided)
+      # 2. Rank by country relevance (lower index in the list is more relevant)
+      # 3. Rank by exchange_operating_mic relevance (lower index in the list is more relevant)
+      sorted_candidates = filtered_candidates.sort_by do |s|
+        [
+          exchange_operating_mic.present? && s.exchange_operating_mic.upcase.to_s == exchange_operating_mic.upcase.to_s ? 0 : 1,
+          sorted_country_codes_by_relevance.index(s.country_code&.upcase.to_s) || sorted_country_codes_by_relevance.length,
+          sorted_exchange_operating_mics_by_relevance.index(s.exchange_operating_mic&.upcase.to_s) || sorted_exchange_operating_mics_by_relevance.length
+        ]
+      end
+
+      match = sorted_candidates.first
+
+      return nil unless match
+
+      find_or_create_provider_match!(match)
+    end
+
+    def find_or_create_provider_match!(match)
+      security = Security.find_or_initialize_by(
+        ticker: match.ticker,
+        exchange_operating_mic: match.exchange_operating_mic,
+      )
+
+      security.country_code = match.country_code
+      security.save!
+
+      security
+    end
+
+    def provider_search_result
+      params = {
+        exchange_operating_mic: exchange_operating_mic,
+        country_code: country_code
+      }.compact_blank
+
+      @provider_search_result ||= Security.search_provider(symbol, **params)
+    end
+
+    # Non-exhaustive list of common country codes for help in choosing "close" matches
+    # These are generally sorted by market cap.
+    def sorted_country_codes_by_relevance
+      %w[US CN JP IN GB CA FR DE CH SA TW AU NL SE KR IE ES AE IT HK BR DK SG MX RU IL ID BE TH NO]
+    end
+
+    # Non-exhaustive list of common exchange operating MICs for help in choosing "close" matches
+    # This is very US-centric since our prices provider and user base is a majority US-based
+    def sorted_exchange_operating_mics_by_relevance
+      [
+        "XNYS",  # New York Stock Exchange
+        "XNAS",  # NASDAQ Stock Market
+        "XOTC",  # OTC Markets Group (OTC Link)
+        "OTCM",  # OTC Markets Group
+        "OTCN",  # OTC Bulletin Board
+        "OTCI",  # OTC International
+        "OPRA",  # Options Price Reporting Authority
+        "MEMX",  # Members Exchange
+        "IEXA",  # IEX All-Market
+        "IEXG",  # IEX Growth Market
+        "EDXM",  # Cboe EDGX Exchange (Equities)
+        "XCME",  # CME Group (Derivatives)
+        "XCBT",  # Chicago Board of Trade
+        "XPUS",  # Nasdaq PSX (U.S.)
+        "XPSE",  # Nasdaq PHLX (U.S.)
+        "XTRD",  # Nasdaq TRF (Trade Reporting Facility)
+        "XTXD",  # FINRA TRACE (Trade Reporting)
+        "XARC",  # NYSE Arca
+        "XBOX",  # BOX Options Exchange
+        "XBXO"  # BZX Options (Cboe)
+      ]
+    end
+end
diff --git a/app/models/security/synth_combobox_option.rb b/app/models/security/synth_combobox_option.rb
new file mode 100644
index 00000000..15e76920
--- /dev/null
+++ b/app/models/security/synth_combobox_option.rb
@@ -0,0 +1,13 @@
+class Security::SynthComboboxOption
+  include ActiveModel::Model
+
+  attr_accessor :symbol, :name, :logo_url, :exchange_operating_mic, :country_code
+
+  def id
+    "#{symbol}|#{exchange_operating_mic}" # submitted by combobox as value
+  end
+
+  def to_combobox_display
+    "#{symbol} - #{name} (#{exchange_operating_mic})" # shown in combobox input when selected
+  end
+end
diff --git a/app/models/series.rb b/app/models/series.rb
new file mode 100644
index 00000000..b50a38ee
--- /dev/null
+++ b/app/models/series.rb
@@ -0,0 +1,76 @@
+class Series
+  # Behave like an Array whose elements are the `Value` structs stored in `values`
+  include Enumerable
+
+  # Forward any undefined method calls (e.g. `first`, `[]`, `map`) to `values`
+  delegate_missing_to :values
+
+  # Enumerable needs `#each`
+  def each(&block)
+    values.each(&block)
+  end
+
+  attr_reader :start_date, :end_date, :interval, :trend, :values, :favorable_direction
+
+  Value = Struct.new(
+    :date,
+    :date_formatted,
+    :value,
+    :trend,
+    keyword_init: true
+  )
+
+  class << self
+    def from_raw_values(values, interval: "1 day")
+      raise ArgumentError, "Must be an array of at least 2 values" unless values.size >= 2
+      raise ArgumentError, "Must have date and value properties" unless values.all? { |value| value.has_key?(:date) && value.has_key?(:value) }
+
+      ordered = values.sort_by { |value| value[:date] }
+      start_date = ordered.first[:date]
+      end_date = ordered.last[:date]
+
+      new(
+        start_date: start_date,
+        end_date: end_date,
+        interval: interval,
+        values: [ nil, *ordered ].each_cons(2).map do |prev_value, curr_value|
+          Value.new(
+            date: curr_value[:date],
+            date_formatted: I18n.l(curr_value[:date], format: :long),
+            value: curr_value[:value],
+            trend: Trend.new(
+              current: curr_value[:value],
+              previous: prev_value&.[](:value)
+            )
+          )
+        end
+      )
+    end
+  end
+
+  def initialize(start_date:, end_date:, interval:, values:, favorable_direction: "up")
+    @start_date = start_date
+    @end_date = end_date
+    @interval = interval
+    @values = values
+    @favorable_direction = favorable_direction
+  end
+
+  def trend
+    @trend ||= Trend.new(
+      current: values.last&.value,
+      previous: values.first&.value,
+      favorable_direction: favorable_direction
+    )
+  end
+
+  def as_json
+    {
+      start_date: start_date,
+      end_date: end_date,
+      interval: interval,
+      trend: trend,
+      values: values.map { |v| { date: v.date, date_formatted: v.date_formatted, value: v.value, trend: v.trend } }
+    }
+  end
+end
diff --git a/app/models/session.rb b/app/models/session.rb
index 8e94aa81..66faa0f5 100644
--- a/app/models/session.rb
+++ b/app/models/session.rb
@@ -1,8 +1,22 @@
 class Session < ApplicationRecord
   belongs_to :user
+  belongs_to :active_impersonator_session,
+    -> { where(status: :in_progress) },
+    class_name: "ImpersonationSession",
+    optional: true
 
   before_create do
     self.user_agent = Current.user_agent
     self.ip_address = Current.ip_address
   end
+
+  def get_preferred_tab(tab_key)
+    data.dig("tab_preferences", tab_key)
+  end
+
+  def set_preferred_tab(tab_key, tab_value)
+    data["tab_preferences"] ||= {}
+    data["tab_preferences"][tab_key] = tab_value
+    save!
+  end
 end
diff --git a/app/models/setting.rb b/app/models/setting.rb
index d576fbea..5f44284a 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -2,22 +2,9 @@
 class Setting < RailsSettings::Base
   cache_prefix { "v1" }
 
-  field :render_deploy_hook,
-        type: :string,
-        default: ENV["RENDER_DEPLOY_HOOK"],
-        validates: { allow_blank: true, format: { with: /\Ahttps:\/\/api\.render\.com\/deploy\/srv-.+\z/ } }
-
-  field :upgrades_mode,
-        type: :string,
-        default: ENV.fetch("UPGRADES_MODE", "manual"),
-        validates: { inclusion: { in: %w[manual auto] } }
-
-  field :upgrades_target,
-        type: :string,
-        default: ENV.fetch("UPGRADES_TARGET", "release"),
-        validates: { inclusion: { in: %w[release commit] } }
-
   field :synth_api_key, type: :string, default: ENV["SYNTH_API_KEY"]
+  field :openai_access_token, type: :string, default: ENV["OPENAI_ACCESS_TOKEN"]
 
   field :require_invite_for_signup, type: :boolean, default: false
+  field :require_email_confirmation, type: :boolean, default: ENV.fetch("REQUIRE_EMAIL_CONFIRMATION", "true") == "true"
 end
diff --git a/app/models/subscription.rb b/app/models/subscription.rb
new file mode 100644
index 00000000..90b5303d
--- /dev/null
+++ b/app/models/subscription.rb
@@ -0,0 +1,38 @@
+class Subscription < ApplicationRecord
+  TRIAL_DAYS = 14
+
+  belongs_to :family
+
+  # https://docs.stripe.com/api/subscriptions/object
+  enum :status, {
+    incomplete: "incomplete",
+    incomplete_expired: "incomplete_expired",
+    trialing: "trialing", # We use this, but "offline" (no through Stripe's interface)
+    active: "active",
+    past_due: "past_due",
+    canceled: "canceled",
+    unpaid: "unpaid",
+    paused: "paused"
+  }
+
+  validates :stripe_id, presence: true, if: :active?
+  validates :trial_ends_at, presence: true, if: :trialing?
+  validates :family_id, uniqueness: true
+
+  class << self
+    def new_trial_ends_at
+      TRIAL_DAYS.days.from_now
+    end
+  end
+
+  def name
+    case interval
+    when "month"
+      "Monthly Plan"
+    when "year"
+      "Annual Plan"
+    else
+      "Free trial"
+    end
+  end
+end
diff --git a/app/models/sync.rb b/app/models/sync.rb
new file mode 100644
index 00000000..ea66ebb4
--- /dev/null
+++ b/app/models/sync.rb
@@ -0,0 +1,197 @@
+class Sync < ApplicationRecord
+  # We run a cron that marks any syncs that have not been resolved in 24 hours as "stale"
+  # Syncs often become stale when new code is deployed and the worker restarts
+  STALE_AFTER = 24.hours
+
+  # The max time that a sync will show in the UI (after 5 minutes)
+  VISIBLE_FOR = 5.minutes
+
+  include AASM
+
+  Error = Class.new(StandardError)
+
+  belongs_to :syncable, polymorphic: true
+
+  belongs_to :parent, class_name: "Sync", optional: true
+  has_many :children, class_name: "Sync", foreign_key: :parent_id, dependent: :destroy
+
+  scope :ordered, -> { order(created_at: :desc) }
+  scope :incomplete, -> { where("syncs.status IN (?)", %w[pending syncing]) }
+  scope :visible, -> { incomplete.where("syncs.created_at > ?", VISIBLE_FOR.ago) }
+
+  after_commit :update_family_sync_timestamp
+
+  validate :window_valid
+
+  # Sync state machine
+  aasm column: :status, timestamps: true do
+    state :pending, initial: true
+    state :syncing
+    state :completed
+    state :failed
+    state :stale
+
+    after_all_transitions :handle_transition
+
+    event :start, after_commit: :handle_start_transition do
+      transitions from: :pending, to: :syncing
+    end
+
+    event :complete, after_commit: :handle_completion_transition do
+      transitions from: :syncing, to: :completed
+    end
+
+    event :fail do
+      transitions from: :syncing, to: :failed
+    end
+
+    # Marks a sync that never completed within the expected time window
+    event :mark_stale do
+      transitions from: %i[pending syncing], to: :stale
+    end
+  end
+
+  class << self
+    def clean
+      incomplete.where("syncs.created_at < ?", STALE_AFTER.ago).find_each(&:mark_stale!)
+    end
+  end
+
+  def perform
+    Rails.logger.tagged("Sync", id, syncable_type, syncable_id) do
+      # This can happen on server restarts or if Sidekiq enqueues a duplicate job
+      unless may_start?
+        Rails.logger.warn("Sync #{id} is not in a valid state (#{aasm.from_state}) to start.  Skipping sync.")
+        return
+      end
+
+      start!
+
+      begin
+        syncable.perform_sync(self)
+      rescue => e
+        fail!
+        update(error: e.message)
+        report_error(e)
+      ensure
+        finalize_if_all_children_finalized
+      end
+    end
+  end
+
+  # Finalizes the current sync AND parent (if it exists)
+  def finalize_if_all_children_finalized
+    Sync.transaction do
+      lock!
+
+      # If this is the "parent" and there are still children running, don't finalize.
+      return unless all_children_finalized?
+
+      if syncing?
+        if has_failed_children?
+          fail!
+        else
+          complete!
+        end
+      end
+
+      # If we make it here, the sync is finalized.  Run post-sync, regardless of failure/success.
+      perform_post_sync
+    end
+
+    # If this sync has a parent, try to finalize it so the child status propagates up the chain.
+    parent&.finalize_if_all_children_finalized
+  end
+
+  # If a sync is pending, we can adjust the window if new syncs are created with a wider window.
+  def expand_window_if_needed(new_window_start_date, new_window_end_date)
+    return unless pending?
+    return if self.window_start_date.nil? && self.window_end_date.nil? # already as wide as possible
+
+    earliest_start_date = if self.window_start_date && new_window_start_date
+      [ self.window_start_date, new_window_start_date ].min
+    else
+      nil
+    end
+
+    latest_end_date = if self.window_end_date && new_window_end_date
+      [ self.window_end_date, new_window_end_date ].max
+    else
+      nil
+    end
+
+    update(
+      window_start_date: earliest_start_date,
+      window_end_date: latest_end_date
+    )
+  end
+
+  private
+    def log_status_change
+      Rails.logger.info("changing from #{aasm.from_state} to #{aasm.to_state} (event: #{aasm.current_event})")
+    end
+
+    def has_failed_children?
+      children.failed.any?
+    end
+
+    def all_children_finalized?
+      children.incomplete.empty?
+    end
+
+    def perform_post_sync
+      Rails.logger.info("Performing post-sync for #{syncable_type} (#{syncable.id})")
+      syncable.perform_post_sync
+      syncable.broadcast_sync_complete
+    rescue => e
+      Rails.logger.error("Error performing post-sync for #{syncable_type} (#{syncable.id}): #{e.message}")
+      report_error(e)
+    end
+
+    def report_error(error)
+      Sentry.capture_exception(error) do |scope|
+        scope.set_tags(sync_id: id)
+      end
+    end
+
+    def report_warnings
+      todays_sync_count = syncable.syncs.where(created_at: Date.current.all_day).count
+
+      if todays_sync_count > 10
+        Sentry.capture_exception(
+          Error.new("#{syncable_type} (#{syncable.id}) has exceeded 10 syncs today (count: #{todays_sync_count})"),
+          level: :warning
+        )
+      end
+    end
+
+    def handle_start_transition
+      report_warnings
+    end
+
+    def handle_transition
+      log_status_change
+    end
+
+    def handle_completion_transition
+      family.touch(:latest_sync_completed_at)
+    end
+
+    def window_valid
+      if window_start_date && window_end_date && window_start_date > window_end_date
+        errors.add(:window_end_date, "must be greater than window_start_date")
+      end
+    end
+
+    def update_family_sync_timestamp
+      family.touch(:latest_sync_activity_at)
+    end
+
+    def family
+      if syncable.is_a?(Family)
+        syncable
+      else
+        syncable.family
+      end
+    end
+end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 6b2fb67b..c5bdc0bc 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -1,7 +1,7 @@
 class Tag < ApplicationRecord
   belongs_to :family
   has_many :taggings, dependent: :destroy
-  has_many :transactions, through: :taggings, source: :taggable, source_type: "Account::Transaction"
+  has_many :transactions, through: :taggings, source: :taggable, source_type: "Transaction"
   has_many :import_mappings, as: :mappable, dependent: :destroy, class_name: "Import::Mapping"
 
   validates :name, presence: true, uniqueness: { scope: :family }
diff --git a/app/models/time_series.rb b/app/models/time_series.rb
deleted file mode 100644
index 09091e8f..00000000
--- a/app/models/time_series.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-class TimeSeries
-  DIRECTIONS = %w[up down].freeze
-
-  attr_reader :values, :favorable_direction
-
-  def self.from_collection(collection, value_method, favorable_direction: "up")
-    collection.map do |obj|
-      {
-        date: obj.date,
-        value: obj.public_send(value_method),
-        original: obj
-      }
-    end.then { |data| new(data, favorable_direction: favorable_direction) }
-  end
-
-  def initialize(data, favorable_direction: "up")
-    @favorable_direction = (favorable_direction.presence_in(DIRECTIONS) || "up").inquiry
-    @values = initialize_values data.sort_by { |d| d[:date] }
-  end
-
-  def first
-    values.first
-  end
-
-  def last
-    values.last
-  end
-
-  def on(date)
-    values.find { |v| v.date == date }
-  end
-
-  def trend
-    TimeSeries::Trend.new \
-      current: last&.value,
-      previous: first&.value,
-      series: self
-  end
-
-  # `as_json` returns the data shape used by D3 charts
-  def as_json
-    {
-      values: values.map(&:as_json),
-      trend: trend.as_json,
-      favorable_direction: favorable_direction
-    }.as_json
-  end
-
-  private
-    def initialize_values(data)
-      [ nil, *data ].each_cons(2).map do |previous, current|
-        TimeSeries::Value.new **current,
-          previous_value: previous.try(:[], :value),
-          series: self
-      end
-    end
-end
diff --git a/app/models/time_series/trend.rb b/app/models/time_series/trend.rb
deleted file mode 100644
index b93db2bd..00000000
--- a/app/models/time_series/trend.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-class TimeSeries::Trend
-  include ActiveModel::Validations
-
-  attr_reader :current, :previous, :favorable_direction
-
-  validate :values_must_be_of_same_type, :values_must_be_of_known_type
-
-  def initialize(current:, previous:, series: nil, favorable_direction: nil)
-    @current = current
-    @previous = previous
-    @series = series
-    @favorable_direction = get_favorable_direction(favorable_direction)
-
-    validate!
-  end
-
-  def direction
-    if previous.nil? || current == previous
-      "flat"
-    elsif current && current > previous
-      "up"
-    else
-      "down"
-    end.inquiry
-  end
-
-  def color
-    case direction
-    when "up"
-      favorable_direction.down? ? red_hex : green_hex
-    when "down"
-      favorable_direction.down? ? green_hex : red_hex
-    else
-      gray_hex
-    end
-  end
-
-  def value
-    if previous.nil?
-      current.is_a?(Money) ? Money.new(0) : 0
-    else
-      current - previous
-    end
-  end
-
-  def percent
-    if previous.nil? || (previous.zero? && current.zero?)
-      0.0
-    elsif previous.zero?
-      Float::INFINITY
-    else
-      change = (current_amount - previous_amount)
-      base = previous_amount.to_f
-
-      (change / base * 100).round(1).to_f
-    end
-  end
-
-  def as_json
-    {
-      favorable_direction: favorable_direction,
-      direction: direction,
-      value: value,
-      percent: percent
-    }.as_json
-  end
-
-  private
-
-    attr_reader :series
-
-    def red_hex
-      "#F13636" # red-500
-    end
-
-    def green_hex
-      "#10A861" # green-600
-    end
-
-    def gray_hex
-      "#737373" # gray-500
-    end
-
-    def values_must_be_of_same_type
-      unless current.class == previous.class || [ previous, current ].any?(&:nil?)
-        errors.add :current, :must_be_of_the_same_type_as_previous
-        errors.add :previous, :must_be_of_the_same_type_as_current
-      end
-    end
-
-    def values_must_be_of_known_type
-      unless current.is_a?(Money) || current.is_a?(Numeric) || current.nil?
-        errors.add :current, :must_be_of_type_money_numeric_or_nil
-      end
-
-      unless previous.is_a?(Money) || previous.is_a?(Numeric) || previous.nil?
-        errors.add :previous, :must_be_of_type_money_numeric_or_nil
-      end
-    end
-
-    def current_amount
-      extract_numeric current
-    end
-
-    def previous_amount
-      extract_numeric previous
-    end
-
-    def extract_numeric(obj)
-      if obj.is_a? Money
-        obj.amount
-      else
-        obj
-      end
-    end
-
-    def get_favorable_direction(favorable_direction)
-      direction = favorable_direction.presence || series&.favorable_direction
-      (direction.presence_in(TimeSeries::DIRECTIONS) || "up").inquiry
-    end
-end
diff --git a/app/models/time_series/value.rb b/app/models/time_series/value.rb
deleted file mode 100644
index 390343e1..00000000
--- a/app/models/time_series/value.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-class TimeSeries::Value
-  include Comparable
-  include ActiveModel::Validations
-
-  attr_reader :value, :date, :original, :trend
-
-  validates :date, presence: true
-  validate :value_must_be_of_known_type
-
-  def initialize(date:, value:, original: nil, series: nil, previous_value: nil)
-    @date, @value, @original, @series = date, value, original, series
-    @trend = create_trend previous_value
-
-    validate!
-  end
-
-  def <=>(other)
-    result = date <=> other.date
-    result = value <=> other.value if result == 0
-    result
-  end
-
-  def as_json
-    {
-      date: date.iso8601,
-      value: value.as_json,
-      trend: trend.as_json
-    }
-  end
-
-  private
-    attr_reader :series
-
-    def create_trend(previous_value)
-      TimeSeries::Trend.new \
-        current: value,
-        previous: previous_value,
-        series: series
-    end
-
-    def value_must_be_of_known_type
-      unless value.is_a?(Money) || value.is_a?(Numeric)
-        errors.add :value, :must_be_a_money_or_numeric
-      end
-    end
-end
diff --git a/app/models/tool_call.rb b/app/models/tool_call.rb
new file mode 100644
index 00000000..2908fd13
--- /dev/null
+++ b/app/models/tool_call.rb
@@ -0,0 +1,3 @@
+class ToolCall < ApplicationRecord
+  belongs_to :message
+end
diff --git a/app/models/tool_call/function.rb b/app/models/tool_call/function.rb
new file mode 100644
index 00000000..8cdccce1
--- /dev/null
+++ b/app/models/tool_call/function.rb
@@ -0,0 +1,24 @@
+class ToolCall::Function < ToolCall
+  validates :function_name, :function_result, presence: true
+  validates :function_arguments, presence: true, allow_blank: true
+
+  class << self
+    # Translates an "LLM Concept" provider's FunctionRequest into a ToolCall::Function
+    def from_function_request(function_request, result)
+      new(
+        provider_id: function_request.id,
+        provider_call_id: function_request.call_id,
+        function_name: function_request.function_name,
+        function_arguments: function_request.function_args,
+        function_result: result
+      )
+    end
+  end
+
+  def to_result
+    {
+      call_id: provider_call_id,
+      output: function_result
+    }
+  end
+end
diff --git a/app/models/trade.rb b/app/models/trade.rb
new file mode 100644
index 00000000..f7be4682
--- /dev/null
+++ b/app/models/trade.rb
@@ -0,0 +1,28 @@
+class Trade < ApplicationRecord
+  include Entryable, Monetizable
+
+  monetize :price
+
+  belongs_to :security
+
+  validates :qty, presence: true
+  validates :price, :currency, presence: true
+
+  class << self
+    def build_name(type, qty, ticker)
+      prefix = type == "buy" ? "Buy" : "Sell"
+      "#{prefix} #{qty.to_d.abs} shares of #{ticker}"
+    end
+  end
+
+  def unrealized_gain_loss
+    return nil if qty.negative?
+    current_price = security.current_price
+    return nil if current_price.nil?
+
+    current_value = current_price * qty.abs
+    cost_basis = price_money * qty.abs
+
+    Trend.new(current: current_value, previous: cost_basis)
+  end
+end
diff --git a/app/models/trade/create_form.rb b/app/models/trade/create_form.rb
new file mode 100644
index 00000000..ed26d9b6
--- /dev/null
+++ b/app/models/trade/create_form.rb
@@ -0,0 +1,111 @@
+class Trade::CreateForm
+  include ActiveModel::Model
+
+  attr_accessor :account, :date, :amount, :currency, :qty,
+                :price, :ticker, :manual_ticker, :type, :transfer_account_id
+
+  # Either creates a trade, transaction, or transfer based on type
+  # Returns the model, regardless of success or failure
+  def create
+    case type
+    when "buy", "sell"
+      create_trade
+    when "interest"
+      create_interest_income
+    when "deposit", "withdrawal"
+      create_transfer
+    end
+  end
+
+  private
+    # Users can either look up a ticker from our provider (Synth) or enter a manual, "offline" ticker (that we won't fetch prices for)
+    def security
+      ticker_symbol, exchange_operating_mic = ticker.present? ? ticker.split("|") : [ manual_ticker, nil ]
+
+      Security::Resolver.new(
+        ticker_symbol,
+        exchange_operating_mic: exchange_operating_mic
+      ).resolve
+    end
+
+    def create_trade
+      signed_qty = type == "sell" ? -qty.to_d : qty.to_d
+      signed_amount = signed_qty * price.to_d
+
+      trade_entry = account.entries.new(
+        name: Trade.build_name(type, qty, security.ticker),
+        date: date,
+        amount: signed_amount,
+        currency: currency,
+        entryable: Trade.new(
+          qty: signed_qty,
+          price: price,
+          currency: currency,
+          security: security
+        )
+      )
+
+      if trade_entry.save
+        trade_entry.lock_saved_attributes!
+        account.sync_later
+      end
+
+      trade_entry
+    end
+
+    def create_interest_income
+      signed_amount = amount.to_d * -1
+
+      entry = account.entries.build(
+        name: "Interest payment",
+        date: date,
+        amount: signed_amount,
+        currency: currency,
+        entryable: Transaction.new
+      )
+
+      if entry.save
+        entry.lock_saved_attributes!
+        account.sync_later
+      end
+
+      entry
+    end
+
+    def create_transfer
+      if transfer_account_id.present?
+        from_account_id = type == "withdrawal" ? account.id : transfer_account_id
+        to_account_id = type == "withdrawal" ? transfer_account_id : account.id
+
+        Transfer::Creator.new(
+          family: account.family,
+          source_account_id: from_account_id,
+          destination_account_id: to_account_id,
+          date: date,
+          amount: amount
+        ).create
+      else
+        create_unlinked_transfer
+      end
+    end
+
+    # If user doesn't provide the reciprocal account, it's a regular transaction
+    def create_unlinked_transfer
+      signed_amount = type == "deposit" ? amount.to_d * -1 : amount.to_d
+
+      entry = account.entries.build(
+        name: signed_amount < 0 ? "Deposit to #{account.name}" : "Withdrawal from #{account.name}",
+        date: date,
+        amount: signed_amount,
+        currency: currency,
+        entryable: Transaction.new
+      )
+
+      if entry.save
+        entry.lock_saved_attributes!
+        account.sync_later
+      end
+
+      entry
+    end
+end
diff --git a/app/models/trade_import.rb b/app/models/trade_import.rb
index 4ca57ea1..67fac05d 100644
--- a/app/models/trade_import.rb
+++ b/app/models/trade_import.rb
@@ -3,25 +3,43 @@ class TradeImport < Import
     transaction do
       mappings.each(&:create_mappable!)
 
-      rows.each do |row|
-        account = mappings.accounts.mappable_for(row.account)
-        security = Security.find_or_create_by(ticker: row.ticker)
+      trades = rows.map do |row|
+        mapped_account = if account
+          account
+        else
+          mappings.accounts.mappable_for(row.account)
+        end
 
-        entry = account.entries.build \
-          date: row.date_iso,
-          amount: row.signed_amount,
-          name: row.name,
-          currency: row.currency,
-          entryable: Account::Trade.new(security: security, qty: row.qty, currency: row.currency, price: row.price),
-          import: self
+        # Try to find or create security with ticker only
+        security = find_or_create_security(
+          ticker: row.ticker,
+          exchange_operating_mic: row.exchange_operating_mic
+        )
 
-        entry.save!
+        Trade.new(
+          security: security,
+          qty: row.qty,
+          currency: row.currency.presence || mapped_account.currency,
+          price: row.price,
+          entry: Entry.new(
+            account: mapped_account,
+            date: row.date_iso,
+            amount: row.signed_amount,
+            name: row.name,
+            currency: row.currency.presence || mapped_account.currency,
+            import: self
+          ),
+        )
       end
+
+      Trade.import!(trades, recursive: true)
     end
   end
 
   def mapping_steps
-    [ Import::AccountMapping ]
+    base = []
+    base << Import::AccountMapping if account.nil?
+    base
   end
 
   def required_column_keys
@@ -29,24 +47,54 @@ class TradeImport < Import
   end
 
   def column_keys
-    %i[date ticker qty price currency account name]
+    base = %i[date ticker exchange_operating_mic currency qty price name]
+    base.unshift(:account) if account.nil?
+    base
   end
 
   def dry_run
-    {
-      transactions: rows.count,
+    mappings = { transactions: rows.count }
+
+    mappings.merge(
       accounts: Import::AccountMapping.for_import(self).creational.count
-    }
+    ) if account.nil?
+
+    mappings
   end
 
   def csv_template
     template = <<-CSV
-      date*,ticker*,qty*,price*,currency,account,name
-      05/15/2024,AAPL,10,150.00,USD,Trading Account,Apple Inc. Purchase
-      05/16/2024,GOOGL,-5,2500.00,USD,Investment Account,Alphabet Inc. Sale
-      05/17/2024,TSLA,2,700.50,USD,Retirement Account,Tesla Inc. Purchase
+      date*,ticker*,exchange_operating_mic,currency,qty*,price*,account,name
+      05/15/2024,AAPL,XNAS,USD,10,150.00,Trading Account,Apple Inc. Purchase
+      05/16/2024,GOOGL,XNAS,USD,-5,2500.00,Investment Account,Alphabet Inc. Sale
+      05/17/2024,TSLA,XNAS,USD,2,700.50,Retirement Account,Tesla Inc. Purchase
     CSV
 
-    CSV.parse(template, headers: true)
+    csv = CSV.parse(template, headers: true)
+    csv.delete("account") if account.present?
+    csv
   end
+
+  private
+    def find_or_create_security(ticker: nil, exchange_operating_mic: nil)
+      return nil unless ticker.present?
+
+      # Avoids resolving the same security over and over again (resolver potentially makes network calls)
+      @security_cache ||= {}
+
+      cache_key = [ ticker, exchange_operating_mic ].compact.join(":")
+
+      security = @security_cache[cache_key]
+
+      return security if security.present?
+
+      security = Security::Resolver.new(
+        ticker,
+        exchange_operating_mic: exchange_operating_mic.presence
+      ).resolve
+
+      @security_cache[cache_key] = security
+
+      security
+    end
 end
diff --git a/app/models/transaction.rb b/app/models/transaction.rb
new file mode 100644
index 00000000..c2eb468b
--- /dev/null
+++ b/app/models/transaction.rb
@@ -0,0 +1,34 @@
+class Transaction < ApplicationRecord
+  include Entryable, Transferable, Ruleable
+
+  belongs_to :category, optional: true
+  belongs_to :merchant, optional: true
+
+  has_many :taggings, as: :taggable, dependent: :destroy
+  has_many :tags, through: :taggings
+
+  accepts_nested_attributes_for :taggings, allow_destroy: true
+
+  enum :kind, {
+    standard: "standard", # A regular transaction, included in budget analytics
+    funds_movement: "funds_movement", # Movement of funds between accounts, excluded from budget analytics
+    cc_payment: "cc_payment", # A CC payment, excluded from budget analytics (CC payments offset the sum of expense transactions)
+    loan_payment: "loan_payment", # A payment to a Loan account, treated as an expense in budgets
+    one_time: "one_time" # A one-time expense/income, excluded from budget analytics
+  }
+
+  # Overarching grouping method for all transfer-type transactions
+  def transfer?
+    funds_movement? || cc_payment? || loan_payment?
+  end
+
+  def set_category!(category)
+    if category.is_a?(String)
+      category = entry.account.family.categories.find_or_create_by!(
+        name: category
+      )
+    end
+
+    update!(category: category)
+  end
+end
diff --git a/app/models/transaction/ruleable.rb b/app/models/transaction/ruleable.rb
new file mode 100644
index 00000000..aacd1b92
--- /dev/null
+++ b/app/models/transaction/ruleable.rb
@@ -0,0 +1,17 @@
+module Transaction::Ruleable
+  extend ActiveSupport::Concern
+
+  def eligible_for_category_rule?
+    rules.joins(:actions).where(
+      actions: {
+        action_type: "set_transaction_category",
+        value: category_id
+      }
+    ).empty?
+  end
+
+  private
+    def rules
+      entry.account.family.rules
+    end
+end
diff --git a/app/models/transaction/search.rb b/app/models/transaction/search.rb
new file mode 100644
index 00000000..2fc17182
--- /dev/null
+++ b/app/models/transaction/search.rb
@@ -0,0 +1,143 @@
+class Transaction::Search
+  include ActiveModel::Model
+  include ActiveModel::Attributes
+
+  attribute :search, :string
+  attribute :amount, :string
+  attribute :amount_operator, :string
+  attribute :types, array: true
+  attribute :accounts, array: true
+  attribute :account_ids, array: true
+  attribute :start_date, :string
+  attribute :end_date, :string
+  attribute :categories, array: true
+  attribute :merchants, array: true
+  attribute :tags, array: true
+  attribute :active_accounts_only, :boolean, default: true
+
+  attr_reader :family
+
+  def initialize(family, filters: {})
+    @family = family
+    super(filters)
+  end
+
+  def transactions_scope
+    @transactions_scope ||= begin
+      # This already joins entries + accounts. To avoid expensive double-joins, don't join them again (causes full table scan)
+      query = family.transactions
+
+      query = apply_active_accounts_filter(query, active_accounts_only)
+      query = apply_category_filter(query, categories)
+      query = apply_type_filter(query, types)
+      query = apply_merchant_filter(query, merchants)
+      query = apply_tag_filter(query, tags)
+      query = EntrySearch.apply_search_filter(query, search)
+      query = EntrySearch.apply_date_filters(query, start_date, end_date)
+      query = EntrySearch.apply_amount_filter(query, amount, amount_operator)
+      query = EntrySearch.apply_accounts_filter(query, accounts, account_ids)
+
+      query
+    end
+  end
+
+  # Computes totals for the specific search
+  def totals
+    @totals ||= begin
+      Rails.cache.fetch("transaction_search_totals/#{cache_key_base}") do
+        result = transactions_scope
+                  .select(
+                    "COALESCE(SUM(CASE WHEN entries.amount >= 0 THEN ABS(entries.amount * COALESCE(er.rate, 1)) ELSE 0 END), 0) as expense_total",
+                    "COALESCE(SUM(CASE WHEN entries.amount < 0 THEN ABS(entries.amount * COALESCE(er.rate, 1)) ELSE 0 END), 0) as income_total",
+                    "COUNT(entries.id) as transactions_count"
+                  )
+                  .joins(
+                    ActiveRecord::Base.sanitize_sql_array([
+                      "LEFT JOIN exchange_rates er ON (er.date = entries.date AND er.from_currency = entries.currency AND er.to_currency = ?)",
+                      family.currency
+                    ])
+                  )
+                  .take
+
+        Totals.new(
+          count: result.transactions_count.to_i,
+          income_money: Money.new(result.income_total.to_i, family.currency),
+          expense_money: Money.new(result.expense_total.to_i, family.currency)
+        )
+      end
+    end
+  end
+
+  def cache_key_base
+    [
+      family.id,
+      Digest::SHA256.hexdigest(attributes.sort.to_h.to_json), # cached by filters
+      family.entries_cache_version
+    ].join("/")
+  end
+
+  private
+    Totals = Data.define(:count, :income_money, :expense_money)
+
+    def apply_active_accounts_filter(query, active_accounts_only_filter)
+      if active_accounts_only_filter
+        query.where(accounts: { status: [ "draft", "active" ] })
+      else
+        query
+      end
+    end
+
+
+    def apply_category_filter(query, categories)
+      return query unless categories.present?
+
+      query = query.left_joins(:category).where(
+        "categories.name IN (?) OR (
+        categories.id IS NULL AND (transactions.kind NOT IN ('funds_movement', 'cc_payment'))
+      )",
+        categories
+      )
+
+      if categories.exclude?("Uncategorized")
+        query = query.where.not(category_id: nil)
+      end
+
+      query
+    end
+
+    def apply_type_filter(query, types)
+      return query unless types.present?
+      return query if types.sort == [ "expense", "income", "transfer" ]
+
+      transfer_condition = "transactions.kind IN ('funds_movement', 'cc_payment', 'loan_payment')"
+      expense_condition = "entries.amount >= 0"
+      income_condition = "entries.amount <= 0"
+
+      condition = case types.sort
+      when [ "transfer" ]
+        transfer_condition
+      when [ "expense" ]
+        Arel.sql("#{expense_condition} AND NOT (#{transfer_condition})")
+      when [ "income" ]
+        Arel.sql("#{income_condition} AND NOT (#{transfer_condition})")
+      when [ "expense", "transfer" ]
+        Arel.sql("#{expense_condition} OR #{transfer_condition}")
+      when [ "income", "transfer" ]
+        Arel.sql("#{income_condition} OR #{transfer_condition}")
+      when [ "expense", "income" ]
+        Arel.sql("NOT (#{transfer_condition})")
+      end
+
+      query.where(condition)
+    end
+
+    def apply_merchant_filter(query, merchants)
+      return query unless merchants.present?
+      query.joins(:merchant).where(merchants: { name: merchants })
+    end
+
+    def apply_tag_filter(query, tags)
+      return query unless tags.present?
+      query.joins(:tags).where(tags: { name: tags })
+    end
+end
diff --git a/app/models/transaction/transferable.rb b/app/models/transaction/transferable.rb
new file mode 100644
index 00000000..cea7978b
--- /dev/null
+++ b/app/models/transaction/transferable.rb
@@ -0,0 +1,36 @@
+module Transaction::Transferable
+  extend ActiveSupport::Concern
+
+  included do
+    has_one :transfer_as_inflow, class_name: "Transfer", foreign_key: "inflow_transaction_id", dependent: :destroy
+    has_one :transfer_as_outflow, class_name: "Transfer", foreign_key: "outflow_transaction_id", dependent: :destroy
+
+    # We keep track of rejected transfers to avoid auto-matching them again
+    has_one :rejected_transfer_as_inflow, class_name: "RejectedTransfer", foreign_key: "inflow_transaction_id", dependent: :destroy
+    has_one :rejected_transfer_as_outflow, class_name: "RejectedTransfer", foreign_key: "outflow_transaction_id", dependent: :destroy
+  end
+
+  def transfer
+    transfer_as_inflow || transfer_as_outflow
+  end
+
+  def transfer_match_candidates
+    candidates_scope = if self.entry.amount.negative?
+      family_matches_scope.where("inflow_candidates.entryable_id = ?", self.id)
+    else
+      family_matches_scope.where("outflow_candidates.entryable_id = ?", self.id)
+    end
+
+    candidates_scope.map do |match|
+      Transfer.new(
+        inflow_transaction_id: match.inflow_transaction_id,
+        outflow_transaction_id: match.outflow_transaction_id,
+      )
+    end
+  end
+
+  private
+    def family_matches_scope
+      self.entry.account.family.transfer_match_candidates
+    end
+end
diff --git a/app/models/transaction_import.rb b/app/models/transaction_import.rb
index e2b1c3d6..d233c2e4 100644
--- a/app/models/transaction_import.rb
+++ b/app/models/transaction_import.rb
@@ -3,22 +3,32 @@ class TransactionImport < Import
     transaction do
       mappings.each(&:create_mappable!)
 
-      rows.each do |row|
-        account = mappings.accounts.mappable_for(row.account)
+      transactions = rows.map do |row|
+        mapped_account = if account
+          account
+        else
+          mappings.accounts.mappable_for(row.account)
+        end
+
         category = mappings.categories.mappable_for(row.category)
         tags = row.tags_list.map { |tag| mappings.tags.mappable_for(tag) }.compact
 
-        entry = account.entries.build \
-          date: row.date_iso,
-          amount: row.signed_amount,
-          name: row.name,
-          currency: row.currency,
-          notes: row.notes,
-          entryable: Account::Transaction.new(category: category, tags: tags),
-          import: self
-
-        entry.save!
+        Transaction.new(
+          category: category,
+          tags: tags,
+          entry: Entry.new(
+            account: mapped_account,
+            date: row.date_iso,
+            amount: row.signed_amount,
+            name: row.name,
+            currency: row.currency,
+            notes: row.notes,
+            import: self
+          )
+        )
       end
+
+      Transaction.import!(transactions, recursive: true)
     end
   end
 
@@ -27,11 +37,21 @@ class TransactionImport < Import
   end
 
   def column_keys
-    %i[date amount name currency category tags account notes]
+    base = %i[date amount name currency category tags notes]
+    base.unshift(:account) if account.nil?
+    base
   end
 
   def mapping_steps
-    [ Import::CategoryMapping, Import::TagMapping, Import::AccountMapping ]
+    base = [ Import::CategoryMapping, Import::TagMapping ]
+    base << Import::AccountMapping if account.nil?
+    base
+  end
+
+  def selectable_amount_type_values
+    return [] if entity_type_col_label.nil?
+
+    csv_rows.map { |row| row[entity_type_col_label] }.uniq
   end
 
   def csv_template
@@ -42,6 +62,8 @@ class TransactionImport < Import
       05/17/2024,-12.50,Coffee Shop,,,coffee,,
     CSV
 
-    CSV.parse(template, headers: true)
+    csv = CSV.parse(template, headers: true)
+    csv.delete("account") if account.present?
+    csv
   end
 end
diff --git a/app/models/transfer.rb b/app/models/transfer.rb
new file mode 100644
index 00000000..f1186766
--- /dev/null
+++ b/app/models/transfer.rb
@@ -0,0 +1,138 @@
+class Transfer < ApplicationRecord
+  belongs_to :inflow_transaction, class_name: "Transaction"
+  belongs_to :outflow_transaction, class_name: "Transaction"
+
+  enum :status, { pending: "pending", confirmed: "confirmed" }
+
+  validates :inflow_transaction_id, uniqueness: true
+  validates :outflow_transaction_id, uniqueness: true
+
+  validate :transfer_has_different_accounts
+  validate :transfer_has_opposite_amounts
+  validate :transfer_within_date_range
+  validate :transfer_has_same_family
+
+  class << self
+    def kind_for_account(account)
+      if account.loan?
+        "loan_payment"
+      elsif account.liability?
+        "cc_payment"
+      else
+        "funds_movement"
+      end
+    end
+  end
+
+  def reject!
+    Transfer.transaction do
+      RejectedTransfer.find_or_create_by!(inflow_transaction_id: inflow_transaction_id, outflow_transaction_id: outflow_transaction_id)
+      destroy!
+    end
+  end
+
+  # Once transfer is destroyed, we need to mark the denormalized kind fields on the transactions
+  def destroy!
+    Transfer.transaction do
+      inflow_transaction.update!(kind: "standard")
+      outflow_transaction.update!(kind: "standard")
+      super
+    end
+  end
+
+  def confirm!
+    update!(status: "confirmed")
+  end
+
+  def date
+    inflow_transaction.entry.date
+  end
+
+  def sync_account_later
+    inflow_transaction&.entry&.sync_account_later
+    outflow_transaction&.entry&.sync_account_later
+  end
+
+  def to_account
+    inflow_transaction&.entry&.account
+  end
+
+  def from_account
+    outflow_transaction&.entry&.account
+  end
+
+  def amount_abs
+    inflow_transaction&.entry&.amount_money&.abs
+  end
+
+  def name
+    acc = to_account
+    if payment?
+      acc ? "Payment to #{acc.name}" : "Payment"
+    else
+      acc ? "Transfer to #{acc.name}" : "Transfer"
+    end
+  end
+
+  def payment?
+    to_account&.liability?
+  end
+
+  def loan_payment?
+    outflow_transaction&.kind == "loan_payment"
+  end
+
+  def liability_payment?
+    outflow_transaction&.kind == "cc_payment"
+  end
+
+  def regular_transfer?
+    outflow_transaction&.kind == "funds_movement"
+  end
+
+  def transfer_type
+    return "loan_payment" if loan_payment?
+    return "liability_payment" if liability_payment?
+    "transfer"
+  end
+
+  def categorizable?
+    to_account&.accountable_type == "Loan"
+  end
+
+  private
+    def transfer_has_different_accounts
+      return unless inflow_transaction&.entry && outflow_transaction&.entry
+      errors.add(:base, "Must be from different accounts") if to_account == from_account
+    end
+
+    def transfer_has_same_family
+      return unless inflow_transaction&.entry && outflow_transaction&.entry
+      errors.add(:base, "Must be from same family") unless to_account&.family == from_account&.family
+    end
+
+    def transfer_has_opposite_amounts
+      return unless inflow_transaction&.entry && outflow_transaction&.entry
+
+      inflow_entry = inflow_transaction.entry
+      outflow_entry = outflow_transaction.entry
+
+      inflow_amount = inflow_entry.amount
+      outflow_amount = outflow_entry.amount
+
+      if inflow_entry.currency == outflow_entry.currency
+        # For same currency, amounts must be exactly opposite
+        errors.add(:base, "Must have opposite amounts") if inflow_amount + outflow_amount != 0
+      else
+        # For different currencies, just check the signs are opposite
+        errors.add(:base, "Must have opposite amounts") unless inflow_amount.negative? && outflow_amount.positive?
+      end
+    end
+
+    def transfer_within_date_range
+      return unless inflow_transaction&.entry && outflow_transaction&.entry
+
+      date_diff = (inflow_transaction.entry.date - outflow_transaction.entry.date).abs
+      errors.add(:base, "Must be within 4 days") if date_diff > 4
+    end
+end
diff --git a/app/models/transfer/creator.rb b/app/models/transfer/creator.rb
new file mode 100644
index 00000000..8ea93a9c
--- /dev/null
+++ b/app/models/transfer/creator.rb
@@ -0,0 +1,85 @@
+class Transfer::Creator
+  def initialize(family:, source_account_id:, destination_account_id:, date:, amount:)
+    @family = family
+    @source_account = family.accounts.find(source_account_id) # early throw if not found
+    @destination_account = family.accounts.find(destination_account_id) # early throw if not found
+    @date = date
+    @amount = amount.to_d
+  end
+
+  def create
+    transfer = Transfer.new(
+      inflow_transaction: inflow_transaction,
+      outflow_transaction: outflow_transaction,
+      status: "confirmed"
+    )
+
+    if transfer.save
+      source_account.sync_later
+      destination_account.sync_later
+    end
+
+    transfer
+  end
+
+  private
+    attr_reader :family, :source_account, :destination_account, :date, :amount
+
+    def outflow_transaction
+      name = "#{name_prefix} to #{destination_account.name}"
+
+      Transaction.new(
+        kind: outflow_transaction_kind,
+        entry: source_account.entries.build(
+          amount: amount.abs,
+          currency: source_account.currency,
+          date: date,
+          name: name,
+        )
+      )
+    end
+
+    def inflow_transaction
+      name = "#{name_prefix} from #{source_account.name}"
+
+      Transaction.new(
+        kind: "funds_movement",
+        entry: destination_account.entries.build(
+          amount: inflow_converted_money.amount.abs * -1,
+          currency: destination_account.currency,
+          date: date,
+          name: name,
+        )
+      )
+    end
+
+    # If destination account has different currency, its transaction should show up as converted
+    # Future improvement: instead of a 1:1 conversion fallback, add a UI/UX flow for missing rates
+    def inflow_converted_money
+      Money.new(amount.abs, source_account.currency)
+           .exchange_to(
+             destination_account.currency,
+             date: date,
+             fallback_rate: 1.0
+           )
+    end
+
+    # The "expense" side of a transfer is treated different in analytics based on where it goes.
+    def outflow_transaction_kind
+      if destination_account.loan?
+        "loan_payment"
+      elsif destination_account.liability?
+        "cc_payment"
+      else
+        "funds_movement"
+      end
+    end
+
+    def name_prefix
+      if destination_account.liability?
+        "Payment"
+      else
+        "Transfer"
+      end
+    end
+end
diff --git a/app/models/trend.rb b/app/models/trend.rb
new file mode 100644
index 00000000..33e2014d
--- /dev/null
+++ b/app/models/trend.rb
@@ -0,0 +1,94 @@
+class Trend
+  include ActiveModel::Validations
+
+  DIRECTIONS = %w[up down].freeze
+
+  attr_reader :current, :previous, :favorable_direction
+
+  validates :current, presence: true
+
+  def initialize(current:, previous:, favorable_direction: nil)
+    @current = current
+    @previous = previous || 0
+    @favorable_direction = (favorable_direction.presence_in(DIRECTIONS) || "up").inquiry
+
+    validate!
+  end
+
+  def direction
+    if current == previous
+      "flat"
+    elsif current > previous
+      "up"
+    else
+      "down"
+    end.inquiry
+  end
+
+  def color
+    case direction
+    when "up"
+      favorable_direction.down? ? red_hex : green_hex
+    when "down"
+      favorable_direction.down? ? green_hex : red_hex
+    else
+      gray_hex
+    end
+  end
+
+  def icon
+    if direction.flat?
+      "minus"
+    elsif direction.up?
+      "arrow-up"
+    else
+      "arrow-down"
+    end
+  end
+
+  def value
+    current - previous
+  end
+
+  def percent
+    return 0.0 if previous.zero? && current.zero?
+    return Float::INFINITY if previous.zero?
+
+    change = (current - previous).to_f
+
+    (change / previous.to_f * 100).round(1)
+  end
+
+  def percent_formatted
+    if percent.finite?
+      "#{percent.round(1)}%"
+    else
+      percent > 0 ? "＋∞" : "-∞"
+    end
+  end
+
+  def as_json
+    {
+      value: value,
+      percent: percent,
+      percent_formatted: percent_formatted,
+      current: current,
+      previous: previous,
+      color: color,
+      icon: icon
+    }
+  end
+
+  private
+    def red_hex
+      "var(--color-destructive)"
+    end
+
+    def green_hex
+      "var(--color-success)"
+    end
+
+    def gray_hex
+      "var(--color-gray)"
+    end
+end
diff --git a/app/models/upgrader.rb b/app/models/upgrader.rb
deleted file mode 100644
index 605c7da8..00000000
--- a/app/models/upgrader.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-class Upgrader
-  include Provided
-
-  class << self
-    attr_writer :config
-
-    def config
-      @config ||= Config.new
-    end
-
-    def upgrade_to(commit_or_upgrade)
-      upgrade = commit_or_upgrade.is_a?(String) ? find_upgrade(commit_or_upgrade) : commit_or_upgrade
-      config.deployer.deploy(upgrade)
-    end
-
-    def find_upgrade(commit)
-      upgrade_candidates.find { |candidate| candidate.commit_sha == commit }
-    end
-
-    def available_upgrade
-      available_upgrades.first
-    end
-
-    # Default to showing releases first, then commits
-    def completed_upgrade
-      completed_upgrades.find { |upgrade| upgrade.type == "release" } || completed_upgrades.first
-    end
-
-    def available_upgrade_by_type(type)
-      if type == "commit"
-        commit_upgrade = available_upgrades.find { |upgrade| upgrade.type == "commit" }
-        commit_upgrade || available_upgrades.first
-      elsif type == "release"
-        available_upgrades.find { |upgrade| upgrade.type == "release" }
-      end
-    end
-
-    private
-      def available_upgrades
-        upgrade_candidates.select(&:available?)
-      end
-
-      def completed_upgrades
-        upgrade_candidates.select(&:complete?)
-      end
-
-      def upgrade_candidates
-        latest_candidates = fetch_latest_upgrade_candidates_from_provider
-        return [] unless latest_candidates
-
-        commit_candidate = Upgrade.new("commit", latest_candidates[:commit])
-        release_candidate = latest_candidates[:release] && Upgrade.new("release", latest_candidates[:release])
-
-        [ release_candidate, commit_candidate ].compact.uniq { |candidate| candidate.commit_sha }
-      end
-  end
-end
diff --git a/app/models/upgrader/config.rb b/app/models/upgrader/config.rb
deleted file mode 100644
index a78e51e7..00000000
--- a/app/models/upgrader/config.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class Upgrader::Config
-  attr_reader :env, :options
-
-  def initialize(options = {}, env: ENV)
-    @env = env
-    @options = options
-  end
-
-  def deployer
-    factory = Upgrader::Deployer
-    factory.for(hosting_platform)
-  end
-
-  def hosting_platform
-    options[:hosting_platform] || env["HOSTING_PLATFORM"]
-  end
-end
diff --git a/app/models/upgrader/deployer.rb b/app/models/upgrader/deployer.rb
deleted file mode 100644
index cb12992e..00000000
--- a/app/models/upgrader/deployer.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class Upgrader::Deployer
-  def self.for(platform)
-    case platform
-    when nil, "localhost"
-      Upgrader::Deployer::Null.new
-    when "render"
-      Upgrader::Deployer::Render.new
-    else
-      raise "Unknown platform: #{platform}"
-    end
-  end
-end
diff --git a/app/models/upgrader/deployer/null.rb b/app/models/upgrader/deployer/null.rb
deleted file mode 100644
index d4d217fa..00000000
--- a/app/models/upgrader/deployer/null.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class Upgrader::Deployer::Null
-  def deploy(upgrade)
-    {
-      success: true,
-      message: I18n.t("upgrader.deployer.null_deployer.success_message")
-    }
-  end
-end
diff --git a/app/models/upgrader/deployer/render.rb b/app/models/upgrader/deployer/render.rb
deleted file mode 100644
index 5df86857..00000000
--- a/app/models/upgrader/deployer/render.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-class Upgrader::Deployer::Render
-  def deploy(upgrade)
-    if Setting.render_deploy_hook.blank?
-      return {
-        success: false,
-        message: I18n.t("upgrader.deployer.render.error_message_not_set"),
-        troubleshooting_url: "/settings/self_hosting/edit"
-      }
-    end
-
-    Rails.logger.info I18n.t("upgrader.deployer.render.deploy_log_info", type: upgrade.type, commit_sha: upgrade.commit_sha)
-
-    begin
-      uri = URI.parse(Setting.render_deploy_hook)
-      uri.query = [ uri.query, "ref=#{upgrade.commit_sha}" ].compact.join("&")
-      response = Faraday.post(uri.to_s)
-
-      unless response.success?
-        Rails.logger.error I18n.t("upgrader.deployer.render.deploy_log_error", type: upgrade.type, commit_sha: upgrade.commit_sha, error_message: response.body)
-        return default_error_response
-      end
-
-      {
-        success: true,
-        message: I18n.t("upgrader.deployer.render.success_message", commit_sha: upgrade.commit_sha.slice(0, 7))
-      }
-    rescue => e
-      Rails.logger.error I18n.t("upgrader.deployer.render.deploy_log_error", type: upgrade.type, commit_sha: upgrade.commit_sha, error_message: e.message)
-      default_error_response
-    end
-  end
-
-  private
-    def default_error_response
-      {
-        success: false,
-        message: I18n.t("upgrader.deployer.render.error_message_failed_deploy"),
-        troubleshooting_url: I18n.t("upgrader.deployer.render.troubleshooting_url")
-      }
-    end
-end
diff --git a/app/models/upgrader/provided.rb b/app/models/upgrader/provided.rb
deleted file mode 100644
index 4b518e51..00000000
--- a/app/models/upgrader/provided.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Upgrader::Provided
-  extend ActiveSupport::Concern
-  include Providable
-
-  class_methods do
-    private
-      def fetch_latest_upgrade_candidates_from_provider
-        git_repository_provider.fetch_latest_upgrade_candidates
-      end
-  end
-end
diff --git a/app/models/upgrader/upgrade.rb b/app/models/upgrader/upgrade.rb
deleted file mode 100644
index 6a842947..00000000
--- a/app/models/upgrader/upgrade.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-class Upgrader::Upgrade
-  attr_reader :type, :commit_sha, :version, :url
-
-  def initialize(type, data)
-    @type = %w[release commit].include?(type) ? type : raise(ArgumentError, "Type must be either 'release' or 'commit'")
-    @commit_sha = data[:commit_sha]
-    @version = normalize_version(data[:version])
-    @url = data[:url]
-  end
-
-  def complete?
-    commit_sha == Maybe.commit_sha
-  end
-
-  def available?
-    return false if commit_sha == Maybe.commit_sha || version < Maybe.version
-    return false if version == Maybe.version && type == "release"
-    true
-  end
-
-  def to_s
-    type == "release" ? version.to_release_tag : "#{commit_sha.first(7)} (pre-release)"
-  end
-
-  private
-    def normalize_version(version)
-      version.is_a?(Semver) ? version : Semver.new(version)
-    end
-end
diff --git a/app/models/user.rb b/app/models/user.rb
index fe2a72c9..501e95b8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2,19 +2,29 @@ class User < ApplicationRecord
   has_secure_password
 
   belongs_to :family
+  belongs_to :last_viewed_chat, class_name: "Chat", optional: true
   has_many :sessions, dependent: :destroy
-  accepts_nested_attributes_for :family
+  has_many :chats, dependent: :destroy
+  has_many :api_keys, dependent: :destroy
+  has_many :mobile_devices, dependent: :destroy
+  has_many :invitations, foreign_key: :inviter_id, dependent: :destroy
+  has_many :impersonator_support_sessions, class_name: "ImpersonationSession", foreign_key: :impersonator_id, dependent: :destroy
+  has_many :impersonated_support_sessions, class_name: "ImpersonationSession", foreign_key: :impersonated_id, dependent: :destroy
+  accepts_nested_attributes_for :family, update_only: true
 
-  validates :email, presence: true, uniqueness: true
+  validates :email, presence: true, uniqueness: true, format: { with: URI::MailTo::EMAIL_REGEXP }
   validate :ensure_valid_profile_image
+  validates :default_period, inclusion: { in: Period::PERIODS.keys }
   normalizes :email, with: ->(email) { email.strip.downcase }
+  normalizes :unconfirmed_email, with: ->(email) { email&.strip&.downcase }
 
   normalizes :first_name, :last_name, with: ->(value) { value.strip.presence }
 
-  enum :role, { member: "member", admin: "admin" }, validate: true
+  enum :role, { member: "member", admin: "admin", super_admin: "super_admin" }, validate: true
 
   has_one_attached :profile_image do |attachable|
-    attachable.variant :thumbnail, resize_to_fill: [ 300, 300 ]
+    attachable.variant :thumbnail, resize_to_fill: [ 300, 300 ], convert: :webp, saver: { quality: 80 }
+    attachable.variant :small, resize_to_fill: [ 72, 72 ], convert: :webp, saver: { quality: 80 }, preprocessed: true
   end
 
   validate :profile_image_size
@@ -23,6 +33,39 @@ class User < ApplicationRecord
     password_salt&.last(10)
   end
 
+  generates_token_for :email_confirmation, expires_in: 1.day do
+    unconfirmed_email
+  end
+
+  def pending_email_change?
+    unconfirmed_email.present?
+  end
+
+  def initiate_email_change(new_email)
+    return false if new_email == email
+    return false if new_email == unconfirmed_email
+
+    if Rails.application.config.app_mode.self_hosted? && !Setting.require_email_confirmation
+      update(email: new_email)
+    else
+      if update(unconfirmed_email: new_email)
+        EmailConfirmationMailer.with(user: self).confirmation_email.deliver_later
+        true
+      else
+        false
+      end
+    end
+  end
+
+  def request_impersonation_for(user_id)
+    impersonated = User.find(user_id)
+    impersonator_support_sessions.create!(impersonated: impersonated)
+  end
+
+  def admin?
+    super_admin? || role == "admin"
+  end
+
   def display_name
     [ first_name, last_name ].compact.join(" ").presence || email
   end
@@ -31,20 +74,24 @@ class User < ApplicationRecord
     (display_name&.first || email.first).upcase
   end
 
-  def acknowledge_upgrade_prompt(commit_sha)
-    update!(last_prompted_upgrade_commit_sha: commit_sha)
+  def initials
+    if first_name.present? && last_name.present?
+      "#{first_name.first}#{last_name.first}".upcase
+    else
+      initial
+    end
   end
 
-  def acknowledge_upgrade_alert(commit_sha)
-    update!(last_alerted_upgrade_commit_sha: commit_sha)
+  def show_ai_sidebar?
+    show_ai_sidebar
   end
 
-  def has_seen_upgrade_prompt?(upgrade)
-    last_prompted_upgrade_commit_sha == upgrade.commit_sha
+  def ai_available?
+    !Rails.application.config.app_mode.self_hosted? || ENV["OPENAI_ACCESS_TOKEN"].present?
   end
 
-  def has_seen_upgrade_alert?(upgrade)
-    last_alerted_upgrade_commit_sha == upgrade.commit_sha
+  def ai_enabled?
+    ai_enabled && ai_available?
   end
 
   # Deactivation
@@ -73,6 +120,49 @@ class User < ApplicationRecord
     end
   end
 
+  # MFA
+  def setup_mfa!
+    update!(
+      otp_secret: ROTP::Base32.random(32),
+      otp_required: false,
+      otp_backup_codes: []
+    )
+  end
+
+  def enable_mfa!
+    update!(
+      otp_required: true,
+      otp_backup_codes: generate_backup_codes
+    )
+  end
+
+  def disable_mfa!
+    update!(
+      otp_secret: nil,
+      otp_required: false,
+      otp_backup_codes: []
+    )
+  end
+
+  def verify_otp?(code)
+    return false if otp_secret.blank?
+    return true if verify_backup_code?(code)
+    totp.verify(code, drift_behind: 15)
+  end
+
+  def provisioning_uri
+    return nil unless otp_secret.present?
+    totp.provisioning_uri(email)
+  end
+
+  def onboarded?
+    onboarded_at.present?
+  end
+
+  def needs_onboarding?
+    !onboarded?
+  end
+
   private
     def ensure_valid_profile_image
       return unless profile_image.attached?
@@ -92,8 +182,30 @@ class User < ApplicationRecord
     end
 
     def profile_image_size
-      if profile_image.attached? && profile_image.byte_size > 5.megabytes
-        errors.add(:profile_image, :invalid_file_size, max_megabytes: 5)
+      if profile_image.attached? && profile_image.byte_size > 10.megabytes
+        errors.add(:profile_image, :invalid_file_size, max_megabytes: 10)
       end
     end
+
+    def totp
+      ROTP::TOTP.new(otp_secret, issuer: "Maybe Finance")
+    end
+
+    def verify_backup_code?(code)
+      return false if otp_backup_codes.blank?
+
+      # Find and remove the used backup code
+      if (index = otp_backup_codes.index(code))
+        remaining_codes = otp_backup_codes.dup
+        remaining_codes.delete_at(index)
+        update_column(:otp_backup_codes, remaining_codes)
+        true
+      else
+        false
+      end
+    end
+
+    def generate_backup_codes
+      8.times.map { SecureRandom.hex(4) }
+    end
 end
diff --git a/app/models/user_message.rb b/app/models/user_message.rb
new file mode 100644
index 00000000..5a123120
--- /dev/null
+++ b/app/models/user_message.rb
@@ -0,0 +1,17 @@
+class UserMessage < Message
+  validates :ai_model, presence: true
+
+  after_create_commit :request_response_later
+
+  def role
+    "user"
+  end
+
+  def request_response_later
+    chat.ask_assistant_later(self)
+  end
+
+  def request_response
+    chat.ask_assistant(self)
+  end
+end
diff --git a/app/models/valuation.rb b/app/models/valuation.rb
new file mode 100644
index 00000000..f80226be
--- /dev/null
+++ b/app/models/valuation.rb
@@ -0,0 +1,23 @@
+class Valuation < ApplicationRecord
+  include Entryable
+
+  enum :kind, {
+    reconciliation: "reconciliation",
+    opening_anchor: "opening_anchor",
+    current_anchor: "current_anchor"
+  }, validate: true, default: "reconciliation"
+
+  class << self
+    def build_reconciliation_name(accountable_type)
+      Valuation::Name.new("reconciliation", accountable_type).to_s
+    end
+
+    def build_opening_anchor_name(accountable_type)
+      Valuation::Name.new("opening_anchor", accountable_type).to_s
+    end
+
+    def build_current_anchor_name(accountable_type)
+      Valuation::Name.new("current_anchor", accountable_type).to_s
+    end
+  end
+end
diff --git a/app/models/valuation/name.rb b/app/models/valuation/name.rb
new file mode 100644
index 00000000..79398cde
--- /dev/null
+++ b/app/models/valuation/name.rb
@@ -0,0 +1,57 @@
+class Valuation::Name
+  def initialize(valuation_kind, accountable_type)
+    @valuation_kind = valuation_kind
+    @accountable_type = accountable_type
+  end
+
+  def to_s
+    case valuation_kind
+    when "opening_anchor"
+      opening_anchor_name
+    when "current_anchor"
+      current_anchor_name
+    else
+      recon_name
+    end
+  end
+
+  private
+    attr_reader :valuation_kind, :accountable_type
+
+    def opening_anchor_name
+      case accountable_type
+      when "Property", "Vehicle"
+        "Original purchase price"
+      when "Loan"
+        "Original principal"
+      when "Investment", "Crypto", "OtherAsset"
+        "Opening account value"
+      else
+        "Opening balance"
+      end
+    end
+
+    def current_anchor_name
+      case accountable_type
+      when "Property", "Vehicle"
+        "Current market value"
+      when "Loan"
+        "Current loan balance"
+      when "Investment", "Crypto", "OtherAsset"
+        "Current account value"
+      else
+        "Current balance"
+      end
+    end
+
+    def recon_name
+      case accountable_type
+      when "Property", "Investment", "Vehicle", "Crypto", "OtherAsset"
+        "Manual value update"
+      when "Loan"
+        "Manual principal update"
+      else
+        "Manual balance update"
+      end
+    end
+end
diff --git a/app/models/value_group.rb b/app/models/value_group.rb
deleted file mode 100644
index 275884b9..00000000
--- a/app/models/value_group.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-  class ValueGroup
-    attr_accessor :parent, :original
-    attr_reader :name, :children, :value, :currency
-
-    def initialize(name, currency = Money.default_currency)
-      @name = name
-      @currency = Money::Currency.new(currency)
-      @children = []
-    end
-
-    def sum
-      return value if is_value_node?
-      return Money.new(0, currency) if children.empty? && value.nil?
-      children.sum(&:sum)
-    end
-
-    def avg
-      return value if is_value_node?
-      return Money.new(0, currency) if children.empty? && value.nil?
-      leaf_values = value_nodes.map(&:value)
-      leaf_values.compact.sum / leaf_values.compact.size
-    end
-
-    def series
-      return @series if is_value_node?
-
-      summed_by_date = children.each_with_object(Hash.new(0)) do |child, acc|
-        child.series.values.each do |series_value|
-          acc[series_value.date] += series_value.value
-        end
-      end
-
-      first_child = children.first
-
-      summed_series = summed_by_date.map { |date, value| { date: date, value: value } }
-
-      TimeSeries.new(summed_series, favorable_direction: first_child&.series&.favorable_direction || "up")
-    end
-
-    def series=(series)
-      raise "Cannot set series on a non-leaf node" unless is_value_node?
-
-      _series = series || TimeSeries.new([])
-
-      raise "Series must be an instance of TimeSeries" unless _series.is_a?(TimeSeries)
-      raise "Series must contain money values in the node's currency" unless _series.values.all? { |v| v.value.currency == currency }
-      @series = _series
-    end
-
-    def value_nodes
-      return [ self ] unless value.nil?
-      children.flat_map { |child| child.value_nodes }
-    end
-
-    def empty?
-      value_nodes.empty?
-    end
-
-    def percent_of_total
-      return 100 if parent.nil? || parent.sum.zero?
-
-      ((sum / parent.sum) * 100).round(1)
-    end
-
-    def add_child_group(name, currency = Money.default_currency)
-      raise "Cannot add subgroup to node with a value" if is_value_node?
-      child = self.class.new(name, currency)
-      child.parent = self
-      @children << child
-      child
-    end
-
-    def add_value_node(original, value, series = nil)
-      raise "Cannot add value node to a non-leaf node" unless can_add_value_node?
-      child = self.class.new(original.name)
-      child.original = original
-      child.value = value
-      child.series = series
-      child.parent = self
-      @children << child
-      child
-    end
-
-    def value=(value)
-      raise "Cannot set value on a non-leaf node" unless is_leaf_node?
-      raise "Value must be an instance of Money" unless value.is_a?(Money)
-      @value = value
-      @currency = value.currency
-    end
-
-    def is_leaf_node?
-      children.empty?
-    end
-
-    def is_value_node?
-      value.present?
-    end
-
-    private
-      def can_add_value_node?
-        return false if is_value_node?
-        children.empty? || children.all?(&:is_value_node?)
-      end
-  end
diff --git a/app/models/vehicle.rb b/app/models/vehicle.rb
index 2ab34d7b..255e11d6 100644
--- a/app/models/vehicle.rb
+++ b/app/models/vehicle.rb
@@ -12,11 +12,25 @@ class Vehicle < ApplicationRecord
   end
 
   def trend
-    TimeSeries::Trend.new(current: account.balance_money, previous: first_valuation_amount)
+    Trend.new(current: account.balance_money, previous: first_valuation_amount)
+  end
+
+  class << self
+    def color
+      "#F23E94"
+    end
+
+    def icon
+      "car-front"
+    end
+
+    def classification
+      "asset"
+    end
   end
 
   private
     def first_valuation_amount
-      account.entries.account_valuations.order(:date).first&.amount_money || account.balance_money
+      account.entries.valuations.order(:date).first&.amount_money || account.balance_money
     end
 end
diff --git a/app/services/api_rate_limiter.rb b/app/services/api_rate_limiter.rb
new file mode 100644
index 00000000..9ceb9e79
--- /dev/null
+++ b/app/services/api_rate_limiter.rb
@@ -0,0 +1,85 @@
+class ApiRateLimiter
+  # Rate limit tiers (requests per hour)
+  RATE_LIMITS = {
+    standard: 100,
+    premium: 1000,
+    enterprise: 10000
+  }.freeze
+
+  DEFAULT_TIER = :standard
+
+  def initialize(api_key)
+    @api_key = api_key
+    @redis = Redis.new
+  end
+
+  # Check if the API key has exceeded its rate limit
+  def rate_limit_exceeded?
+    current_count >= rate_limit
+  end
+
+  # Increment the request count for this API key
+  def increment_request_count!
+    key = redis_key
+    current_time = Time.current.to_i
+    window_start = (current_time / 3600) * 3600 # Hourly window
+
+    @redis.multi do |transaction|
+      # Use a sliding window with hourly buckets
+      transaction.hincrby(key, window_start.to_s, 1)
+      transaction.expire(key, 7200) # Keep data for 2 hours to handle sliding window
+    end
+  end
+
+  # Get current request count within the current hour
+  def current_count
+    key = redis_key
+    current_time = Time.current.to_i
+    window_start = (current_time / 3600) * 3600
+
+    count = @redis.hget(key, window_start.to_s)
+    count.to_i
+  end
+
+  # Get the rate limit for this API key's tier
+  def rate_limit
+    tier = determine_tier
+    RATE_LIMITS[tier]
+  end
+
+  # Calculate seconds until the rate limit resets
+  def reset_time
+    current_time = Time.current.to_i
+    next_window = ((current_time / 3600) + 1) * 3600
+    next_window - current_time
+  end
+
+  # Get detailed usage information
+  def usage_info
+    {
+      current_count: current_count,
+      rate_limit: rate_limit,
+      remaining: [ rate_limit - current_count, 0 ].max,
+      reset_time: reset_time,
+      tier: determine_tier
+    }
+  end
+
+  # Class method to get usage for an API key without incrementing
+  def self.usage_for(api_key)
+    new(api_key).usage_info
+  end
+
+  private
+
+    def redis_key
+      "api_rate_limit:#{@api_key.id}"
+    end
+
+    def determine_tier
+      # For now, all API keys are standard tier
+      # This can be extended later to support different tiers based on user subscription
+      # or API key configuration
+      DEFAULT_TIER
+    end
+end
diff --git a/app/views/account/cashes/_cash.html.erb b/app/views/account/cashes/_cash.html.erb
deleted file mode 100644
index e5e2065d..00000000
--- a/app/views/account/cashes/_cash.html.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<%# locals: (holding:) %>
-
-<%= turbo_frame_tag dom_id(holding) do %>
-  <div class="grid grid-cols-12 items-center text-gray-900 text-sm font-medium p-4">
-    <div class="col-span-9 flex items-center gap-4">
-      <%= render "shared/circle_logo", name: holding.name %>
-      <div>
-        <%= tag.p holding.name %>
-        <%= tag.p holding.ticker, class: "text-gray-500 text-xs uppercase" %>
-      </div>
-    </div>
-
-    <div class="col-span-3 text-right">
-      <% if holding.amount_money %>
-        <%= tag.p format_money holding.amount_money %>
-      <% else %>
-        <%= tag.p "?", class: "text-gray-500" %>
-      <% end %>
-    </div>
-  </div>
-<% end %>
diff --git a/app/views/account/cashes/index.html.erb b/app/views/account/cashes/index.html.erb
deleted file mode 100644
index 1d0b8c82..00000000
--- a/app/views/account/cashes/index.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<%= turbo_frame_tag dom_id(@account, "cash") do %>
-  <div class="bg-white space-y-4 p-5 border border-alpha-black-25 rounded-xl shadow-xs">
-    <div class="flex items-center justify-between">
-      <%= tag.h2 t(".cash"), class: "font-medium text-lg" %>
-    </div>
-
-    <div class="rounded-xl bg-gray-25 p-1">
-      <div class="grid grid-cols-12 items-center uppercase text-xs font-medium text-gray-500 px-4 py-2">
-        <%= tag.p t(".name"), class: "col-span-9" %>
-        <%= tag.p t(".value"), class: "col-span-3 justify-self-end" %>
-      </div>
-
-      <div class="rounded-lg bg-white border-alpha-black-25 shadow-xs">
-        <%= render partial: "account/cashes/cash", collection: [brokerage_cash(@account)], as: :holding %>
-      </div>
-    </div>
-  </div>
-<% end %>
diff --git a/app/views/account/entries/_empty.html.erb b/app/views/account/entries/_empty.html.erb
deleted file mode 100644
index 9cb5e3fa..00000000
--- a/app/views/account/entries/_empty.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="flex flex-col items-center justify-center py-40">
-  <p class="text-gray-500 mb-2"><%= t(".title") %></p>
-  <p class="text-gray-400 max-w-xs text-center"><%= t(".description") %></p>
-</div>
diff --git a/app/views/account/entries/_entry.html.erb b/app/views/account/entries/_entry.html.erb
deleted file mode 100644
index ab081dff..00000000
--- a/app/views/account/entries/_entry.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<%# locals: (entry:, **opts) %>
-
-<%= turbo_frame_tag dom_id(entry) do %>
-  <%= render partial: entry.entryable.to_partial_path, locals: { entry: entry, **opts } %>
-<% end %>
diff --git a/app/views/account/entries/_entry_group.html.erb b/app/views/account/entries/_entry_group.html.erb
deleted file mode 100644
index 11489c2a..00000000
--- a/app/views/account/entries/_entry_group.html.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<%# locals: (date:, entries:, content:, selectable:) %>
-<div id="entry-group-<%= date %>" class="bg-gray-25 rounded-xl p-1 w-full" data-bulk-select-target="group">
-  <div class="py-2 px-4 flex items-center justify-between font-medium text-xs text-gray-500">
-    <div class="flex pl-0.5 items-center gap-4">
-      <% if selectable %>
-        <%= check_box_tag "#{date}_entries_selection",
-                          class: ["maybe-checkbox maybe-checkbox--light", "hidden": entries.size == 0],
-                          id: "selection_entry_#{date}",
-                          data: { action: "bulk-select#toggleGroupSelection" } %>
-      <% end %>
-
-      <p class="uppercase space-x-1.5">
-        <%= tag.span I18n.l(date, format: :long) %>
-        <span>·</span>
-        <%= tag.span entries.size %>
-      </p>
-    </div>
-
-    <%= totals_by_currency(collection: entries, money_method: :amount_money, negate: true) %>
-  </div>
-  <div class="bg-white shadow-xs rounded-md border border-alpha-black-25 divide-y divide-alpha-black-50">
-    <%= content %>
-  </div>
-</div>
diff --git a/app/views/account/entries/_loading.html.erb b/app/views/account/entries/_loading.html.erb
deleted file mode 100644
index 4f49ca61..00000000
--- a/app/views/account/entries/_loading.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="bg-white space-y-4 p-5 border border-alpha-black-25 rounded-xl shadow-xs">
-  <div class="p-5 flex justify-center items-center">
-    <%= tag.p t(".loading"), class: "text-gray-500 animate-pulse text-sm" %>
-  </div>
-</div>
diff --git a/app/views/account/entries/_ruler.html.erb b/app/views/account/entries/_ruler.html.erb
deleted file mode 100644
index 31c6ee6c..00000000
--- a/app/views/account/entries/_ruler.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<div class="h-px bg-alpha-black-50 ml-16 mr-4"></div>
diff --git a/app/views/account/holdings/_ruler.html.erb b/app/views/account/holdings/_ruler.html.erb
deleted file mode 100644
index 31c6ee6c..00000000
--- a/app/views/account/holdings/_ruler.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<div class="h-px bg-alpha-black-50 ml-16 mr-4"></div>
diff --git a/app/views/account/holdings/index.html.erb b/app/views/account/holdings/index.html.erb
deleted file mode 100644
index 993e6b15..00000000
--- a/app/views/account/holdings/index.html.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-<%= turbo_frame_tag dom_id(@account, "holdings") do %>
-  <div class="bg-white space-y-4 p-5 border border-alpha-black-25 rounded-xl shadow-xs">
-    <div class="flex items-center justify-between">
-      <%= tag.h2 t(".holdings"), class: "font-medium text-lg" %>
-      <%= link_to new_account_trade_path(@account),
-                  id: dom_id(@account, "new_trade"),
-                  data: { turbo_frame: :modal },
-                  class: "flex gap-1 font-medium items-center bg-gray-50 text-gray-900 p-2 rounded-lg" do %>
-        <%= lucide_icon("plus", class: "w-5 h-5 text-gray-900") %>
-        <%= tag.span t(".new_holding"), class: "text-sm" %>
-      <% end %>
-    </div>
-
-    <div class="rounded-xl bg-gray-25 p-1">
-      <div class="grid grid-cols-12 items-center uppercase text-xs font-medium text-gray-500 px-4 py-2">
-        <%= tag.p t(".name"), class: "col-span-4" %>
-        <%= tag.p t(".weight"), class: "col-span-2 justify-self-end" %>
-        <%= tag.p t(".cost"), class: "col-span-2 justify-self-end" %>
-        <%= tag.p t(".holdings"), class: "col-span-2 justify-self-end" %>
-        <%= tag.p t(".return"), class: "col-span-2 justify-self-end" %>
-      </div>
-
-      <div class="rounded-lg bg-white border-alpha-black-25 shadow-xs">
-        <% if @holdings.any? %>
-          <%= render partial: "account/holdings/holding", collection: @holdings, spacer_template: "ruler" %>
-        <% elsif @account.needs_sync? || true %>
-          <div class="flex flex-col justify-center items-center pt-4 pb-8">
-            <p class="text-gray-500 p-4"><%= t(".needs_sync") %></p>
-            <%= button_to "Sync holding prices", sync_account_path(@account), class: "bg-gray-900 text-white text-sm rounded-lg px-3 py-2" %>
-          </div>
-        <% else %>
-          <p class="text-gray-500 text-sm p-4"><%= t(".no_holdings") %></p>
-        <% end %>
-      </div>
-    </div>
-  </div>
-<% end %>
diff --git a/app/views/account/holdings/show.html.erb b/app/views/account/holdings/show.html.erb
deleted file mode 100644
index 89328378..00000000
--- a/app/views/account/holdings/show.html.erb
+++ /dev/null
@@ -1,112 +0,0 @@
-<%= drawer do %>
-  <div class="space-y-4">
-    <header class="flex justify-between">
-      <div>
-        <%= tag.h3 @holding.name, class: "text-2xl font-medium text-gray-900" %>
-        <%= tag.p @holding.ticker, class: "text-sm text-gray-500" %>
-      </div>
-
-      <%= render "shared/circle_logo", name: @holding.name %>
-    </header>
-
-    <details class="group space-y-2" open>
-      <summary class="flex list-none items-center justify-between rounded-xl px-3 py-2 text-xs font-medium uppercase text-gray-500 bg-gray-25 focus-visible:outline-none">
-        <h4><%= t(".overview") %></h4>
-        <%= lucide_icon "chevron-down", class: "group-open:transform group-open:rotate-180 text-gray-500 w-5" %>
-      </summary>
-
-      <div class="pb-4">
-        <dl class="space-y-3 px-3 py-2">
-          <div class="flex items-center justify-between text-sm">
-            <dt class="text-gray-500"><%= t(".ticker_label") %></dt>
-            <dd class="text-gray-900"><%= @holding.ticker %></dd>
-          </div>
-
-          <div class="flex items-center justify-between text-sm">
-            <dt class="text-gray-500"><%= t(".current_market_price_label") %></dt>
-            <dd class="text-gray-900"><%= @holding.security.current_price ? format_money(@holding.security.current_price) : t(".unknown") %></dd>
-          </div>
-
-          <div class="flex items-center justify-between text-sm">
-            <dt class="text-gray-500"><%= t(".portfolio_weight_label") %></dt>
-            <dd class="text-gray-900"><%= @holding.weight ? number_to_percentage(@holding.weight, precision: 2) : t(".unknown") %></dd>
-          </div>
-
-          <div class="flex items-center justify-between text-sm">
-            <dt class="text-gray-500"><%= t(".avg_cost_label") %></dt>
-            <dd class="text-gray-900"><%= @holding.avg_cost ? format_money(@holding.avg_cost) : t(".unknown") %></dd>
-          </div>
-
-          <div class="flex items-center justify-between text-sm">
-            <dt class="text-gray-500"><%= t(".trend_label") %></dt>
-            <dd style="color: <%= @holding.trend&.color %>;">
-              <%= @holding.trend ? render("shared/trend_change", trend: @holding.trend) : t(".unknown") %>
-            </dd>
-          </div>
-        </dl>
-      </div>
-    </details>
-
-    <details class="group space-y-2" open>
-      <summary class="flex list-none items-center justify-between rounded-xl px-3 py-2 text-xs font-medium uppercase text-gray-500 bg-gray-25 focus-visible:outline-none">
-        <h4><%= t(".history") %></h4>
-        <%= lucide_icon "chevron-down", class: "group-open:transform group-open:rotate-180 text-gray-500 w-5" %>
-      </summary>
-
-      <div class="space-y-2">
-        <div class="px-3 py-4">
-          <% if @holding.trades.any? %>
-            <ul class="space-y-2">
-              <% @holding.trades.each_with_index do |trade_entry, index| %>
-                <li class="flex gap-4 text-sm space-y-1">
-                  <div class="flex flex-col items-center gap-1.5 pt-2">
-                    <div class="rounded-full h-1.5 w-1.5 bg-gray-300"></div>
-                    <% unless index == @holding.trades.length - 1 %>
-                      <div class="h-12 w-px bg-alpha-black-200"></div>
-                    <% end %>
-                  </div>
-
-                  <div>
-                    <p class="text-gray-500 text-xs uppercase"><%= l(trade_entry.date, format: :long) %></p>
-
-                    <p><%= t(
-                      ".trade_history_entry",
-                      qty: trade_entry.account_trade.qty,
-                      security: trade_entry.account_trade.security.ticker,
-                      price: format_money(trade_entry.account_trade.price)
-                    ) %></p>
-                  </div>
-                </li>
-              <% end %>
-            </ul>
-
-          <% else %>
-            <p class="text-gray-500">No trade history available for this holding.</p>
-          <% end %>
-        </div>
-      </div>
-    </details>
-
-    <details class="group space-y-2" open>
-      <summary class="flex list-none items-center justify-between rounded-xl px-3 py-2 text-xs font-medium uppercase text-gray-500 bg-gray-25 focus-visible:outline-none">
-        <h4><%= t(".settings") %></h4>
-        <%= lucide_icon "chevron-down", class: "group-open:transform group-open:rotate-180 text-gray-500 w-5" %>
-      </summary>
-
-      <div class="pb-4">
-        <div class="flex items-center justify-between gap-2 p-3">
-          <div class="text-sm space-y-1">
-            <h4 class="text-gray-900"><%= t(".delete_title") %></h4>
-            <p class="text-gray-500"><%= t(".delete_subtitle") %></p>
-          </div>
-
-          <%= button_to t(".delete"),
-                account_holding_path(@holding.account, @holding),
-                method: :delete,
-                class: "rounded-lg px-3 py-2 text-red-500 text-sm font-medium border border-alpha-black-200",
-                data: { turbo_confirm: true, turbo_frame: "_top" } %>
-        </div>
-      </div>
-    </details>
-  </div>
-<% end %>
diff --git a/app/views/account/logos/show.svg.erb b/app/views/account/logos/show.svg.erb
deleted file mode 100644
index 19186e26..00000000
--- a/app/views/account/logos/show.svg.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<svg
-  version="1.1"
-  xmlns="http://www.w3.org/2000/svg"
-  xmlns:xlink="http://www.w3.org/1999/xlink"
-  viewBox="0 0 32 32"
-  aria-hidden="true">
-  <g>
-    <rect width="100%" height="100%" rx="50%" fill="<%= accountable_color(@account.accountable_type) %>" opacity="0.1" />
-    <text
-      x="50%"
-      y="50%"
-      fill="<%= accountable_color(@account.accountable_type) %>"
-      text-anchor="middle"
-      dy="0.35em"
-      font-family="ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji"
-      font-size="16"
-      font-weight="400">
-      <%= @account.name[0].upcase %>
-    </text>
-  </g>
-</svg>
diff --git a/app/views/account/trades/_form.html.erb b/app/views/account/trades/_form.html.erb
deleted file mode 100644
index e39c7b15..00000000
--- a/app/views/account/trades/_form.html.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-<%# locals: (entry:) %>
-
-<%= styled_form_with data: { turbo_frame: "_top", controller: "trade-form" },
-                     scope: :account_entry,
-                     url: account_trades_path(entry.account) do |form| %>
-  <div class="space-y-4">
-    <div class="space-y-2">
-      <%= form.select :type, options_for_select([%w[Buy buy], %w[Sell sell], %w[Deposit transfer_in], %w[Withdrawal transfer_out], %w[Interest interest]], "buy"), { label: t(".type") }, { data: { "trade-form-target": "typeInput" } } %>
-      <div data-trade-form-target="tickerInput">
-        <%= form.text_field :ticker, value: nil, label: t(".holding"), placeholder: t(".ticker_placeholder") %>
-      </div>
-
-      <%= form.date_field :date, label: true %>
-
-      <div data-trade-form-target="amountInput" hidden>
-        <%= form.money_field :amount, label: t(".amount"), disable_currency: true %>
-      </div>
-
-      <div data-trade-form-target="transferAccountInput" hidden>
-        <%= form.collection_select :transfer_account_id, Current.family.accounts.alphabetically, :id, :name, { prompt: t(".account_prompt"), label: t(".account") } %>
-      </div>
-
-      <div data-trade-form-target="qtyInput">
-        <%= form.number_field :qty, label: t(".qty"), placeholder: "10", min: 0.000000000000000001, step: "any" %>
-      </div>
-
-      <div data-trade-form-target="priceInput">
-        <%= form.money_field :price, label: t(".price"), disable_currency: true %>
-      </div>
-    </div>
-
-    <%= form.submit t(".submit") %>
-  </div>
-<% end %>
diff --git a/app/views/account/trades/_selection_bar.html.erb b/app/views/account/trades/_selection_bar.html.erb
deleted file mode 100644
index f4f7208e..00000000
--- a/app/views/account/trades/_selection_bar.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="fixed bottom-6 z-10 flex items-center justify-between rounded-xl bg-gray-900 px-4 text-sm text-white w-[420px] py-1.5">
-  <div class="flex items-center gap-2">
-    <%= check_box_tag "entry_selection", 1, true, class: "maybe-checkbox maybe-checkbox--dark", data: { action: "bulk-select#deselectAll" } %>
-
-    <p data-bulk-select-target="selectionBarText"></p>
-  </div>
-
-  <div class="flex items-center gap-1 text-gray-500">
-    <%= form_with url: bulk_delete_transactions_path, data: { turbo_confirm: true, turbo_frame: "_top" } do %>
-      <button type="button" data-bulk-select-scope-param="bulk_delete" data-action="bulk-select#submitBulkRequest" class="p-1.5 group hover:bg-gray-700 flex items-center justify-center rounded-md" title="Delete">
-        <%= lucide_icon "trash-2", class: "w-5 group-hover:text-white" %>
-      </button>
-    <% end %>
-  </div>
-</div>
diff --git a/app/views/account/trades/_trade.html.erb b/app/views/account/trades/_trade.html.erb
deleted file mode 100644
index 273ec184..00000000
--- a/app/views/account/trades/_trade.html.erb
+++ /dev/null
@@ -1,50 +0,0 @@
-<%# locals: (entry:, selectable: true, **opts) %>
-
-<% trade, account = entry.account_trade, entry.account %>
-
-<div class="grid grid-cols-12 items-center text-gray-900 text-sm font-medium p-4">
-  <div class="pr-10 flex items-center gap-4 col-span-6">
-    <% if selectable %>
-      <%= check_box_tag dom_id(entry, "selection"),
-                        class: "maybe-checkbox maybe-checkbox--light",
-                        data: { id: entry.id, "bulk-select-target": "row", action: "bulk-select#toggleRowSelection" } %>
-    <% end %>
-
-    <div class="max-w-full">
-      <%= tag.div class: ["flex items-center gap-2"] do %>
-        <div class="flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-gray-600/5 text-gray-600">
-          <%= entry_name(entry).first.upcase %>
-        </div>
-
-        <div class="truncate text-gray-900">
-          <% if entry.new_record? %>
-            <%= content_tag :p, entry_name(entry) %>
-          <% else %>
-            <%= link_to entry_name(entry),
-                        account_entry_path(account, entry),
-                        data: { turbo_frame: "drawer", turbo_prefetch: false },
-                        class: "hover:underline hover:text-gray-800" %>
-          <% end %>
-        </div>
-      <% end %>
-    </div>
-  </div>
-
-  <div class="flex items-center justify-end gap-1 col-span-3">
-    <% if entry.account_transaction? && entry.marked_as_transfer? %>
-      <%= tag.p entry.inflow? ? t(".deposit") : t(".withdrawal") %>
-    <% elsif entry.account_transaction? %>
-      <%= tag.p entry.inflow? ? t(".inflow") : t(".outflow") %>
-    <% else %>
-      <%= tag.p trade.buy? ? t(".buy") : t(".sell") %>
-    <% end %>
-  </div>
-
-  <div class="col-span-3 flex items-center justify-end">
-    <% if entry.account_transaction? %>
-      <%= tag.p format_money(entry.amount_money * -1), class: { "text-green-500": entry.inflow? } %>
-    <% else %>
-      <%= tag.p format_money(entry.amount_money * -1), class: { "text-green-500": trade.sell? } %>
-    <% end %>
-  </div>
-</div>
diff --git a/app/views/account/trades/index.html.erb b/app/views/account/trades/index.html.erb
deleted file mode 100644
index 3ff7cd0d..00000000
--- a/app/views/account/trades/index.html.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-<%= turbo_frame_tag dom_id(@account, "trades") do %>
-  <div id="trades" data-controller="bulk-select" data-bulk-select-resource-value="<%= t(".trade") %>" class="bg-white space-y-4 p-5 border border-alpha-black-25 rounded-xl shadow-xs">
-    <div class="flex justify-between items-center">
-      <h3 class="font-medium text-lg"><%= t(".trades") %></h3>
-      <%= link_to new_account_trade_path(@account),
-                  id:    dom_id(@account, "new_trade"),
-                  class: "flex gap-1 font-medium items-center bg-gray-50 text-gray-900 p-2 rounded-lg",
-                  data:  { turbo_frame: :modal } do %>
-        <%= lucide_icon("plus", class: "w-5 h-5 text-gray-900") %>
-        <span class="text-sm"><%= t(".new") %></span>
-      <% end %>
-    </div>
-
-    <div class="bg-gray-25 rounded-xl grid grid-cols-12 items-center uppercase text-xs font-medium text-gray-500 px-5 py-3">
-      <div class="pl-0.5 col-span-6 flex items-center gap-4">
-        <%= check_box_tag "selection_entry",
-                          class: "maybe-checkbox maybe-checkbox--light",
-                          data:  { action: "bulk-select#togglePageSelection" } %>
-        <%= tag.p t(".trade") %>
-      </div>
-
-      <%= tag.p t(".type"), class: "col-span-3 justify-self-end" %>
-      <%= tag.p t(".amount"), class: "col-span-3 justify-self-end" %>
-    </div>
-
-    <div>
-      <div hidden id="transaction-selection-bar" data-bulk-select-target="selectionBar">
-        <%= render "selection_bar" %>
-      </div>
-
-      <% if @entries.empty? %>
-        <p class="text-gray-500 py-4"><%= t(".no_trades") %></p>
-      <% else %>
-        <div class="space-y-6">
-          <%= entries_by_date(@entries) do |entries| %>
-            <%= render partial: "account/trades/trade", collection: entries, as: :entry %>
-          <% end %>
-        </div>
-      <% end %>
-    </div>
-  </div>
-<% end %>
diff --git a/app/views/account/trades/new.html.erb b/app/views/account/trades/new.html.erb
deleted file mode 100644
index 795e49d0..00000000
--- a/app/views/account/trades/new.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= modal_form_wrapper title: t(".title") do %>
-  <%= render "account/trades/form", entry: @entry %>
-<% end %>
diff --git a/app/views/account/trades/show.html.erb b/app/views/account/trades/show.html.erb
deleted file mode 100644
index 7293f731..00000000
--- a/app/views/account/trades/show.html.erb
+++ /dev/null
@@ -1,146 +0,0 @@
-<% entry, trade, account = @entry, @entry.account_trade, @entry.account %>
-
-<%= drawer do %>
-  <header class="mb-4 space-y-1">
-    <div class="flex items-center gap-4">
-      <h3 class="font-medium">
-        <span class="text-2xl">
-          <%= format_money -entry.amount_money %>
-        </span>
-
-        <span class="text-lg text-gray-500">
-          <%= entry.currency %>
-        </span>
-      </h3>
-    </div>
-
-    <span class="text-sm text-gray-500">
-      <%= I18n.l(entry.date, format: :long) %>
-    </span>
-  </header>
-
-  <div class="space-y-2">
-    <!-- Overview Section -->
-    <%= disclosure t(".overview") do %>
-      <div class="pb-4">
-        <dl class="space-y-3 px-3 py-2">
-          <div class="flex items-center justify-between text-sm">
-            <dt class="text-gray-500"><%= t(".symbol_label") %></dt>
-            <dd class="text-gray-900"><%= trade.security.ticker %></dd>
-          </div>
-
-          <% if trade.buy? %>
-            <div class="flex items-center justify-between text-sm">
-              <dt class="text-gray-500"><%= t(".purchase_qty_label") %></dt>
-              <dd class="text-gray-900"><%= trade.qty.abs %></dd>
-            </div>
-
-            <div class="flex items-center justify-between text-sm">
-              <dt class="text-gray-500"><%= t(".purchase_price_label") %></dt>
-              <dd class="text-gray-900"><%= format_money trade.price_money %></dd>
-            </div>
-          <% end %>
-
-          <div class="flex items-center justify-between text-sm">
-            <dt class="text-gray-500"><%= t(".current_market_price_label") %></dt>
-            <dd class="text-gray-900"><%= format_money trade.security.current_price %></dd>
-          </div>
-
-          <% if trade.buy? %>
-            <div class="flex items-center justify-between text-sm">
-              <dt class="text-gray-500"><%= t(".total_return_label") %></dt>
-              <dd style="color: <%= trade.unrealized_gain_loss.color %>;">
-                <%= render "shared/trend_change", trend: trade.unrealized_gain_loss %>
-              </dd>
-            </div>
-          <% end %>
-        </dl>
-      </div>
-    <% end %>
-
-    <!-- Details Section -->
-    <%= disclosure t(".details") do %>
-      <div class="pb-4">
-        <%= styled_form_with model: [account, entry],
-              url: account_trade_path(account, entry),
-              class: "space-y-2",
-              data: { controller: "auto-submit-form" } do |f| %>
-          <%= f.date_field :date,
-                label: t(".date_label"),
-                max: Date.current,
-                "data-auto-submit-form-target": "auto" %>
-
-          <%= f.fields_for :entryable do |ef| %>
-            <%= ef.number_field :qty,
-                  label: t(".quantity_label"),
-                  step: "any",
-                  "data-auto-submit-form-target": "auto" %>
-
-            <%= ef.money_field :price,
-                  label: t(".cost_per_share_label"),
-                  disable_currency: true,
-                  auto_submit: true,
-                  min: 0 %>
-          <% end %>
-        <% end %>
-      </div>
-    <% end %>
-
-    <!-- Additional Section -->
-    <%= disclosure t(".additional") do %>
-      <div class="pb-4">
-        <%= styled_form_with model: [account, entry],
-              url: account_trade_path(account, entry),
-              class: "space-y-2",
-              data: { controller: "auto-submit-form" } do |f| %>
-          <%= f.text_area :notes,
-                label: t(".note_label"),
-                placeholder: t(".note_placeholder"),
-                rows: 5,
-                "data-auto-submit-form-target": "auto" %>
-        <% end %>
-      </div>
-    <% end %>
-
-    <!-- Settings Section -->
-    <%= disclosure t(".settings") do %>
-      <div class="pb-4">
-        <!-- Exclude Trade Form -->
-        <%= styled_form_with model: [account, entry],
-              url: account_trade_path(account, entry),
-              class: "p-3",
-              data: { controller: "auto-submit-form" } do |f| %>
-          <div class="flex cursor-pointer items-center gap-2 justify-between">
-            <div class="text-sm space-y-1">
-              <h4 class="text-gray-900"><%= t(".exclude_title") %></h4>
-              <p class="text-gray-500"><%= t(".exclude_subtitle") %></p>
-            </div>
-
-            <div class="relative inline-block select-none">
-              <%= f.check_box :excluded,
-                      class: "sr-only peer",
-                      "data-auto-submit-form-target": "auto" %>
-              <label for="account_entry_excluded"
-                         class="maybe-switch"></label>
-            </div>
-          </div>
-        <% end %>
-
-        <!-- Delete Trade Form -->
-        <div class="flex items-center justify-between gap-2 p-3">
-          <div class="text-sm space-y-1">
-            <h4 class="text-gray-900"><%= t(".delete_title") %></h4>
-            <p class="text-gray-500"><%= t(".delete_subtitle") %></p>
-          </div>
-
-          <%= button_to t(".delete"),
-                account_entry_path(account, entry),
-                method: :delete,
-                class:  "rounded-lg px-3 py-2 text-red-500 text-sm
-                         font-medium border border-alpha-black-200",
-                data:   { turbo_confirm: true, turbo_frame: "_top" } %>
-        </div>
-      </div>
-    <% end %>
-  </div>
-<% end %>
diff --git a/app/views/account/transactions/_selection_bar.html.erb b/app/views/account/transactions/_selection_bar.html.erb
deleted file mode 100644
index 3f72eaab..00000000
--- a/app/views/account/transactions/_selection_bar.html.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-<div class="fixed bottom-6 z-10 flex items-center justify-between rounded-xl bg-gray-900 px-4 text-sm text-white w-[420px] py-1.5">
-  <div class="flex items-center gap-2">
-    <%= check_box_tag "entry_selection", 1, true, class: "maybe-checkbox maybe-checkbox--dark", data: { action: "bulk-select#deselectAll" } %>
-
-    <p data-bulk-select-target="selectionBarText"></p>
-  </div>
-
-  <div class="flex items-center gap-1 text-gray-500">
-    <%= turbo_frame_tag "bulk_transaction_edit_drawer" %>
-
-    <%= form_with url: mark_transfers_transactions_path,
-                  scope: "bulk_update",
-                  data: {
-                    turbo_frame: "_top",
-                    turbo_confirm: {
-                      title: t(".mark_transfers"),
-                      body: t(".mark_transfers_message"),
-                      accept: t(".mark_transfers_confirm"),
-                    }
-                  } do |f| %>
-      <button id="bulk-transfer-btn"
-              type="button"
-              data-bulk-select-scope-param="bulk_update"
-              data-action="bulk-select#submitBulkRequest"
-              class="p-1.5 group hover:bg-gray-700 flex items-center justify-center rounded-md"
-              title="Mark as transfer">
-        <%= lucide_icon "arrow-right-left", class: "w-5 group-hover:text-white" %>
-      </button>
-    <% end %>
-
-    <%= link_to bulk_edit_transactions_path,
-                class: "p-1.5 group hover:bg-gray-700 flex items-center justify-center rounded-md",
-                title: "Edit",
-                data: { turbo_frame: "bulk_transaction_edit_drawer" } do %>
-      <%= lucide_icon "pencil-line", class: "w-5 group-hover:text-white" %>
-    <% end %>
-
-    <%= form_with url: bulk_delete_transactions_path, data: { turbo_confirm: true, turbo_frame: "_top" } do %>
-      <button type="button" data-bulk-select-scope-param="bulk_delete" data-action="bulk-select#submitBulkRequest" class="p-1.5 group hover:bg-gray-700 flex items-center justify-center rounded-md" title="Delete">
-        <%= lucide_icon "trash-2", class: "w-5 group-hover:text-white" %>
-      </button>
-    <% end %>
-  </div>
-</div>
diff --git a/app/views/account/transactions/_transaction.html.erb b/app/views/account/transactions/_transaction.html.erb
deleted file mode 100644
index 475ab256..00000000
--- a/app/views/account/transactions/_transaction.html.erb
+++ /dev/null
@@ -1,90 +0,0 @@
-<%# locals: (entry:, selectable: true, editable: true, short: false, show_tags: false, **opts) %>
-<% transaction, account = entry.account_transaction, entry.account %>
-
-<div class="grid grid-cols-12 items-center text-gray-900 text-sm font-medium p-4">
-  <% name_col_span = unconfirmed_transfer?(entry) ? "col-span-10" : short ? "col-span-6" : "col-span-4" %>
-  <div class="pr-10 flex items-center gap-4 <%= name_col_span %>">
-    <% if selectable %>
-      <%= check_box_tag dom_id(entry, "selection"),
-                        class: "maybe-checkbox maybe-checkbox--light",
-                        data: { id: entry.id, "bulk-select-target": "row", action: "bulk-select#toggleRowSelection" } %>
-    <% end %>
-
-    <div class="max-w-full">
-      <%= content_tag :div, class: ["flex items-center gap-2"] do %>
-        <div class="flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-gray-600/5 text-gray-600">
-          <%= entry_name(entry).first.upcase %>
-        </div>
-
-        <div class="truncate text-gray-900">
-          <% if entry.new_record? %>
-            <%= content_tag :p, entry.name %>
-          <% else %>
-            <%= link_to entry_name(entry),
-                        account_entry_path(account, entry),
-                        data: { turbo_frame: "drawer", turbo_prefetch: false },
-                        class: "hover:underline hover:text-gray-800" %>
-          <% end %>
-        </div>
-      <% end %>
-    </div>
-
-    <% if unconfirmed_transfer?(entry) %>
-      <% if editable %>
-        <%= form_with url: unmark_transfers_transactions_path, class: "flex items-center", data: {
-          turbo_confirm: {
-            title: t(".remove_transfer"),
-            body: t(".remove_transfer_body"),
-            accept: t(".remove_transfer_confirm"),
-          },
-          turbo_frame: "_top"
-        } do |f| %>
-          <%= f.hidden_field "bulk_update[entry_ids][]", value: entry.id %>
-          <%= f.button class: "flex items-center justify-center group", title: "Remove transfer" do %>
-            <%= lucide_icon "arrow-left-right", class: "group-hover:hidden text-gray-500 w-4 h-4" %>
-            <%= lucide_icon "unlink", class: "hidden group-hover:inline-block text-gray-900 w-4 h-4" %>
-          <% end %>
-        <% end %>
-      <% else %>
-        <%= lucide_icon "arrow-left-right", class: "text-gray-500 w-4 h-4" %>
-      <% end %>
-    <% end %>
-  </div>
-
-  <% unless entry.marked_as_transfer? %>
-    <% unless short %>
-      <div class="flex items-center gap-1 <%= show_tags ? "col-span-6" : "col-span-3" %>">
-        <% if editable %>
-          <%= render "categories/menu", transaction: transaction %>
-        <% else %>
-          <%= render "categories/badge", category: transaction.category %>
-        <% end %>
-
-        <% if show_tags %>
-          <% transaction.tags.each do |tag| %>
-            <%= render partial: "tags/badge", locals: { tag: tag } %>
-          <% end %>
-        <% end %>
-      </div>
-    <% end %>
-
-    <% unless show_tags %>
-      <%= tag.div class: short ? "col-span-4" : "col-span-3" do %>
-        <% if entry.new_record? %>
-          <%= tag.p account.name %>
-        <% else %>
-          <%= link_to account.name,
-                      account_path(account, tab: "transactions"),
-                      data: { turbo_frame: "_top" },
-                      class: "hover:underline" %>
-        <% end %>
-      <% end %>
-    <% end %>
-  <% end %>
-
-  <div class="col-span-2 ml-auto">
-    <%= content_tag :p,
-                    format_money(-entry.amount_money),
-                    class: ["text-green-600": entry.inflow?] %>
-  </div>
-</div>
diff --git a/app/views/account/transactions/index.html.erb b/app/views/account/transactions/index.html.erb
deleted file mode 100644
index b036ceb4..00000000
--- a/app/views/account/transactions/index.html.erb
+++ /dev/null
@@ -1,32 +0,0 @@
-<%= turbo_frame_tag dom_id(@account, "transactions") do %>
-  <div class="bg-white space-y-4 p-5 border border-alpha-black-25 rounded-xl shadow-xs">
-    <div class="flex justify-between items-center">
-      <h3 class="font-medium text-lg"><%= t(".transactions") %></h3>
-      <%= link_to new_transaction_path(account_id: @account),
-                  class: "flex gap-1 font-medium items-center bg-gray-50 text-gray-900 p-2 rounded-lg",
-                  data:  { turbo_frame: :modal } do %>
-        <%= lucide_icon("plus", class: "w-5 h-5 text-gray-900") %>
-        <span class="text-sm"><%= t(".new") %></span>
-      <% end %>
-    </div>
-
-    <div id="transactions" data-controller="bulk-select" data-bulk-select-resource-value="<%= t(".transaction") %>">
-      <div hidden id="transaction-selection-bar" data-bulk-select-target="selectionBar">
-        <%= render "selection_bar" %>
-      </div>
-
-      <% if @entries.empty? %>
-        <p class="text-gray-500 py-4"><%= t(".no_transactions") %></p>
-      <% else %>
-        <div class="space-y-6">
-          <%= entries_by_date(@entries) do |entries| %>
-            <%= render entries %>
-          <% end %>
-        </div>
-        <div class="pt-4">
-          <%= render "pagination", pagy: @pagy %>
-        </div>
-      <% end %>
-    </div>
-  </div>
-<% end %>
diff --git a/app/views/account/transactions/show.html.erb b/app/views/account/transactions/show.html.erb
deleted file mode 100644
index ecf22131..00000000
--- a/app/views/account/transactions/show.html.erb
+++ /dev/null
@@ -1,166 +0,0 @@
-<% entry, transaction, account = @entry, @entry.account_transaction, @entry.account %>
-
-<%= drawer do %>
-  <header class="mb-4 space-y-1">
-    <div class="flex items-center gap-4">
-      <h3 class="font-medium">
-        <span class="text-2xl">
-          <%= format_money -entry.amount_money %>
-        </span>
-
-        <span class="text-lg text-gray-500">
-          <%= entry.currency %>
-        </span>
-      </h3>
-
-      <% if entry.marked_as_transfer? %>
-        <%= lucide_icon "arrow-left-right", class: "text-gray-500 mt-1 w-5 h-5" %>
-      <% end %>
-    </div>
-
-    <span class="text-sm text-gray-500">
-      <%= I18n.l(entry.date, format: :long) %>
-    </span>
-  </header>
-
-  <div class="space-y-2">
-    <!-- Overview Section -->
-    <%= disclosure t(".overview") do %>
-      <div class="pb-4">
-        <%= styled_form_with model: [account, entry],
-              url: account_transaction_path(account, entry),
-              class: "space-y-2",
-              data: { controller: "auto-submit-form" } do |f| %>
-          <%= f.text_field :name,
-                label: t(".name_label"),
-                "data-auto-submit-form-target": "auto" %>
-
-          <%= f.date_field :date,
-                label: t(".date_label"),
-                max: Date.current,
-                "data-auto-submit-form-target": "auto" %>
-
-          <% unless entry.marked_as_transfer? %>
-            <div class="flex items-center gap-2">
-              <%= f.select :nature,
-                    [["Expense", "expense"], ["Income", "income"]],
-                    { container_class: "w-1/3", label: t(".nature"), selected: entry.amount.negative? ? "income" : "expense" },
-                    { data: { "auto-submit-form-target": "auto" } } %>
-
-              <%= f.money_field :amount, label: t(".amount"),
-                    container_class: "w-2/3",
-                    auto_submit: true,
-                    min: 0,
-                    value: entry.amount.abs %>
-            </div>
-          <% end %>
-
-          <%= f.select :account,
-                options_for_select(
-                  Current.family.accounts.alphabetically.pluck(:name, :id),
-                  entry.account_id
-                ),
-                { label: t(".account_label") },
-                { disabled: true } %>
-        <% end %>
-      </div>
-    <% end %>
-
-    <!-- Details Section -->
-    <%= disclosure t(".details") do %>
-      <div class="pb-4">
-        <%= styled_form_with model: [account, entry],
-              url: account_transaction_path(account, entry),
-              class: "space-y-2",
-              data: { controller: "auto-submit-form" } do |f| %>
-          <%= f.fields_for :entryable do |ef| %>
-            <% unless entry.marked_as_transfer? %>
-              <%= ef.collection_select :category_id,
-                    Current.family.categories.alphabetically,
-                    :id, :name,
-                    { prompt: t(".category_placeholder"),
-                      label: t(".category_label"),
-                      class: "text-gray-400" },
-                    "data-auto-submit-form-target": "auto" %>
-
-              <%= ef.collection_select :merchant_id,
-                    Current.family.merchants.alphabetically,
-                    :id, :name,
-                    { prompt: t(".merchant_placeholder"),
-                      label: t(".merchant_label"),
-                      class: "text-gray-400" },
-                    "data-auto-submit-form-target": "auto" %>
-            <% end %>
-
-            <%= ef.select :tag_ids,
-                  options_for_select(
-                    Current.family.tags.alphabetically.pluck(:name, :id),
-                    transaction.tag_ids
-                  ),
-                  {
-                    multiple: true,
-                    label:    t(".tags_label"),
-                    container_class: "h-40"
-                  },
-                  { "data-auto-submit-form-target": "auto" } %>
-
-          <% end %>
-
-          <%= styled_form_with model: [account, entry],
-              url: account_transaction_path(account, entry),
-              class: "space-y-2",
-              data: { controller: "auto-submit-form" } do |f| %>
-            <%= f.text_area :notes,
-                  label: t(".note_label"),
-                  placeholder: t(".note_placeholder"),
-                  rows: 5,
-                  "data-auto-submit-form-target": "auto" %>
-          <% end %>
-        <% end %>
-      </div>
-    <% end %>
-
-    <!-- Settings Section -->
-    <%= disclosure t(".settings") do %>
-      <div class="pb-4">
-        <!-- Exclude Transaction Form -->
-        <%= styled_form_with model: [account, entry],
-              url: account_transaction_path(account, entry),
-              class: "p-3",
-              data: { controller: "auto-submit-form" } do |f| %>
-          <div class="flex cursor-pointer items-center gap-2 justify-between">
-            <div class="text-sm space-y-1">
-              <h4 class="text-gray-900"><%= t(".exclude_title") %></h4>
-              <p class="text-gray-500"><%= t(".exclude_subtitle") %></p>
-            </div>
-
-            <div class="relative inline-block select-none">
-              <%= f.check_box :excluded,
-                      class: "sr-only peer",
-                      "data-auto-submit-form-target": "auto" %>
-              <label for="account_entry_entryable_attributes_excluded"
-                         class="maybe-switch"></label>
-            </div>
-          </div>
-        <% end %>
-
-        <!-- Delete Transaction Form -->
-        <% unless entry.marked_as_transfer? %>
-          <div class="flex items-center justify-between gap-2 p-3">
-            <div class="text-sm space-y-1">
-              <h4 class="text-gray-900"><%= t(".delete_title") %></h4>
-              <p class="text-gray-500"><%= t(".delete_subtitle") %></p>
-            </div>
-
-            <%= button_to t(".delete"),
-                  account_entry_path(account, entry),
-                  method: :delete,
-                  class:  "rounded-lg px-3 py-2 text-red-500 text-sm
-                           font-medium border border-alpha-black-200",
-                  data:   { turbo_confirm: true, turbo_frame: "_top" } %>
-          </div>
-        <% end %>
-      </div>
-    <% end %>
-  </div>
-<% end %>
diff --git a/app/views/account/transfers/_form.html.erb b/app/views/account/transfers/_form.html.erb
deleted file mode 100644
index 61fb9350..00000000
--- a/app/views/account/transfers/_form.html.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-<%= styled_form_with model: transfer, class: "space-y-4", data: { turbo_frame: "_top" } do |f| %>
-  <% if transfer.errors.present? %>
-    <div class="text-red-600 flex items-center gap-2">
-      <%= lucide_icon "circle-alert", class: "w-5 h-5" %>
-      <p class="text-sm"><%= @transfer.errors.full_messages.to_sentence %></p>
-    </div>
-  <% end %>
-
-  <section>
-    <fieldset class="bg-gray-50 rounded-lg p-1 grid grid-flow-col justify-stretch gap-x-2">
-      <%= link_to new_transaction_path(nature: "expense"), data: { turbo_frame: :modal }, class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-gray-400" do %>
-        <%= lucide_icon "minus-circle", class: "w-5 h-5" %>
-        <%= tag.span t(".expense") %>
-      <% end %>
-
-      <%= link_to new_transaction_path(nature: "income"), data: { turbo_frame: :modal }, class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-gray-400" do %>
-        <%= lucide_icon "plus-circle", class: "w-5 h-5" %>
-        <%= tag.span t(".income") %>
-      <% end %>
-
-      <%= tag.div class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-gray-400 bg-white text-gray-800 shadow-sm" do %>
-        <%= lucide_icon "arrow-right-left", class: "w-5 h-5" %>
-        <%= tag.span t(".transfer") %>
-      <% end %>
-    </fieldset>
-  </section>
-
-  <section class="space-y-2">
-    <%= f.text_field :name, value: transfer.name, label: t(".description"), placeholder: t(".description_placeholder"), required: true %>
-    <%= f.collection_select :from_account_id, Current.family.accounts.alphabetically, :id, :name, { prompt: t(".select_account"), label: t(".from") }, required: true %>
-    <%= f.collection_select :to_account_id, Current.family.accounts.alphabetically, :id, :name, { prompt: t(".select_account"), label: t(".to") }, required: true %>
-    <%= f.money_field :amount, label: t(".amount"), required: true, hide_currency: true %>
-    <%= f.date_field :date, value: transfer.date, label: t(".date"), required: true, max: Date.current %>
-  </section>
-
-  <section>
-    <%= f.submit t(".submit") %>
-  </section>
-<% end %>
diff --git a/app/views/account/transfers/_transfer.html.erb b/app/views/account/transfers/_transfer.html.erb
deleted file mode 100644
index 1948b965..00000000
--- a/app/views/account/transfers/_transfer.html.erb
+++ /dev/null
@@ -1,49 +0,0 @@
-<%# locals: (transfer:, selectable: true, editable: true, short: false, **opts) %>
-
-<%= turbo_frame_tag dom_id(transfer) do %>
-  <div class="grid grid-cols-12 items-center text-gray-900 text-sm font-medium p-4">
-    <div class="col-span-7 flex items-center">
-      <% if selectable %>
-        <%= check_box_tag dom_id(transfer, "selection"),
-                          disabled: true,
-                          class: "mr-3 cursor-not-allowed maybe-checkbox maybe-checkbox--light" %>
-      <% end %>
-
-      <%= tag.div class: short ? "max-w-[250px]" : "max-w-[325px]" do %>
-        <div class="flex items-center gap-2 <%= selectable ? "" : "pl-8" %>">
-          <%= circle_logo(transfer.from_name[0].upcase) %>
-
-          <%= tag.p transfer.name, class: "truncate text-gray-900" %>
-        </div>
-      <% end %>
-
-      <%= button_to account_transfer_path(transfer),
-                    method: :delete,
-                    class: "ml-2 flex items-center group/transfer hover:bg-gray-50 rounded-md p-1",
-                    data: {
-                      turbo_frame: "_top",
-                      turbo_confirm: {
-                        title: t(".remove_title"),
-                        body: t(".remove_body"),
-                        confirm: t(".remove_confirm")
-                      }
-                    } do %>
-
-        <%= lucide_icon "link-2", class: "group-hover/transfer:hidden w-4 h-4 text-gray-500" %>
-        <%= lucide_icon "unlink", class: "group-hover/transfer:inline-block hidden w-4 h-4 text-gray-500" %>
-      <% end %>
-    </div>
-
-    <% unless short %>
-      <div class="col-span-3 flex items-center gap-2">
-        <%= circle_logo(transfer.from_name[0].upcase, size: "sm") %>
-        <span class="text-gray-500 font-medium">&rarr;</span>
-        <%= circle_logo(transfer.to_name[0].upcase, size: "sm") %>
-      </div>
-    <% end %>
-
-    <div class="ml-auto <%= short ? "col-span-5" : "col-span-2" %>">
-      <%= tag.p format_money(transfer.amount_money), class: "font-medium" %>
-    </div>
-  </div>
-<% end %>
diff --git a/app/views/account/transfers/new.html.erb b/app/views/account/transfers/new.html.erb
deleted file mode 100644
index f1a7ae0d..00000000
--- a/app/views/account/transfers/new.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= modal_form_wrapper title: t(".title") do %>
-  <%= render "form", transfer: @transfer %>
-<% end %>
diff --git a/app/views/account/valuations/_form.html.erb b/app/views/account/valuations/_form.html.erb
deleted file mode 100644
index c28597c5..00000000
--- a/app/views/account/valuations/_form.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<%# locals: (entry:) %>
-
-<%= form_with model: [entry.account, entry],
-              data: { turbo_frame: "_top" },
-              url: entry.new_record? ? account_valuations_path(entry.account) : account_entry_path(entry.account, entry) do |f| %>
-  <div class="grid grid-cols-10 p-4 items-center">
-    <div class="col-span-7 flex items-center gap-4">
-      <div class="w-8 h-8 rounded-full p-1.5 flex items-center justify-center bg-gray-500/5">
-        <%= lucide_icon("pencil-line", class: "w-4 h-4 text-gray-500") %>
-      </div>
-      <div class="w-full flex items-center justify-between gap-2">
-        <%= f.date_field :date, required: "required", min: Account::Entry.min_supported_date, max: Date.current, value: Date.current, class: "border border-alpha-black-200 bg-white rounded-lg shadow-xs min-w-[200px] px-3 py-1.5 text-gray-900 text-sm" %>
-        <%= f.number_field :amount, required: "required", placeholder: "0.00", step: "0.01", class: "bg-white border border-alpha-black-200 rounded-lg shadow-xs text-gray-900 text-sm px-3 py-1.5 text-right" %>
-        <%= f.hidden_field :currency, value: entry.account.currency %>
-      </div>
-    </div>
-
-    <div class="col-span-3 flex gap-2 justify-end items-center">
-      <%= link_to t(".cancel"), account_valuations_path(entry.account), class: "text-sm text-gray-900 hover:text-gray-800 font-medium px-3 py-1.5" %>
-      <%= f.submit class: "bg-gray-50 rounded-lg font-medium px-3 py-1.5 cursor-pointer hover:bg-gray-100 text-sm" %>
-    </div>
-  </div>
-<% end %>
diff --git a/app/views/account/valuations/_valuation.html.erb b/app/views/account/valuations/_valuation.html.erb
deleted file mode 100644
index 895c5c9c..00000000
--- a/app/views/account/valuations/_valuation.html.erb
+++ /dev/null
@@ -1,50 +0,0 @@
-<%# locals: (entry:, **opts) %>
-
-<% account = entry.account %>
-
-<%= turbo_frame_tag dom_id(entry) do %>
-  <% is_oldest = entry.first_of_type? %>
-
-  <div class="p-4 grid grid-cols-10 items-center">
-    <div class="col-span-5 flex items-center gap-4">
-      <%= tag.div class: "w-8 h-8 rounded-full p-1.5 flex items-center justify-center", style: entry_style(entry, is_oldest:).html_safe do %>
-        <%= lucide_icon entry_icon(entry, is_oldest:), class: "w-4 h-4" %>
-      <% end %>
-
-      <div class="text-sm">
-        <%= tag.p entry.date, class: "text-gray-900 font-medium" %>
-        <%= tag.p is_oldest ? t(".start_balance") : t(".value_update"), class: "text-gray-500" %>
-      </div>
-    </div>
-
-    <div class="col-span-2 justify-self-end">
-      <%= tag.p format_money(entry.amount_money), class: "font-medium text-sm text-gray-900" %>
-    </div>
-
-    <div class="col-span-2 justify-self-end font-medium text-sm" style="color: <%= entry.trend.color %>">
-      <% if entry.trend.direction.flat? %>
-        <%= tag.span t(".no_change"), class: "text-gray-500" %>
-      <% else %>
-        <%= tag.span format_money(entry.trend.value) %>
-        <%= tag.span "(#{entry.trend.percent}%)" %>
-      <% end %>
-    </div>
-
-    <div class="col-span-1 justify-self-end">
-      <%= contextual_menu do %>
-        <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-          <%= contextual_menu_modal_action_item t(".edit_entry"), edit_account_entry_path(account, entry), turbo_frame: dom_id(entry) %>
-
-          <%= contextual_menu_destructive_item t(".delete_entry"),
-                                               account_entry_path(account, entry),
-                                               turbo_frame: "_top",
-                                               turbo_confirm: {
-                                                 title: t(".confirm_title"),
-                                                 body: t(".confirm_body_html"),
-                                                 accept: t(".confirm_accept")
-                                               } %>
-        </div>
-      <% end %>
-    </div>
-  </div>
-<% end %>
diff --git a/app/views/account/valuations/edit.html.erb b/app/views/account/valuations/edit.html.erb
deleted file mode 100644
index 1e94f516..00000000
--- a/app/views/account/valuations/edit.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= turbo_frame_tag dom_id(@entry) do %>
-  <%= render "account/valuations/form", entry: @entry %>
-<% end %>
diff --git a/app/views/account/valuations/new.html.erb b/app/views/account/valuations/new.html.erb
deleted file mode 100644
index b74a04c7..00000000
--- a/app/views/account/valuations/new.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= turbo_frame_tag dom_id(@entry) do %>
-  <%= render "account/valuations/form", entry: @entry %>
-  <div class="h-px bg-alpha-black-50 ml-20 mr-4"></div>
-<% end %>
diff --git a/app/views/account/valuations/show.html.erb b/app/views/account/valuations/show.html.erb
deleted file mode 100644
index d8efac24..00000000
--- a/app/views/account/valuations/show.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% entry = @entry %>
-
-<%= render "account/valuations/valuation", entry: entry %>
diff --git a/app/views/accountable_sparklines/show.html.erb b/app/views/accountable_sparklines/show.html.erb
new file mode 100644
index 00000000..c090551a
--- /dev/null
+++ b/app/views/accountable_sparklines/show.html.erb
@@ -0,0 +1,11 @@
+<%= turbo_frame_tag "#{@accountable.model_name.param_key}_sparkline" do %>
+  <div class="flex items-center justify-end gap-1">
+    <div class="w-8 h-3">
+      <%= render "shared/sparkline", id: dom_id(@accountable, :sparkline_chart), series: @series %>
+    </div>
+
+    <%= tag.p @series.trend.percent_formatted,
+                style: "color: #{@series.trend.color}",
+                class: "font-mono text-right text-xs font-medium text-primary" %>
+  </div>
+<% end %>
diff --git a/app/views/accounts/_account.html.erb b/app/views/accounts/_account.html.erb
index e8627e69..b1e1be99 100644
--- a/app/views/accounts/_account.html.erb
+++ b/app/views/accounts/_account.html.erb
@@ -1,37 +1,61 @@
+<%# locals: (account:, return_to: nil) %>
+
 <%= turbo_frame_tag dom_id(account) do %>
   <div class="p-4 flex items-center justify-between gap-3 group/account">
     <div class="flex items-center gap-3">
-      <div class="w-8 h-8 flex items-center justify-center rounded-full text-xs font-medium <%= account.is_active ? "bg-blue-500/10 text-blue-500" : "bg-gray-500/10 text-gray-500" %>">
-        <%= account.name[0].upcase %>
-      </div>
+      <%= render "accounts/logo", account: account, size: "md" %>
 
       <div>
-        <%= link_to account.name, account, class: [(account.is_active ? "text-gray-900" : "text-gray-400"), "text-sm font-medium hover:underline"], data: { turbo_frame: "_top" } %>
-        <% if account.has_issues? %>
-          <div class="text-sm flex items-center gap-1 text-error">
-            <%= lucide_icon "alert-octagon", class: "shrink-0 w-4 h-4" %>
-            <%= tag.span t(".has_issues") %>
-            <%= link_to t(".troubleshoot"), issue_path(account.issues.first), class: "underline", data: { turbo_frame: :drawer } %>
-          </div>
+        <% if account.pending_deletion? %>
+          <p class="text-sm font-medium text-primary">
+            <span>
+              <%= account.name %>
+            </span>
+            <span class="text-red-500 animate-pulse">
+              (deletion in progress...)
+            </span>
+          </p>
+        <% else %>
+          <%= link_to account.name, account, class: [(account.active? ? "text-primary" : "text-subdued"), "text-sm font-medium hover:underline"], data: { turbo_frame: "_top" } %>
+          <% if account.long_subtype_label %>
+            <p class="text-sm text-secondary truncate"><%= account.long_subtype_label %></p>
+          <% end %>
         <% end %>
       </div>
 
-      <%= link_to edit_account_path(account), data: { turbo_frame: :modal }, class: "group-hover/account:flex hidden hover:opacity-80 items-center justify-center" do %>
-        <%= lucide_icon "pencil-line", class: "w-4 h-4 text-gray-500" %>
+      <% unless account.pending_deletion? %>
+        <%= link_to edit_account_path(account, return_to: return_to), data: { turbo_frame: :modal }, class: "group-hover/account:flex hidden hover:opacity-80 items-center justify-center" do %>
+          <%= icon("pencil-line", size: "sm") %>
+        <% end %>
       <% end %>
     </div>
     <div class="flex items-center gap-8">
-      <p class="text-sm font-medium <%= account.is_active ? "text-gray-900" : "text-gray-400" %>">
-        <%= format_money account.balance_money %>
-      </p>
+      <% if account.draft? %>
+        <!-- Balance hidden for draft accounts -->
+      <% elsif account.syncing? %>
+        <div class="w-16 h-6 bg-loader rounded-full animate-pulse"></div>
+      <% else %>
+        <p class="text-sm font-medium <%= account.active? ? "text-primary" : "text-subdued" %>">
+          <%= format_money account.balance_money %>
+        </p>
+      <% end %>
 
-      <%= form_with model: account,
-                    namespace: account.id,
-                    data: { controller: "auto-submit-form", turbo_frame: "_top" } do |form| %>
-        <div class="relative inline-block select-none">
-          <%= form.check_box :is_active, { class: "sr-only peer", data: { "auto-submit-form-target": "auto" } } %>
-          <%= form.label :is_active, "&nbsp;".html_safe, class: "maybe-switch" %>
-        </div>
+      <% if account.draft? %>
+        <%= render DS::Link.new(
+          text: "Complete setup",
+          href: edit_account_path(account, return_to: return_to),
+          variant: :outline,
+          frame: :modal
+        ) %>
+      <% elsif account.active? || account.disabled? %>
+        <%= form_with model: account, url: toggle_active_account_path(account), method: :patch, data: { turbo_frame: "_top", controller: "auto-submit-form" } do |f| %>
+          <%= render DS::Toggle.new(
+            id: "account_#{account.id}_active",
+            name: "active",
+            checked: account.active?,
+            data: { auto_submit_form_target: "auto" }
+          ) %>
+        <% end %>
       <% end %>
     </div>
   </div>
diff --git a/app/views/accounts/_account_list.html.erb b/app/views/accounts/_account_list.html.erb
deleted file mode 100644
index b42df152..00000000
--- a/app/views/accounts/_account_list.html.erb
+++ /dev/null
@@ -1,69 +0,0 @@
-<%# locals: (group:) -%>
-<% type = Accountable.from_type(group.name) %>
-<% if group && group.children.any? %>
-  <details class="mb-1 text-sm group" data-controller="account-collapse" data-account-collapse-type-value="<%= type %>">
-    <summary class="flex gap-4 px-3 py-2 items-center w-full rounded-[10px] font-medium hover:bg-gray-100 cursor-pointer">
-      <%= lucide_icon("chevron-down", class: "hidden group-open:block text-gray-500 w-5 h-5") %>
-      <%= lucide_icon("chevron-right", class: "group-open:hidden text-gray-500 w-5 h-5") %>
-      <div class="text-left"><%= type.model_name.human %></div>
-      <div class="ml-auto flex flex-col items-end">
-        <p class="text-right"><%= format_money group.sum %></p>
-        <div class="flex items-center gap-1">
-          <%=
-              tag.div(
-                id: "#{group.name}_sparkline",
-                class: "h-3 w-8 ml-auto",
-                data: {
-                  controller: "time-series-chart",
-                  "time-series-chart-data-value": group.series.to_json,
-                  "time-series-chart-stroke-width-value": 1,
-                  "time-series-chart-use-labels-value": false,
-                  "time-series-chart-use-tooltip-value": false
-                }
-              )
-          %>
-          <% styles = trend_styles(group.series.trend) %>
-          <span class="text-xs <%= styles[:text_class] %>"><%= sprintf("%+.2f", group.series.trend.percent) %>%</span>
-        </div>
-      </div>
-    </summary>
-    <% group.children.sort_by(&:name).each do |account_value_node| %>
-      <% account = account_value_node.original %>
-      <%= link_to account_path(account), class: "flex items-center w-full gap-3 px-3 py-2 mb-1 hover:bg-gray-100 rounded-[10px]" do %>
-        <%= image_tag account_logo_url(account), class: "w-6 h-6" %>
-        <div>
-          <p class="font-medium"><%= account_value_node.name %></p>
-          <% if account.subtype %>
-            <p class="text-xs text-gray-500"><%= account.subtype&.humanize %></p>
-          <% end %>
-        </div>
-        <div class="flex flex-col ml-auto font-medium text-right">
-          <p><%= format_money account.balance_money %></p>
-          <% unless account_value_node.series.trend.direction.flat? %>
-            <div class="flex items-center gap-1">
-              <%=
-              tag.div(
-                id: dom_id(account, :list_sparkline),
-                class: "h-3 w-8 ml-auto",
-                data: {
-                  controller: "time-series-chart",
-                  "time-series-chart-data-value": account_value_node.series.to_json,
-                  "time-series-chart-stroke-width-value": 1,
-                  "time-series-chart-use-labels-value": false,
-                  "time-series-chart-use-tooltip-value": false
-                }
-              )
-              %>
-              <% styles = trend_styles(account_value_node.series.trend) %>
-              <span class="text-xs <%= styles[:text_class] %>"><%= sprintf("%+.2f", account_value_node.series.trend.percent) %>%</span>
-            </div>
-          <% end %>
-        </div>
-      <% end %>
-    <% end %>
-    <%= link_to new_account_path(step: "method", type: type.name.demodulize), class: "flex items-center min-h-10 gap-4 px-3 py-2 mb-1 text-gray-500 text-sm font-medium rounded-[10px] hover:bg-gray-100", data: { turbo_frame: "modal" } do %>
-      <%= lucide_icon("plus", class: "w-5 h-5") %>
-      <p>New <%= type.model_name.human.downcase %></p>
-    <% end %>
-  </details>
-<% end %>
diff --git a/app/views/accounts/_account_sidebar_tabs.html.erb b/app/views/accounts/_account_sidebar_tabs.html.erb
new file mode 100644
index 00000000..8951cc3c
--- /dev/null
+++ b/app/views/accounts/_account_sidebar_tabs.html.erb
@@ -0,0 +1,91 @@
+<%# locals: (family:, active_tab:, mobile: false) %>
+
+<div id="account-sidebar-tabs">
+  <% if family.missing_data_provider? %>
+    <details class="group bg-yellow-tint-10 rounded-lg p-2 text-yellow-600 mb-3 text-xs">
+      <summary class="flex items-center justify-between gap-2">
+        <div class="flex items-center gap-2">
+          <%= icon "triangle-alert", size: "sm", color: "warning" %>
+          <p class="font-medium">Missing historical data</p>
+        </div>
+
+        <%= icon("chevron-down", color: "warning", class: "group-open:transform group-open:rotate-180") %>
+      </summary>
+      <div class="text-xs py-2 space-y-2">
+        <p>Maybe uses Synth API to fetch historical exchange rates, security prices, and more.  This data is required to calculate accurate historical account balances.</p>
+
+        <p>
+          <%= link_to "Add your Synth API key here.", settings_hosting_path, class: "text-yellow-600 underline" %>
+        </p>
+      </div>
+    </details>
+  <% end %>
+
+  <%= render DS::Tabs.new(active_tab: active_tab, session_key: "account_sidebar_tab", testid: "account-sidebar-tabs") do |tabs| %>
+    <% tabs.with_nav do |nav| %>
+      <% nav.with_btn(id: "asset", label: "Assets") %>
+      <% nav.with_btn(id: "liability", label: "Debts") %>
+      <% nav.with_btn(id: "all", label: "All") %>
+    <% end %>
+
+    <% tabs.with_panel(tab_id: "asset") do %>
+      <div class="space-y-2">
+        <%= render DS::Link.new(
+          text: "New asset",
+          variant: "ghost",
+          href: new_account_path(step: "method_select", classification: "asset"),
+          icon: "plus",
+          frame: :modal,
+          full_width: true,
+          class: "justify-start"
+        ) %>
+
+        <div>
+          <% family.balance_sheet.assets.account_groups.each do |group| %>
+            <%= render "accounts/accountable_group", account_group: group, mobile: mobile %>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+
+    <% tabs.with_panel(tab_id: "liability") do %>
+      <div class="space-y-2">
+        <%= render DS::Link.new(
+            text: "New debt",
+            variant: "ghost",
+            href: new_account_path(step: "method_select", classification: "liability"),
+            icon: "plus",
+            frame: :modal,
+            full_width: true,
+            class: "justify-start"
+          ) %>
+
+        <div>
+          <% family.balance_sheet.liabilities.account_groups.each do |group| %>
+            <%= render "accounts/accountable_group", account_group: group, mobile: mobile %>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+
+    <% tabs.with_panel(tab_id: "all") do %>
+      <div class="space-y-2">
+        <%= render DS::Link.new(
+            text: "New account",
+            variant: "ghost",
+            full_width: true,
+            href: new_account_path(step: "method_select"),
+            icon: "plus",
+            frame: :modal,
+            class: "justify-start"
+          ) %>
+
+        <div>
+          <% family.balance_sheet.account_groups.each do |group| %>
+            <%= render "accounts/accountable_group", account_group: group, mobile: mobile, all_tab: true %>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
+</div>
diff --git a/app/views/accounts/_account_type.html.erb b/app/views/accounts/_account_type.html.erb
index d8b400c7..741ace78 100644
--- a/app/views/accounts/_account_type.html.erb
+++ b/app/views/accounts/_account_type.html.erb
@@ -1,11 +1,11 @@
-<%= link_to new_account_path(
-              step: "method",
-              type: type.class.name.demodulize,
-              institution_id: params[:institution_id]
-            ),
-            class: "flex items-center gap-4 w-full text-center focus:outline-none focus:bg-alpha-black-25 hover:bg-alpha-black-25 border border-transparent block px-2 rounded-lg p-2" do %>
-  <span class="flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg <%= bg_color %> border border-alpha-black-25">
-    <%= lucide_icon(icon, class: "#{text_color} w-5 h-5") %>
-  </span>
-  <%= type.model_name.human %>
+<%# locals: (accountable:) %>
+
+<%= link_to new_polymorphic_path(accountable, step: "method_select", return_to: params[:return_to]),
+            class: "flex items-center gap-4 w-full text-center focus:outline-hidden hover:bg-surface-hover focus:bg-surface-hover fg-primary border border-transparent block px-2 rounded-lg p-2" do %>
+  <%= render DS::FilledIcon.new(
+    icon: accountable.icon,
+    hex_color: accountable.color,
+  ) %>
+
+  <%= accountable.display_name.singularize %>
 <% end %>
diff --git a/app/views/accounts/_accountable_group.html.erb b/app/views/accounts/_accountable_group.html.erb
index bef3069e..e3ae8d5a 100644
--- a/app/views/accounts/_accountable_group.html.erb
+++ b/app/views/accounts/_accountable_group.html.erb
@@ -1,17 +1,65 @@
-<%# locals: (accounts:) %>
+<%# locals: (account_group:, mobile: false, all_tab: false, open: nil, **args) %>
 
-<% accounts.group_by(&:accountable_type).each do |group, accounts| %>
-  <div class="bg-gray-25 p-1 rounded-xl">
-    <div class="flex items-center px-4 py-2 text-xs font-medium text-gray-500">
-      <p><%= to_accountable_title(Accountable.from_type(group)) %></p>
-      <span class="text-gray-400 mx-2">&middot;</span>
-      <p><%= accounts.count %></p>
-      <p class="ml-auto"><%= totals_by_currency(collection: accounts, money_method: :balance_money) %></p>
-    </div>
-    <div class="bg-white">
-      <% accounts.each do |account| %>
-        <%= render account %>
+<div id="<%= account_group.dom_id(tab: all_tab ? :all : nil, mobile: mobile) %>">
+  <% is_open = open.nil? ? account_group.accounts.any? { |account| page_active?(account_path(account)) } : open %>
+  <%= render DS::Disclosure.new(align: :left, open: is_open) do |disclosure| %>
+    <% disclosure.with_summary_content do %>
+      <div class="flex items-center gap-3">
+        <%= icon "chevron-right", class: "group-open:transform group-open:rotate-90" %>
+        <%= tag.span class: class_names("text-sm text-primary font-medium", "animate-pulse" => account_group.syncing?) do %>
+          <%= account_group.name %>
+        <% end %>
+      </div>
+
+      <div class="ml-auto text-right grow">
+        <%= tag.p format_money(account_group.total_money), class: "text-sm font-medium text-primary" %>
+        <%= turbo_frame_tag "#{account_group.key}_sparkline", src: accountable_sparkline_path(account_group.key), loading: "lazy", data: { controller: "turbo-frame-timeout", turbo_frame_timeout_timeout_value: 10000 } do %>
+          <div class="flex items-center w-8 h-4 ml-auto">
+            <div class="w-6 h-px bg-loader"></div>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+
+    <div class="space-y-1">
+      <% account_group.accounts.each do |account| %>
+        <%= link_to account_path(account),
+                  class: class_names(
+                    "block flex items-center gap-2 px-3 py-2 rounded-lg",
+                    page_active?(account_path(account)) ? "bg-container" : "hover:bg-surface-hover"
+                  ),
+                  title: account.name do %>
+          <%= render "accounts/logo", account: account, size: "sm", color: account_group.color %>
+
+          <div class="min-w-0 grow">
+            <div class="flex items-center gap-2 mb-0.5">
+              <%= tag.p account.name, class: class_names("text-sm text-primary font-medium truncate", "animate-pulse" => account.syncing?) %>
+            </div>
+            <%= tag.p account.short_subtype_label, class: "text-sm text-secondary truncate" %>
+          </div>
+
+          <div class="ml-auto text-right grow h-10">
+            <%= tag.p format_money(account.balance_money), class: "text-sm font-medium text-primary whitespace-nowrap" %>
+            <%= turbo_frame_tag dom_id(account, :sparkline), src: sparkline_account_path(account), loading: "lazy", data: { controller: "turbo-frame-timeout", turbo_frame_timeout_timeout_value: 10000 } do %>
+              <div class="flex items-center w-8 h-4 ml-auto">
+                <div class="w-6 h-px bg-loader"></div>
+              </div>
+            <% end %>
+          </div>
+        <% end %>
       <% end %>
     </div>
-  </div>
-<% end %>
+
+    <div class="my-2">
+      <%= render DS::Link.new(
+      href: new_polymorphic_path(account_group.key, step: "method_select"),
+      text: "New #{account_group.name.downcase.singularize}",
+      icon: "plus",
+      full_width: true,
+      variant: "ghost",
+      frame: :modal,
+      class: "justify-start"
+    ) %>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/accounts/_empty.html.erb b/app/views/accounts/_empty.html.erb
index e938c863..4583616f 100644
--- a/app/views/accounts/_empty.html.erb
+++ b/app/views/accounts/_empty.html.erb
@@ -1,11 +1,12 @@
 <div class="flex justify-center items-center h-[800px] text-sm">
   <div class="text-center flex flex-col items-center max-w-[300px]">
-    <%= tag.p t(".no_accounts"), class: "text-gray-900 mb-1 font-medium" %>
-    <%= tag.p t(".empty_message"), class: "text-gray-500 mb-4" %>
+    <%= tag.p t(".no_accounts"), class: "text-primary mb-1 font-medium" %>
+    <%= tag.p t(".empty_message"), class: "text-secondary mb-4" %>
 
-    <%= link_to new_account_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>
-      <%= lucide_icon("plus", class: "w-5 h-5") %>
-      <span><%= t(".new_account") %></span>
-    <% end %>
+    <%= render DS::Link.new(
+      text: t(".new_account"),
+      href: new_account_path,
+      frame: :modal
+    ) %>
   </div>
 </div>
diff --git a/app/views/accounts/_entry_method.html.erb b/app/views/accounts/_entry_method.html.erb
deleted file mode 100644
index ea73af73..00000000
--- a/app/views/accounts/_entry_method.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<% if local_assigns[:disabled] && disabled %>
-  <span class="flex items-center w-full gap-4 p-2 px-2 text-center border border-transparent rounded-lg cursor-not-allowed focus:outline-none focus:bg-gray-50 focus:border focus:border-gray-200 hover:bg-gray-50">
-    <span class="flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg bg-alpha-black-50 shadow-[inset_0_0_0_1px_rgba(0,0,0,0.02)]">
-      <%= lucide_icon(icon, class: "text-gray-500 w-5 h-5") %>
-    </span>
-    <%= text %>
-  </span>
-<% else %>
-  <%= link_to new_account_path(type: type.class.name.demodulize, institution_id: params[:institution_id]), class: "flex items-center gap-4 w-full text-center focus:outline-none focus:bg-gray-50 border border-transparent focus:border focus:border-gray-200 px-2 hover:bg-gray-50 rounded-lg p-2" do %>
-    <span class="flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg bg-alpha-black-50 shadow-[inset_0_0_0_1px_rgba(0,0,0,0.02)]">
-      <%= lucide_icon(icon, class: "text-gray-500 w-5 h-5") %>
-    </span>
-    <%= text %>
-  <% end %>
-<% end %>
diff --git a/app/views/accounts/_form.html.erb b/app/views/accounts/_form.html.erb
index 4fa0cce1..d2139b56 100644
--- a/app/views/accounts/_form.html.erb
+++ b/app/views/accounts/_form.html.erb
@@ -1,27 +1,22 @@
 <%# locals: (account:, url:) %>
 
-<%= styled_form_with model: account, url: url, scope: :account, class: "flex flex-col gap-4 justify-between grow", data: { turbo: false } do |f| %>
+<% if @error_message.present? %>
+  <%= render DS::Alert.new(message: @error_message, variant: :error) %>
+<% end %>
+
+<%= styled_form_with model: account, url: url, scope: :account, data: { turbo: false }, class: "flex flex-col gap-4 justify-between grow text-primary" do |form| %>
   <div class="grow space-y-2">
-    <%= f.hidden_field :accountable_type %>
-    <%= f.text_field :name, placeholder: t(".name_placeholder"), required: "required", label: t(".name_label"), autofocus: true %>
+    <%= form.hidden_field :accountable_type %>
+    <%= form.hidden_field :return_to, value: params[:return_to] %>
 
-    <% if account.new_record? %>
-      <%= f.hidden_field :institution_id %>
-    <% else %>
-      <%= f.collection_select :institution_id, Current.family.institutions.alphabetically, :id, :name, { include_blank: t(".ungrouped"), label: t(".institution") } %>
+    <%= form.text_field :name, placeholder: t(".name_placeholder"), required: "required", label: t(".name_label") %>
+
+    <% unless account.linked? %>
+      <%= form.money_field :balance, label: t(".balance"), required: true, default_currency: Current.family.currency %>
     <% end %>
 
-    <%= f.money_field :balance, label: t(".balance"), required: true, default_currency: Current.family.currency %>
-
-    <% if account.new_record? %>
-      <div class="flex items-center gap-2 mt-3 mb-6">
-        <div class="w-1/2"><%= f.date_field :start_date, label: t(".start_date"), max: Date.yesterday, min: Account::Entry.min_supported_date %></div>
-        <div class="w-1/2"><%= f.money_field :start_balance, label: t(".start_balance"), placeholder: 90, hide_currency: true, default_currency: Current.family.currency %></div>
-      </div>
-    <% end %>
-
-    <%= render "accounts/accountables/#{permitted_accountable_partial(account.accountable_type)}", f: f %>
+    <%= yield form %>
   </div>
 
-  <%= f.submit "#{account.new_record? ? "Add" : "Update"} #{account.accountable.model_name.human.downcase}" %>
+  <%= form.submit %>
 <% end %>
diff --git a/app/views/accounts/_header.html.erb b/app/views/accounts/_header.html.erb
deleted file mode 100644
index f8c8eb3e..00000000
--- a/app/views/accounts/_header.html.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<header class="flex justify-between items-center text-gray-900 font-medium">
-  <h1 class="text-xl"><%= t(".accounts") %></h1>
-
-  <div class="flex items-center gap-2">
-    <%= contextual_menu do %>
-      <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-        <%= link_to accounts_path(return_to: summary_accounts_path),
-                    class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg font-normal" do %>
-          <%= lucide_icon "settings", class: "w-5 h-5 text-gray-500" %>
-          <span class="text-black"><%= t(".manage") %></span>
-        <% end %>
-      </div>
-
-    <% end %>
-
-    <%= link_to new_account_path, class: "rounded-lg bg-gray-900 text-white flex items-center gap-1 justify-center hover:bg-gray-700 px-3 py-2", data: { turbo_frame: :modal } do %>
-      <%= lucide_icon("plus", class: "w-5 h-5") %>
-      <p class="text-sm font-medium"><%= t(".new") %></p>
-    <% end %>
-  </div>
-</header>
diff --git a/app/views/accounts/_institution_accounts.html.erb b/app/views/accounts/_institution_accounts.html.erb
deleted file mode 100644
index 9554f1f4..00000000
--- a/app/views/accounts/_institution_accounts.html.erb
+++ /dev/null
@@ -1,91 +0,0 @@
-<%# locals: (institution:) %>
-
-<details open class="group bg-white p-4 border border-alpha-black-25 shadow-xs rounded-xl">
-  <summary class="flex items-center justify-between gap-2 focus-visible:outline-none">
-    <div class="flex items-center gap-2">
-      <%= lucide_icon "chevron-right", class: "group-open:transform group-open:rotate-90 text-gray-500 w-5" %>
-
-      <div class="flex items-center justify-center h-8 w-8 bg-blue-600/10 rounded-full bg-black/5">
-        <% if institution_logo(institution) %>
-          <%= image_tag institution_logo(institution), class: "rounded-full h-full w-full" %>
-        <% else %>
-          <div class="flex items-center justify-center">
-            <%= tag.p institution.name.first.upcase, class: "text-blue-600 text-xs font-medium" %>
-          </div>
-        <% end %>
-      </div>
-
-      <div class="pl-1 text-sm">
-        <%= link_to institution.name, edit_institution_path(institution), data: { turbo_frame: :modal }, class: "font-medium text-gray-900 hover:underline" %>
-        <% if institution.has_issues? %>
-          <div class="flex items-center gap-1 text-error">
-            <%= lucide_icon "alert-octagon", class: "shrink-0 w-4 h-4" %>
-            <%= tag.span t(".has_issues") %>
-          </div>
-        <% elsif institution.syncing? %>
-          <div class="text-gray-500 flex items-center gap-1">
-            <%= lucide_icon "loader", class: "w-4 h-4 animate-pulse" %>
-            <%= tag.span t(".syncing") %>
-          </div>
-        <% else %>
-          <p class="text-gray-500"><%= institution.last_synced_at ? t(".status", last_synced_at: time_ago_in_words(institution.last_synced_at)) : t(".status_never") %></p>
-        <% end %>
-      </div>
-    </div>
-
-    <div class="flex items-center gap-2">
-      <%= button_to sync_institution_path(institution), method: :post, class: "text-gray-900 flex hover:text-gray-800 items-center text-sm font-medium hover:underline" do %>
-        <%= lucide_icon "refresh-cw", class: "w-4 h-4" %>
-      <% end %>
-
-      <%= contextual_menu do %>
-        <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-          <%= link_to new_account_path(institution_id: institution.id),
-                    class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg",
-                    data: { turbo_frame: :modal } do %>
-            <%= lucide_icon "plus", class: "w-5 h-5 text-gray-500" %>
-
-            <span><%= t(".add_account_to_institution") %></span>
-          <% end %>
-
-          <%= link_to edit_institution_path(institution),
-                    class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg",
-                    data: { turbo_frame: :modal } do %>
-            <%= lucide_icon "pencil-line", class: "w-5 h-5 text-gray-500" %>
-
-            <span><%= t(".edit") %></span>
-          <% end %>
-
-          <%= button_to institution_path(institution),
-                      method: :delete,
-                      class: "block w-full py-2 px-3 space-x-2 text-red-600 hover:bg-red-50 flex items-center rounded-lg",
-                      data: {
-                        turbo_confirm: {
-                          title: t(".confirm_title"),
-                          body: t(".confirm_body"),
-                          accept: t(".confirm_accept")
-                        }
-                      } do %>
-            <%= lucide_icon "trash-2", class: "w-5 h-5" %>
-
-            <span><%= t(".delete") %></span>
-          <% end %>
-        </div>
-      <% end %>
-    </div>
-  </summary>
-
-  <div class="space-y-4 mt-4">
-    <% if institution.accounts.any? %>
-      <%= render "accountable_group", accounts: institution.accounts %>
-    <% else %>
-      <div class="p-4 flex flex-col gap-3 items-center justify-center">
-        <p class="text-gray-500 text-sm">There are no accounts in this financial institution</p>
-        <%= link_to new_account_path(institution_id: institution.id), class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-1.5 pr-2", data: { turbo_frame: "modal" } do %>
-          <%= lucide_icon("plus", class: "w-4 h-4") %>
-          <span><%= t(".new_account") %></span>
-        <% end %>
-      </div>
-    <% end %>
-  </div>
-</details>
diff --git a/app/views/accounts/_institutionless_accounts.html.erb b/app/views/accounts/_institutionless_accounts.html.erb
deleted file mode 100644
index 335e842e..00000000
--- a/app/views/accounts/_institutionless_accounts.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<%# locals: (accounts:) %>
-
-<details open class="group bg-white p-4 border border-alpha-black-25 shadow-xs rounded-xl">
-  <summary class="flex items-center gap-2 focus-visible:outline-none">
-    <%= lucide_icon "chevron-right", class: "group-open:transform group-open:rotate-90 text-gray-500 w-5" %>
-
-    <div class="flex items-center justify-center h-8 w-8 rounded-full bg-black/5">
-      <%= lucide_icon("folder-pen", class: "w-5 h-5 text-gray-500") %>
-    </div>
-
-    <span class="mr-auto text-sm font-medium text-gray-900"><%= t(".other_accounts") %></span>
-  </summary>
-
-  <div class="space-y-4 mt-4">
-    <%= render "accountable_group", accounts: accounts %>
-  </div>
-</details>
diff --git a/app/views/accounts/_logo.html.erb b/app/views/accounts/_logo.html.erb
new file mode 100644
index 00000000..1da8e0bc
--- /dev/null
+++ b/app/views/accounts/_logo.html.erb
@@ -0,0 +1,16 @@
+<%# locals: (account:, size: "md", color: nil) %>
+
+<% size_classes = {
+  "sm" => "w-6 h-6",
+  "md" => "w-9 h-9",
+  "lg" => "w-10 h-10",
+  "full" => "w-full h-full"
+} %>
+
+<% if account.plaid_account_id? && account.institution_domain.present? %>
+  <%= image_tag "https://logo.synthfinance.com/#{account.institution_domain}", class: "shrink-0 rounded-full #{size_classes[size]}" %>
+<% elsif account.logo.attached? %>
+  <%= image_tag account.logo, class: "shrink-0 rounded-full #{size_classes[size]}" %>
+<% else %>
+  <%= render DS::FilledIcon.new(variant: :text, hex_color: color || account.accountable.color, text: account.name, size: size, rounded: true) %>
+<% end %>
diff --git a/app/views/accounts/_overview.html.erb b/app/views/accounts/_overview.html.erb
deleted file mode 100644
index d586e780..00000000
--- a/app/views/accounts/_overview.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%# locals: (account:) %>
-
-<%= render partial: "accounts/accountables/#{account.accountable_type.underscore}/overview", locals: { account: account } %>
diff --git a/app/views/accounts/_summary_card.html.erb b/app/views/accounts/_summary_card.html.erb
index 424a2a2c..fe327728 100644
--- a/app/views/accounts/_summary_card.html.erb
+++ b/app/views/accounts/_summary_card.html.erb
@@ -1,8 +1,8 @@
 <%# locals: (title:, content:) %>
 
-<div class="rounded-xl bg-white shadow-xs border border-alpha-black-25 p-4">
-  <h4 class="text-gray-500 text-sm"><%= title %></h4>
-  <p class="text-xl font-medium text-gray-900">
+<div class="rounded-xl bg-container shadow-xs border border-alpha-black-25 p-4">
+  <h4 class="text-secondary text-sm"><%= title %></h4>
+  <p class="text-xl font-medium text-primary">
     <%= content %>
   </p>
 </div>
diff --git a/app/views/accounts/_sync_all_button.html.erb b/app/views/accounts/_sync_all_button.html.erb
deleted file mode 100644
index 0cf16bbd..00000000
--- a/app/views/accounts/_sync_all_button.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= button_to sync_all_accounts_path, class: "btn btn--outline flex items-center gap-2", title: "Sync All" do %>
-  <%= lucide_icon "refresh-cw", class: "w-5 h-5" %>
-  <span><%= t("accounts.sync_all.button_text") %></span>
-<% end %>
diff --git a/app/views/accounts/_tooltip.html.erb b/app/views/accounts/_tooltip.html.erb
deleted file mode 100644
index 952d2ad1..00000000
--- a/app/views/accounts/_tooltip.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<%# locals: (account:) -%>
-<div data-controller="tooltip" data-tooltip-placement-value="right" data-tooltip-offset-value=10 data-tooltip-cross-axis-value=50>
-  <%= lucide_icon("info", class: "w-4 h-4 shrink-0 text-gray-500") %>
-  <div role="tooltip" data-tooltip-target="tooltip" class="tooltip bg-gray-700 text-sm p-2 rounded w-64">
-    <div class="text-white">
-      <%= t(".total_value_tooltip") %>
-    </div>
-    <div class="flex pt-3">
-      <div class="text-gray-300">
-        <%= t(".holdings") %>
-      </div>
-      <div class="text-white ml-auto">
-        <%= tag.p format_money(account.investment.holdings_value, precision: 0) %>
-      </div>
-    </div>
-    <div class="flex">
-      <div class="text-gray-300">
-        <%= t(".cash") %>
-      </div>
-      <div class="text-white ml-auto">
-        <%= tag.p format_money(account.balance_money, precision: 0) %>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/app/views/accounts/accountables/_credit_card.html.erb b/app/views/accounts/accountables/_credit_card.html.erb
deleted file mode 100644
index 7e3d573a..00000000
--- a/app/views/accounts/accountables/_credit_card.html.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<div>
-  <hr class="my-4">
-
-  <div class="space-y-2">
-    <%= f.fields_for :accountable do |credit_card_form| %>
-      <div class="flex items-center gap-2">
-        <%= credit_card_form.number_field :available_credit, label: t(".available_credit"), placeholder: t(".available_credit_placeholder"), min: 0 %>
-      </div>
-
-      <div class="flex items-center gap-2">
-        <%= credit_card_form.number_field :minimum_payment, label: t(".minimum_payment"), placeholder: t(".minimum_payment_placeholder"), min: 0 %>
-        <%= credit_card_form.number_field :apr, label: t(".apr"), placeholder: t(".apr_placeholder"), min: 0, step: 0.01 %>
-      </div>
-
-      <div class="flex items-center gap-2">
-        <%= credit_card_form.date_field :expiration_date, label: t(".expiration_date") %>
-        <%= credit_card_form.number_field :annual_fee, label: t(".annual_fee"), placeholder: t(".annual_fee_placeholder"), min: 0 %>
-      </div>
-    <% end %>
-  </div>
-</div>
diff --git a/app/views/accounts/accountables/_crypto.html.erb b/app/views/accounts/accountables/_crypto.html.erb
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/views/accounts/accountables/_depository.html.erb b/app/views/accounts/accountables/_depository.html.erb
deleted file mode 100644
index 0504400a..00000000
--- a/app/views/accounts/accountables/_depository.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= f.select :subtype, [["Checking", "checking"], ["Savings", "savings"]], { label: true, prompt: t(".prompt"), include_blank: t(".none") } %>
diff --git a/app/views/accounts/accountables/_investment.html.erb b/app/views/accounts/accountables/_investment.html.erb
deleted file mode 100644
index 86355b07..00000000
--- a/app/views/accounts/accountables/_investment.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= f.select :subtype, Investment::SUBTYPES, { label: true, prompt: t(".prompt"), include_blank: t(".none") } %>
diff --git a/app/views/accounts/accountables/_loan.html.erb b/app/views/accounts/accountables/_loan.html.erb
deleted file mode 100644
index d44b1037..00000000
--- a/app/views/accounts/accountables/_loan.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<div>
-  <hr class="my-4">
-
-  <div class="space-y-2">
-    <%= f.fields_for :accountable do |loan_form| %>
-      <div class="flex items-center gap-2">
-        <%= loan_form.number_field :interest_rate, label: t(".interest_rate"), placeholder: t(".interest_rate_placeholder"), min: 0, step: 0.01 %>
-        <%= loan_form.select :rate_type, options_for_select([["Fixed", "fixed"], ["Variable", "variable"], ["Adjustable", "adjustable"]]), { label: t(".rate_type") } %>
-      </div>
-
-      <div class="flex items-center gap-2">
-        <%= loan_form.number_field :term_months, label: t(".term_months"), placeholder: t(".term_months_placeholder") %>
-      </div>
-    <% end %>
-  </div>
-</div>
diff --git a/app/views/accounts/accountables/_other_asset.html.erb b/app/views/accounts/accountables/_other_asset.html.erb
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/views/accounts/accountables/_other_liability.html.erb b/app/views/accounts/accountables/_other_liability.html.erb
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/views/accounts/accountables/_property.html.erb b/app/views/accounts/accountables/_property.html.erb
deleted file mode 100644
index 67ccc042..00000000
--- a/app/views/accounts/accountables/_property.html.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-<%# locals: (f:) %>
-
-<div>
-  <hr class="my-4">
-
-  <h3 class="my-4 font-medium"><%= t(".additional_info") %> (<%= t(".optional") %>)</h3>
-
-  <div class="space-y-2">
-    <%= f.fields_for :accountable do |af| %>
-      <div class="flex gap-2">
-        <%= af.number_field :year_built, label: t(".year_built"), placeholder: 2005, min: 1700, max: Time.current.year %>
-        <%= af.number_field :area_value, label: t(".area_value"), placeholder: 2000, min: 1 %>
-        <%= af.select :area_unit,
-                  [["Square feet", "sqft"], ["Square meters", "sqm"]],
-                  { label: t(".area_unit") } %>
-      </div>
-
-      <%= af.fields_for :address do |address_form| %>
-        <div class="flex gap-2">
-          <%= address_form.text_field :line1, label: t(".line1"), placeholder: "123 Main St" %>
-          <%= address_form.text_field :line2, label: t(".line2"), placeholder: "Apt 1" %>
-        </div>
-
-        <div class="flex gap-2">
-          <%= address_form.text_field :locality, label: t(".city"), placeholder: "Sacramento" %>
-          <%= address_form.text_field :region, label: t(".state"), placeholder: "CA" %>
-        </div>
-
-        <div class="flex gap-2">
-          <%= address_form.text_field :postal_code, label: t(".postal_code"), placeholder: "95814" %>
-          <%= address_form.text_field :country, label: t(".country"), placeholder: "USA" %>
-        </div>
-      <% end %>
-    <% end %>
-  </div>
-</div>
diff --git a/app/views/accounts/accountables/_vehicle.html.erb b/app/views/accounts/accountables/_vehicle.html.erb
deleted file mode 100644
index b8baeed1..00000000
--- a/app/views/accounts/accountables/_vehicle.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<%# locals: (f:) %>
-
-<div>
-  <hr class="my-4">
-
-  <div class="space-y-2">
-    <%= f.fields_for :accountable do |vehicle_form| %>
-
-      <div class="flex items-center gap-2">
-        <%= vehicle_form.text_field :make, label: t(".make"), placeholder: t(".make_placeholder") %>
-        <%= vehicle_form.text_field :model, label: t(".model"), placeholder: t(".model_placeholder") %>
-      </div>
-
-      <div class="flex items-center gap-2">
-        <%= vehicle_form.number_field :year, label: t(".year"), placeholder: t(".year_placeholder"), min: 1900, max: Time.current.year %>
-        <%= vehicle_form.number_field :mileage_value, label: t(".mileage"), placeholder: t(".mileage_placeholder"), min: 0 %>
-        <%= vehicle_form.select :mileage_unit,
-                  [["Miles", "mi"], ["Kilometers", "km"]],
-                  { label: t(".mileage_unit") } %>
-      </div>
-    <% end %>
-  </div>
-</div>
diff --git a/app/views/accounts/edit.html.erb b/app/views/accounts/edit.html.erb
deleted file mode 100644
index 26eff37d..00000000
--- a/app/views/accounts/edit.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= modal_form_wrapper title: t(".edit", account: @account.name) do %>
-  <%= render "form", account: @account, url: edit_account_form_url(@account) %>
-<% end %>
diff --git a/app/views/accounts/index.html.erb b/app/views/accounts/index.html.erb
index adf33f50..ff45d33f 100644
--- a/app/views/accounts/index.html.erb
+++ b/app/views/accounts/index.html.erb
@@ -1,48 +1,28 @@
-<% content_for :sidebar do %>
-  <%= render "settings/nav" %>
+<header class="flex justify-between items-center text-primary font-medium">
+  <h1 class="text-xl"><%= t(".accounts") %></h1>
+  <div class="flex items-center gap-5">
+    <div class="flex items-center gap-2">
+      <%= render DS::Link.new(
+        text: "New account",
+        href: new_account_path(return_to: accounts_path),
+        variant: "primary",
+        icon: "plus",
+        frame: :modal
+      ) %>
+    </div>
+  </div>
+</header>
+
+<% if @manual_accounts.empty? && @plaid_items.empty? %>
+  <%= render "empty" %>
+<% else %>
+  <div class="space-y-2">
+    <% if @plaid_items.any? %>
+      <%= render @plaid_items.sort_by(&:created_at) %>
+    <% end %>
+
+    <% if @manual_accounts.any? %>
+      <%= render "accounts/index/manual_accounts", accounts: @manual_accounts %>
+    <% end %>
+  </div>
 <% end %>
-
-<div class="space-y-4">
-  <header class="flex justify-between items-center text-gray-900 font-medium">
-    <h1 class="text-xl"><%= t(".accounts") %></h1>
-    <div class="flex items-center gap-5">
-      <div class="flex items-center gap-2">
-        <%= contextual_menu do %>
-          <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-            <%= link_to new_institution_path,
-                        class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg font-normal",
-                        data: { turbo_frame: "modal" } do %>
-              <%= lucide_icon "building-2", class: "w-5 h-5 text-gray-500" %>
-              <span class="text-black"><%= t(".add_institution") %></span>
-            <% end %>
-          </div>
-        <% end %>
-
-        <%= render "sync_all_button" %>
-
-        <%= link_to new_account_path,
-                    data: { turbo_frame: "modal" },
-                    class: "btn btn--primary flex items-center gap-1" do %>
-          <%= lucide_icon("plus", class: "w-5 h-5") %>
-          <p class="text-sm font-medium"><%= t(".new_account") %></p>
-        <% end %>
-      </div>
-    </div>
-  </header>
-
-  <% if @accounts.empty? && @institutions.empty? %>
-    <%= render "empty" %>
-  <% else %>
-    <div class="space-y-2">
-      <% @institutions.each do |institution| %>
-        <%= render "institution_accounts", institution: %>
-      <% end %>
-
-      <% if @accounts.any? %>
-        <%= render "institutionless_accounts", accounts: @accounts %>
-      <% end %>
-    </div>
-  <% end %>
-
-  <%= settings_nav_footer %>
-</div>
diff --git a/app/views/accounts/index/_account_groups.erb b/app/views/accounts/index/_account_groups.erb
new file mode 100644
index 00000000..841e60c2
--- /dev/null
+++ b/app/views/accounts/index/_account_groups.erb
@@ -0,0 +1,23 @@
+<%# locals: (accounts:) %>
+
+<% accounts.group_by(&:accountable_type).sort_by { |group, _| group }.each do |group, accounts| %>
+  <div class="bg-container-inset p-1 rounded-xl">
+    <div class="flex items-center px-4 py-2 text-xs font-medium text-secondary">
+      <p><%= Accountable.from_type(group).display_name %></p>
+      <span class="text-subdued mx-2">&middot;</span>
+      <p><%= accounts.count %></p>
+
+      <% unless accounts.any?(&:syncing?) %>
+        <p class="ml-auto"><%= totals_by_currency(collection: accounts, money_method: :balance_money) %></p>
+      <% end %>
+    </div>
+    <div class="bg-container rounded-lg shadow-border-xs">
+      <% accounts.each_with_index do |account, index| %>
+        <%= render account %>
+        <% unless index == accounts.count - 1 %>
+          <%= render "shared/ruler" %>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/accounts/index/_manual_accounts.html.erb b/app/views/accounts/index/_manual_accounts.html.erb
new file mode 100644
index 00000000..0dd8f66d
--- /dev/null
+++ b/app/views/accounts/index/_manual_accounts.html.erb
@@ -0,0 +1,17 @@
+<%# locals: (accounts:) %>
+
+<details open class="group bg-container p-4 shadow-border-xs rounded-xl">
+  <summary class="flex items-center gap-2 focus-visible:outline-hidden">
+    <%= icon("chevron-right", class: "group-open:transform group-open:rotate-90") %>
+
+    <div class="flex items-center justify-center h-8 w-8 rounded-full bg-black/5">
+      <%= icon("folder-pen") %>
+    </div>
+
+    <span class="mr-auto text-sm font-medium text-primary"><%= t(".other_accounts") %></span>
+  </summary>
+
+  <div class="space-y-4 mt-4">
+    <%= render "accounts/index/account_groups", accounts: accounts %>
+  </div>
+</details>
diff --git a/app/views/accounts/list.html.erb b/app/views/accounts/list.html.erb
deleted file mode 100644
index 6075fd14..00000000
--- a/app/views/accounts/list.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<%= turbo_frame_tag "account-list" do %>
-  <% account_groups(period: @period).each do |group| %>
-    <%= render "accounts/account_list", group: group %>
-  <% end %>
-<% end %>
diff --git a/app/views/accounts/new.html.erb b/app/views/accounts/new.html.erb
index bb544e85..35407561 100644
--- a/app/views/accounts/new.html.erb
+++ b/app/views/accounts/new.html.erb
@@ -1,87 +1,37 @@
-<h1 class="text-3xl font-semibold font-display"><%= t(".title") %></h1>
-<%= modal do %>
-  <div class="flex flex-col w-screen max-w-xl" data-controller="list-keyboard-navigation">
-    <% if @account.accountable.blank? %>
-      <div class="border-b border-alpha-black-25 p-4 text-gray-400">
-        <%= t ".select_accountable_type" %>
-      </div>
-      <div class="flex flex-col p-2 text-sm grow">
-        <button hidden data-controller="hotkey" data-hotkey="k,K,ArrowUp,ArrowLeft" data-action="list-keyboard-navigation#focusPrevious">Previous</button>
-        <button hidden data-controller="hotkey" data-hotkey="j,J,ArrowDown,ArrowRight" data-action="list-keyboard-navigation#focusNext">Next</button>
-        <%= render "account_type", type: Depository.new, bg_color: "bg-blue-500/5", text_color: "text-blue-500", icon: "landmark" %>
-        <%= render "account_type", type: Investment.new, bg_color: "bg-green-500/5", text_color: "text-green-500", icon: "line-chart" %>
-        <%= render "account_type", type: Crypto.new, bg_color: "bg-orange-500/5", text_color: "text-orange-500", icon: "bitcoin" %>
-        <%= render "account_type", type: Property.new, bg_color: "bg-pink-500/5", text_color: "text-pink-500", icon: "home" %>
-        <%= render "account_type", type: Vehicle.new, bg_color: "bg-cyan-500/5", text_color: "text-cyan-500", icon: "car-front" %>
-        <%= render "account_type", type: CreditCard.new, bg_color: "bg-violet-500/5", text_color: "text-violet-500", icon: "credit-card" %>
-        <%= render "account_type", type: Loan.new, bg_color: "bg-yellow-500/5", text_color: "text-yellow-500", icon: "hand-coins" %>
-        <%= render "account_type", type: OtherAsset.new, bg_color: "bg-green-500/5", text_color: "text-green-500", icon: "plus" %>
-        <%= render "account_type", type: OtherLiability.new, bg_color: "bg-red-500/5", text_color: "text-red-500", icon: "minus" %>
-      </div>
-      <div class="border-t border-alpha-black-25 p-4 text-gray-500 text-sm flex justify-between">
-        <div class="flex space-x-5">
-          <div class="flex items-center space-x-2">
-            <span>Select</span>
-            <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center"><%= lucide_icon("corner-down-left", class: "inline w-3 h-3") %></kbd>
-          </div>
-          <div class="flex items-center space-x-2">
-            <span>Navigate</span>
-            <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center"><%= lucide_icon("arrow-up", class: "inline w-3 h-3") %></kbd>
-            <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center"><%= lucide_icon("arrow-down", class: "inline w-3 h-3") %></kbd>
-          </div>
-        </div>
-        <div class="flex items-center space-x-2">
-          <button data-action="modal#close">Close</button>
-          <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-8 h-5 shrink-0 grow-0 items-center justify-center text-xs">ESC</kbd>
-        </div>
-      </div>
-    <% elsif params[:step] == 'method' && @account.accountable.present? %>
-      <div class="border-b border-alpha-black-25 p-4 text-gray-400 flex items-center space-x-3">
-        <%= link_to new_account_path, class: "flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg bg-alpha-black-50 back focus:outline-gray-300 focus:outline" do %>
-          <%= lucide_icon("arrow-left", class: "text-gray-500 w-5 h-5") %>
-        <% end %>
-        <span>How would you like to add it?</span>
-      </div>
-      <div class="flex flex-col p-2 text-sm grow">
-        <button hidden data-controller="hotkey" data-hotkey="k,K,ArrowUp,ArrowLeft" data-action="list-keyboard-navigation#focusPrevious">Previous</button>
-        <button hidden data-controller="hotkey" data-hotkey="j,J,ArrowDown,ArrowRight" data-action="list-keyboard-navigation#focusNext">Next</button>
-        <%= render "entry_method", type: @account.accountable, text: "Enter account balance manually", icon: "keyboard" %>
-        <%= link_to new_import_path, class: "flex items-center gap-4 w-full text-center focus:outline-none focus:bg-gray-50 border border-transparent focus:border focus:border-gray-200 px-2 hover:bg-gray-50 rounded-lg p-2" do %>
-          <span class="flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg bg-alpha-black-50 shadow-[inset_0_0_0_1px_rgba(0,0,0,0.02)]">
-            <%= lucide_icon("sheet", class: "text-gray-500 w-5 h-5") %>
-          </span>
-          Upload CSV
-        <% end %>
-        <%= render "entry_method", type: @account.accountable, text: "Securely link bank account with data provider (coming soon)", icon: "link-2", disabled: true %>
-      </div>
-      <div class="border-t border-alpha-black-25 p-4 text-gray-500 text-sm flex justify-between">
-        <div class="flex space-x-5">
-          <div class="flex items-center space-x-2">
-            <span>Select</span>
-            <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center"><%= lucide_icon("corner-down-left", class: "inline w-3 h-3") %></kbd>
-          </div>
-          <div class="flex items-center space-x-2">
-            <span>Navigate</span>
-            <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center"><%= lucide_icon("arrow-up", class: "inline w-3 h-3") %></kbd>
-            <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center"><%= lucide_icon("arrow-down", class: "inline w-3 h-3") %></kbd>
-          </div>
-        </div>
-        <div class="flex items-center space-x-2">
-          <button data-action="modal#close">Close</button>
-          <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-8 h-5 shrink-0 grow-0 items-center justify-center text-xs">ESC</kbd>
-        </div>
-      </div>
-    <% else %>
-      <div class="border-b border-alpha-black-25 p-4 text-gray-800 flex items-center space-x-3">
-        <%= link_to new_account_path(step: "method", type: params[:type]), class: "flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg bg-alpha-black-50 focus:outline-gray-300 focus:outline" do %>
-          <%= lucide_icon("arrow-left", class: "text-gray-500 w-5 h-5") %>
-        <% end %>
-        <span>Add <%= @account.accountable.model_name.human.downcase %></span>
-      </div>
+<%= render layout: "accounts/new/container", locals: { title: t(".title") } do %>
+  <div class="text-sm">
+    <% unless params[:classification] == "liability" %>
+      <%= render "account_type", accountable: Depository.new %>
+      <%= render "account_type", accountable: Investment.new %>
+      <%= render "account_type", accountable: Crypto.new %>
+      <%= render "account_type", accountable: Property.new %>
+      <%= render "account_type", accountable: Vehicle.new %>
+    <% end %>
 
-      <div class="p-4 pt-1">
-        <%= render "form", account: @account, url: new_account_form_url(@account) %>
-      </div>
+    <% unless params[:classification] == "asset" %>
+      <%= render "account_type", accountable: CreditCard.new %>
+      <%= render "account_type", accountable: Loan.new %>
+    <% end %>
+
+    <% unless params[:classification] == "liability" %>
+      <%= render "account_type", accountable: OtherAsset.new %>
+    <% end %>
+
+    <% unless params[:classification] == "asset" %>
+      <%= render "account_type", accountable: OtherLiability.new %>
+    <% end %>
+
+    <% unless params[:return_to].present? %>
+      <%= button_to imports_path(import: { type: "AccountImport" }),
+              data: { turbo_frame: :_top },
+            class: "flex items-center gap-4 w-full text-center focus:outline-hidden hover:bg-surface-hover focus:bg-surface-hover fg-primary border border-transparent block px-2 rounded-lg p-2" do %>
+        <%= render DS::FilledIcon.new(
+          icon: "download",
+          hex_color: "#F79009",
+        ) %>
+
+        <%= t("accounts.new.import_accounts") %>
+      <% end %>
     <% end %>
   </div>
 <% end %>
diff --git a/app/views/accounts/new/_container.html.erb b/app/views/accounts/new/_container.html.erb
new file mode 100644
index 00000000..47a75ca9
--- /dev/null
+++ b/app/views/accounts/new/_container.html.erb
@@ -0,0 +1,53 @@
+<%# locals: (title:, back_path: nil) %>
+
+<%= render DS::Dialog.new do |dialog| %>
+  <div class="flex flex-col relative" data-controller="list-keyboard-navigation">
+    <div class="border-b border-tertiary md:border-alpha-black-25 px-4 pb-4 text-gray-800 flex items-center justify-between gap-2">
+      <div class="flex items-center gap-2">
+        <% if back_path %>
+          <%= render DS::Link.new(
+          variant: "icon",
+          icon: "arrow-left",
+          href: back_path,
+          size: "lg"
+        ) %>
+        <% end %>
+
+        <span class="text-primary"><%= title %></span>
+      </div>
+
+      <%= icon("x", as_button: true, size: "lg", data: { action: "dialog#close" }) %>
+    </div>
+
+    <div class="p-2 text-subdued">
+      <button hidden data-controller="hotkey" data-hotkey="k,K,ArrowUp,ArrowLeft" data-action="list-keyboard-navigation#focusPrevious">Previous</button>
+      <button hidden data-controller="hotkey" data-hotkey="j,J,ArrowDown,ArrowRight" data-action="list-keyboard-navigation#focusNext">Next</button>
+
+      <%= yield %>
+    </div>
+
+    <div class="border-t border-alpha-black-25 px-4 pt-4 text-secondary text-sm justify-between hidden md:flex">
+      <div class="flex space-x-5">
+        <div class="flex items-center space-x-2">
+          <span>Select</span>
+          <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center">
+            <%= icon("corner-down-left", size: "xs") %>
+          </kbd>
+        </div>
+        <div class="flex items-center space-x-2">
+          <span>Navigate</span>
+          <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center">
+            <%= icon("arrow-up", size: "xs") %>
+          </kbd>
+          <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-5 h-5 shrink-0 grow-0 items-center justify-center">
+            <%= icon("arrow-down", size: "xs") %>
+          </kbd>
+        </div>
+      </div>
+      <div class="flex items-center space-x-2">
+        <button data-action="dialog#close">Close</button>
+        <kbd class="bg-alpha-black-50 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.1)] p-1 rounded-md flex w-8 h-5 shrink-0 grow-0 items-center justify-center text-xs">ESC</kbd>
+      </div>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/accounts/new/_method_selector.html.erb b/app/views/accounts/new/_method_selector.html.erb
new file mode 100644
index 00000000..03beaa92
--- /dev/null
+++ b/app/views/accounts/new/_method_selector.html.erb
@@ -0,0 +1,36 @@
+<%# locals: (path:, accountable_type:, show_us_link: true, show_eu_link: true) %>
+
+<%= render layout: "accounts/new/container", locals: { title: t(".title"), back_path: new_account_path } do %>
+  <div class="text-sm">
+    <%= link_to path, class: "flex items-center gap-4 w-full text-center text-primary focus:outline-hidden focus:bg-surface border border-transparent focus:border focus:border-gray-200 px-2 hover:bg-surface rounded-lg p-2" do %>
+      <span class="flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg bg-alpha-black-50 shadow-[inset_0_0_0_1px_rgba(0,0,0,0.02)]">
+        <%= icon("keyboard") %>
+      </span>
+      <%= t("accounts.new.method_selector.manual_entry") %>
+    <% end %>
+
+    <% if show_us_link %>
+      <%# Default US-only Link %>
+      <%= link_to new_plaid_item_path(region: "us", accountable_type: accountable_type),
+                  class: "text-primary flex items-center gap-4 w-full text-center focus:outline-hidden focus:bg-gray-50 border border-transparent focus:border focus:border-gray-200 px-2 hover:bg-gray-50 rounded-lg p-2",
+                  data: { turbo_frame: "modal" } do %>
+        <span class="flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg bg-alpha-black-50 shadow-[inset_0_0_0_1px_rgba(0,0,0,0.02)]">
+          <%= icon("link-2") %>
+        </span>
+        <%= t("accounts.new.method_selector.connected_entry") %>
+      <% end %>
+    <% end %>
+
+    <%# EU Link %>
+    <% if show_eu_link %>
+      <%= link_to new_plaid_item_path(region: "eu", accountable_type: accountable_type),
+                  class: "text-primary flex items-center gap-4 w-full text-center focus:outline-hidden focus:bg-gray-50 border border-transparent focus:border focus:border-gray-200 px-2 hover:bg-gray-50 rounded-lg p-2",
+                  data: { turbo_frame: "modal" } do %>
+        <span class="flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg bg-alpha-black-50 shadow-[inset_0_0_0_1px_rgba(0,0,0,0.02)]">
+          <%= icon("link-2") %>
+        </span>
+        <%= t("accounts.new.method_selector.connected_entry_eu") %>
+      <% end %>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/accounts/show.html.erb b/app/views/accounts/show.html.erb
index d9041766..170f1298 100644
--- a/app/views/accounts/show.html.erb
+++ b/app/views/accounts/show.html.erb
@@ -1,112 +1,8 @@
-<%= turbo_stream_from @account %>
-
-<%= tag.div id: dom_id(@account), class: "space-y-4" do %>
-  <header class="flex justify-between items-center">
-    <div class="flex items-center gap-3">
-      <%= image_tag account_logo_url(@account), class: "w-8 h-8" %>
-      <div>
-        <h2 class="font-medium text-xl"><%= @account.name %></h2>
-
-        <% if @account.property? && @account.property.address&.line1.present? %>
-          <p class="text-gray-500"><%= @account.property.address %></p>
-        <% end %>
-      </div>
-    </div>
-    <div class="flex items-center gap-3">
-      <%= button_to sync_account_path(@account), method: :post, class: "flex items-center gap-2", title: "Sync Account" do %>
-        <%= lucide_icon "refresh-cw", class: "w-4 h-4 text-gray-500 hover:text-gray-400" %>
-      <% end %>
-
-      <%= contextual_menu do %>
-        <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-          <%= link_to edit_account_path(@account),
-                      data: { turbo_frame: :modal },
-                      class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg" do %>
-            <%= lucide_icon "pencil-line", class: "w-5 h-5 text-gray-500" %>
-
-            <span><%= t(".edit") %></span>
-          <% end %>
-
-          <%= link_to new_import_path,
-                      class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg" do %>
-            <%= lucide_icon "download", class: "w-5 h-5 text-gray-500" %>
-
-            <span><%= t(".import") %></span>
-          <% end %>
-
-          <%= button_to account_path(@account),
-                        method: :delete,
-                        class: "block w-full py-2 px-3 space-x-2 text-red-600 hover:bg-red-50 flex items-center rounded-lg",
-                        data: {
-                          turbo_confirm: {
-                            title: t(".confirm_title"),
-                            body: t(".confirm_body_html"),
-                            accept: t(".confirm_accept", name: @account.name)
-                          }
-                        } do %>
-            <%= lucide_icon("trash-2", class: "w-5 h-5 mr-2") %> Delete account
-          <% end %>
-        </div>
-      <% end %>
-    </div>
-  </header>
-
-  <% if @account.highest_priority_issue %>
-    <%= render partial: "issues/issue", locals: { issue: @account.highest_priority_issue } %>
-  <% end %>
-
-  <div class="bg-white shadow-xs rounded-xl border border-alpha-black-25 rounded-lg">
-    <div class="p-4 flex justify-between">
-      <div class="space-y-2">
-        <div class="flex items-center gap-1">
-          <div>
-            <% if @account.asset? %>
-              <%= tag.p t(".total_value"), class: "text-sm font-medium text-gray-500" %>
-            <% else %>
-              <%= tag.p t(".total_owed"), class: "text-sm font-medium text-gray-500" %>
-            <% end %>
-          </div>
-          <%= render "tooltip", account: @account if @account.investment? %>
-        </div>
-        <%= tag.p format_money(@account.value), class: "text-gray-900 text-3xl font-medium" %>
-        <div>
-          <% if @series.trend.direction.flat? %>
-            <%= tag.span t(".no_change"), class: "text-gray-500" %>
-          <% else %>
-            <%= tag.span format_money(@series.trend.value), style: "color: #{@trend.color}" %>
-            <%= tag.span "(#{@trend.percent}%)", style: "color: #{@trend.color}" %>
-          <% end %>
-
-          <%= tag.span period_label(@period), class: "text-gray-500" %>
-        </div>
-      </div>
-      <%= form_with url: account_path(@account), method: :get, data: { controller: "auto-submit-form" } do |form| %>
-        <%= period_select form: form, selected: @period.name %>
-      <% end %>
-    </div>
-    <div class="h-96 flex items-center justify-center text-2xl font-bold">
-      <%= render partial: "shared/line_chart", locals: { series: @series } %>
-    </div>
-  </div>
-
-  <% selected_tab = selected_account_tab(@account) %>
-  <% selected_tab_key = selected_tab[:key] %>
-  <% selected_tab_partial_path = selected_tab[:partial_path] %>
-  <% selected_tab_route = selected_tab[:route] %>
-
-  <div class="flex gap-2 text-sm text-gray-900 font-medium mb-4">
-    <% account_tabs(@account).each do |tab| %>
-      <%= link_to tab[:label], tab[:path], class: ["px-2 py-1.5 rounded-md border border-transparent", "bg-white shadow-xs border-alpha-black-50": selected_tab_key == tab[:key]] %>
-    <% end %>
-  </div>
-
-  <div class="min-h-[800px]">
-    <% if selected_tab_route.present? %>
-      <%= turbo_frame_tag dom_id(@account, selected_tab_key), src: selected_tab_route do %>
-        <%= render "account/entries/loading" %>
-      <% end %>
-    <% else %>
-      <%= render selected_tab_partial_path, account: @account %>
-    <% end %>
-  </div>
+<%= render UI::AccountPage.new(
+      account: @account,
+      chart_view: @chart_view,
+      chart_period: @period,
+      active_tab: @tab
+    ) do |account_page| %>
+  <%= account_page.with_activity_feed(feed_data: @activity_feed_data, pagy: @pagy, search: @q[:search]) %>
 <% end %>
diff --git a/app/views/accounts/show/_activity.html.erb b/app/views/accounts/show/_activity.html.erb
new file mode 100644
index 00000000..da5e5ecb
--- /dev/null
+++ b/app/views/accounts/show/_activity.html.erb
@@ -0,0 +1,93 @@
+<%# locals: (account:) %>
+
+<%= turbo_frame_tag dom_id(account, "entries") do %>
+  <div class="bg-container p-5 shadow-border-xs rounded-xl">
+    <div class="flex items-center justify-between mb-4" data-testid="activity-menu">
+      <%= tag.h2 t(".title"), class: "font-medium text-lg" %>
+      <% unless @account.plaid_account_id.present? %>
+        <%= render DS::Menu.new(variant: "button") do |menu| %>
+          <% menu.with_button(text: "New", variant: "secondary", icon: "plus") %>
+
+          <% menu.with_item(
+              variant: "link",
+              text: "New balance",
+              icon: "circle-dollar-sign",
+              href: new_valuation_path(account_id: @account.id),
+              data: { turbo_frame: :modal }) %>
+
+          <% unless @account.crypto? %>
+            <% href = @account.investment? ? new_trade_path(account_id: @account.id) : new_transaction_path(account_id: @account.id) %>
+            <% menu.with_item(
+                variant: "link",
+                text: "New transaction",
+                icon: "credit-card",
+                href: href,
+                data: { turbo_frame: :modal }) %>
+          <% end %>
+        <% end %>
+      <% end %>
+    </div>
+
+    <div>
+      <%= form_with url: account_path(account),
+              id: "entries-search",
+              scope: :q,
+              method: :get,
+              data: { controller: "auto-submit-form" } do |form| %>
+        <div class="flex gap-2 mb-4">
+          <div class="grow">
+            <div class="flex items-center px-3 py-2 gap-2 border border-secondary rounded-lg focus-within:ring-gray-100 focus-within:border-gray-900">
+              <%= icon("search") %>
+              <%= hidden_field_tag :account_id, @account.id %>
+              <%= form.search_field :search,
+                            placeholder: "Search entries by name",
+                            value: @q[:search],
+                            class: "form-field__input placeholder:text-sm placeholder:text-secondary",
+                            "data-auto-submit-form-target": "auto" %>
+            </div>
+          </div>
+        </div>
+      <% end %>
+    </div>
+
+    <% if @entries.empty? %>
+      <p class="text-secondary text-sm p-4"><%= t(".no_entries") %></p>
+    <% else %>
+      <%= tag.div id: dom_id(@account, "entries_bulk_select"),
+                data: {
+                  controller: "bulk-select",
+                  bulk_select_singular_label_value: t(".entry"),
+                  bulk_select_plural_label_value: t(".entries")
+                } do %>
+        <div id="entry-selection-bar" data-bulk-select-target="selectionBar" class="flex justify-center hidden">
+          <%= render "entries/selection_bar" %>
+        </div>
+
+        <div class="grid bg-container-inset rounded-xl grid-cols-12 items-center uppercase text-xs font-medium text-secondary px-5 py-3 mb-4">
+          <div class="pl-0.5 col-span-8 flex items-center gap-4">
+            <%= check_box_tag "selection_entry",
+                              class: "checkbox checkbox--light",
+                              data: { action: "bulk-select#togglePageSelection" } %>
+            <p><%= t(".date") %></p>
+          </div>
+          <%= tag.p t(".amount"), class: "col-span-2 justify-self-end" %>
+          <%= tag.p t(".balance"), class: "col-span-2 justify-self-end" %>
+        </div>
+
+        <div>
+          <div class="space-y-4">
+            <%= entries_by_date(@entries) do |entries| %>
+              <% entries.each_with_index do |entry, index| %>
+                <%= render entry, view_ctx: "account" %>
+              <% end %>
+            <% end %>
+          </div>
+
+          <div class="p-4 bg-container rounded-bl-lg rounded-br-lg">
+            <%= render "shared/pagination", pagy: @pagy %>
+          </div>
+        </div>
+      <% end %>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/accounts/show/_header.html.erb b/app/views/accounts/show/_header.html.erb
new file mode 100644
index 00000000..421f188d
--- /dev/null
+++ b/app/views/accounts/show/_header.html.erb
@@ -0,0 +1,44 @@
+<%# locals: (account:, title:, subtitle: nil) %>
+
+<header class="space-y-4">
+  <div class="flex items-center gap-4">
+    <div class="flex items-center gap-3 overflow-hidden">
+      <%= render "accounts/logo", account: account %>
+
+      <div class="flex items-center gap-2">
+        <div class="truncate">
+          <div class="flex items-center gap-3">
+            <h2 class="font-medium text-xl truncate <%= "animate-pulse" if account.syncing? %>"><%= title %></h2>
+            <% if account.draft? %>
+              <%= render DS::Link.new(
+                  text: "Complete setup",
+                  href: edit_account_path(account),
+                  variant: :outline,
+                  size: :sm,
+                  frame: :modal
+                ) %>
+            <% end %>
+          </div>
+          <% if subtitle.present? %>
+            <p class="text-sm text-secondary"><%= subtitle %></p>
+          <% end %>
+        </div>
+      </div>
+    </div>
+
+    <div class="flex items-center gap-1 ml-auto">
+      <% if Rails.env.development? || self_hosted? %>
+        <%= icon(
+            "refresh-cw",
+            as_button: true,
+            size: "sm",
+            href: account.linked? ? sync_plaid_item_path(account.plaid_account.plaid_item) : sync_account_path(account),
+            disabled: account.syncing?,
+            frame: :_top
+          ) %>
+      <% end %>
+
+      <%= render "accounts/show/menu", account: account %>
+    </div>
+  </div>
+</header>
diff --git a/app/views/accounts/show/_menu.html.erb b/app/views/accounts/show/_menu.html.erb
new file mode 100644
index 00000000..ef98ae9e
--- /dev/null
+++ b/app/views/accounts/show/_menu.html.erb
@@ -0,0 +1,27 @@
+<%# locals: (account:) %>
+
+<%= render DS::Menu.new(testid: "account-menu") do |menu| %>
+  <% menu.with_item(variant: "link", text: "Edit", href: edit_account_path(account), icon: "pencil-line", data: { turbo_frame: :modal }) %>
+
+  <% unless account.crypto? %>
+    <% menu.with_item(
+      variant: "link",
+      text: "Import transactions",
+      href: imports_path({ import: { type: account.investment? ? "TradeImport" : "TransactionImport", account_id: account.id } }),
+      icon: "download",
+      data: { turbo_frame: :_top }
+    ) %>
+  <% end %>
+
+  <% unless account.linked? %>
+    <% menu.with_item(
+      variant: "button",
+      text: "Delete account",
+      href: account_path(account),
+      method: :delete,
+      icon: "trash-2",
+      confirm: CustomConfirm.for_resource_deletion("account", high_severity: true),
+      data: { turbo_frame: :_top }
+    ) %>
+  <% end %>
+<% end %>
diff --git a/app/views/accounts/sparkline.html.erb b/app/views/accounts/sparkline.html.erb
new file mode 100644
index 00000000..0a07c653
--- /dev/null
+++ b/app/views/accounts/sparkline.html.erb
@@ -0,0 +1,11 @@
+<%= turbo_frame_tag dom_id(@account, :sparkline) do %>
+  <div class="flex items-center justify-end gap-1">
+    <div class="w-8 h-5">
+      <%= render "shared/sparkline", id: dom_id(@account, :sparkline_chart), series: @sparkline_series %>
+    </div>
+
+    <%= tag.p @sparkline_series.trend.percent_formatted,
+                style: "color: #{@sparkline_series.trend.color}",
+                class: "font-mono text-right text-xs font-medium text-primary" %>
+  </div>
+<% end %>
diff --git a/app/views/accounts/summary.html.erb b/app/views/accounts/summary.html.erb
deleted file mode 100644
index feffec64..00000000
--- a/app/views/accounts/summary.html.erb
+++ /dev/null
@@ -1,90 +0,0 @@
-<div class="space-y-4">
-
-  <%= render "header" %>
-
-  <div class="bg-white rounded-xl shadow-xs border border-alpha-black-100 flex divide-x divide-gray-200">
-    <div class="w-1/2 p-4 flex items-stretch justify-between">
-      <div class="space-y-2 grow">
-        <%= render partial: "shared/value_heading", locals: {
-            label: "Assets",
-            period: @period,
-            value: Current.family.assets,
-            trend: @asset_series.trend
-          } %>
-      </div>
-      <div
-          id="assetsChart"
-          class="h-full w-2/5"
-          data-controller="time-series-chart"
-          data-time-series-chart-data-value="<%= @asset_series.to_json %>"
-          data-time-series-chart-use-labels-value="false"></div>
-    </div>
-    <div class="w-1/2 p-4 flex items-stretch justify-between">
-      <div class="space-y-2 grow">
-        <%= render partial: "shared/value_heading", locals: {
-            label: "Liabilities",
-            period: @period,
-            size: "md",
-            value: Current.family.liabilities,
-            trend: @liability_series.trend
-          } %>
-      </div>
-      <div
-          id="liabilitiesChart"
-          class="h-full w-2/5"
-          data-controller="time-series-chart"
-          data-time-series-chart-data-value="<%= @liability_series.to_json %>"
-          data-time-series-chart-use-labels-value="false"></div>
-    </div>
-  </div>
-  <div class="p-4 bg-white rounded-xl shadow-xs border border-alpha-black-25 space-y-4">
-    <div class="flex justify-between items-center mb-5">
-      <h2 class="text-lg font-medium text-gray-900">Assets</h2>
-      <div class="flex items-center gap-2">
-        <%= link_to new_account_path, class: "btn btn--secondary flex items-center gap-1", data: { turbo_frame: "modal" } do %>
-          <%= lucide_icon("plus", class: "w-5 h-5 text-gray-500") %>
-          <p><%= t(".new") %></p>
-        <% end %>
-        <%= form_with url: summary_accounts_path, method: :get, data: { controller: "auto-submit-form" } do |form| %>
-          <%= period_select form: form, selected: @period.name %>
-        <% end %>
-      </div>
-    </div>
-
-    <% if @account_groups[:assets].children.any? %>
-      <%= render partial: "pages/account_percentages_bar", locals: { account_groups: @account_groups[:assets].children } %>
-      <%= render partial: "pages/account_percentages_table", locals: { account_groups: @account_groups[:assets].children } %>
-    <% else %>
-      <div class="py-20 flex flex-col items-center">
-        <%= lucide_icon "blocks", class: "w-6 h-6 shrink-0 text-gray-500" %>
-        <p class="text-gray-900 text-sm font-medium mb-1 mt-4"><%= t(".no_assets") %></p>
-        <p class="text-gray-500 text-sm max-w-xs text-center"><%= t(".no_assets_description") %></p>
-      </div>
-    <% end %>
-  </div>
-  <div class="p-4 bg-white rounded-xl shadow-xs border border-alpha-black-25 space-y-4">
-    <div class="flex justify-between items-center mb-5">
-      <h2 class="text-lg font-medium text-gray-900">Liabilities</h2>
-      <div class="flex items-center gap-2">
-        <%= link_to new_account_path, class: "btn btn--secondary flex items-center gap-1", data: { turbo_frame: "modal" } do %>
-          <%= lucide_icon("plus", class: "w-5 h-5 text-gray-500") %>
-          <p><%= t(".new") %></p>
-        <% end %>
-        <%= form_with url: summary_accounts_path, method: :get, data: { controller: "auto-submit-form" } do |form| %>
-          <%= period_select form: form, selected: @period.name %>
-        <% end %>
-      </div>
-    </div>
-
-    <% if @account_groups[:liabilities].children.any? %>
-      <%= render partial: "pages/account_percentages_bar", locals: { account_groups: @account_groups[:liabilities].children } %>
-      <%= render partial: "pages/account_percentages_table", locals: { account_groups: @account_groups[:liabilities].children } %>
-    <% else %>
-      <div class="py-20 flex flex-col items-center">
-        <%= lucide_icon "scale", class: "w-6 h-6 shrink-0 text-gray-500" %>
-        <p class="text-gray-900 text-sm font-medium mb-1 mt-4"><%= t(".no_liabilities") %></p>
-        <p class="text-gray-500 text-sm max-w-xs text-center"><%= t(".no_liabilities_description") %></p>
-      </div>
-    <% end %>
-  </div>
-</div>
diff --git a/app/views/api/v1/accounts/index.json.jbuilder b/app/views/api/v1/accounts/index.json.jbuilder
new file mode 100644
index 00000000..e6e8bfee
--- /dev/null
+++ b/app/views/api/v1/accounts/index.json.jbuilder
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+json.accounts @accounts do |account|
+  json.id account.id
+  json.name account.name
+  json.balance account.balance_money.format
+  json.currency account.currency
+  json.classification account.classification
+  json.account_type account.accountable_type.underscore
+end
+
+json.pagination do
+  json.page @pagy.page
+  json.per_page @per_page
+  json.total_count @pagy.count
+  json.total_pages @pagy.pages
+end
diff --git a/app/views/api/v1/chats/_chat.json.jbuilder b/app/views/api/v1/chats/_chat.json.jbuilder
new file mode 100644
index 00000000..a1b520eb
--- /dev/null
+++ b/app/views/api/v1/chats/_chat.json.jbuilder
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+json.id chat.id
+json.title chat.title
+json.error chat.error.present? ? chat.error : nil
+json.created_at chat.created_at.iso8601
+json.updated_at chat.updated_at.iso8601
diff --git a/app/views/api/v1/chats/index.json.jbuilder b/app/views/api/v1/chats/index.json.jbuilder
new file mode 100644
index 00000000..c251b416
--- /dev/null
+++ b/app/views/api/v1/chats/index.json.jbuilder
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+json.chats @chats do |chat|
+  json.id chat.id
+  json.title chat.title
+  json.last_message_at chat.messages.ordered.first&.created_at&.iso8601
+  json.message_count chat.messages.count
+  json.error chat.error.present? ? chat.error : nil
+  json.created_at chat.created_at.iso8601
+  json.updated_at chat.updated_at.iso8601
+end
+
+json.pagination do
+  json.page @pagy.page
+  json.per_page @pagy.vars[:items]
+  json.total_count @pagy.count
+  json.total_pages @pagy.pages
+end
diff --git a/app/views/api/v1/chats/show.json.jbuilder b/app/views/api/v1/chats/show.json.jbuilder
new file mode 100644
index 00000000..d179da26
--- /dev/null
+++ b/app/views/api/v1/chats/show.json.jbuilder
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+json.partial! "chat", chat: @chat
+
+json.messages @messages do |message|
+  json.id message.id
+  json.type message.type.underscore
+  json.role message.role
+  json.content message.content
+  json.model message.ai_model if message.type == "AssistantMessage"
+  json.created_at message.created_at.iso8601
+  json.updated_at message.updated_at.iso8601
+
+  # Include tool calls for assistant messages
+  if message.type == "AssistantMessage" && message.tool_calls.any?
+    json.tool_calls message.tool_calls do |tool_call|
+      json.id tool_call.id
+      json.function_name tool_call.function_name
+      json.function_arguments tool_call.function_arguments
+      json.function_result tool_call.function_result
+      json.created_at tool_call.created_at.iso8601
+    end
+  end
+end
+
+if @pagy
+  json.pagination do
+    json.page @pagy.page
+    json.per_page @pagy.vars[:items]
+    json.total_count @pagy.count
+    json.total_pages @pagy.pages
+  end
+end
diff --git a/app/views/api/v1/messages/show.json.jbuilder b/app/views/api/v1/messages/show.json.jbuilder
new file mode 100644
index 00000000..4f580f62
--- /dev/null
+++ b/app/views/api/v1/messages/show.json.jbuilder
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+json.id @message.id
+json.chat_id @message.chat_id
+json.type @message.type.underscore
+json.role @message.role
+json.content @message.content
+json.model @message.ai_model if @message.type == "AssistantMessage"
+json.created_at @message.created_at.iso8601
+json.updated_at @message.updated_at.iso8601
+
+# Note: AI response will be processed asynchronously
+if @message.type == "UserMessage"
+  json.ai_response_status "pending"
+  json.ai_response_message "AI response is being generated"
+end
diff --git a/app/views/api/v1/transactions/_transaction.json.jbuilder b/app/views/api/v1/transactions/_transaction.json.jbuilder
new file mode 100644
index 00000000..2a1c9779
--- /dev/null
+++ b/app/views/api/v1/transactions/_transaction.json.jbuilder
@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+json.id transaction.id
+json.date transaction.entry.date
+json.amount transaction.entry.amount_money.format
+json.currency transaction.entry.currency
+json.name transaction.entry.name
+json.notes transaction.entry.notes
+json.classification transaction.entry.classification
+
+# Account information
+json.account do
+  json.id transaction.entry.account.id
+  json.name transaction.entry.account.name
+  json.account_type transaction.entry.account.accountable_type.underscore
+end
+
+# Category information
+if transaction.category.present?
+  json.category do
+    json.id transaction.category.id
+    json.name transaction.category.name
+    json.classification transaction.category.classification
+    json.color transaction.category.color
+    json.icon transaction.category.lucide_icon
+  end
+else
+  json.category nil
+end
+
+# Merchant information
+if transaction.merchant.present?
+  json.merchant do
+    json.id transaction.merchant.id
+    json.name transaction.merchant.name
+  end
+else
+  json.merchant nil
+end
+
+# Tags
+json.tags transaction.tags do |tag|
+  json.id tag.id
+  json.name tag.name
+  json.color tag.color
+end
+
+# Transfer information (if this transaction is part of a transfer)
+if transaction.transfer.present?
+  json.transfer do
+    json.id transaction.transfer.id
+    json.amount transaction.transfer.amount_abs.format
+    json.currency transaction.transfer.inflow_transaction.entry.currency
+
+    # Other transaction in the transfer
+    if transaction.transfer.inflow_transaction == transaction
+      other_transaction = transaction.transfer.outflow_transaction
+    else
+      other_transaction = transaction.transfer.inflow_transaction
+    end
+
+    if other_transaction.present?
+      json.other_account do
+        json.id other_transaction.entry.account.id
+        json.name other_transaction.entry.account.name
+        json.account_type other_transaction.entry.account.accountable_type.underscore
+      end
+    end
+  end
+else
+  json.transfer nil
+end
+
+# Additional metadata
+json.created_at transaction.created_at.iso8601
+json.updated_at transaction.updated_at.iso8601
diff --git a/app/views/api/v1/transactions/index.json.jbuilder b/app/views/api/v1/transactions/index.json.jbuilder
new file mode 100644
index 00000000..5718567e
--- /dev/null
+++ b/app/views/api/v1/transactions/index.json.jbuilder
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+json.transactions @transactions do |transaction|
+  json.partial! "transaction", transaction: transaction
+end
+
+json.pagination do
+  json.page @pagy.page
+  json.per_page @per_page
+  json.total_count @pagy.count
+  json.total_pages @pagy.pages
+end
diff --git a/app/views/api/v1/transactions/show.json.jbuilder b/app/views/api/v1/transactions/show.json.jbuilder
new file mode 100644
index 00000000..22dd4f8c
--- /dev/null
+++ b/app/views/api/v1/transactions/show.json.jbuilder
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+json.partial! "transaction", transaction: @transaction
diff --git a/app/views/application/_pagination.html.erb b/app/views/application/_pagination.html.erb
deleted file mode 100644
index dee086be..00000000
--- a/app/views/application/_pagination.html.erb
+++ /dev/null
@@ -1,55 +0,0 @@
-<%# locals: (pagy:) %>
-<nav class="flex w-full items-center justify-between">
-  <div class="flex items-center gap-1">
-    <div>
-      <% if pagy.prev %>
-        <%= link_to pagy_url_for(pagy, pagy.prev), class: "inline-flex items-center p-2 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700" do %>
-          <%= lucide_icon("chevron-left", class: "w-5 h-5 text-gray-500") %>
-        <% end %>
-      <% else %>
-        <div class="inline-flex items-center p-2 text-sm font-medium hover:border-gray-300">
-          <%= lucide_icon("chevron-left", class: "w-5 h-5 text-gray-200") %>
-        </div>
-      <% end %>
-    </div>
-    <div class="rounded-xl p-1 bg-gray-25">
-      <% pagy.series.each do |series_item| %>
-        <% if series_item.is_a?(Integer) %>
-          <%= link_to pagy_url_for(pagy, series_item), class: "rounded-md px-2 py-1 inline-flex items-center text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700" do %>
-            <%= series_item %>
-          <% end %>
-        <% elsif series_item.is_a?(String) %>
-          <%= link_to pagy_url_for(pagy, series_item), class: "rounded-md px-2 py-1 bg-white border border-alpha-black-25 shadow-xs inline-flex items-center text-sm font-medium text-gray-900" do %>
-            <%= series_item %>
-          <% end %>
-        <% elsif series_item == :gap %>
-          <span class="inline-flex items-center px-2 py-1 text-sm font-medium text-gray-500">...</span>
-        <% end %>
-      <% end %>
-    </div>
-    <div>
-      <% if pagy.next %>
-        <%= link_to pagy_url_for(pagy, pagy.next), class: "inline-flex items-center p-2 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700" do %>
-          <%= lucide_icon("chevron-right", class: "w-5 h-5 text-gray-500") %>
-        <% end %>
-      <% else %>
-        <div class="inline-flex items-center p-2 text-sm font-medium hover:border-gray-300">
-          <%= lucide_icon("chevron-right", class: "w-5 h-5 text-gray-200") %>
-        </div>
-      <% end %>
-    </div>
-  </div>
-  <div class="flex items-center gap-4">
-    <%= form_with url: url_for,
-                method: :get,
-                class: "flex items-center gap-4",
-                data: { controller: "auto-submit-form" } do |f| %>
-    <%= f.label :per_page, t(".rows_per_page"), class: "text-sm text-gray-500" %>
-    <%= f.select :per_page,
-                 options_for_select(["10", "20", "30", "50"], pagy.limit),
-                 {},
-                 class: "py-1.5 pr-8 text-sm text-gray-900 font-medium border border-gray-200 rounded-lg focus:border-gray-900 focus:ring-gray-900 focus-visible:ring-gray-900",
-                 data: { "auto-submit-form-target": "auto" } %>
-  <% end %>
-  </div>
-</nav>
diff --git a/app/views/assistant_messages/_assistant_message.html.erb b/app/views/assistant_messages/_assistant_message.html.erb
new file mode 100644
index 00000000..59356a78
--- /dev/null
+++ b/app/views/assistant_messages/_assistant_message.html.erb
@@ -0,0 +1,24 @@
+<%# locals: (assistant_message:) %>
+
+<div id="<%= dom_id(assistant_message) %>">
+  <% if assistant_message.reasoning? %>
+    <details class="group mb-1">
+      <summary class="flex items-center gap-2">
+        <p class="text-secondary text-sm">Assistant reasoning</p>
+        <%= icon("chevron-down", class: "group-open:transform group-open:rotate-180") %>
+      </summary>
+
+      <div class="prose prose--ai-chat"><%= markdown(assistant_message.content) %></div>
+    </details>
+  <% else %>
+    <% if assistant_message.chat.debug_mode? && assistant_message.tool_calls.any? %>
+      <%= render "assistant_messages/tool_calls", message: assistant_message %>
+    <% end %>
+
+    <div class="flex items-start gap-3 mb-6">
+      <%= render "chats/ai_avatar" %>
+
+      <div class="prose prose--ai-chat"><%= markdown(assistant_message.content) %></div>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/assistant_messages/_tool_calls.html.erb b/app/views/assistant_messages/_tool_calls.html.erb
new file mode 100644
index 00000000..59c14922
--- /dev/null
+++ b/app/views/assistant_messages/_tool_calls.html.erb
@@ -0,0 +1,19 @@
+<%# locals: (message:) %>
+
+<details class="my-2 group mb-4">
+  <summary class="text-secondary text-xs cursor-pointer flex items-center gap-2">
+    <%= icon("chevron-right", class: "group-open:transform group-open:rotate-90") %>
+    <p>Tool Calls</p>
+  </summary>
+
+  <div class="mt-2">
+    <% message.tool_calls.each do |tool_call| %>
+      <div class="bg-blue-50 border-blue-200 px-3 py-2 rounded-lg border mb-2">
+        <p class="text-secondary text-xs">Function:</p>
+        <p class="text-primary text-sm font-mono"><%= tool_call.function_name %></p>
+        <p class="text-secondary text-xs mt-2">Arguments:</p>
+        <pre class="text-primary text-sm font-mono whitespace-pre-wrap"><%= tool_call.function_arguments %></pre>
+      </div>
+    <% end %>
+  </div>
+</details>
diff --git a/app/views/budget_categories/_allocation_progress.erb b/app/views/budget_categories/_allocation_progress.erb
new file mode 100644
index 00000000..8302a57d
--- /dev/null
+++ b/app/views/budget_categories/_allocation_progress.erb
@@ -0,0 +1,44 @@
+<%# locals: (budget:) %>
+
+<div id="<%= dom_id(budget, :allocation_progress) %>" class="space-y-2 mb-6">
+  <div class="flex items-center gap-2">
+    <% if budget.available_to_allocate.negative? %>
+      <div class="rounded-full w-1.5 h-1.5 bg-red-500"></div>
+    <% else %>
+      <div class="rounded-full w-1.5 h-1.5 <%= budget.allocated_spending > 0 ? "bg-gray-900" : "bg-gray-100" %>"></div>
+    <% end %>
+
+    <% if budget.available_to_allocate.negative? %>
+      <p class="text-primary text-sm">&gt; 100% set</p>
+    <% else %>
+      <p class="text-secondary text-sm">
+        <%= number_to_percentage(budget.allocated_percent, precision: 0) %> set
+      </p>
+    <% end %>
+
+    <p class="ml-auto text-sm space-x-1">
+      <span class="<%= budget.available_to_allocate.negative? ? "text-red-500" : "text-primary" %>"><%= format_money(budget.allocated_spending_money) %></span>
+      <span class="text-secondary"> / </span>
+      <span class="text-secondary"><%= format_money(budget.budgeted_spending_money) %></span>
+    </p>
+  </div>
+
+  <div class="relative h-1.5 rounded-2xl bg-gray-100">
+    <% if budget.available_to_allocate.negative? %>
+      <div class="absolute inset-0 bg-red-500 rounded-2xl" style="width: 100%;"></div>
+    <% else %>
+      <div class="absolute inset-0 bg-gray-900 rounded-2xl" style="width: <%= budget.allocated_percent %>%;"></div>
+    <% end %>
+  </div>
+
+  <div class="text-sm">
+    <% if budget.available_to_allocate.negative? %>
+      <p class="text-secondary">
+        Budget exceeded by <span class="text-red-500"><%= format_money(budget.available_to_allocate_money.abs) %></span>
+      </p>
+    <% else %>
+      <span class="text-primary"><%= format_money(budget.available_to_allocate_money) %></span>
+      <span class="text-secondary">left to allocate</span>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/budget_categories/_budget_category.html.erb b/app/views/budget_categories/_budget_category.html.erb
new file mode 100644
index 00000000..81e857a2
--- /dev/null
+++ b/app/views/budget_categories/_budget_category.html.erb
@@ -0,0 +1,54 @@
+<%# locals: (budget_category:) %>
+
+<%= turbo_frame_tag dom_id(budget_category), class: "w-full" do %>
+  <%= link_to budget_budget_category_path(budget_category.budget, budget_category), class: "group w-full p-4 flex items-center gap-3 bg-container", data: { turbo_frame: "drawer" } do %>
+
+    <% if budget_category.initialized? %>
+      <div class="w-10 h-10 group-hover:scale-105 transition-all duration-300">
+        <%= render "budget_categories/budget_category_donut", budget_category: budget_category %>
+      </div>
+    <% else %>
+      <div class="w-8 h-8 group-hover:scale-105 transition-all duration-300 rounded-full flex justify-center items-center" style="color: <%= budget_category.category.color %>">
+        <% if budget_category.category.lucide_icon %>
+          <%= icon(budget_category.category.lucide_icon, color: "current") %>
+        <% else %>
+          <%= render DS::FilledIcon.new(
+            variant: :text,
+            hex_color: budget_category.category.color,
+            text: budget_category.category.name,
+            size: "sm",
+            rounded: true
+          ) %>
+        <% end %>
+      </div>
+    <% end %>
+
+    <div>
+      <p class="text-sm font-medium text-primary"><%= budget_category.category.name %></p>
+
+      <% if budget_category.initialized? %>
+        <% if budget_category.available_to_spend.negative? %>
+          <p class="text-sm font-medium text-red-500"><%= format_money(budget_category.available_to_spend_money.abs) %> over</p>
+        <% elsif budget_category.available_to_spend.zero? %>
+          <p class="text-sm font-medium <%= budget_category.budgeted_spending.positive? ? "text-orange-500" : "text-secondary" %>">
+            <%= format_money(budget_category.available_to_spend_money) %> left
+          </p>
+        <% else %>
+          <p class="text-sm text-secondary font-medium"><%= format_money(budget_category.available_to_spend_money) %> left</p>
+        <% end %>
+      <% else %>
+        <p class="text-sm text-secondary font-medium">
+          <%= budget_category.median_monthly_expense_money.format %> avg
+        </p>
+      <% end %>
+    </div>
+
+    <div class="ml-auto text-right">
+      <p class="text-sm font-medium text-primary"><%= format_money(budget_category.actual_spending_money) %></p>
+
+      <% if budget_category.initialized? %>
+        <p class="text-sm text-secondary">from <%= format_money(budget_category.budgeted_spending_money) %></p>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/budget_categories/_budget_category_donut.html.erb b/app/views/budget_categories/_budget_category_donut.html.erb
new file mode 100644
index 00000000..0305d316
--- /dev/null
+++ b/app/views/budget_categories/_budget_category_donut.html.erb
@@ -0,0 +1,24 @@
+<%# locals: (budget_category:) %>
+
+<%= tag.div data: {
+  controller: "donut-chart",
+  donut_chart_segments_value: budget_category.to_donut_segments_json,
+  donut_chart_segment_height_value: 5,
+  donut_chart_segment_opacity_value: 0.2
+}, class: "relative h-full" do %>
+  <div data-donut-chart-target="chartContainer" class="absolute inset-0 pointer-events-none"></div>
+
+  <div data-donut-chart-target="contentContainer" class="flex justify-center items-center h-full p-1">
+    <div data-donut-chart-target="defaultContent" class="h-full w-full rounded-full flex flex-col items-center justify-center" style="background-color: <%= hex_with_alpha(budget_category.category.color, 0.05) %>">
+      <% if budget_category.category.lucide_icon %>
+        <span style="color: <%= budget_category.category.color %>">
+          <%= icon(budget_category.category.lucide_icon, size: "sm", color: "current") %>
+        </span>
+      <% else %>
+        <span class="text-sm uppercase" style="color: <%= budget_category.category.color %>">
+          <%= budget_category.category.name.first.upcase %>
+        </span>
+      <% end %>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/budget_categories/_budget_category_form.html.erb b/app/views/budget_categories/_budget_category_form.html.erb
new file mode 100644
index 00000000..0c4561cd
--- /dev/null
+++ b/app/views/budget_categories/_budget_category_form.html.erb
@@ -0,0 +1,31 @@
+<%# locals: (budget_category:) %>
+
+<% currency = Money::Currency.new(budget_category.budget.currency) %>
+
+<div id="<%= dom_id(budget_category, :form) %>" class="w-full flex gap-3">
+  <div class="w-1 h-3 rounded-xl mt-1" style="background-color: <%= budget_category.category.color %>"></div>
+
+  <div class="text-sm mr-3">
+    <p class="text-primary font-medium mb-0.5"><%= budget_category.category.name %></p>
+
+    <p class="text-secondary"><%= budget_category.median_monthly_expense_money.format(precision: 0) %>/m avg</p>
+  </div>
+
+  <div class="ml-auto">
+    <%= form_with model: [budget_category.budget, budget_category], data: { controller: "auto-submit-form preserve-focus" } do |f| %>
+      <div class="form-field w-[120px]">
+        <div class="flex items-center">
+          <span class="text-secondary text-sm mr-2"><%= currency.symbol %></span>
+          <%= f.number_field :budgeted_spending,
+                            class: "form-field__input text-right [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none",
+                            placeholder: "0",
+                            step: currency.step,
+                            id: dom_id(budget_category, :budgeted_spending),
+                            min: 0,
+                            max: budget_category.max_allocation,
+                            data: { auto_submit_form_target: "auto" } %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/budget_categories/_confirm_button.html.erb b/app/views/budget_categories/_confirm_button.html.erb
new file mode 100644
index 00000000..a9d98331
--- /dev/null
+++ b/app/views/budget_categories/_confirm_button.html.erb
@@ -0,0 +1,10 @@
+<div id="<%= dom_id(budget, :confirm_button) %>">
+  <%= render DS::Button.new(
+    text: "Confirm",
+    variant: "primary",
+    full_width: true,
+    href: budget_path(budget),
+    method: :get,
+    disabled: !budget.allocations_valid?
+  ) %>
+</div>
diff --git a/app/views/budget_categories/_no_categories.html.erb b/app/views/budget_categories/_no_categories.html.erb
new file mode 100644
index 00000000..44d8915b
--- /dev/null
+++ b/app/views/budget_categories/_no_categories.html.erb
@@ -0,0 +1,23 @@
+<div class="flex justify-center items-center">
+  <div class="text-center flex flex-col items-center max-w-[500px]">
+    <h2 class="text-lg text-primary font-medium">Oops!</h2>
+    <p class="text-secondary text-sm max-w-sm mx-auto mb-4">
+      You have not created or assigned any expense categories to your transactions yet.
+    </p>
+
+    <div class="flex items-center gap-2">
+      <%= render DS::Button.new(
+        text: "Use defaults (recommended)",
+        href: bootstrap_categories_path,
+      ) %>
+
+      <%= render DS::Link.new(
+        text: "New category",
+        variant: "outline",
+        icon: "plus",
+        href: new_category_path,
+        frame: :modal,
+      ) %>
+    </div>
+  </div>
+</div>
diff --git a/app/views/budget_categories/_uncategorized_budget_category_form.html.erb b/app/views/budget_categories/_uncategorized_budget_category_form.html.erb
new file mode 100644
index 00000000..0ed955d3
--- /dev/null
+++ b/app/views/budget_categories/_uncategorized_budget_category_form.html.erb
@@ -0,0 +1,21 @@
+<%# locals: (budget:) %>
+
+<% budget_category = budget.uncategorized_budget_category %>
+
+<div id="<%= dom_id(budget, :uncategorized_budget_category_form) %>" class="flex gap-3">
+  <div class="w-1 h-3 rounded-xl mt-1" style="background-color: <%= budget_category.category.color %>"></div>
+
+  <div class="text-sm mr-3">
+    <p class="text-primary font-medium mb-0.5"><%= budget_category.category.name %></p>
+    <p class="text-secondary"><%= budget_category.avg_monthly_expense_money.format(precision: 0) %>/m avg</p>
+  </div>
+
+  <div class="ml-auto">
+    <div class="form-field w-[120px]">
+      <div class="flex items-center">
+        <span class="text-subdued text-sm mr-2"><%= budget_category.budgeted_spending_money.currency.symbol %></span>
+        <%= text_field_tag :uncategorized, budget_category.budgeted_spending_money.amount, autocomplete: "off", class: "form-field__input text-right [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none", disabled: true %>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/app/views/budget_categories/index.html.erb b/app/views/budget_categories/index.html.erb
new file mode 100644
index 00000000..d5ded43d
--- /dev/null
+++ b/app/views/budget_categories/index.html.erb
@@ -0,0 +1,53 @@
+<%= content_for :header_nav do %>
+  <%= render "budgets/budget_nav", budget: @budget %>
+<% end %>
+
+<%= content_for :previous_path, edit_budget_path(@budget) %>
+<%= content_for :cancel_path, budget_path(@budget) %>
+
+<div>
+  <div class="space-y-6">
+    <div class="text-center space-y-2">
+      <h1 class="text-3xl text-primary font-medium">Edit your category budgets</h1>
+      <p class="text-secondary text-sm max-w-md mx-auto">
+        Adjust category budgets to set spending limits. Unallocated funds will be automatically assigned as uncategorized.
+      </p>
+    </div>
+
+    <div class="mx-auto max-w-lg">
+      <% if @budget.family.categories.empty? %>
+        <div class="bg-container shadow-border-xs rounded-lg p-4">
+          <%= render "budget_categories/no_categories" %>
+        </div>
+      <% else %>
+        <div class="max-w-md mx-auto">
+          <%= render "budget_categories/allocation_progress", budget: @budget %>
+
+          <div class="space-y-4 mb-4">
+            <% BudgetCategory::Group.for(@budget_categories).sort_by(&:name).each do |group| %>
+              <div class="space-y-4">
+                <%= render "budget_categories/budget_category_form", budget_category: group.budget_category %>
+
+                <div class="space-y-4">
+                  <% group.budget_subcategories.each do |budget_subcategory| %>
+                    <div class="w-full flex items-center gap-4">
+                      <div class="ml-4 flex items-center justify-center text-subdued">
+                        <%= icon("corner-down-right") %>
+                      </div>
+
+                      <%= render "budget_categories/budget_category_form", budget_category: budget_subcategory %>
+                    </div>
+                  <% end %>
+                </div>
+              </div>
+            <% end %>
+
+            <%= render "budget_categories/uncategorized_budget_category_form", budget: @budget %>
+          </div>
+
+          <%= render "budget_categories/confirm_button", budget: @budget %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>
diff --git a/app/views/budget_categories/show.html.erb b/app/views/budget_categories/show.html.erb
new file mode 100644
index 00000000..affb01af
--- /dev/null
+++ b/app/views/budget_categories/show.html.erb
@@ -0,0 +1,142 @@
+<%= render DS::Dialog.new(variant: :drawer) do |dialog| %>
+  <% dialog.with_header do %>
+    <div>
+      <p class="text-sm text-secondary">Category</p>
+      <h3 class="text-2xl font-medium text-primary">
+        <%= @budget_category.name %>
+      </h3>
+
+      <% if @budget_category.budget.initialized? %>
+        <p class="text-sm text-secondary">
+          <span class="text-primary">
+            <%= format_money(@budget_category.actual_spending_money) %>
+          </span>
+          <span>/</span>
+          <span><%= format_money(@budget_category.budgeted_spending_money) %></span>
+        </p>
+      <% end %>
+    </div>
+
+    <% if @budget_category.budget.initialized? %>
+      <div class="ml-auto w-10 h-10">
+        <%= render "budget_categories/budget_category_donut",
+                    budget_category: @budget_category %>
+      </div>
+    <% end %>
+  <% end %>
+
+  <% dialog.with_body do %>
+    <% dialog.with_section(title: "Overview", open: true) do %>
+      <div class="pb-4">
+        <dl class="space-y-3 px-3 py-2">
+          <div class="flex items-center justify-between text-sm">
+            <dt class="text-secondary">
+              <%= @budget_category.budget.start_date.strftime("%b %Y") %> spending
+            </dt>
+            <dd class="text-primary font-medium">
+              <%= format_money @budget_category.actual_spending_money %>
+            </dd>
+          </div>
+
+          <% if @budget_category.budget.initialized? %>
+            <div class="flex items-center justify-between text-sm">
+              <dt class="text-secondary">Status</dt>
+              <% if @budget_category.available_to_spend.negative? %>
+                <dd class="flex items-center gap-1 text-red-500 font-medium">
+                  <%= icon "alert-circle", size: "sm", color: "destructive" %>
+                  <%= format_money @budget_category.available_to_spend_money.abs %>
+                  <span>overspent</span>
+                </dd>
+              <% elsif @budget_category.available_to_spend.zero? %>
+                <dd class="flex items-center gap-1 text-orange-500 font-medium">
+                  <%= icon "x-circle", size: "sm", color: "warning" %>
+                  <%= format_money @budget_category.available_to_spend_money %>
+                  <span>left</span>
+                </dd>
+              <% else %>
+                <dd class="text-primary flex items-center gap-1 text-green-500 font-medium">
+                  <%= icon "check-circle", size: "sm", color: "success" %>
+                  <%= format_money @budget_category.available_to_spend_money %>
+                  <span>left</span>
+                </dd>
+              <% end %>
+            </div>
+
+            <div class="flex items-center justify-between text-sm">
+              <dt class="text-secondary">Budgeted</dt>
+              <dd class="text-primary font-medium">
+                <%= format_money @budget_category.budgeted_spending_money %>
+              </dd>
+            </div>
+          <% end %>
+
+          <div class="flex items-center justify-between text-sm">
+            <dt class="text-secondary">Monthly average spending</dt>
+            <dd class="text-primary font-medium">
+              <%= @budget_category.avg_monthly_expense_money.format %>
+            </dd>
+          </div>
+
+          <div class="flex items-center justify-between text-sm">
+            <dt class="text-secondary">Monthly median spending</dt>
+            <dd class="text-primary font-medium">
+              <%= @budget_category.median_monthly_expense_money.format %>
+            </dd>
+          </div>
+        </dl>
+      </div>
+    <% end %>
+
+    <% dialog.with_section(title: "Recent Transactions", open: true) do %>
+      <div class="space-y-2">
+        <div class="px-3 py-4 space-y-2">
+          <% if @recent_transactions.any? %>
+            <ul class="space-y-2 mb-4">
+              <% @recent_transactions.each_with_index do |transaction, index| %>
+                <li class="flex gap-4 text-sm space-y-1">
+                  <div class="flex flex-col items-center gap-1.5 pt-2">
+                    <div class="rounded-full h-1.5 w-1.5 bg-gray-300"></div>
+                    <% unless index == @recent_transactions.length - 1 %>
+                      <div class="h-12 w-px bg-alpha-black-200"></div>
+                    <% end %>
+                  </div>
+
+                  <div class="flex justify-between w-full">
+                    <div>
+                      <p class="text-secondary text-xs uppercase">
+                        <%= transaction.entry.date.strftime("%b %d") %>
+                      </p>
+                      <%= link_to transaction.entry.name,
+                                  transactions_path,
+                                  class: "text-primary hover:underline",
+                                  data: { turbo_frame: :_top } %>
+                    </div>
+                    <p class="text-primary font-medium">
+                      <%= format_money transaction.entry.amount_money %>
+                    </p>
+                  </div>
+                </li>
+              <% end %>
+            </ul>
+
+            <%= render DS::Link.new(
+              text: "View all category transactions",
+              variant: "outline",
+              full_width: true,
+              href: transactions_path(q: {
+                categories: [@budget_category.name],
+                start_date: @budget.start_date,
+                end_date: @budget.end_date
+              }),
+              frame: :_top
+            ) %>
+          <% else %>
+            <p class="text-secondary text-sm mb-4">
+              No transactions found for this budget period.
+            </p>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/budget_categories/update.turbo_stream.erb b/app/views/budget_categories/update.turbo_stream.erb
new file mode 100644
index 00000000..bf44fea3
--- /dev/null
+++ b/app/views/budget_categories/update.turbo_stream.erb
@@ -0,0 +1,18 @@
+<%= turbo_stream.replace dom_id(@budget, :allocation_progress), partial: "budget_categories/allocation_progress", locals: { budget: @budget } %>
+
+<%= turbo_stream.replace dom_id(@budget, :uncategorized_budget_category_form), partial: "budget_categories/uncategorized_budget_category_form", locals: { budget: @budget } %>
+
+<%= turbo_stream.replace dom_id(@budget, :confirm_button), partial: "budget_categories/confirm_button", locals: { budget: @budget } %>
+
+<% if @budget_category.subcategory? %>
+  <%# Update sibling subcategories when a subcategory changes %>
+  <% @budget_category.siblings.each do |sibling| %>
+    <%= turbo_stream.update dom_id(sibling, :form), partial: "budget_categories/budget_category_form", locals: { budget_category: sibling } %>
+  <% end %>
+
+<% else %>
+  <%# Update all subcategories when a parent category changes %>
+  <% @budget_category.subcategories.each do |subcategory| %>
+    <%= turbo_stream.update dom_id(subcategory, :form), partial: "budget_categories/budget_category_form", locals: { budget_category: subcategory } %>
+  <% end %>
+<% end %>
diff --git a/app/views/budgets/_actuals_summary.html.erb b/app/views/budgets/_actuals_summary.html.erb
new file mode 100644
index 00000000..5b4adf1d
--- /dev/null
+++ b/app/views/budgets/_actuals_summary.html.erb
@@ -0,0 +1,57 @@
+<%# locals: (budget:) %>
+
+<div>
+  <div class="p-4 border-b border-secondary">
+    <h3 class="text-sm text-secondary mb-2">Income</h3>
+
+    <span class="inline-block mb-2 text-xl font-medium text-primary">
+      <%= budget.actual_income_money.format %>
+    </span>
+
+    <% if budget.income_category_totals.any? %>
+      <div>
+        <div class="flex h-1.5 mb-3 gap-1">
+          <% budget.income_category_totals.each do |category_total| %>
+            <div class="h-full rounded-full" style="background-color: <%= category_total.category.color %>; width: <%= category_total.weight %>%"></div>
+          <% end %>
+        </div>
+
+        <div class="flex flex-wrap gap-x-2.5 gap-y-1 text-xs">
+          <% budget.income_category_totals.each do |category_total| %>
+            <div class="flex items-center gap-1.5">
+              <div class="w-2.5 h-2.5 rounded-full shrink-0" style="background-color: <%= category_total.category.color %>"></div>
+              <span class="text-secondary"><%= category_total.category.name %></span>
+              <span class="text-primary"><%= number_to_percentage(category_total.weight, precision: 0) %></span>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+
+  <div class="p-4">
+    <h3 class="text-sm text-secondary mb-2">Expenses</h3>
+
+    <span class="inline-block mb-2 text-xl font-medium text-primary"><%= budget.actual_spending_money.format %></span>
+
+    <% if budget.expense_category_totals.any? %>
+      <div>
+        <div class="flex h-1.5 mb-3 gap-1">
+          <% budget.expense_category_totals.each do |category_total| %>
+            <div class="h-full rounded-full" style="background-color: <%= category_total.category.color %>; width: <%= category_total.weight %>%"></div>
+          <% end %>
+        </div>
+
+        <div class="flex flex-wrap gap-x-2.5 gap-y-1 text-xs">
+          <% budget.expense_category_totals.each do |category_total| %>
+            <div class="flex items-center gap-1.5">
+              <div class="w-2.5 h-2.5 rounded-full shrink-0" style="background-color: <%= category_total.category.color %>"></div>
+              <span class="text-secondary"><%= category_total.category.name %></span>
+              <span class="text-primary"><%= number_to_percentage(category_total.weight, precision: 0) %></span>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/budgets/_budget_categories.html.erb b/app/views/budgets/_budget_categories.html.erb
new file mode 100644
index 00000000..99437302
--- /dev/null
+++ b/app/views/budgets/_budget_categories.html.erb
@@ -0,0 +1,43 @@
+<%# locals: (budget:) %>
+
+<div>
+  <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-secondary uppercase">
+    <p>Categories</p>
+    <span class="text-subdued">&middot;</span>
+    <p><%= budget.budget_categories.count %></p>
+
+    <p class="ml-auto">Amount</p>
+  </div>
+
+  <div class="bg-container py-1 shadow-border-xs rounded-md">
+    <% if budget.family.categories.expenses.empty? %>
+      <div class="py-8">
+        <%= render "budget_categories/no_categories" %>
+      </div>
+    <% else %>
+      <% category_groups = BudgetCategory::Group.for(budget.budget_categories) %>
+
+      <% category_groups.each_with_index do |group, index| %>
+        <div>
+          <%= render "budget_categories/budget_category", budget_category: group.budget_category %>
+
+          <div>
+            <% group.budget_subcategories.each do |budget_subcategory| %>
+              <div class="w-full flex items-center -mt-4">
+                <div class="ml-8 flex items-center justify-center text-subdued">
+                  <%= icon "corner-down-right" %>
+                </div>
+
+                <%= render "budget_categories/budget_category", budget_category: budget_subcategory %>
+              </div>
+            <% end %>
+          </div>
+        </div>
+
+        <%= render "shared/ruler" %>
+      <% end %>
+
+      <%= render "budget_categories/budget_category", budget_category: budget.uncategorized_budget_category %>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/budgets/_budget_donut.html.erb b/app/views/budgets/_budget_donut.html.erb
new file mode 100644
index 00000000..8726f4e4
--- /dev/null
+++ b/app/views/budgets/_budget_donut.html.erb
@@ -0,0 +1,69 @@
+<%= tag.div data: { controller: "donut-chart", donut_chart_segments_value: budget.to_donut_segments_json }, class: "relative h-full" do %>
+  <div data-donut-chart-target="chartContainer" class="absolute inset-0 pointer-events-none"></div>
+
+  <div data-donut-chart-target="contentContainer" class="flex justify-center items-center h-full">
+    <div data-donut-chart-target="defaultContent" class="flex flex-col items-center">
+      <% if budget.initialized? %>
+        <div class="text-gray-600 text-sm mb-2">
+          <span>Spent</span>
+        </div>
+
+        <div class="mb-2 text-3xl font-medium <%= budget.available_to_spend.negative? ? "text-red-500" : "text-primary" %>">
+          <%= format_money(budget.actual_spending_money) %>
+        </div>
+
+        <%= render DS::Link.new(
+          text: "of #{budget.budgeted_spending_money.format}",
+          variant: "secondary",
+          icon: "pencil",
+          icon_position: "right",
+          size: "sm",
+          href: edit_budget_path(budget)
+        ) %>
+      <% else %>
+        <div class="text-subdued text-3xl mb-2">
+          <span><%= format_money Money.new(0, budget.currency || budget.family.currency) %></span>
+        </div>
+
+        <%= render DS::Link.new(
+          text: "New budget",
+          size: "sm",
+          icon: "plus",
+          href: edit_budget_path(budget)
+        ) %>
+      <% end %>
+    </div>
+
+    <% budget.budget_categories.each do |bc| %>
+      <div id="segment_<%= bc.id %>" class="hidden">
+        <div class="flex flex-col gap-2 items-center">
+          <div class="flex items-center gap-3">
+            <div class="w-1 h-3 rounded-xl" style="background-color: <%= bc.category.color %>"></div>
+            <p class="text-sm text-secondary"><%= bc.category.name %></p>
+          </div>
+
+          <p class="text-3xl font-medium <%= bc.available_to_spend.negative? ? "text-red-500" : "text-primary" %>">
+            <%= format_money(bc.actual_spending_money) %>
+          </p>
+
+          <%= render DS::Link.new(
+            text: "of #{bc.budgeted_spending_money.format(precision: 0)}",
+            variant: "secondary",
+            icon: "pencil",
+            icon_position: "right",
+            size: "sm",
+            href: budget_budget_categories_path(budget)
+          ) %>
+        </div>
+      </div>
+    <% end %>
+
+    <div id="segment_unused" class="hidden">
+      <p class="text-sm text-secondary text-center mb-2">Unused</p>
+
+      <p class="text-3xl font-medium text-primary">
+        <%= format_money(budget.available_to_spend_money) %>
+      </p>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/budgets/_budget_header.html.erb b/app/views/budgets/_budget_header.html.erb
new file mode 100644
index 00000000..6f7d59fc
--- /dev/null
+++ b/app/views/budgets/_budget_header.html.erb
@@ -0,0 +1,48 @@
+<%# locals: (budget:, previous_budget:, next_budget:, latest_budget:) %>
+
+<div class="flex items-center gap-1 mb-4">
+  <div class="flex items-center gap-2">
+    <% if budget.previous_budget_param %>
+      <%= render DS::Link.new(
+        variant: "icon",
+        icon: "chevron-left",
+        href: budget_path(budget.previous_budget_param),
+      ) %>
+    <% else %>
+      <span class="text-subdued">
+        <%= icon "chevron-left", color: "current" %>
+      </span>
+    <% end %>
+
+    <% if budget.next_budget_param %>
+      <%= render DS::Link.new(
+        variant: "icon",
+        icon: "chevron-right",
+        href: budget_path(budget.next_budget_param),
+      ) %>
+    <% else %>
+      <span class="text-subdued">
+        <%= icon "chevron-right", color: "current" %>
+      </span>
+    <% end %>
+  </div>
+
+  <%= render DS::Menu.new(variant: "button") do |menu| %>
+    <% menu.with_button class: "flex items-center gap-1 hover:bg-alpha-black-25 cursor-pointer rounded-md p-2"  do %>
+      <span class="text-primary font-medium text-lg lg:text-base"><%= @budget.name %></span>
+      <%= icon("chevron-down") %>
+    <% end %>
+
+    <% menu.with_custom_content do %>
+      <%= render "budgets/picker", family: Current.family, year: budget.start_date.year %>
+    <% end %>
+  <% end %>
+
+  <div class="ml-auto">
+    <%= render DS::Link.new(
+        text: "Today",
+        variant: "outline",
+        href: budget_path(Budget.date_to_param(Date.current)),
+    ) %>
+  </div>
+</div>
diff --git a/app/views/budgets/_budget_nav.html.erb b/app/views/budgets/_budget_nav.html.erb
new file mode 100644
index 00000000..41d81a61
--- /dev/null
+++ b/app/views/budgets/_budget_nav.html.erb
@@ -0,0 +1,37 @@
+<%# locals: (budget:) %>
+
+<% steps = [
+  { name: "Setup", path: edit_budget_path(budget), is_complete: budget.initialized?, step_number: 1 },
+  { name: "Categories", path: budget_budget_categories_path(budget), is_complete: budget.allocations_valid?, step_number: 2 },
+] %>
+
+<ul class="flex items-center gap-2">
+  <% steps.each_with_index do |step, idx| %>
+    <li class="flex items-center gap-2 group">
+      <% is_current = request.path == step[:path] %>
+
+      <% text_class = if is_current
+                  "text-primary"
+                else
+                  step[:is_complete] ? "text-green-600" : "text-secondary"
+                end %>
+      <% step_class = if is_current
+                  "bg-primary text-primary"
+                else
+                  step[:is_complete] ? "bg-green-600/10 border-alpha-black-25" : "bg-container-inset"
+                end %>
+
+      <%= link_to step[:path], class: "flex items-center gap-3" do %>
+        <div class="flex items-center gap-2 text-sm font-medium <%= text_class %>">
+          <span class="<%= step_class %> w-7 h-7 rounded-full shrink-0 inline-flex items-center justify-center border border-transparent">
+            <%= step[:is_complete] && !is_current ? icon("check", size: "sm") : idx + 1 %>
+          </span>
+
+          <span><%= step[:name] %></span>
+        </div>
+      <% end %>
+
+      <hr class="border border-secondary w-12 group-last:hidden">
+    </li>
+  <% end %>
+</ul>
diff --git a/app/views/budgets/_budgeted_summary.html.erb b/app/views/budgets/_budgeted_summary.html.erb
new file mode 100644
index 00000000..37e225e7
--- /dev/null
+++ b/app/views/budgets/_budgeted_summary.html.erb
@@ -0,0 +1,63 @@
+<%# locals: (budget:) %>
+
+<div>
+  <div class="p-4 border-b border-secondary">
+    <h3 class="text-sm text-secondary mb-2">Expected income</h3>
+
+    <span class="inline-block mb-2 text-xl font-medium text-primary">
+      <%= format_money(budget.expected_income_money) %>
+    </span>
+
+    <div>
+      <div class="flex h-1.5 mb-3 gap-1">
+        <% if budget.remaining_expected_income.negative? %>
+          <div class="rounded-md h-1.5 bg-green-500" style="width: <%= 100 - budget.surplus_percent %>%"></div>
+          <div class="rounded-md h-1.5 bg-green-500" style="width: <%= budget.surplus_percent %>%"></div>
+        <% else %>
+          <div class="rounded-md h-1.5 bg-green-500" style="width: <%= budget.actual_income_percent %>%"></div>
+          <div class="rounded-md h-1.5 bg-surface-inset" style="width: <%= 100 - budget.actual_income_percent %>%"></div>
+        <% end %>
+      </div>
+      <div class="flex justify-between text-sm">
+        <p class="text-secondary"><%= format_money(budget.actual_income_money) %> earned</p>
+        <p class="font-medium">
+          <% if budget.remaining_expected_income.negative? %>
+            <span class="text-green-500"><%= format_money(budget.remaining_expected_income_money.abs) %> over</span>
+          <% else %>
+            <span class="text-primary"><%= format_money(budget.remaining_expected_income_money) %> left</span>
+          <% end %>
+        </p>
+      </div>
+    </div>
+  </div>
+
+  <div class="p-4">
+    <h3 class="text-sm text-secondary mb-2">Budgeted</h3>
+
+    <span class="inline-block mb-2 text-xl font-medium text-primary">
+      <%= format_money(budget.budgeted_spending_money) %>
+    </span>
+
+    <div>
+      <div class="flex h-1.5 mb-3 gap-1">
+        <% if budget.available_to_spend.negative? %>
+          <div class="rounded-md h-1.5 bg-inverse" style="width: <%= 100 - budget.overage_percent %>%"></div>
+          <div class="rounded-md h-1.5 bg-destructive" style="width: <%= budget.overage_percent %>%"></div>
+        <% else %>
+          <div class="rounded-md h-1.5 bg-inverse" style="width: <%= budget.percent_of_budget_spent %>%"></div>
+          <div class="rounded-md h-1.5 bg-surface-inset" style="width: <%= 100 - budget.percent_of_budget_spent %>%"></div>
+        <% end %>
+      </div>
+      <div class="flex justify-between text-sm">
+        <p class="text-secondary"><%= format_money(budget.actual_spending_money) %> spent</p>
+        <p class="font-medium">
+          <% if budget.available_to_spend.negative? %>
+            <span class="text-destructive"><%= format_money(budget.available_to_spend_money.abs) %> over</span>
+          <% else %>
+            <span class="text-primary"><%= format_money(budget.available_to_spend_money) %> left</span>
+          <% end %>
+        </p>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/app/views/budgets/_over_allocation_warning.html.erb b/app/views/budgets/_over_allocation_warning.html.erb
new file mode 100644
index 00000000..bd75fba2
--- /dev/null
+++ b/app/views/budgets/_over_allocation_warning.html.erb
@@ -0,0 +1,15 @@
+<%# locals: (budget:) %>
+
+<div class="flex flex-col gap-4 items-center justify-center h-full">
+  <%= icon "alert-triangle", size: "lg", color: "destructive" %>
+  <p class="text-secondary text-sm text-center">You have over-allocated your budget.  Please fix your allocations.</p>
+
+  <%= render DS::Link.new(
+    text: "Fix allocations",
+    variant: "secondary",
+    size: "sm",
+    icon: "pencil",
+    icon_position: "right",
+    href: budget_budget_categories_path(budget)
+  ) %>
+</div>
diff --git a/app/views/budgets/_picker.html.erb b/app/views/budgets/_picker.html.erb
new file mode 100644
index 00000000..a1deaea0
--- /dev/null
+++ b/app/views/budgets/_picker.html.erb
@@ -0,0 +1,54 @@
+<%# locals: (family:, year:) %>
+
+<%= turbo_frame_tag "budget_picker" do %>
+  <div class="p-3 space-y-4">
+    <div class="flex items-center gap-2 justify-between">
+      <% last_month_of_previous_year = Date.new(year - 1, 12, 1) %>
+
+      <% if Budget.budget_date_valid?(last_month_of_previous_year, family: family) %>
+        <%= link_to picker_budgets_path(year: year - 1), data: { turbo_frame: "budget_picker" }, class: "p-2 flex items-center justify-center hover:bg-alpha-black-25 rounded-md" do %>
+          <%= icon "chevron-left" %>
+        <% end %>
+      <% else %>
+        <span class="p-2 flex items-center justify-center text-subdued rounded-md">
+          <%= icon "chevron-left", color: "current" %>
+        </span>
+      <% end %>
+
+      <span class="w-40 text-center px-3 py-2 border border-tertiary rounded-md" data-budget-picker-target="year">
+        <%= year %>
+      </span>
+
+      <% first_month_of_next_year = Date.new(year + 1, 1, 1) %>
+
+      <% if Budget.budget_date_valid?(first_month_of_next_year, family: family) %>
+        <%= link_to picker_budgets_path(year: year + 1), data: { turbo_frame: "budget_picker" }, class: "p-2 flex items-center justify-center hover:bg-alpha-black-25 rounded-md" do %>
+          <%= icon "chevron-right" %>
+        <% end %>
+      <% else %>
+        <span class="p-2 flex items-center justify-center text-subdued rounded-md">
+          <%= icon "chevron-right", color: "current" %>
+        </span>
+      <% end %>
+    </div>
+
+    <div class="grid grid-cols-3 gap-2 text-sm text-center font-medium">
+      <% Date::ABBR_MONTHNAMES.compact.each do |month_name| %>
+        <% date = Date.strptime("#{month_name}-#{year}", "%b-%Y") %>
+        <% param_key = Budget.date_to_param(date) %>
+
+        <% if Budget.budget_date_valid?(date, family: family) %>
+          <%= render DS::Link.new(
+            variant: "ghost",
+            text: month_name,
+            href: budget_path(param_key),
+            full_width: true,
+            frame: :_top
+          ) %>
+        <% else %>
+          <span class="px-3 py-2 text-subdued rounded-md"><%= month_name %></span>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/budgets/edit.html.erb b/app/views/budgets/edit.html.erb
new file mode 100644
index 00000000..3ec00b22
--- /dev/null
+++ b/app/views/budgets/edit.html.erb
@@ -0,0 +1,47 @@
+<%= content_for :header_nav do %>
+  <%= render "budgets/budget_nav", budget: @budget %>
+<% end %>
+
+<%= content_for :previous_path, budget_path(@budget) %>
+<%= content_for :cancel_path, budget_path(@budget) %>
+
+<div>
+  <div class="space-y-4">
+    <div class="text-center space-y-2">
+      <h1 class="text-3xl text-primary font-medium">Setup your budget</h1>
+      <p class="text-secondary text-sm max-w-sm mx-auto">
+        Enter your monthly earnings and planned spending below to setup your budget.
+      </p>
+    </div>
+
+    <div class="mx-auto max-w-lg">
+      <%= styled_form_with model: @budget, class: "space-y-3", data: { controller: "budget-form" } do |f| %>
+        <%= f.money_field :budgeted_spending, label: "Budgeted spending", required: true, disable_currency: true %>
+        <%= f.money_field :expected_income, label: "Expected income", required: true, disable_currency: true %>
+
+        <% if @budget.estimated_income && @budget.estimated_spending %>
+          <div class="border border-tertiary rounded-lg p-3 flex">
+            <%= icon "sparkles" %>
+            <div class="ml-2 space-y-1 text-sm">
+              <h4 class="text-primary">Autosuggest income & spending budget</h4>
+              <p class="text-secondary">
+                This will be based on transaction history. AI can make mistakes, verify before continuing.
+              </p>
+            </div>
+
+            <%= render DS::Toggle.new(
+              id: "auto_fill",
+              data: {
+                action: "change->budget-form#toggleAutoFill",
+                budget_form_income_param: { key: "budget_expected_income", value: sprintf("%.2f", @budget.estimated_income) },
+                budget_form_spending_param: { key: "budget_budgeted_spending", value: sprintf("%.2f", @budget.estimated_spending) }
+              }
+            ) %>
+          </div>
+        <% end %>
+
+        <%= f.submit "Continue" %>
+      <% end %>
+    </div>
+  </div>
+</div>
diff --git a/app/views/budgets/show.html.erb b/app/views/budgets/show.html.erb
new file mode 100644
index 00000000..de47b27c
--- /dev/null
+++ b/app/views/budgets/show.html.erb
@@ -0,0 +1,66 @@
+<div class="pb-12">
+  <%= render "budgets/budget_header",
+            budget: @budget,
+            previous_budget: @previous_budget,
+            next_budget: @next_budget,
+            latest_budget: @latest_budget %>
+
+  <div class="flex flex-col items-start gap-4 md:flex-row">
+    <div class="w-full md:max-w-[300px] space-y-4">
+      <div class="h-[300px] bg-container rounded-xl shadow-border-xs p-8">
+        <% if @budget.available_to_allocate.negative? %>
+          <%= render "budgets/over_allocation_warning", budget: @budget %>
+        <% else %>
+          <%= render "budgets/budget_donut", budget: @budget %>
+        <% end %>
+      </div>
+
+      <div>
+
+        <% if @budget.initialized? && @budget.available_to_allocate.positive? %>
+          <%= render DS::Tabs.new(active_tab: params[:tab].presence || "budgeted") do |tabs| %>
+            <% tabs.with_nav do |nav| %>
+              <% nav.with_btn(id: "budgeted", label: "Budgeted") %>
+              <% nav.with_btn(id: "actuals", label: "Actual") %>
+            <% end %>
+
+            <% tabs.with_panel(tab_id: "budgeted") do %>
+              <div class="bg-container rounded-xl shadow-border-xs">
+                <%= render "budgets/budgeted_summary", budget: @budget %>
+              </div>
+            <% end %>
+
+            <% tabs.with_panel(tab_id: "actuals") do %>
+              <div class="bg-container rounded-xl shadow-border-xs">
+                <%= render "budgets/actuals_summary", budget: @budget %>
+              </div>
+            <% end %>
+          <% end %>
+        <% else %>
+          <div class="bg-container rounded-xl shadow-border-xs">
+            <%= render "budgets/actuals_summary", budget: @budget %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+
+    <div class="w-full grow bg-container rounded-xl shadow-border-xs p-4">
+      <div class="flex items-center justify-between mb-4">
+        <h2 class="text-lg font-medium">Categories</h2>
+
+        <% if @budget.initialized? %>
+          <%= render DS::Link.new(
+            text: "Edit",
+            variant: "secondary",
+            icon: "settings-2",
+            href: budget_budget_categories_path(@budget)
+          ) %>
+        <% end %>
+      </div>
+
+      <div class="bg-container-inset rounded-xl p-1">
+        <%= render "budgets/budget_categories", budget: @budget %>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/app/views/categories/_badge.html.erb b/app/views/categories/_badge.html.erb
index a9752262..10135c25 100644
--- a/app/views/categories/_badge.html.erb
+++ b/app/views/categories/_badge.html.erb
@@ -1,12 +1,15 @@
 <%# locals: (category:) %>
-<% category ||= null_category %>
+<% category ||= Category.uncategorized %>
 
 <div>
-  <span class="flex items-center gap-1 text-sm font-medium rounded-full px-1.5 py-1 border"
+  <span class="flex items-center gap-1 text-sm font-medium rounded-full px-1.5 py-1 border truncate focus-visible:outline-none focus-visible:ring-0"
         style="
-          background-color: color-mix(in srgb, <%= category.color %> 5%, white);
-          border-color: color-mix(in srgb, <%= category.color %> 30%, white);
+          background-color: color-mix(in oklab, <%= category.color %> 10%, transparent);
+          border-color: color-mix(in oklab, <%= category.color %> 10%, transparent);
           color: <%= category.color %>;">
+    <% if category.lucide_icon.present? %>
+      <%= icon category.lucide_icon, size: "sm", color: "current" %>
+    <% end %>
     <%= category.name %>
   </span>
 </div>
diff --git a/app/views/categories/_category.html.erb b/app/views/categories/_category.html.erb
index f25e5c25..dbc9b80f 100644
--- a/app/views/categories/_category.html.erb
+++ b/app/views/categories/_category.html.erb
@@ -1,21 +1,25 @@
 <%# locals: (category:) %>
 
-<div id="<%= dom_id(category) %>" class="flex justify-between items-center p-4 bg-white">
+<div id="<%= dom_id(category) %>" class="flex justify-between items-center px-4 pb-4 <%= "pt-4" unless category.subcategory? %> <%= "pb-4" unless category.subcategories.any? %> bg-container">
   <div class="flex w-full items-center gap-2.5">
+    <% if category.subcategory? %>
+      <span style="color: <%= category.color %>">
+        <%= icon "corner-down-right", size: "sm", color: "current", class: "ml-2" %>
+      </span>
+    <% end %>
+
     <%= render partial: "categories/badge", locals: { category: category } %>
   </div>
-  <div class="justify-self-end">
-    <%= contextual_menu do %>
-      <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-        <%= contextual_menu_modal_action_item t(".edit"), edit_category_path(category) %>
 
-        <%= link_to new_category_deletion_path(category),
-              class: "flex items-center w-full rounded-lg text-red-600 hover:bg-red-50 py-2 px-3 gap-2",
-              data: { turbo_frame: :modal } do %>
-          <%= lucide_icon "trash-2", class: "shrink-0 w-5 h-5" %>
-          <span class="text-sm"><%= t(".delete") %></span>
-        <% end %>
-      </div>
+  <div class="justify-self-end">
+    <%= render DS::Menu.new do |menu| %>
+      <% menu.with_item(variant: "link", text: t(".edit"), icon: "pencil", href: edit_category_path(category), data: { turbo_frame: :modal }) %>
+
+      <% if category.transactions.any? %>
+        <% menu.with_item(variant: "link", text: t(".delete"), icon: "trash-2", href: new_category_deletion_path(category), destructive: true, data: { turbo_frame: :modal }) %>
+      <% else %>
+        <% menu.with_item(variant: "button", text: t(".delete"), icon: "trash-2", href: category_path(category), method: :delete) %>
+      <% end %>
     <% end %>
   </div>
 </div>
diff --git a/app/views/categories/_category_list_group.html.erb b/app/views/categories/_category_list_group.html.erb
new file mode 100644
index 00000000..17482848
--- /dev/null
+++ b/app/views/categories/_category_list_group.html.erb
@@ -0,0 +1,25 @@
+<%# locals: (title:, categories:) %>
+
+<div class="rounded-xl bg-container-inset space-y-1 p-1">
+  <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-secondary uppercase">
+    <p><%= title %></p>
+    <span class="text-subdued">&middot;</span>
+    <p><%= categories.count %></p>
+  </div>
+
+  <div class="shadow-border-xs rounded-lg bg-container">
+    <div class="overflow-hidden rounded-lg">
+      <% Category::Group.for(categories).each_with_index do |group, idx| %>
+        <%= render group.category %>
+
+        <% group.subcategories.each do |subcategory| %>
+          <%= render subcategory %>
+        <% end %>
+
+        <% unless idx == Category::Group.for(categories).count - 1 %>
+          <%= render "shared/ruler" %>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+</div>
diff --git a/app/views/categories/_color_avatar.html.erb b/app/views/categories/_color_avatar.html.erb
new file mode 100644
index 00000000..b8cde18a
--- /dev/null
+++ b/app/views/categories/_color_avatar.html.erb
@@ -0,0 +1,8 @@
+<%# locals: (category:) %>
+
+<span
+      data-category-target="avatar"
+      class="w-14 h-14 flex items-center justify-center rounded-full"
+      style="background-color: color-mix(in oklab, <%= category.color %> 10%, transparent); color: <%= category.color %>">
+  <%= icon(category.lucide_icon, size: "2xl", color: "current") %>
+</span>
diff --git a/app/views/categories/_form.html.erb b/app/views/categories/_form.html.erb
index 5f36f8d9..b0f75b8f 100644
--- a/app/views/categories/_form.html.erb
+++ b/app/views/categories/_form.html.erb
@@ -1,20 +1,73 @@
-<div data-controller="color-avatar">
-  <%= styled_form_with model: category, class: "space-y-4", data: { turbo: false } do |f| %>
+<%# locals: (category:, categories:) %>
+
+<div data-controller="category" data-category-preset-colors-value="<%= Category::COLORS %>">
+  <%= styled_form_with model: category, class: "space-y-4" do |f| %>
     <section class="space-y-4">
-      <div class="w-fit m-auto">
-        <%= render partial: "shared/color_avatar", locals: { name: category.name, color: category.color } %>
+      <div class="w-fit mx-auto relative">
+        <%= render partial: "color_avatar", locals: { category: category } %>
+
+        <details data-category-target="details" data-action="mousedown->category#handleOutsideClick">
+          <summary class="cursor-pointer absolute -bottom-2 -right-2 flex justify-center items-center bg-surface-inset hover:bg-surface-inset-hover border-2 w-7 h-7 border-subdued rounded-full text-secondary">
+            <%= icon("pen", size: "sm") %>
+          </summary>
+
+          <div class="fixed right-0 sm:right-auto mx-2 sm:ml-8 sm:mr-0 mt-2 z-50 bg-container p-4 border border-alpha-black-25 rounded-2xl shadow-xs h-fit" data-category-target="popup">
+            <div class="flex gap-2 flex-col mb-4" data-category-target="selection" style="<%= "display:none;" if @category.subcategory? %>">
+              <div data-category-target="pickerSection"></div>
+              <h4 class="text-gray-500 text-sm">Color</h4>
+              <div class="flex flex-wrap md:flex-nowrap gap-2 items-center" data-category-target="colorsSection">
+                <% Category::COLORS.each do |color| %>
+                  <label class="relative">
+                    <%= f.radio_button :color, color, class: "sr-only peer", data: { action: "change->category#handleColorChange" } %>
+                    <div class="w-6 h-6 rounded-full cursor-pointer peer-checked:ring-2 peer-checked:ring-offset-2 peer-checked:ring-gray-500" style="background-color: <%= color %>"></div>
+                  </label>
+                <% end %>
+                <label class="relative">
+                  <%= f.radio_button :color, "custom-color", class: "sr-only peer", data: { category_target: "colorPickerRadioBtn"} %>
+                  <div class="w-6 h-6 rounded-full cursor-pointer peer-checked:ring-2 peer-checked:ring-offset-2 peer-checked:ring-blue-500" data-category-target="pickerBtn" style="background: conic-gradient(red,orange,yellow,lime,green,teal,cyan,blue,indigo,purple,magenta,pink,red)"></div>
+                </label>
+              </div>
+              <div class="flex gap-2 items-center hidden flex-col" data-category-target="paletteSection">
+                <div class="flex gap-2 items-center w-full">
+                  <div class="w-6 h-6 p-4 rounded-full cursor-pointer" style="background-color: <%= category.color %>" data-category-target="colorPreview"></div>
+                  <%= f.text_field :color , data: { category_target: "colorInput"}, inline: true %>
+                  <%= icon "palette", size: "2xl", data: { action: "click->category#toggleSections" } %>
+                </div>
+                <div data-category-target="validationMessage" class="hidden self-start flex gap-1 items-center text-xs text-destructive ">
+                  <span>Poor contrast, choose darker color or</span>
+                  <button type="button" class="underline cursor-pointer" data-action="category#autoAdjust">auto-adjust.</button>
+                </div>
+              </div>
+            </div>
+
+            <div class="flex flex-wrap gap-2 justify-center flex-col w-auto md:w-87">
+              <h4 class="text-secondary text-sm">Icon</h4>
+              <div class="flex flex-wrap gap-0.5">
+                <% Category.icon_codes.each do |icon| %>
+                  <label class="relative">
+                    <%= f.radio_button :lucide_icon, icon, class: "sr-only peer", data: { action: "change->category#handleIconChange change->category#handleIconColorChange", category_target:"icon" } %>
+                    <div class="text-secondary w-7 h-7 flex m-0.5 items-center justify-center rounded-full cursor-pointer hover:bg-container-inset-hover peer-checked:bg-container-inset border-1 border-transparent">
+                      <%= icon(icon, size: "sm", color: "current") %>
+                    </div>
+                  </label>
+                <% end %>
+              </div>
+            </div>
+          </div>
+        </details>
       </div>
-      <div class="flex gap-2 items-center justify-center">
-        <% Category::COLORS.each do |color| %>
-          <label class="relative">
-            <%= f.radio_button :color, color, class: "sr-only peer", data: { action: "change->color-avatar#handleColorChange" } %>
-            <div class="w-6 h-6 rounded-full cursor-pointer peer-checked:ring-2 peer-checked:ring-offset-2 peer-checked:ring-blue-500" style="background-color: <%= color %>"></div>
-          </label>
+
+      <% if category.errors.any? %>
+        <%= render "shared/form_errors", model: category %>
+      <% end %>
+
+      <div class="space-y-2">
+        <%= f.select :classification, [["Income", "income"], ["Expense", "expense"]], { label: "Classification" }, required: true %>
+        <%= f.text_field :name, placeholder: t(".placeholder"), required: true, autofocus: true, label: "Name", data: { color_avatar_target: "name" } %>
+        <% unless category.parent? %>
+          <%= f.select :parent_id, categories.pluck(:name, :id), { include_blank: "(unassigned)", label: "Parent category (optional)" }, disabled: category.parent?, data: { action: "change->category#handleParentChange" } %>
         <% end %>
       </div>
-      <div class="relative flex items-center border border-gray-200 rounded-lg">
-        <%= f.text_field :name, placeholder: t(".placeholder"), class: "text-sm font-normal placeholder:text-gray-500 h-10 relative pl-3 w-full border-none rounded-lg", required: true, data: { color_avatar_target: "name" } %>
-      </div>
     </section>
 
     <section>
diff --git a/app/views/categories/_menu.html.erb b/app/views/categories/_menu.html.erb
index 6c632596..f7c74eac 100644
--- a/app/views/categories/_menu.html.erb
+++ b/app/views/categories/_menu.html.erb
@@ -1,15 +1,15 @@
 <%# locals: (transaction:) %>
-<div class="relative" data-controller="menu">
-  <button data-menu-target="button" class="flex cursor-pointer">
-    <%= render partial: "categories/badge", locals: { category: transaction.category } %>
-  </button>
-  <div data-menu-target="content" class="absolute z-10 hidden w-screen mt-2 max-w-min cursor-default">
-    <div class="w-64 text-sm font-semibold leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-      <%= turbo_frame_tag "category_dropdown", src: category_dropdown_path(category_id: transaction.category_id, transaction_id: transaction.id), loading: :lazy do %>
-        <div class="p-6 flex items-center justify-center">
-          <p class="text-sm text-gray-500 animate-pulse"><%= t(".loading") %></p>
-        </div>
-      <% end %>
-    </div>
-  </div>
-</div>
+
+<%= render DS::Menu.new(variant: "button") do |menu| %>
+  <% menu.with_button do %>
+    <% render partial: "categories/badge", locals: { category: transaction.category } %>
+  <% end %>
+
+  <% menu.with_custom_content do %>
+    <%= turbo_frame_tag "category_dropdown", src: category_dropdown_path(category_id: transaction.category_id, transaction_id: transaction.id), loading: :lazy do %>
+      <div class="p-6 flex items-center justify-center">
+        <p class="text-sm text-secondary animate-pulse"><%= t(".loading") %></p>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/categories/_ruler.html.erb b/app/views/categories/_ruler.html.erb
deleted file mode 100644
index fc1d8ce9..00000000
--- a/app/views/categories/_ruler.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="bg-white">
-  <div class="h-px bg-alpha-black-50 ml-4 mr-6"></div>
-</div>
diff --git a/app/views/categories/edit.html.erb b/app/views/categories/edit.html.erb
index 69c52c6d..b71dac59 100644
--- a/app/views/categories/edit.html.erb
+++ b/app/views/categories/edit.html.erb
@@ -1,3 +1,6 @@
-<%= modal_form_wrapper title: t(".edit") do %>
-  <%= render "form", category: @category %>
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".edit")) %>
+  <% dialog.with_body do %>
+    <%= render "form", category: @category, categories: @categories %>
+  <% end %>
 <% end %>
diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb
index 6e79fa13..0c873915 100644
--- a/app/views/categories/index.html.erb
+++ b/app/views/categories/index.html.erb
@@ -1,44 +1,57 @@
-<% content_for :sidebar do %>
-  <%= render "settings/nav" %>
-<% end %>
+<header class="flex items-center justify-between">
+  <h1 class="text-primary text-xl font-medium"><%= t(".categories") %></h1>
 
-<section class="space-y-4">
-  <header class="flex items-center justify-between">
-    <h1 class="text-gray-900 text-xl font-medium"><%= t(".categories") %></h1>
-
-    <%= link_to new_category_path, class: "btn btn--primary flex items-center gap-1 justify-center", data: { turbo_frame: :modal } do %>
-      <%= lucide_icon "plus", class: "w-5 h-5" %>
-      <p><%= t(".new") %></p>
+  <div class="flex items-center gap-2">
+    <%= render DS::Menu.new do |menu| %>
+      <% menu.with_item(
+          variant: "button",
+          text: "Delete all",
+          href: destroy_all_categories_path,
+          method: :delete,
+          icon: "trash-2",
+          confirm: CustomConfirm.for_resource_deletion("all categories", high_severity: true)) %>
     <% end %>
-  </header>
 
-  <div class="bg-white shadow-xs border border-alpha-black-25 rounded-xl p-4">
-    <% if @categories.any? %>
-      <div class="rounded-xl bg-gray-25 space-y-1 p-1">
-        <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-gray-500 uppercase">
-          <p><%= t(".categories") %></p>
-          <span class="text-gray-400">&middot;</span>
-          <p><%= @categories.count %></p>
-        </div>
-
-        <div class="border border-alpha-black-25 rounded-md bg-white shadow-xs">
-          <div class="overflow-hidden rounded-md">
-            <%= render partial: @categories, spacer_template: "categories/ruler" %>
-          </div>
-        </div>
-      </div>
-    <% else %>
-      <div class="flex justify-center items-center py-20">
-        <div class="text-center flex flex-col items-center max-w-[300px]">
-          <p class="text-gray-900 mb-1 font-medium text-sm"><%= t(".empty") %></p>
-          <%= link_to new_category_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>
-            <%= lucide_icon("plus", class: "w-5 h-5") %>
-            <span><%= t(".new") %></span>
-          <% end %>
-        </div>
-      </div>
-    <% end %>
+    <%= render DS::Link.new(
+      text: t(".new"),
+      variant: "primary",
+      icon: "plus",
+      href: new_category_path,
+      frame: :modal
+    ) %>
   </div>
+</header>
 
-  <%= settings_nav_footer %>
-</section>
+<div class="bg-container rounded-xl shadow-border-xs p-4">
+  <% if @categories.any? %>
+    <div class="space-y-4">
+      <% if @categories.incomes.any? %>
+        <%= render "categories/category_list_group", title: t(".categories_incomes"), categories: @categories.incomes %>
+      <% end %>
+
+      <% if @categories.expenses.any? %>
+        <%= render "categories/category_list_group", title: t(".categories_expenses"), categories: @categories.expenses %>
+      <% end %>
+    </div>
+  <% else %>
+    <div class="flex justify-center items-center py-20">
+      <div class="text-center flex flex-col items-center max-w-[500px]">
+        <p class="text-sm text-secondary mb-4"><%= t(".empty") %></p>
+        <div class="flex items-center gap-2">
+          <%= render DS::Button.new(
+            text: t(".bootstrap"),
+            href: bootstrap_categories_path,
+          ) %>
+
+          <%= render DS::Link.new(
+            text: t(".new"),
+            variant: "outline",
+            icon: "plus",
+            href: new_category_path,
+            frame: :modal
+          ) %>
+        </div>
+      </div>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/categories/new.html.erb b/app/views/categories/new.html.erb
index de8e68d3..73f69f64 100644
--- a/app/views/categories/new.html.erb
+++ b/app/views/categories/new.html.erb
@@ -1,3 +1,6 @@
-<%= modal_form_wrapper title: t(".new_category") do %>
-  <%= render "form", category: @category %>
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".new_category")) %>
+  <% dialog.with_body do %>
+    <%= render "form", category: @category, categories: @categories %>
+  <% end %>
 <% end %>
diff --git a/app/views/category/deletions/new.html.erb b/app/views/category/deletions/new.html.erb
index 67575498..2de9c6c9 100644
--- a/app/views/category/deletions/new.html.erb
+++ b/app/views/category/deletions/new.html.erb
@@ -1,21 +1,32 @@
-<%= modal_form_wrapper title: t(".delete_category"), subtitle: t(".explanation", category_name: @category.name) do %>
-  <%= styled_form_with url: category_deletions_path(@category),
-                       class: "space-y-4",
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".delete_category"), subtitle: t(".explanation", category_name: @category.name)) %>
+
+  <% dialog.with_body do %>
+    <%= styled_form_with url: category_deletions_path(@category),
                        data: {
                          turbo: false,
                          controller: "deletion",
-                         deletion_dangerous_action_class: "form-field__submit bg-white text-red-600 border hover:bg-red-50",
-                         deletion_safe_action_class: "form-field__submit border border-transparent",
                          deletion_submit_text_when_not_replacing_value: t(".delete_and_leave_uncategorized", category_name: @category.name),
                          deletion_submit_text_when_replacing_value: t(".delete_and_recategorize", category_name: @category.name) } do |f| %>
-    <%= f.collection_select :replacement_category_id,
+      <%= f.collection_select :replacement_category_id,
                             Current.family.categories.alphabetically.without(@category),
                             :id, :name,
-                            { prompt: t(".replacement_category_prompt"), label: t(".category") },
-                            { data: { deletion_target: "replacementField", action: "deletion#updateSubmitButton" } } %>
+                            { prompt: t(".replacement_category_prompt"), label: t(".category"), container_class: "mb-4" },
+                            data: { deletion_target: "replacementField", action: "deletion#chooseSubmitButton" } %>
 
-    <%= f.submit t(".delete_and_leave_uncategorized", category_name: @category.name),
-                 class: "form-field__submit bg-white text-red-600 border hover:bg-red-50",
-                 data: { deletion_target: "submitButton" } %>
+      <%= render DS::Button.new(
+        variant: "destructive",
+        text: t(".delete_and_leave_uncategorized", category_name: @category.name),
+        full_width: true,
+        data: { deletion_target: "destructiveSubmitButton" }
+      ) %>
+
+      <%= render DS::Button.new(
+        text: "Delete and reassign",
+        data: { deletion_target: "safeSubmitButton" },
+        hidden: true,
+        full_width: true
+      ) %>
+    <% end %>
   <% end %>
 <% end %>
diff --git a/app/views/category/dropdowns/_row.html.erb b/app/views/category/dropdowns/_row.html.erb
index b4b6971b..6e25d478 100644
--- a/app/views/category/dropdowns/_row.html.erb
+++ b/app/views/category/dropdowns/_row.html.erb
@@ -1,31 +1,31 @@
 <%# locals: (category:) %>
 <% is_selected = category.id === @selected_category&.id %>
 
-<%= content_tag :div, class: ["filterable-item flex justify-between items-center border-none rounded-lg px-2 py-1 group w-full", { "bg-gray-25": is_selected }], data: { filter_name: category.name } do %>
-  <%= button_to account_transaction_path(@transaction.entry.account, @transaction.entry, account_entry: { entryable_type: "Account::Transaction", entryable_attributes: { id: @transaction.id, category_id: category.id } }), method: :patch, data: { turbo_frame: dom_id(@transaction.entry) }, class: "flex w-full items-center gap-1.5 cursor-pointer" do %>
-    <span class="w-5 h-5">
-      <%= lucide_icon("check", class: "w-5 h-5 text-gray-500") if is_selected %>
-    </span>
+<%= content_tag :div,
+      class: ["filterable-item flex justify-between items-center border-none rounded-lg px-2 py-1 group w-full hover:bg-container-inset-hover",
+              { "bg-container-inset": is_selected }],
+      data: { filter_name: category.name } do %>
+  <%= button_to transaction_category_path(
+        @transaction.entry,
+        entry: {
+          entryable_type: "Transaction",
+          entryable_attributes: { id: @transaction.id, category_id: category.id }
+        }
+      ),
+      method: :patch,
+      class: "flex w-full items-center gap-1.5 cursor-pointer focus:outline-none" do %>
+
+    <%= icon("check") if is_selected %>
+
+    <% if category.subcategory? %>
+      <%= icon("corner-down-right", size: "sm") %>
+    <% end %>
+
     <%= render partial: "categories/badge", locals: { category: category } %>
   <% end %>
 
-  <%= contextual_menu do %>
-    <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-      <%= link_to edit_category_path(category),
-            class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg",
-            data: { turbo_frame: :modal } do %>
-        <%= lucide_icon "pencil-line", class: "w-5 h-5 text-gray-500" %>
-
-        <span><%= t(".edit") %></span>
-      <% end %>
-
-      <%= link_to new_category_deletion_path(category),
-            class: "block w-full py-2 px-3 space-x-2 text-red-600 hover:bg-red-50 flex items-center rounded-lg",
-            data: { turbo_frame: :modal } do %>
-        <%= lucide_icon "trash-2", class: "w-5 h-5" %>
-
-        <span><%= t(".delete") %></span>
-      <% end %>
-    </div>
+  <%= render DS::Menu.new do |menu| %>
+    <% menu.with_item(variant: "link", text: t(".edit"), icon: "pencil-line", href: edit_category_path(category), data: { turbo_frame: :modal }) %>
+    <% menu.with_item(variant: "link", text: t(".delete"), icon: "trash-2", href: new_category_deletion_path(category), data: { turbo_frame: :modal }, destructive: true) %>
   <% end %>
 <% end %>
diff --git a/app/views/category/dropdowns/show.html.erb b/app/views/category/dropdowns/show.html.erb
index 4f3baa63..02ec05a7 100644
--- a/app/views/category/dropdowns/show.html.erb
+++ b/app/views/category/dropdowns/show.html.erb
@@ -1,40 +1,89 @@
 <%= turbo_frame_tag "category_dropdown" do %>
   <div class="flex flex-col relative" data-controller="list-filter">
     <div class="grow p-1.5">
-      <div class="relative flex items-center bg-white border border-gray-200 rounded-lg">
-        <input placeholder="<%= t(".search_placeholder") %>" autocomplete="nope" type="search" class="placeholder:text-sm placeholder:text-gray-500 font-normal h-10 relative pl-10 w-full border-none rounded-lg" data-list-filter-target="input" data-action="list-filter#filter">
-        <%= lucide_icon("search", class: "w-5 h-5 text-gray-500 ml-2 absolute inset-0 transform top-1/2 -translate-y-1/2") %>
+      <div class="relative flex items-center bg-container border border-secondary rounded-lg">
+        <input
+          placeholder="<%= t(".search_placeholder") %>"
+          autocomplete="nope"
+          type="search"
+          class="bg-container placeholder:text-sm placeholder:text-secondary font-normal h-10 relative pl-10 w-full border-none rounded-lg focus:outline-hidden focus:ring-0"
+          data-list-filter-target="input"
+          data-action="list-filter#filter">
+          <%= icon("search", class: "absolute inset-0 ml-2 transform top-1/2 -translate-y-1/2") %>
+        </div>
       </div>
-    </div>
-    <div data-list-filter-target="list" class="flex flex-col gap-0.5 p-1.5 mt-0.5 mr-2 max-h-64 overflow-y-scroll scrollbar">
-      <div class="pb-2 pl-4 mr-2 text-gray-500 hidden" data-list-filter-target="emptyMessage">
-        <%= t(".no_categories") %>
+      <div data-list-filter-target="list" class="flex flex-col gap-0.5 p-1.5 mt-0.5 mr-2 max-h-64 overflow-y-scroll scrollbar">
+        <div class="pb-2 pl-4 mr-2 text-secondary hidden" data-list-filter-target="emptyMessage">
+          <%= t(".no_categories") %>
+        </div>
+        <% if @categories.any? %>
+          <% Category::Group.for(@categories).each do |group| %>
+            <%= render "category/dropdowns/row", category: group.category %>
+
+            <% group.subcategories.each do |category| %>
+              <%= render "category/dropdowns/row", category: category %>
+            <% end %>
+          <% end %>
+        <% else %>
+          <div class="flex justify-center items-center py-12">
+            <div class="text-center flex flex-col items-center max-w-[500px]">
+              <p class="text-sm text-secondary font-normal mb-4"><%= t(".empty") %></p>
+
+              <%= render DS::Button.new(
+              text: t(".bootstrap"),
+              variant: "outline",
+              href: bootstrap_categories_path,
+              method: :post,
+              data: { turbo_frame: :_top }) %>
+            </div>
+          </div>
+        <% end %>
       </div>
-      <% @categories.each do |category| %>
-        <%= render partial: "category/dropdowns/row", locals: { category: } %>
-      <% end %>
-    </div>
-    <hr>
-    <div class="relative p-1.5 w-full">
-      <%= link_to new_category_path(transaction_id: @transaction),
-                  class: "flex text-sm font-medium items-center gap-2 text-gray-500 w-full rounded-lg p-2 hover:bg-gray-100",
-                  data: { turbo_frame: "modal" } do %>
-        <%= lucide_icon "plus", class: "w-5 h-5" %>
 
-        <%= t(".add_new") %>
-      <% end %>
+      <%= render "shared/ruler", classes: "my-2" %>
 
-      <% if @transaction.category %>
-        <%= button_to account_transaction_path(@transaction.entry.account, @transaction.entry),
+      <div class="relative p-1.5 w-full">
+        <% if @transaction.category %>
+          <%= button_to transaction_path(@transaction.entry),
                       method: :patch,
                       data: { turbo_frame: dom_id(@transaction.entry) },
-                      params: { account_entry: { entryable_type: "Account::Transaction", entryable_attributes: { id: @transaction.id, category_id: nil } } },
-                      class: "flex text-sm font-medium items-center gap-2 text-gray-500 w-full rounded-lg p-2 hover:bg-gray-100" do %>
-          <%= lucide_icon "minus", class: "w-5 h-5" %>
+                      params: { entry: { entryable_type: "Transaction", entryable_attributes: { id: @transaction.id, category_id: nil } } },
+                      class: "flex text-sm font-medium items-center gap-2 text-secondary w-full rounded-lg p-2 hover:bg-container-inset-hover" do %>
+            <%= icon("minus") %>
 
-          <%= t(".clear") %>
+            <%= t(".clear") %>
+          <% end %>
         <% end %>
-      <% end %>
+
+        <% unless @transaction.transfer? %>
+          <%= link_to new_transaction_transfer_match_path(@transaction.entry),
+                  class: "flex text-sm font-medium items-center gap-2 text-secondary w-full rounded-lg p-2 hover:bg-container-inset-hover",
+                  data: { turbo_frame: "modal" } do %>
+            <%= icon("refresh-cw") %>
+
+            <p>Match transfer/payment</p>
+          <% end %>
+        <% end %>
+
+        <div class="flex text-sm font-medium items-center gap-2 text-secondary w-full rounded-lg p-2">
+          <div class="flex items-center gap-2">
+            <%= form_with url: transaction_path(@transaction.entry),
+                        method: :patch,
+                        data: { controller: "auto-submit-form" } do |f| %>
+              <%= f.hidden_field "entry[excluded]", value: !@transaction.entry.excluded %>
+              <%= f.check_box "entry[excluded]",
+                          checked: @transaction.entry.excluded,
+                          class: "checkbox checkbox--light",
+                          data: { auto_submit_form_target: "auto", autosubmit_trigger_event: "change" } %>
+            <% end %>
+          </div>
+
+          <p>One-time <%= @transaction.entry.amount.negative? ? "income" : "expense" %></p>
+
+          <span class="text-orange-500 ml-auto">
+            <%= icon("asterisk", color: "current") %>
+          </span>
+        </div>
+      </div>
     </div>
-  </div>
-<% end %>
+  <% end %>
diff --git a/app/views/chats/_ai_avatar.html.erb b/app/views/chats/_ai_avatar.html.erb
new file mode 100644
index 00000000..ec5b47dd
--- /dev/null
+++ b/app/views/chats/_ai_avatar.html.erb
@@ -0,0 +1,7 @@
+<%# locals: (theme: "light") %>
+
+<div class="shrink-0 w-8 h-8 antialiased" style="filter: drop-shadow(0px 6px 8px rgba(244, 78, 247, 0.10));">
+  <%# Never use svg as an image tag, it appears blurry in Safari %>
+  <%= inline_svg_tag "ai-dark.svg", alt: "AI", class: "w-full h-full hidden theme-dark:block" %>
+  <%= inline_svg_tag "ai.svg", alt: "AI", class: "w-full h-full theme-dark:hidden" %>
+</div>
diff --git a/app/views/chats/_ai_consent.html.erb b/app/views/chats/_ai_consent.html.erb
new file mode 100644
index 00000000..e96d2570
--- /dev/null
+++ b/app/views/chats/_ai_consent.html.erb
@@ -0,0 +1,26 @@
+<div class="rounded-lg p-4 bg-container shadow-border-xs">
+  <div class="flex justify-center mb-4">
+    <%= render "chats/ai_avatar" %>
+  </div>
+
+  <h3 class="text-sm font-medium text-primary mb-1 -mt-2 text-center">Enable Maybe AI</h3>
+
+  <p class="text-gray-600 mb-4 text-sm text-center">
+    <% if Current.user.ai_available? %>
+      Maybe AI can answer financial questions and provide insights based on your data. To use this feature you'll need to explicitly enable it.
+    <% else %>
+      To use the AI assistant, you need to set the <code class="bg-surface-inset px-1 py-0.5 rounded font-mono text-xs">OPENAI_ACCESS_TOKEN</code>
+      environment variable in your self-hosted instance.
+    <% end %>
+  </p>
+
+  <% if Current.user.ai_available? %>
+    <%= form_with url: user_path(Current.user), method: :patch, class: "w-full", data: { turbo: false } do |form| %>
+      <%= form.hidden_field "user[ai_enabled]", value: true %>
+      <%= form.hidden_field "user[redirect_to]", value: "home" %>
+      <%= form.submit "Enable Maybe AI", class: "cursor-pointer hover:bg-inverse-hover w-full py-2 px-4 bg-inverse fg-inverse rounded-lg text-sm font-medium" %>
+    <% end %>
+  <% end %>
+
+  <p class="text-xs text-secondary text-center mt-2">Disable anytime.  All data sent to our LLM providers is anonymized.</p>
+</div>
diff --git a/app/views/chats/_ai_greeting.html.erb b/app/views/chats/_ai_greeting.html.erb
new file mode 100644
index 00000000..162ee8ea
--- /dev/null
+++ b/app/views/chats/_ai_greeting.html.erb
@@ -0,0 +1,40 @@
+<div class="flex items-start w-full gap-3 p-2">
+  <%= render "chats/ai_avatar" %>
+
+  <div class="max-w-[85%] text-sm space-y-4 text-primary">
+    <p>Hey <%= Current.user&.first_name || "there" %>! I'm an AI built by Maybe to help with your finances. I have access to the web and your account data.</p>
+
+    <p>
+      You can use <span class="bg-container border border-secondary px-1.5 py-0.5 rounded font-mono text-xs">/</span> to access commands
+    </p>
+
+    <div class="space-y-3">
+      <p>Here's a few questions you can ask:</p>
+
+      <% questions = [
+        {
+          icon: "chart-area",
+          text: "Evaluate investment portfolio"
+        },
+        {
+          icon: "wallet-minimal",
+          text: "Show spending insights"
+        },
+        {
+          icon: "alert-triangle",
+          text: "Find unusual patterns"
+        }
+      ] %>
+
+      <div class="space-y-2.5">
+        <% questions.each do |question| %>
+          <button data-action="chat#submitSampleQuestion"
+                  data-chat-question-param="<%= question[:text] %>"
+                  class="w-fit flex items-center gap-2 border border-tertiary rounded-full py-1.5 px-2.5 hover:bg-gray-100">
+            <%= icon(question[:icon]) %> <%= question[:text] %>
+          </button>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/app/views/chats/_chat.html.erb b/app/views/chats/_chat.html.erb
new file mode 100644
index 00000000..9eb35a0f
--- /dev/null
+++ b/app/views/chats/_chat.html.erb
@@ -0,0 +1,30 @@
+<%# locals: (chat:) %>
+
+<%= tag.div class: "flex items-center justify-between px-4 py-3 bg-container shadow-border-xs rounded-lg" do %>
+  <div class="grow">
+    <%= turbo_frame_tag dom_id(chat, :title) do %>
+      <%= render "chats/chat_title", chat: chat, ctx: "list" %>
+    <% end %>
+
+    <p class="text-sm text-secondary">
+      <%= time_ago_in_words(chat.updated_at) %> ago
+    </p>
+  </div>
+
+  <%= render DS::Menu.new(icon_vertical: true) do |menu| %>
+    <% menu.with_item(
+      variant: "link",
+      text: "Edit chat title",
+      href: edit_chat_path(chat, ctx: "list"),
+      icon: "pencil",
+      frame: dom_id(chat, "title")) %>
+
+    <% menu.with_item(
+      variant: "button",
+      text: "Delete chat",
+      href: chat_path(chat),
+      icon: "trash-2",
+      method: :delete,
+      confirm: CustomConfirm.for_resource_deletion("chat")) %>
+  <% end %>
+<% end %>
diff --git a/app/views/chats/_chat_nav.html.erb b/app/views/chats/_chat_nav.html.erb
new file mode 100644
index 00000000..6cf7d28f
--- /dev/null
+++ b/app/views/chats/_chat_nav.html.erb
@@ -0,0 +1,41 @@
+<%# locals: (chat:) %>
+
+<nav class="flex items-center justify-between">
+  <% path = chat.new_record? ? chats_path : chats_path(previous_chat_id: chat.id) %>
+
+  <div class="flex items-center gap-2 grow">
+    <%= render DS::Link.new(
+      id: "chat-nav-back",
+      variant: "icon",
+      icon: "menu",
+      href: path,
+      frame: chat_frame,
+      text: "All chats"
+    ) %>
+
+    <div class="grow">
+      <%= render "chats/chat_title", chat: chat, ctx: "chat" %>
+    </div>
+  </div>
+
+  <%= render DS::Menu.new(icon_vertical: true) do |menu| %>
+    <% menu.with_item(variant: "link", text: "Start new chat", href: new_chat_path, icon: "plus") %>
+
+    <% unless chat.new_record? %>
+      <% menu.with_item(
+        variant: "link",
+        text: "Edit chat title",
+        href: edit_chat_path(chat, ctx: "chat"),
+        icon: "pencil",
+        frame: dom_id(chat, "title")) %>
+
+      <% menu.with_item(
+        variant: "button",
+        text: "Delete chat",
+        href: chat_path(chat),
+        icon: "trash-2",
+        method: :delete,
+        confirm: CustomConfirm.for_resource_deletion("chat")) %>
+    <% end %>
+  <% end %>
+</nav>
diff --git a/app/views/chats/_chat_title.html.erb b/app/views/chats/_chat_title.html.erb
new file mode 100644
index 00000000..8e6d59b8
--- /dev/null
+++ b/app/views/chats/_chat_title.html.erb
@@ -0,0 +1,11 @@
+<%# locals: (chat:, ctx: "list") %>
+
+<%= turbo_frame_tag dom_id(chat, :title), class: "block" do %>
+  <% if chat.new_record? || ctx == "chat" %>
+    <h3 class="text-sm font-medium text-primary"><%= chat.title || "New chat" %></h3>
+  <% else %>
+    <%= link_to chat_path(chat), data: { turbo_frame: chat_frame } do %>
+      <h3 class="truncate text-sm font-medium text-primary"><%= chat.title %></h3>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/chats/_error.html.erb b/app/views/chats/_error.html.erb
new file mode 100644
index 00000000..bbcb7581
--- /dev/null
+++ b/app/views/chats/_error.html.erb
@@ -0,0 +1,18 @@
+<%# locals: (chat:) %>
+
+<div id="chat-error" class="px-3 py-2 bg-red-100 border border-red-500 rounded-lg">
+  <% if chat.debug_mode? %>
+    <div class="overflow-x-auto text-xs p-4 bg-red-200 rounded-md mb-2">
+      <code><%= chat.error %></code>
+    </div>
+  <% end %>
+
+  <div class="flex items-center justify-between gap-2">
+    <p class="text-xs text-red-500">Failed to generate response.  Please try again.</p>
+
+    <%= render DS::Button.new(
+      text: "Retry",
+      href: retry_chat_path(chat),
+    ) %>
+  </div>
+</div>
diff --git a/app/views/chats/_thinking_indicator.html.erb b/app/views/chats/_thinking_indicator.html.erb
new file mode 100644
index 00000000..e1ba8921
--- /dev/null
+++ b/app/views/chats/_thinking_indicator.html.erb
@@ -0,0 +1,6 @@
+<%# locals: (chat:, message: "Thinking ...") -%>
+
+<div id="thinking-indicator" class="flex items-start gap-3">
+  <%= render "chats/ai_avatar" %>
+  <p class="text-sm text-secondary animate-pulse"><%= message %></p>
+</div>
diff --git a/app/views/chats/edit.html.erb b/app/views/chats/edit.html.erb
new file mode 100644
index 00000000..5789efe5
--- /dev/null
+++ b/app/views/chats/edit.html.erb
@@ -0,0 +1,9 @@
+<%= turbo_frame_tag dom_id(@chat, :title), class: "block" do %>
+  <%= styled_form_with model: @chat, data: { controller: "auto-submit-form", auto_submit_form_trigger_event_value: "blur" } do |f| %>
+    <%= f.text_field :title,
+      data: { auto_submit_form_target: "auto" },
+      autofocus: true,
+      inline: true,
+      class: "w-full rounded-md px-2 py-1 text-sm font-medium bg-transparent" %>
+  <% end %>
+<% end %>
diff --git a/app/views/chats/index.html.erb b/app/views/chats/index.html.erb
new file mode 100644
index 00000000..0f450748
--- /dev/null
+++ b/app/views/chats/index.html.erb
@@ -0,0 +1,32 @@
+<div data-controller="chat hotkey">
+  <%= turbo_frame_tag chat_frame do %>
+    <div class="flex flex-col h-full md:p-4">
+      <% if @chats.any? %>
+        <div class="grow flex flex-col">
+          <div class="flex items-center justify-between my-6">
+            <h1 class="text-xl font-medium">Chats</h1>
+            <%= render DS::Link.new(
+              id: "new-chat",
+              icon: "plus",
+              variant: "icon",
+              href: new_chat_path,
+              frame: chat_frame,
+              text: "New chat"
+            ) %>
+          </div>
+          <div class="space-y-2 px-0.5">
+            <%= render @chats %>
+          </div>
+        </div>
+      <% else %>
+        <div class="grow flex flex-col">
+          <h1 class="sr-only">Chats</h1>
+          <div class="mt-auto py-8">
+            <%= render "chats/ai_greeting" %>
+          </div>
+          <%= render "messages/chat_form" %>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/chats/new.html.erb b/app/views/chats/new.html.erb
new file mode 100644
index 00000000..8bee5429
--- /dev/null
+++ b/app/views/chats/new.html.erb
@@ -0,0 +1,11 @@
+<%= turbo_frame_tag chat_frame do %>
+  <div class="flex flex-col h-full md:p-4">
+    <%= render "chats/chat_nav", chat: @chat %>
+
+    <div class="mt-auto py-8">
+      <%= render "chats/ai_greeting" %>
+    </div>
+
+    <%= render "messages/chat_form", chat: @chat %>
+  </div>
+<% end %>
diff --git a/app/views/chats/show.html.erb b/app/views/chats/show.html.erb
new file mode 100644
index 00000000..945507f7
--- /dev/null
+++ b/app/views/chats/show.html.erb
@@ -0,0 +1,38 @@
+<div data-controller="chat hotkey">
+  <%= turbo_frame_tag chat_frame do %>
+    <%= turbo_stream_from @chat %>
+
+    <h1 class="sr-only"><%= @chat.title %></h1>
+
+    <div class="flex flex-col h-full">
+      <div class="md:p-4">
+        <%= render "chats/chat_nav", chat: @chat %>
+      </div>
+
+      <div id="messages" class="grow overflow-y-auto p-4 space-y-6 pb-24 lg:pb-4" data-chat-target="messages">
+        <% if @chat.conversation_messages.any? %>
+          <% @chat.conversation_messages.ordered.each do |message| %>
+            <%= render message %>
+          <% end %>
+        <% else %>
+          <div class="mt-auto">
+            <%= render "chats/ai_greeting", context: "chat" %>
+          </div>
+        <% end %>
+
+        <% if params[:thinking].present? %>
+          <%= render "chats/thinking_indicator", chat: @chat %>
+        <% end %>
+
+        <% if @chat.error.present? && @chat.needs_assistant_response? %>
+          <%= render "chats/error", chat: @chat %>
+        <% end %>
+      </div>
+
+      <%# DESKTOP - Chat form %>
+      <div class="p-4 pt-0 lg:mt-auto fixed lg:static left-0 bottom-16 w-full bg-surface">
+        <%= render "messages/chat_form", chat: @chat %>
+      </div>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/credit_cards/_form.html.erb b/app/views/credit_cards/_form.html.erb
new file mode 100644
index 00000000..ef3d5d3d
--- /dev/null
+++ b/app/views/credit_cards/_form.html.erb
@@ -0,0 +1,38 @@
+<%# locals: (account:, url:) %>
+
+<%= render "accounts/form", account: account, url: url do |form| %>
+  <%= render "shared/ruler", classes: "my-4" %>
+
+  <div class="space-y-2">
+    <%= form.fields_for :accountable do |credit_card_form| %>
+      <div class="flex items-center gap-2">
+        <%= credit_card_form.number_field :available_credit,
+                                        label: t("credit_cards.form.available_credit"),
+                                        placeholder: t("credit_cards.form.available_credit_placeholder"),
+                                        min: 0 %>
+      </div>
+
+      <div class="flex items-center gap-2">
+        <%= credit_card_form.money_field :minimum_payment,
+                                        label: t("credit_cards.form.minimum_payment"),
+                                        placeholder: t("credit_cards.form.minimum_payment_placeholder"),
+                                        default_currency: Current.family.currency %>
+
+        <%= credit_card_form.number_field :apr,
+                                        label: t("credit_cards.form.apr"),
+                                        placeholder: t("credit_cards.form.apr_placeholder"),
+                                        min: 0,
+                                        step: 0.01 %>
+      </div>
+
+      <div class="flex items-center gap-2">
+        <%= credit_card_form.date_field :expiration_date,
+                                      label: t("credit_cards.form.expiration_date") %>
+        <%= credit_card_form.number_field :annual_fee,
+                                        label: t("credit_cards.form.annual_fee"),
+                                        placeholder: t("credit_cards.form.annual_fee_placeholder"),
+                                        min: 0 %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/accounts/accountables/credit_card/_overview.html.erb b/app/views/credit_cards/_overview.html.erb
similarity index 83%
rename from app/views/accounts/accountables/credit_card/_overview.html.erb
rename to app/views/credit_cards/_overview.html.erb
index 3121528b..1dfcbb0b 100644
--- a/app/views/accounts/accountables/credit_card/_overview.html.erb
+++ b/app/views/credit_cards/_overview.html.erb
@@ -25,3 +25,12 @@
     <%= format_money(account.credit_card.annual_fee_money || Money.new(0, account.currency)) %>
   <% end %>
 </div>
+
+<div class="flex justify-center py-8">
+  <%= render DS::Link.new(
+    text: "Edit account details",
+    variant: "ghost",
+    href: edit_credit_card_path(account),
+    frame: :modal
+  ) %>
+</div>
diff --git a/app/views/credit_cards/edit.html.erb b/app/views/credit_cards/edit.html.erb
new file mode 100644
index 00000000..5e95ffa5
--- /dev/null
+++ b/app/views/credit_cards/edit.html.erb
@@ -0,0 +1,7 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".edit", account: @account.name)) %>
+
+  <% dialog.with_body do %>
+    <%= render "form", account: @account, url: credit_card_path(@account) %>
+  <% end %>
+<% end %>
diff --git a/app/views/credit_cards/new.html.erb b/app/views/credit_cards/new.html.erb
new file mode 100644
index 00000000..a81805f2
--- /dev/null
+++ b/app/views/credit_cards/new.html.erb
@@ -0,0 +1,14 @@
+<% if params[:step] == "method_select" %>
+  <%= render "accounts/new/method_selector",
+             path: new_credit_card_path(return_to: params[:return_to]),
+             show_us_link: @show_us_link,
+             show_eu_link: @show_eu_link,
+             accountable_type: "CreditCard" %>
+<% else %>
+  <%= render DS::Dialog.new do |dialog| %>
+    <% dialog.with_header(title: t(".title")) %>
+    <% dialog.with_body do %>
+      <%= render "credit_cards/form", account: @account, url: credit_cards_path %>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/cryptos/_form.html.erb b/app/views/cryptos/_form.html.erb
new file mode 100644
index 00000000..8895b27a
--- /dev/null
+++ b/app/views/cryptos/_form.html.erb
@@ -0,0 +1,3 @@
+<%# locals: (account:, url:) %>
+
+<%= render "accounts/form", account: account, url: url %>
diff --git a/app/views/cryptos/edit.html.erb b/app/views/cryptos/edit.html.erb
new file mode 100644
index 00000000..0f08498d
--- /dev/null
+++ b/app/views/cryptos/edit.html.erb
@@ -0,0 +1,6 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".edit", account: @account.name)) %>
+  <% dialog.with_body do %>
+    <%= render "form", account: @account, url: crypto_path(@account) %>
+  <% end %>
+<% end %>
diff --git a/app/views/cryptos/new.html.erb b/app/views/cryptos/new.html.erb
new file mode 100644
index 00000000..97fcccdc
--- /dev/null
+++ b/app/views/cryptos/new.html.erb
@@ -0,0 +1,14 @@
+<% if params[:step] == "method_select" %>
+  <%= render "accounts/new/method_selector",
+             path: new_crypto_path(return_to: params[:return_to]),
+             show_us_link: @show_us_link,
+             show_eu_link: @show_eu_link,
+             accountable_type: "Crypto" %>
+<% else %>
+  <%= render DS::Dialog.new do |dialog| %>
+    <% dialog.with_header(title: t(".title")) %>
+    <% dialog.with_body do %>
+      <%= render "form", account: @account, url: cryptos_path %>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/depositories/_form.html.erb b/app/views/depositories/_form.html.erb
new file mode 100644
index 00000000..df853e8d
--- /dev/null
+++ b/app/views/depositories/_form.html.erb
@@ -0,0 +1,7 @@
+<%# locals: (account:, url:) %>
+
+<%= render "accounts/form", account: account, url: url do |form| %>
+  <%= form.select :subtype,
+                 Depository::SUBTYPES.map { |k, v| [v[:long], k] },
+                 { label: true, prompt: t("depositories.form.subtype_prompt"), include_blank: t("depositories.form.none") } %>
+<% end %>
diff --git a/app/views/depositories/edit.html.erb b/app/views/depositories/edit.html.erb
new file mode 100644
index 00000000..5b265f41
--- /dev/null
+++ b/app/views/depositories/edit.html.erb
@@ -0,0 +1,6 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".edit", account: @account.name)) %>
+  <% dialog.with_body do %>
+    <%= render "form", account: @account, url: depository_path(@account) %>
+  <% end %>
+<% end %>
diff --git a/app/views/depositories/new.html.erb b/app/views/depositories/new.html.erb
new file mode 100644
index 00000000..f75ed00b
--- /dev/null
+++ b/app/views/depositories/new.html.erb
@@ -0,0 +1,14 @@
+<% if params[:step] == "method_select" %>
+  <%= render "accounts/new/method_selector",
+             path: new_depository_path(return_to: params[:return_to]),
+             show_us_link: @show_us_link,
+             show_eu_link: @show_eu_link,
+             accountable_type: "Depository" %>
+<% else %>
+  <%= render DS::Dialog.new do |dialog| %>
+    <% dialog.with_header(title: t(".title")) %>
+    <% dialog.with_body do %>
+      <%= render "depositories/form", account: @account, url: depositories_path %>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/developer_messages/_developer_message.html.erb b/app/views/developer_messages/_developer_message.html.erb
new file mode 100644
index 00000000..d756442f
--- /dev/null
+++ b/app/views/developer_messages/_developer_message.html.erb
@@ -0,0 +1,6 @@
+<%# locals: (developer_message:) %>
+
+<div id="<%= dom_id(developer_message) %>" class="my-2 <%= developer_message.debug? ? "bg-yellow-50 border-yellow-200" : "bg-blue-50 border-blue-200" %> px-3 py-2 rounded-lg max-w-[85%] ml-auto border">
+  <span class="text-secondary text-xs"><%= developer_message.debug? ? "Debug message (internal only)" : "System instruction (sent to AI)" %></span>
+  <p class="text-primary text-sm"><%= developer_message.content %></p>
+</div>
diff --git a/app/views/doorkeeper/applications/_delete_form.html.erb b/app/views/doorkeeper/applications/_delete_form.html.erb
new file mode 100644
index 00000000..bf7a0d0d
--- /dev/null
+++ b/app/views/doorkeeper/applications/_delete_form.html.erb
@@ -0,0 +1,6 @@
+<%- submit_btn_css ||= "btn btn-link" %>
+<%= form_tag oauth_application_path(application), method: :delete do %>
+  <%= submit_tag t("doorkeeper.applications.buttons.destroy"),
+                 onclick: "return confirm('#{ t('doorkeeper.applications.confirmations.destroy') }')",
+                 class: submit_btn_css %>
+<% end %>
diff --git a/app/views/doorkeeper/applications/_form.html.erb b/app/views/doorkeeper/applications/_form.html.erb
new file mode 100644
index 00000000..4cc71b3d
--- /dev/null
+++ b/app/views/doorkeeper/applications/_form.html.erb
@@ -0,0 +1,59 @@
+<%= form_for application, url: doorkeeper_submit_path(application), as: :doorkeeper_application, html: { role: "form" } do |f| %>
+  <% if application.errors.any? %>
+    <div class="alert alert-danger" data-alert><p><%= t("doorkeeper.applications.form.error") %></p></div>
+  <% end %>
+
+  <div class="form-group row">
+    <%= f.label :name, class: "col-sm-2 col-form-label font-weight-bold" %>
+    <div class="col-sm-10">
+      <%= f.text_field :name, class: "form-control #{ 'is-invalid' if application.errors[:name].present? }", required: true %>
+      <%= doorkeeper_errors_for application, :name %>
+    </div>
+  </div>
+
+  <div class="form-group row">
+    <%= f.label :redirect_uri, class: "col-sm-2 col-form-label font-weight-bold" %>
+    <div class="col-sm-10">
+      <%= f.text_area :redirect_uri, class: "form-control #{ 'is-invalid' if application.errors[:redirect_uri].present? }" %>
+      <%= doorkeeper_errors_for application, :redirect_uri %>
+      <span class="form-text text-secondary">
+        <%= t("doorkeeper.applications.help.redirect_uri") %>
+      </span>
+
+      <% if Doorkeeper.configuration.allow_blank_redirect_uri?(application) %>
+        <span class="form-text text-secondary">
+          <%= t("doorkeeper.applications.help.blank_redirect_uri") %>
+        </span>
+      <% end %>
+    </div>
+  </div>
+
+  <div class="form-group row">
+    <%= f.label :confidential, class: "col-sm-2 form-check-label font-weight-bold" %>
+    <div class="col-sm-10">
+      <%= f.check_box :confidential, class: "checkbox #{ 'is-invalid' if application.errors[:confidential].present? }" %>
+      <%= doorkeeper_errors_for application, :confidential %>
+      <span class="form-text text-secondary">
+        <%= t("doorkeeper.applications.help.confidential") %>
+      </span>
+    </div>
+  </div>
+
+  <div class="form-group row">
+    <%= f.label :scopes, class: "col-sm-2 col-form-label font-weight-bold" %>
+    <div class="col-sm-10">
+      <%= f.text_field :scopes, class: "form-control #{ 'has-error' if application.errors[:scopes].present? }" %>
+      <%= doorkeeper_errors_for application, :scopes %>
+      <span class="form-text text-secondary">
+        <%= t("doorkeeper.applications.help.scopes") %>
+      </span>
+    </div>
+  </div>
+
+  <div class="form-group">
+    <div class="col-sm-offset-2 col-sm-10">
+      <%= f.submit t("doorkeeper.applications.buttons.submit"), class: "btn btn-primary" %>
+      <%= link_to t("doorkeeper.applications.buttons.cancel"), oauth_applications_path, class: "btn btn-secondary" %>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/doorkeeper/applications/edit.html.erb b/app/views/doorkeeper/applications/edit.html.erb
new file mode 100644
index 00000000..91cf6f8c
--- /dev/null
+++ b/app/views/doorkeeper/applications/edit.html.erb
@@ -0,0 +1,5 @@
+<div class="border-bottom mb-4">
+  <h1><%= t(".title") %></h1>
+</div>
+
+<%= render "form", application: @application %>
diff --git a/app/views/doorkeeper/applications/index.html.erb b/app/views/doorkeeper/applications/index.html.erb
new file mode 100644
index 00000000..259e72d3
--- /dev/null
+++ b/app/views/doorkeeper/applications/index.html.erb
@@ -0,0 +1,38 @@
+<div class="border-bottom mb-4">
+  <h1><%= t(".title") %></h1>
+</div>
+
+<p><%= link_to t(".new"), new_oauth_application_path, class: "btn btn-success" %></p>
+
+<table class="table table-striped">
+  <thead>
+  <tr>
+    <th><%= t(".name") %></th>
+    <th><%= t(".callback_url") %></th>
+    <th><%= t(".confidential") %></th>
+    <th><%= t(".actions") %></th>
+    <th></th>
+  </tr>
+  </thead>
+  <tbody>
+  <% @applications.each do |application| %>
+    <tr id="application_<%= application.id %>">
+      <td class="align-middle">
+        <%= link_to application.name, oauth_application_path(application) %>
+      </td>
+      <td class="align-middle">
+        <%= simple_format(application.redirect_uri) %>
+      </td>
+      <td class="align-middle">
+        <%= application.confidential? ? t("doorkeeper.applications.index.confidentiality.yes") : t("doorkeeper.applications.index.confidentiality.no") %>
+      </td>
+      <td class="align-middle">
+        <%= link_to t("doorkeeper.applications.buttons.edit"), edit_oauth_application_path(application), class: "btn btn-link" %>
+      </td>
+      <td class="align-middle">
+        <%= render "delete_form", application: application %>
+      </td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>
diff --git a/app/views/doorkeeper/applications/new.html.erb b/app/views/doorkeeper/applications/new.html.erb
new file mode 100644
index 00000000..91cf6f8c
--- /dev/null
+++ b/app/views/doorkeeper/applications/new.html.erb
@@ -0,0 +1,5 @@
+<div class="border-bottom mb-4">
+  <h1><%= t(".title") %></h1>
+</div>
+
+<%= render "form", application: @application %>
diff --git a/app/views/doorkeeper/applications/show.html.erb b/app/views/doorkeeper/applications/show.html.erb
new file mode 100644
index 00000000..53e84c78
--- /dev/null
+++ b/app/views/doorkeeper/applications/show.html.erb
@@ -0,0 +1,63 @@
+<div class="border-bottom mb-4">
+  <h1><%= t(".title", name: @application.name) %></h1>
+</div>
+
+<div class="row">
+  <div class="col-md-8">
+    <h4><%= t(".application_id") %>:</h4>
+    <p><code class="bg-light" id="application_id"><%= @application.uid %></code></p>
+
+    <h4><%= t(".secret") %>:</h4>
+    <p>
+      <code class="bg-light" id="secret">
+        <% secret = flash[:application_secret].presence || @application.plaintext_secret %>
+        <% if secret.blank? && Doorkeeper.config.application_secret_hashed? %>
+          <span class="bg-light font-italic text-uppercase text-muted"><%= t(".secret_hashed") %></span>
+        <% else %>
+          <%= secret %>
+        <% end %>
+      </code>
+    </p>
+
+    <h4><%= t(".scopes") %>:</h4>
+    <p>
+      <code class="bg-light" id="scopes">
+        <% if @application.scopes.present? %>
+          <%= @application.scopes %>
+        <% else %>
+          <span class="bg-light font-italic text-uppercase text-muted"><%= t(".not_defined") %></span>
+        <% end %>
+      </code>
+    </p>
+
+    <h4><%= t(".confidential") %>:</h4>
+    <p><code class="bg-light" id="confidential"><%= @application.confidential? %></code></p>
+
+    <h4><%= t(".callback_urls") %>:</h4>
+
+    <% if @application.redirect_uri.present? %>
+      <table>
+        <% @application.redirect_uri.split.each do |uri| %>
+          <tr>
+            <td>
+              <code class="bg-light"><%= uri %></code>
+            </td>
+            <td>
+              <%= link_to t("doorkeeper.applications.buttons.authorize"), oauth_authorization_path(client_id: @application.uid, redirect_uri: uri, response_type: "code", scope: @application.scopes), class: "btn btn-success", target: "_blank" %>
+            </td>
+          </tr>
+        <% end %>
+      </table>
+    <% else %>
+      <span class="bg-light font-italic text-uppercase text-muted"><%= t(".not_defined") %></span>
+    <% end %>
+  </div>
+
+  <div class="col-md-4">
+    <h3><%= t(".actions") %></h3>
+
+    <p><%= link_to t("doorkeeper.applications.buttons.edit"), edit_oauth_application_path(@application), class: "btn btn-primary" %></p>
+
+    <p><%= render "delete_form", application: @application, submit_btn_css: "btn btn-danger" %></p>
+  </div>
+</div>
diff --git a/app/views/doorkeeper/authorizations/error.html.erb b/app/views/doorkeeper/authorizations/error.html.erb
new file mode 100644
index 00000000..401e191f
--- /dev/null
+++ b/app/views/doorkeeper/authorizations/error.html.erb
@@ -0,0 +1,22 @@
+<div class="bg-container rounded-xl p-6 space-y-6">
+  <div class="text-center space-y-2">
+    <div class="mx-auto w-12 h-12 rounded-full bg-destructive-surface flex items-center justify-center mb-4">
+      <%= icon("alert-circle", class: "w-6 h-6 text-destructive") %>
+    </div>
+    <h1 class="text-2xl font-medium text-primary"><%= t("doorkeeper.authorizations.error.title") %></h1>
+  </div>
+
+  <div class="bg-surface-inset rounded-lg p-4">
+    <p class="text-sm text-secondary">
+      <%= (local_assigns[:error_response] ? error_response : @pre_auth.error_response).body[:error_description] %>
+    </p>
+  </div>
+
+  <div class="text-center">
+    <%= render DS::Link.new(
+      text: "Go back",
+      href: "javascript:history.back()",
+      variant: :secondary
+    ) %>
+  </div>
+</div>
diff --git a/app/views/doorkeeper/authorizations/form_post.html.erb b/app/views/doorkeeper/authorizations/form_post.html.erb
new file mode 100644
index 00000000..d9c0a15b
--- /dev/null
+++ b/app/views/doorkeeper/authorizations/form_post.html.erb
@@ -0,0 +1,22 @@
+<div class="bg-container rounded-xl p-6 space-y-6">
+  <div class="text-center space-y-2">
+    <div class="mx-auto w-12 h-12 rounded-full bg-surface-inset flex items-center justify-center mb-4">
+      <%= icon("loader-circle", class: "w-6 h-6 text-primary animate-spin") %>
+    </div>
+    <h1 class="text-2xl font-medium text-primary"><%= t(".title") %></h1>
+    <p class="text-sm text-secondary">Redirecting you back to the application...</p>
+  </div>
+</div>
+
+<% turbo_disabled = @pre_auth.redirect_uri&.start_with?("maybeapp://") || params[:display] == "mobile" %>
+<%= form_tag @pre_auth.redirect_uri, method: :post, name: :redirect_form, authenticity_token: false, data: { turbo: !turbo_disabled } do %>
+  <% auth.body.compact.each do |key, value| %>
+    <%= hidden_field_tag key, value %>
+  <% end %>
+<% end %>
+
+<script>
+  window.onload = function () {
+    document.forms['redirect_form'].submit();
+  };
+</script>
diff --git a/app/views/doorkeeper/authorizations/new.html.erb b/app/views/doorkeeper/authorizations/new.html.erb
new file mode 100644
index 00000000..30c3ebfa
--- /dev/null
+++ b/app/views/doorkeeper/authorizations/new.html.erb
@@ -0,0 +1,76 @@
+<% if params[:redirect_uri]&.start_with?('maybeapp://') || params[:display] == 'mobile' %>
+  <meta name="turbo-visit-control" content="reload">
+<% end %>
+
+<div class="bg-container rounded-xl p-6 space-y-6">
+  <div class="space-y-2 text-center">
+    <p class="text-sm text-secondary">
+      <%= raw t(".prompt", client_name: content_tag(:span, @pre_auth.client.name, class: "font-medium text-primary")) %>
+    </p>
+  </div>
+
+  <% if @pre_auth.scopes.count > 0 %>
+    <div class="bg-surface-inset rounded-lg p-4 space-y-3">
+      <p class="text-sm font-medium text-primary"><%= t(".able_to") %>:</p>
+      <ul class="space-y-2">
+        <% @pre_auth.scopes.each do |scope| %>
+          <li class="flex items-start gap-2 text-sm text-secondary">
+            <%= icon("check", class: "w-4 h-4 mt-0.5 text-success") %>
+            <span><%= t scope, scope: [:doorkeeper, :scopes] %></span>
+          </li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="space-y-3">
+    <% turbo_disabled = params[:redirect_uri]&.start_with?("maybeapp://") || params[:display] == "mobile" %>
+    <%= form_tag oauth_authorization_path, method: :post, class: "w-full", data: { turbo: !turbo_disabled } do %>
+      <%= hidden_field_tag :client_id, @pre_auth.client.uid, id: nil %>
+      <%= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri, id: nil %>
+      <%= hidden_field_tag :state, @pre_auth.state, id: nil %>
+      <%= hidden_field_tag :response_type, @pre_auth.response_type, id: nil %>
+      <%= hidden_field_tag :response_mode, @pre_auth.response_mode, id: nil %>
+      <%= hidden_field_tag :scope, @pre_auth.scope, id: nil %>
+      <%= hidden_field_tag :code_challenge, @pre_auth.code_challenge, id: nil %>
+      <%= hidden_field_tag :code_challenge_method, @pre_auth.code_challenge_method, id: nil %>
+      <% if params[:display].present? %>
+        <%= hidden_field_tag :display, params[:display], id: nil %>
+      <% end %>
+      <%= render DS::Button.new(
+        text: t("doorkeeper.authorizations.buttons.authorize"),
+        variant: :primary,
+        size: :lg,
+        full_width: true,
+        href: oauth_authorization_path,
+        data: { disable_with: "Authorizing..." }
+      ) %>
+    <% end %>
+
+    <%= form_tag oauth_authorization_path, method: :delete, class: "w-full", data: { turbo: !turbo_disabled } do %>
+      <%= hidden_field_tag :client_id, @pre_auth.client.uid, id: nil %>
+      <%= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri, id: nil %>
+      <%= hidden_field_tag :state, @pre_auth.state, id: nil %>
+      <%= hidden_field_tag :response_type, @pre_auth.response_type, id: nil %>
+      <%= hidden_field_tag :response_mode, @pre_auth.response_mode, id: nil %>
+      <%= hidden_field_tag :scope, @pre_auth.scope, id: nil %>
+      <%= hidden_field_tag :code_challenge, @pre_auth.code_challenge, id: nil %>
+      <%= hidden_field_tag :code_challenge_method, @pre_auth.code_challenge_method, id: nil %>
+      <% if params[:display].present? %>
+        <%= hidden_field_tag :display, params[:display], id: nil %>
+      <% end %>
+      <%= render DS::Button.new(
+        text: t("doorkeeper.authorizations.buttons.deny"),
+        variant: :outline,
+        size: :lg,
+        full_width: true,
+        href: oauth_authorization_path,
+        data: { disable_with: "Denying..." }
+      ) %>
+    <% end %>
+  </div>
+
+  <p class="text-xs text-tertiary text-center">
+    By authorizing, you allow this app to access your Maybe data according to the permissions above.
+  </p>
+</div>
diff --git a/app/views/doorkeeper/authorizations/show.html.erb b/app/views/doorkeeper/authorizations/show.html.erb
new file mode 100644
index 00000000..4653af2a
--- /dev/null
+++ b/app/views/doorkeeper/authorizations/show.html.erb
@@ -0,0 +1,17 @@
+<div class="bg-container rounded-xl p-6 space-y-6">
+  <div class="text-center space-y-2">
+    <div class="mx-auto w-12 h-12 rounded-full bg-success-surface flex items-center justify-center mb-4">
+      <%= icon("check", class: "w-6 h-6 text-success") %>
+    </div>
+    <h1 class="text-2xl font-medium text-primary"><%= t(".title") %></h1>
+  </div>
+
+  <div class="bg-surface-inset rounded-lg p-4">
+    <p class="text-xs text-secondary mb-2">Authorization Code:</p>
+    <code id="authorization_code" class="block text-sm font-mono text-primary break-all"><%= params[:code] %></code>
+  </div>
+
+  <p class="text-sm text-secondary text-center">
+    Copy this code and paste it into the application.
+  </p>
+</div>
diff --git a/app/views/doorkeeper/authorized_applications/_delete_form.html.erb b/app/views/doorkeeper/authorized_applications/_delete_form.html.erb
new file mode 100644
index 00000000..7668b397
--- /dev/null
+++ b/app/views/doorkeeper/authorized_applications/_delete_form.html.erb
@@ -0,0 +1,4 @@
+<%- submit_btn_css ||= "btn btn-link" %>
+<%= form_tag oauth_authorized_application_path(application), method: :delete do %>
+  <%= submit_tag t("doorkeeper.authorized_applications.buttons.revoke"), onclick: "return confirm('#{ t('doorkeeper.authorized_applications.confirmations.revoke') }')", class: submit_btn_css %>
+<% end %>
diff --git a/app/views/doorkeeper/authorized_applications/index.html.erb b/app/views/doorkeeper/authorized_applications/index.html.erb
new file mode 100644
index 00000000..fe36f954
--- /dev/null
+++ b/app/views/doorkeeper/authorized_applications/index.html.erb
@@ -0,0 +1,24 @@
+<header class="page-header">
+  <h1><%= t("doorkeeper.authorized_applications.index.title") %></h1>
+</header>
+
+<main role="main">
+  <table class="table table-striped">
+    <thead>
+    <tr>
+      <th><%= t("doorkeeper.authorized_applications.index.application") %></th>
+      <th><%= t("doorkeeper.authorized_applications.index.created_at") %></th>
+      <th></th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @applications.each do |application| %>
+      <tr>
+        <td><%= application.name %></td>
+        <td><%= application.created_at.strftime(t("doorkeeper.authorized_applications.index.date_format")) %></td>
+        <td><%= render "delete_form", application: application %></td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
+</main>
diff --git a/app/views/email_confirmation_mailer/confirmation_email.html.erb b/app/views/email_confirmation_mailer/confirmation_email.html.erb
new file mode 100644
index 00000000..1501a00e
--- /dev/null
+++ b/app/views/email_confirmation_mailer/confirmation_email.html.erb
@@ -0,0 +1,7 @@
+<h1><%= t(".greeting") %></h1>
+
+<p><%= t(".body") %></p>
+
+<%= link_to @cta, @confirmation_url, class: "button" %>
+
+<p class="footer"><%= t(".expiry_notice", hours: 24) %></p>
diff --git a/app/views/email_confirmation_mailer/confirmation_email.text.erb b/app/views/email_confirmation_mailer/confirmation_email.text.erb
new file mode 100644
index 00000000..e315baac
--- /dev/null
+++ b/app/views/email_confirmation_mailer/confirmation_email.text.erb
@@ -0,0 +1,9 @@
+EmailConfirmation#confirmation_email
+
+<%= t(".greeting") %>
+
+<%= t(".body") %>
+
+<%= t(".cta") %>: <%= @confirmation_url %>
+
+<%= t(".expiry_notice", hours: 24) %>
diff --git a/app/views/entries/_empty.html.erb b/app/views/entries/_empty.html.erb
new file mode 100644
index 00000000..60c296e9
--- /dev/null
+++ b/app/views/entries/_empty.html.erb
@@ -0,0 +1,4 @@
+<div class="flex flex-col items-center justify-center py-40">
+  <p class="text-secondary mb-2"><%= t(".title") %></p>
+  <p class="text-subdued max-w-xs text-center"><%= t(".description") %></p>
+</div>
diff --git a/app/views/entries/_entry.html.erb b/app/views/entries/_entry.html.erb
new file mode 100644
index 00000000..4bdf42ae
--- /dev/null
+++ b/app/views/entries/_entry.html.erb
@@ -0,0 +1,4 @@
+<%# locals: (entry:, balance_trend: nil, view_ctx: "global") %>
+
+<%= render partial: entry.entryable.to_partial_path,
+           locals: { entry: entry, balance_trend: balance_trend, view_ctx: view_ctx } %>
diff --git a/app/views/entries/_entry_group.html.erb b/app/views/entries/_entry_group.html.erb
new file mode 100644
index 00000000..2ee8954c
--- /dev/null
+++ b/app/views/entries/_entry_group.html.erb
@@ -0,0 +1,27 @@
+<%# locals: (date:, entries:, content:, totals: false) %>
+
+<div id="entry-group-<%= date %>" class="bg-container-inset rounded-xl p-1 w-full" data-bulk-select-target="group">
+  <div class="py-2 px-4 flex items-center justify-between font-medium text-xs text-secondary">
+    <div class="flex pl-0.5 items-center gap-4">
+        <%= check_box_tag "#{date}_entries_selection",
+                          class: ["checkbox checkbox--light", "hidden": entries.size == 0],
+                          id: "selection_entry_#{date}",
+                          data: { action: "bulk-select#toggleGroupSelection" } %>
+
+      <p class="uppercase space-x-1.5">
+        <%= tag.span I18n.l(date, format: :long) %>
+        <span>·</span>
+        <%= tag.span entries.size %>
+      </p>
+    </div>
+
+    <% if totals %>
+      <div id="entry-group-<%= date %>-totals">
+        <%= totals_by_currency(collection: entries, money_method: :amount_money, negate: true) %>
+      </div>
+    <% end %>
+  </div>
+  <div class="bg-container shadow-border-xs rounded-lg">
+    <%= content %>
+  </div>
+</div>
diff --git a/app/views/entries/_loading.html.erb b/app/views/entries/_loading.html.erb
new file mode 100644
index 00000000..cb9276b5
--- /dev/null
+++ b/app/views/entries/_loading.html.erb
@@ -0,0 +1,5 @@
+<div class="bg-container space-y-4 p-5 shadow-border-xs rounded-xl">
+  <div class="p-5 flex justify-center items-center">
+    <%= tag.p t(".loading"), class: "text-secondary animate-pulse text-sm" %>
+  </div>
+</div>
diff --git a/app/views/entries/_selection_bar.html.erb b/app/views/entries/_selection_bar.html.erb
new file mode 100644
index 00000000..a1faca09
--- /dev/null
+++ b/app/views/entries/_selection_bar.html.erb
@@ -0,0 +1,15 @@
+<div class="fixed bottom-6 z-10 flex items-center justify-between rounded-xl bg-gray-900 px-4 text-sm text-white w-[420px] py-1.5">
+  <div class="flex items-center gap-2">
+    <%= check_box_tag "entry_selection", 1, true, class: "checkbox checkbox--dark", data: { action: "bulk-select#deselectAll" } %>
+
+    <p data-bulk-select-target="selectionBarText"></p>
+  </div>
+
+  <div class="flex items-center gap-1 text-secondary">
+    <%= form_with url: transactions_bulk_deletion_path, data: { turbo_confirm: CustomConfirm.for_resource_deletion("entry").to_data_attribute, turbo_frame: "_top" } do %>
+      <button type="button" data-bulk-select-scope-param="bulk_delete" data-action="bulk-select#submitBulkRequest" class="p-1.5 group hover:bg-inverse flex items-center justify-center rounded-md" title="Delete">
+        <%= icon "trash-2", class: "group-hover:text-inverse" %>
+      </button>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/family_merchants/_family_merchant.html.erb b/app/views/family_merchants/_family_merchant.html.erb
new file mode 100644
index 00000000..bc69a25f
--- /dev/null
+++ b/app/views/family_merchants/_family_merchant.html.erb
@@ -0,0 +1,29 @@
+<%# locals: (family_merchant:) %>
+
+<div class="flex justify-between items-center p-4 bg-container">
+  <div class="flex w-full items-center gap-2.5">
+    <% if family_merchant.logo_url %>
+      <div class="w-8 h-8 rounded-full flex justify-center items-center">
+        <%= image_tag family_merchant.logo_url, class: "w-8 h-8 rounded-full" %>
+      </div>
+    <% else %>
+      <%= render partial: "shared/color_avatar", locals: { name: family_merchant.name, color: family_merchant.color } %>
+    <% end %>
+
+    <p class="text-primary text-sm truncate">
+      <%= family_merchant.name %>
+    </p>
+  </div>
+  <div class="justify-self-end">
+    <%= render DS::Menu.new do |menu| %>
+      <% menu.with_item(variant: "link", text: "Edit", href: edit_family_merchant_path(family_merchant), icon: "pencil", data: { turbo_frame: "modal" }) %>
+      <% menu.with_item(
+        variant: "button",
+        text: "Delete",
+        href: family_merchant_path(family_merchant),
+        icon: "trash-2",
+        method: :delete,
+        confirm: CustomConfirm.for_resource_deletion(family_merchant.name)) %>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/merchants/_form.html.erb b/app/views/family_merchants/_form.html.erb
similarity index 57%
rename from app/views/merchants/_form.html.erb
rename to app/views/family_merchants/_form.html.erb
index 4b748f67..f0680ab5 100644
--- a/app/views/merchants/_form.html.erb
+++ b/app/views/family_merchants/_form.html.erb
@@ -1,19 +1,25 @@
+<%# locals: (family_merchant:) %>
+
 <div data-controller="color-avatar">
-  <%= styled_form_with model: @merchant, class: "space-y-4", data: { turbo: false } do |f| %>
+  <%= styled_form_with model: family_merchant, class: "space-y-4" do |f| %>
     <section class="space-y-4">
-      <div class="w-fit m-auto">
-        <%= render partial: "shared/color_avatar", locals: { name: @merchant.name, color: @merchant.color } %>
+      <% if family_merchant.errors.any? %>
+        <%= render "shared/form_errors", model: family_merchant %>
+      <% end %>
+
+      <div class="w-fit m-auto mb-4">
+        <%= render partial: "shared/color_avatar", locals: { name: family_merchant.name, color: family_merchant.color } %>
       </div>
       <div class="flex gap-2 items-center justify-center">
-        <% Merchant::COLORS.each do |color| %>
+        <% FamilyMerchant::COLORS.each do |color| %>
           <label class="relative">
             <%= f.radio_button :color, color, class: "sr-only peer", data: { action: "change->color-avatar#handleColorChange" } %>
             <div class="w-6 h-6 rounded-full cursor-pointer peer-checked:ring-2 peer-checked:ring-offset-2 peer-checked:ring-blue-500" style="background-color: <%= color %>"></div>
           </label>
         <% end %>
       </div>
-      <div class="relative flex items-center border border-gray-200 rounded-lg">
-        <%= f.text_field :name, placeholder: t(".name_placeholder"), class: "text-sm font-normal placeholder:text-gray-500 h-10 relative pl-3 w-full border-none rounded-lg", required: true, data: { color_avatar_target: "name" } %>
+      <div class="relative flex items-center border border-secondary rounded-lg text-subdued">
+        <%= f.text_field :name, placeholder: t(".name_placeholder"), autofocus: true, required: true, data: { color_avatar_target: "name" } %>
       </div>
     </section>
 
diff --git a/app/views/family_merchants/edit.html.erb b/app/views/family_merchants/edit.html.erb
new file mode 100644
index 00000000..f1dfd133
--- /dev/null
+++ b/app/views/family_merchants/edit.html.erb
@@ -0,0 +1,6 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".title")) %>
+  <% dialog.with_body do %>
+    <%= render "form", family_merchant: @family_merchant %>
+  <% end %>
+<% end %>
diff --git a/app/views/family_merchants/index.html.erb b/app/views/family_merchants/index.html.erb
new file mode 100644
index 00000000..1ca1e940
--- /dev/null
+++ b/app/views/family_merchants/index.html.erb
@@ -0,0 +1,41 @@
+<header class="flex items-center justify-between">
+  <h1 class="text-primary text-xl font-medium">Merchants</h1>
+
+  <%= render DS::Link.new(
+    text: "New merchant",
+    variant: "primary",
+    href: new_family_merchant_path,
+    frame: :modal
+  ) %>
+</header>
+
+<div class="bg-container rounded-xl shadow-border-xs p-4">
+  <% if @family_merchants.any? %>
+    <div class="rounded-xl bg-container-inset space-y-1 p-1">
+      <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-secondary uppercase">
+        <p><%= t(".title") %></p>
+        <span class="text-subdued">&middot;</span>
+        <p><%= @family_merchants.count %></p>
+      </div>
+
+      <div class="bg-container rounded-lg shadow-border-xs">
+        <div class="overflow-hidden rounded-lg">
+          <%= render partial: "family_merchants/family_merchant", collection: @family_merchants, spacer_template: "shared/ruler" %>
+        </div>
+      </div>
+    </div>
+  <% else %>
+    <div class="flex justify-center items-center py-20">
+      <div class="text-center flex flex-col items-center max-w-[300px]">
+        <p class="text-primary mb-1 font-medium text-sm"><%= t(".empty") %></p>
+
+        <%= render DS::Link.new(
+          text: t(".new"),
+          icon: "plus",
+          href: new_family_merchant_path,
+          frame: :modal
+        ) %>
+      </div>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/family_merchants/new.html.erb b/app/views/family_merchants/new.html.erb
new file mode 100644
index 00000000..f1dfd133
--- /dev/null
+++ b/app/views/family_merchants/new.html.erb
@@ -0,0 +1,6 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".title")) %>
+  <% dialog.with_body do %>
+    <%= render "form", family_merchant: @family_merchant %>
+  <% end %>
+<% end %>
diff --git a/app/views/holdings/_cash.html.erb b/app/views/holdings/_cash.html.erb
new file mode 100644
index 00000000..6fde392d
--- /dev/null
+++ b/app/views/holdings/_cash.html.erb
@@ -0,0 +1,38 @@
+<%# locals: (account:) %>
+
+<% currency = Money::Currency.new(account.currency) %>
+
+<div class="grid grid-cols-12 items-center text-primary text-sm font-medium p-4">
+  <div class="col-span-4 flex items-center gap-4">
+    <%= render DS::FilledIcon.new(
+      variant: :text,
+      text: currency.symbol,
+      rounded: true,
+      size: "lg"
+    ) %>
+
+    <div class="space-y-0.5">
+      <%= tag.p t(".brokerage_cash"), class: "text-primary" %>
+      <%= tag.p account.currency, class: "text-secondary text-xs uppercase" %>
+    </div>
+  </div>
+
+  <div class="col-span-2 flex justify-end items-center gap-2">
+    <% cash_weight = account.balance.zero? ? 0 : account.cash_balance / account.balance * 100 %>
+
+    <%= render "shared/progress_circle", progress: cash_weight %>
+    <%= tag.p number_to_percentage(cash_weight, precision: 1) %>
+  </div>
+
+  <div class="col-span-2 text-right">
+    <%= tag.p "--", class: "text-secondary" %>
+  </div>
+
+  <div class="col-span-2 text-right">
+    <%= tag.p format_money account.cash_balance_money %>
+  </div>
+
+  <div class="col-span-2 text-right">
+    <%= tag.p "--", class: "text-secondary" %>
+  </div>
+</div>
diff --git a/app/views/account/holdings/_holding.html.erb b/app/views/holdings/_holding.html.erb
similarity index 64%
rename from app/views/account/holdings/_holding.html.erb
rename to app/views/holdings/_holding.html.erb
index 19a0c52c..5fe0e4c9 100644
--- a/app/views/account/holdings/_holding.html.erb
+++ b/app/views/holdings/_holding.html.erb
@@ -1,15 +1,15 @@
 <%# locals: (holding:) %>
 
 <%= turbo_frame_tag dom_id(holding) do %>
-  <div class="grid grid-cols-12 items-center text-gray-900 text-sm font-medium p-4">
+  <div class="grid grid-cols-12 items-center text-primary text-sm font-medium p-4">
     <div class="col-span-4 flex items-center gap-4">
-      <%= render "shared/circle_logo", name: holding.name %>
+      <%= image_tag "https://logo.synthfinance.com/ticker/#{holding.ticker}", class: "w-9 h-9 rounded-full", loading: "lazy" %>
 
       <div class="space-y-0.5">
-        <%= link_to holding.name, account_holding_path(holding.account, holding), data: { turbo_frame: :drawer }, class: "hover:underline" %>
+        <%= link_to holding.name, holding_path(holding), data: { turbo_frame: :drawer }, class: "hover:underline" %>
 
         <% if holding.amount %>
-          <%= tag.p holding.ticker, class: "text-gray-500 text-xs uppercase" %>
+          <%= tag.p holding.ticker, class: "text-secondary text-xs uppercase" %>
         <% else %>
           <%= render "missing_price_tooltip" %>
         <% end %>
@@ -18,25 +18,25 @@
 
     <div class="col-span-2 flex justify-end items-center gap-2">
       <% if holding.weight %>
-        <%= render "shared/progress_circle", progress: holding.weight, text_class: "text-blue-500" %>
+        <%= render "shared/progress_circle", progress: holding.weight %>
         <%= tag.p number_to_percentage(holding.weight, precision: 1) %>
       <% else %>
-        <%= tag.p "--", class: "text-gray-500 mb-5" %>
+        <%= tag.p "--", class: "text-secondary mb-5" %>
       <% end %>
     </div>
 
     <div class="col-span-2 text-right">
       <%= tag.p format_money holding.avg_cost %>
-      <%= tag.p t(".per_share"), class: "font-normal text-gray-500" %>
+      <%= tag.p t(".per_share"), class: "font-normal text-secondary" %>
     </div>
 
     <div class="col-span-2 text-right">
       <% if holding.amount_money %>
         <%= tag.p format_money holding.amount_money %>
       <% else %>
-        <%= tag.p "--", class: "text-gray-500" %>
+        <%= tag.p "--", class: "text-secondary" %>
       <% end %>
-      <%= tag.p t(".shares", qty: number_with_precision(holding.qty, precision: 1)), class: "font-normal text-gray-500" %>
+      <%= tag.p t(".shares", qty: number_with_precision(holding.qty, precision: 1)), class: "font-normal text-secondary" %>
     </div>
 
     <div class="col-span-2 text-right">
@@ -44,7 +44,7 @@
         <%= tag.p format_money(holding.trend.value), style: "color: #{holding.trend.color};" %>
         <%= tag.p "(#{number_to_percentage(holding.trend.percent, precision: 1)})", style: "color: #{holding.trend.color};" %>
       <% else %>
-        <%= tag.p "--", class: "text-gray-500 mb-4" %>
+        <%= tag.p "--", class: "text-secondary mb-4" %>
       <% end %>
     </div>
   </div>
diff --git a/app/views/account/holdings/_missing_price_tooltip.html.erb b/app/views/holdings/_missing_price_tooltip.html.erb
similarity index 80%
rename from app/views/account/holdings/_missing_price_tooltip.html.erb
rename to app/views/holdings/_missing_price_tooltip.html.erb
index 933a4355..f2f59201 100644
--- a/app/views/account/holdings/_missing_price_tooltip.html.erb
+++ b/app/views/holdings/_missing_price_tooltip.html.erb
@@ -1,10 +1,10 @@
 <div data-controller="tooltip" data-tooltip-cross-axis-value="50">
   <div class="flex items-center gap-1 text-warning">
-    <%= lucide_icon "info", class: "w-4 h-4 shrink-0" %>
+    <%= icon "info", size: "sm", color: "current" %>
     <%= tag.span t(".missing_data"), class: "font-normal text-xs" %>
   </div>
   <div role="tooltip" data-tooltip-target="tooltip" class="tooltip bg-gray-700 text-sm p-2 rounded w-64">
-    <div class="text-white">
+    <div class="fg-inverse">
       <%= t(".description") %>
     </div>
   </div>
diff --git a/app/views/holdings/index.html.erb b/app/views/holdings/index.html.erb
new file mode 100644
index 00000000..d200e54f
--- /dev/null
+++ b/app/views/holdings/index.html.erb
@@ -0,0 +1,35 @@
+<%= turbo_frame_tag dom_id(@account, "holdings") do %>
+  <div class="bg-container space-y-4 p-5 rounded-xl shadow-border-xs">
+    <div class="flex items-center justify-between">
+      <%= tag.h2 t(".holdings"), class: "font-medium text-lg" %>
+      <%= link_to new_trade_path(account_id: @account.id),
+                  id: dom_id(@account, "new_trade"),
+                  data: { turbo_frame: :modal },
+                  class: "flex gap-1 font-medium items-center bg-gray-50 text-primary p-2 rounded-lg" do %>
+        <span class="text-primary">
+          <%= icon("plus", color: "current") %>
+        </span>
+        <%= tag.span t(".new_holding"), class: "text-sm" %>
+      <% end %>
+    </div>
+
+    <div class="bg-container-inset rounded-xl p-1">
+      <div class="grid grid-cols-12 items-center uppercase text-xs font-medium text-secondary px-4 py-2">
+        <%= tag.p t(".name"), class: "col-span-4" %>
+        <%= tag.p t(".weight"), class: "col-span-2 justify-self-end" %>
+        <%= tag.p t(".average_cost"), class: "col-span-2 justify-self-end" %>
+        <%= tag.p t(".holdings"), class: "col-span-2 justify-self-end" %>
+        <%= tag.p t(".return"), class: "col-span-2 justify-self-end" %>
+      </div>
+
+      <div class="bg-container rounded-lg shadow-border-xs">
+        <%= render "holdings/cash", account: @account %>
+        <%= render "shared/ruler" %>
+
+        <% if @account.current_holdings.any? %>
+          <%= render partial: "holdings/holding", collection: @account.current_holdings, spacer_template: "shared/ruler" %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/account/holdings/new.html.erb b/app/views/holdings/new.html.erb
similarity index 100%
rename from app/views/account/holdings/new.html.erb
rename to app/views/holdings/new.html.erb
diff --git a/app/views/holdings/show.html.erb b/app/views/holdings/show.html.erb
new file mode 100644
index 00000000..5088ef10
--- /dev/null
+++ b/app/views/holdings/show.html.erb
@@ -0,0 +1,101 @@
+<%= render DS::Dialog.new(variant: "drawer") do |dialog| %>
+  <% dialog.with_header do %>
+    <div class="flex items-center justify-between">
+      <div>
+        <%= tag.h3 @holding.name, class: "text-2xl font-medium text-primary" %>
+        <%= tag.p @holding.ticker, class: "text-sm text-secondary" %>
+      </div>
+
+      <%= image_tag "https://logo.synthfinance.com/ticker/#{@holding.ticker}", loading: "lazy", class: "w-9 h-9 rounded-full" %>
+    </div>
+  <% end %>
+
+  <% dialog.with_body do %>
+    <% dialog.with_section(title: t(".overview"), open: true) do %>
+      <div class="pb-4">
+        <dl class="space-y-3 px-3 py-2">
+          <div class="flex items-center justify-between text-sm">
+            <dt class="text-secondary"><%= t(".ticker_label") %></dt>
+            <dd class="text-primary"><%= @holding.ticker %></dd>
+          </div>
+
+          <div class="flex items-center justify-between text-sm">
+            <dt class="text-secondary"><%= t(".current_market_price_label") %></dt>
+            <dd class="text-primary"><%= @holding.security.current_price ? format_money(@holding.security.current_price) : t(".unknown") %></dd>
+          </div>
+
+          <div class="flex items-center justify-between text-sm">
+            <dt class="text-secondary"><%= t(".portfolio_weight_label") %></dt>
+            <dd class="text-primary"><%= @holding.weight ? number_to_percentage(@holding.weight, precision: 2) : t(".unknown") %></dd>
+          </div>
+
+          <div class="flex items-center justify-between text-sm">
+            <dt class="text-secondary"><%= t(".avg_cost_label") %></dt>
+            <dd class="text-primary"><%= @holding.avg_cost ? format_money(@holding.avg_cost) : t(".unknown") %></dd>
+          </div>
+
+          <div class="flex items-center justify-between text-sm">
+            <dt class="text-secondary"><%= t(".total_return_label") %></dt>
+            <dd style="color: <%= @holding.trend&.color %>;">
+              <%= @holding.trend ? render("shared/trend_change", trend: @holding.trend) : t(".unknown") %>
+            </dd>
+          </div>
+        </dl>
+      </div>
+    <% end %>
+
+    <% dialog.with_section(title: t(".history"), open: true) do %>
+      <div class="space-y-2">
+        <div class="px-3 py-4">
+          <% if @holding.trades.any? %>
+            <ul class="space-y-2">
+              <% @holding.trades.each_with_index do |trade_entry, index| %>
+                <li class="flex gap-4 text-sm space-y-1">
+                  <div class="flex flex-col items-center gap-1.5 pt-2">
+                    <div class="rounded-full h-1.5 w-1.5 bg-gray-300"></div>
+                    <% unless index == @holding.trades.length - 1 %>
+                      <div class="h-12 w-px bg-alpha-black-200"></div>
+                    <% end %>
+                  </div>
+
+                  <div>
+                    <p class="text-secondary text-xs uppercase"><%= l(trade_entry.date, format: :long) %></p>
+
+                    <p><%= t(
+                      ".trade_history_entry",
+                      qty: trade_entry.trade.qty,
+                      security: trade_entry.trade.security.ticker,
+                      price: trade_entry.trade.price_money.format
+                    ) %></p>
+                  </div>
+                </li>
+              <% end %>
+            </ul>
+
+          <% else %>
+            <p class="text-secondary">No trade history available for this holding.</p>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+
+    <% unless @holding.account.plaid_account_id.present? %>
+      <% dialog.with_section(title: t(".settings"), open: true) do %>
+        <div class="pb-4">
+          <div class="flex items-center justify-between gap-2 p-3">
+            <div class="text-sm space-y-1">
+              <h4 class="text-primary"><%= t(".delete_title") %></h4>
+              <p class="text-secondary"><%= t(".delete_subtitle") %></p>
+            </div>
+
+            <%= button_to t(".delete"),
+                holding_path(@holding),
+                method: :delete,
+                class: "rounded-lg px-3 py-2 text-red-500 text-sm font-medium border border-secondary",
+                data: { turbo_confirm: true } %>
+          </div>
+        </div>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/impersonation_sessions/_approval_bar.html.erb b/app/views/impersonation_sessions/_approval_bar.html.erb
new file mode 100644
index 00000000..b8690c74
--- /dev/null
+++ b/app/views/impersonation_sessions/_approval_bar.html.erb
@@ -0,0 +1,21 @@
+<% pending_session = Current.true_user.impersonated_support_sessions.pending.first %>
+<% in_progress_session = Current.true_user.impersonated_support_sessions.in_progress.first %>
+
+<div class="sticky top-0 left-0 w-full bg-black flex items-center justify-between font-mono">
+  <div class="flex items-center bg-red-600 text-inverse px-6 py-4">
+    <%= icon "alert-triangle", size: "lg", color: "current", class: "mr-2" %>
+    <span class="text-inverse font-semibold uppercase">Access <%= in_progress_session.present? ? "Session" : "Request" %></span>
+  </div>
+  <div class="flex items-center space-x-2 px-2 py-2 text-white gap-4">
+    <% if pending_session.present? %>
+      <p class="text-xs max-w-3xl text-right">Maybe support staff has requested access to your account (likely to help you with a support request). If you approve the request, all activity they take will be logged for security and audit purposes.</p>
+      <%= button_to "Approve", approve_impersonation_session_path(pending_session), method: :put, class: "inline-flex items-center px-3 py-1.5 border border-transparent text-sm font-medium rounded-md text-white bg-green-600 hover:bg-green-700 focus:outline-hidden focus:ring-2 focus:ring-offset-2 focus:ring-green-500" %>
+      <%= button_to "Reject", reject_impersonation_session_path(pending_session), method: :put, class: "inline-flex items-center px-3 py-1.5 border border-transparent text-sm font-medium rounded-md text-white bg-red-600 hover:bg-red-700 focus:outline-hidden focus:ring-2 focus:ring-offset-2 focus:ring-red-500" %>
+    <% elsif in_progress_session.present? %>
+      <p class="text-xs max-w-3xl text-right">Someone from the Maybe Finance team is currently viewing your data.  You may end the session at any time.</p>
+      <%= button_to "End Session", complete_impersonation_session_path(in_progress_session), method: :put, class: "inline-flex items-center px-3 py-1.5 border border-transparent text-sm font-medium rounded-md text-white bg-blue-600 hover:bg-blue-700 focus:outline-hidden focus:ring-2 focus:ring-offset-2 focus:ring-blue-500" %>
+    <% else %>
+      <p class="text-xs max-w-3xl text-right text-red-500">Something went wrong.  Please contact us.</p>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/impersonation_sessions/_super_admin_bar.html.erb b/app/views/impersonation_sessions/_super_admin_bar.html.erb
new file mode 100644
index 00000000..a09a8250
--- /dev/null
+++ b/app/views/impersonation_sessions/_super_admin_bar.html.erb
@@ -0,0 +1,39 @@
+<div class="sticky top-0 left-0 w-full bg-black flex items-center justify-between font-mono">
+  <div class="flex items-center bg-red-600 px-6 py-4">
+    <%= icon "alert-triangle", size: "lg", color: "current", class: "mr-2" %>
+    <span class="text-inverse font-semibold uppercase">Super Admin</span>
+  </div>
+  <div>
+    <%= link_to "Jobs", sidekiq_web_url, class: "text-white underline hover:text-gray-100" %>
+  </div>
+
+  <div class="flex items-center space-x-2 px-2 py-2 text-white">
+    <% if Current.session.active_impersonator_session.present? %>
+      <div class="flex items-center space-x-3 bg-gray-800 border border-gray-700 rounded-md pl-3">
+        <div class="text-sm">
+          Impersonating: <span class="font-semibold text-red-400"><%= Current.impersonated_user.email %></span>
+        </div>
+        <%= button_to "Leave", leave_impersonation_sessions_path, method: :delete, class: "items-center px-3 py-1.5 border border-transparent text-sm font-medium rounded-md text-white bg-red-600 hover:bg-red-700 focus:outline-hidden focus:ring-2 focus:ring-offset-2 focus:ring-red-500" %>
+        <%= button_to "Terminate", complete_impersonation_session_path(Current.session.active_impersonator_session), method: :put, class: "items-center px-3 py-1.5 border border-transparent text-sm font-medium rounded-md text-white bg-red-600 hover:bg-red-700 focus:outline-hidden focus:ring-2 focus:ring-offset-2 focus:ring-red-500" %>
+      </div>
+    <% else %>
+      <% if Current.true_user.impersonator_support_sessions.in_progress.any? %>
+        <%= form_with url: join_impersonation_sessions_path, class: "flex items-center space-x-2 mr-4" do |f| %>
+          <%= f.select :impersonation_session_id,
+            Current.true_user.impersonator_support_sessions.in_progress.map { |session|
+              ["#{session.impersonated.email} (#{session.status})", session.id]
+            },
+            { prompt: "Join a session" },
+            { class: "rounded-md text-sm border-0 focus:ring-0 ring-0 text-black font-mono" } %>
+          <%= f.submit "Join",
+            class: "inline-flex items-center px-3 py-1.5 border border-transparent text-sm font-medium rounded-md text-white bg-red-600 hover:bg-red-700 focus:outline-hidden focus:ring-2 focus:ring-offset-2 focus:ring-red-500" %>
+        <% end %>
+      <% end %>
+
+      <%= form_with model: ImpersonationSession.new, class: "flex items-center space-x-2" do |f| %>
+        <%= f.text_field :impersonated_id, class: "rounded-md text-sm border-0 focus:ring-0 ring-0 text-black font-mono w-96", placeholder: "UUID", autocomplete: "off" %>
+        <%= f.submit "Request Impersonation", class: "inline-flex items-center px-3 py-1.5 border border-transparent text-sm font-medium rounded-md text-white bg-red-600 hover:bg-red-700 focus:outline-hidden focus:ring-2 focus:ring-offset-2 focus:ring-red-500" %>
+      <% end %>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/import/cleans/show.html.erb b/app/views/import/cleans/show.html.erb
index 25276fb9..c0bce7d7 100644
--- a/app/views/import/cleans/show.html.erb
+++ b/app/views/import/cleans/show.html.erb
@@ -4,56 +4,65 @@
 
 <%= content_for :previous_path, import_configuration_path(@import) %>
 
-<div class="space-y-4 mx-auto max-w-screen-lg">
+<div class="space-y-4 mx-auto max-w-5xl">
   <div class="text-center space-y-2 max-w-[400px] mx-auto mb-4">
-    <h2 class="text-3xl text-gray-900 font-medium"><%= t(".title") %></h2>
-    <p class="text-gray-500 text-sm"><%= t(".description") %></p>
+    <h2 class="text-3xl text-primary font-medium"><%= t(".title") %></h2>
+    <p class="text-secondary text-sm"><%= t(".description") %></p>
   </div>
 
   <% if @import.cleaned? %>
-    <div class="bg-white border border-alpha-black-100 rounded-lg p-3 flex items-center justify-between">
+    <div class="bg-container border border-tertiary rounded-lg p-3 flex flex-col md:flex-row items-start md:items-center justify-between gap-2 md:gap-0">
       <div class="flex items-center gap-2">
-        <%= lucide_icon "check-circle", class: "w-4 h-4 text-green-500" %>
-        <p class="text-green-500">Your data has been cleaned</p>
+        <%= icon "check-circle", size: "sm", color: "success" %>
+        <p class="text-success text-sm">Your data has been cleaned</p>
       </div>
 
-      <%= link_to "Next step", import_confirm_path(@import), class: "btn btn--primary" %>
+      <%= render DS::Link.new(
+        text: "Next step",
+        variant: "primary",
+        href: import_confirm_path(@import),
+        frame: :_top,
+        class: "w-full md:w-auto"
+      ) %>
     </div>
   <% else %>
-    <div class="bg-white border border-alpha-black-100 rounded-lg p-3 flex items-center justify-between">
+    <div class="bg-container border border-tertiary rounded-lg p-3 flex flex-col md:flex-row items-start md:items-center justify-between gap-3 md:gap-0">
       <div class="flex items-center gap-2">
-        <%= lucide_icon "alert-triangle", class: "w-4 h-4 text-red-500" %>
-        <p class="text-red-500 text-sm"><%= t(".errors_notice") %></p>
+        <%= icon "alert-triangle", size: "sm", color: "destructive" %>
+        <p class="text-destructive text-sm hidden md:block"><%= t(".errors_notice") %></p>
+        <p class="text-destructive text-sm md:hidden"><%= t(".errors_notice_mobile") %></p>
       </div>
 
-      <div class="flex justify-center">
-        <div class="bg-gray-50 rounded-lg inline-flex p-1 space-x-2 text-sm text-gray-900 font-medium">
-          <%= link_to "All rows", import_clean_path(@import, per_page: params[:per_page], view: "all"), class: "p-2 rounded-lg #{params[:view] != 'errors' ? 'bg-white' : ''}" %>
-          <%= link_to "Error rows", import_clean_path(@import, per_page: params[:per_page], view: "errors"), class: "p-2 rounded-lg #{params[:view] == 'errors' ? 'bg-white' : ''}" %>
+      <div class="flex justify-center w-full md:w-auto">
+        <div class="bg-gray-50 rounded-lg inline-flex p-1 space-x-2 text-sm text-primary font-medium w-full md:w-auto">
+          <%= link_to "All rows", import_clean_path(@import, per_page: params[:per_page], view: "all"), class: "p-2 rounded-lg flex-1 md:flex-auto text-center #{params[:view] != 'errors' ? 'bg-container' : ''}" %>
+          <%= link_to "Error rows", import_clean_path(@import, per_page: params[:per_page], view: "errors"), class: "p-2 rounded-lg flex-1 md:flex-auto text-center #{params[:view] == 'errors' ? 'bg-container' : ''}" %>
         </div>
       </div>
     </div>
   <% end %>
 
   <div class="pb-12">
-    <div class="bg-gray-25 rounded-xl p-1 mb-6">
-      <div style="grid-template-columns: repeat(<%= @import.column_keys.count %>, 1fr)" class="grid items-center uppercase text-xs font-medium text-gray-500 py-3">
-        <% @import.column_keys.each do |key| %>
-          <div class="px-5"><%= import_col_label(key) %></div>
-        <% end %>
-      </div>
+    <div class="bg-container-inset rounded-xl p-1 mb-6">
+      <div class="overflow-x-auto">
+        <div style="grid-template-columns: repeat(<%= @import.column_keys.count %>, minmax(150px, 1fr));" class="grid items-center uppercase text-xs font-medium text-secondary py-3">
+          <% @import.column_keys.each do |key| %>
+            <div class="px-5"><%= import_col_label(key) %></div>
+          <% end %>
+        </div>
 
-      <div class="bg-white border border-alpha-black-200 rounded-xl shadow-xs divide-y divide-alpha-black-200">
-        <% @rows.each do |row| %>
-          <%= render "import/rows/form", row: row %>
-        <% end %>
+        <div class="bg-container shadow-border-xs rounded-xl divide-y divide-alpha-black-200 theme-dark:divide-alpha-white-200">
+          <% @rows.each do |row| %>
+            <%= render "import/rows/form", row: row %>
+          <% end %>
+        </div>
       </div>
     </div>
   </div>
 
   <div class="fixed bottom-0 left-1/2 -translate-x-1/2 w-full p-12">
-    <div class="border border-alpha-black-100 rounded-lg p-3 max-w-screen-sm mx-auto bg-white shadow-xs">
-      <%= render "application/pagination", pagy: @pagy %>
+    <div class="shadow-border-xs rounded-lg p-3 max-w-2xl mx-auto bg-container">
+      <%= render "shared/pagination", pagy: @pagy %>
     </div>
   </div>
 </div>
diff --git a/app/views/import/configurations/_account_import.html.erb b/app/views/import/configurations/_account_import.html.erb
index 2e2a5cd3..28096ff9 100644
--- a/app/views/import/configurations/_account_import.html.erb
+++ b/app/views/import/configurations/_account_import.html.erb
@@ -1,9 +1,10 @@
 <%# locals: (import:) %>
 
-<%= styled_form_with model: @import, url: import_configuration_path(@import), scope: :import, method: :patch, class: "space-y-2" do |form| %>
+<%= styled_form_with model: @import, url: import_configuration_path(@import), scope: :import, method: :patch, class: "space-y-4" do |form| %>
   <%= form.select :entity_type_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Entity Type" } %>
-  <%= form.select :name_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Name (optional)" } %>
-  <%= form.select :amount_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Balance" } %>
+  <%= form.select :name_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Name" }, required: true %>
+  <%= form.select :amount_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Balance" }, required: true %>
+  <%= form.select :currency_col_label, import.csv_headers, { include_blank: "Default", label: "Currency" } %>
 
-  <%= form.submit "Apply configuration", class: "w-full btn btn--primary", disabled: import.complete? %>
+  <%= form.submit "Apply configuration", disabled: import.complete? %>
 <% end %>
diff --git a/app/views/import/configurations/_mint_import.html.erb b/app/views/import/configurations/_mint_import.html.erb
index afb13156..4fdbe698 100644
--- a/app/views/import/configurations/_mint_import.html.erb
+++ b/app/views/import/configurations/_mint_import.html.erb
@@ -1,25 +1,35 @@
 <%# locals: (import:) %>
 
-<div class="flex items-center justify-between border border-alpha-black-200 rounded-lg bg-green-500/5 p-5 gap-4">
-  <%= lucide_icon("check-circle", class: "w-5 h-5 shrink-0 text-green-500") %>
-  <p class="text-sm text-gray-900 italic">We have pre-configured your Mint import for you. Please proceed to the next step.</p>
+<div class="flex items-center justify-between border border-secondary rounded-lg bg-green-500/5 p-5 gap-4 mb-4">
+  <span class="text-green-500">
+    <%= icon("check-circle", color: "current") %>
+  </span>
+  <p class="text-sm text-primary italic">We have pre-configured your Mint import for you. Please proceed to the next step.</p>
 </div>
 
-<%= styled_form_with model: @import, url: import_configuration_path(@import), scope: :import, method: :patch, class: "space-y-2" do |form| %>
-  <div class="flex items-center gap-2">
+<%= styled_form_with model: @import, url: import_configuration_path(@import), scope: :import, method: :patch, class: "space-y-4" do |form| %>
+  <div class="flex items-center gap-4">
     <%= form.select :date_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Date" }, required: true, disabled: import.complete? %>
-    <%= form.select :date_format, [["DD-MM-YYYY", "%d-%m-%Y"], ["MM-DD-YYYY", "%m-%d-%Y"], ["YYYY-MM-DD", "%Y-%m-%d"], ["DD/MM/YYYY", "%d/%m/%Y"], ["YYYY/MM/DD", "%Y/%m/%d"], ["MM/DD/YYYY", "%m/%d/%Y"]], { label: true }, required: true, disabled: import.complete? %>
+    <%= form.select :date_format, Family::DATE_FORMATS, { label: t(".date_format_label")}, label: true, required: true, disabled: import.complete? %>
   </div>
 
-  <div class="flex items-center gap-2">
+  <div class="flex items-center gap-4">
     <%= form.select :amount_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Amount" }, required: true, disabled: import.complete? %>
     <%= form.select :signage_convention, [["Incomes are negative", "inflows_negative"], ["Incomes are positive", "inflows_positive"]], { label: true }, disabled: import.complete? %>
   </div>
 
-  <%= form.select :account_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Account (optional)" }, disabled: import.complete? %>
+  <div class="flex items-center gap-4">
+    <%= form.select :currency_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Currency" }, disabled: import.complete? %>
+    <%= form.select :number_format, Import::NUMBER_FORMATS.keys, { label: "Format", prompt: "Select format" }, required: true %>
+  </div>
+
+  <% unless import.account.present? %>
+    <%= form.select :account_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Account (optional)" }, disabled: import.complete? %>
+  <% end %>
+
   <%= form.select :name_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Name (optional)" }, disabled: import.complete? %>
   <%= form.select :category_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Category (optional)" }, disabled: import.complete? %>
   <%= form.select :tags_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Tags (optional)" }, disabled: import.complete? %>
 
-  <%= form.submit "Apply configuration", class: "w-full btn btn--primary", disabled: import.complete? %>
+  <%= form.submit "Apply configuration", disabled: import.complete? %>
 <% end %>
diff --git a/app/views/import/configurations/_trade_import.html.erb b/app/views/import/configurations/_trade_import.html.erb
index a953dc31..007bf34b 100644
--- a/app/views/import/configurations/_trade_import.html.erb
+++ b/app/views/import/configurations/_trade_import.html.erb
@@ -1,20 +1,40 @@
 <%# locals: (import:) %>
 
-<%= styled_form_with model: @import, url: import_configuration_path(@import), scope: :import, method: :patch, class: "space-y-2" do |form| %>
-  <div class="flex items-center gap-2">
-    <%= form.select :date_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Date" }, required: true %>
-    <%= form.select :date_format, [["DD-MM-YYYY", "%d-%m-%Y"], ["MM-DD-YYYY", "%m-%d-%Y"], ["YYYY-MM-DD", "%Y-%m-%d"], ["DD/MM/YYYY", "%d/%m/%Y"], ["YYYY/MM/DD", "%Y/%m/%d"], ["MM/DD/YYYY", "%m/%d/%Y"]], label: true, required: true %>
+<%= styled_form_with model: @import, url: import_configuration_path(@import), scope: :import, method: :patch, class: "space-y-4" do |form| %>
+  <div class="space-y-4">
+    <div class="flex items-center gap-4">
+      <%= form.select :date_col_label, import.csv_headers, { include_blank: "Select column", label: "Date" }, required: true %>
+      <%= form.select :date_format, Family::DATE_FORMATS, { label: t(".date_format_label")}, label: true, required: true %>
+    </div>
+
+    <div class="flex items-center gap-4">
+      <%= form.select :qty_col_label, import.csv_headers, { include_blank: "Select column", label: "Quantity" }, required: true %>
+      <%= form.select :signage_convention, [["Buys are positive qty", "inflows_positive"], ["Buys are negative qty", "inflows_negative"]], label: true, required: true %>
+    </div>
+
+    <div class="flex items-center gap-4">
+      <%= form.select :currency_col_label, import.csv_headers, { include_blank: "Default", label: "Currency" } %>
+      <%= form.select :number_format, Import::NUMBER_FORMATS.keys, { label: "Format", prompt: "Select format" }, required: true %>
+    </div>
+
+    <%= form.select :ticker_col_label, import.csv_headers, { include_blank: "Select column", label: "Ticker" }, required: true %>
+    <%= form.select :exchange_operating_mic_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Stock exchange code" } %>
+    <%= form.select :price_col_label, import.csv_headers, { include_blank: "Select column", label: "Price" }, required: true %>
+
+    <% unless import.account.present? %>
+      <%= form.select :account_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Account" } %>
+    <% end %>
+
+    <%= form.select :name_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Name" } %>
+
+    <% unless Security.provider %>
+      <div class="alert alert-warning">
+        <p>
+          <strong>Note:</strong> The security prices provider is not configured.  Your trade imports will work, but Maybe will not backfill price history.  Please go to your settings to configure this.
+        </p>
+      </div>
+    <% end %>
   </div>
 
-  <div class="flex items-center gap-2">
-    <%= form.select :qty_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Quantity" } %>
-    <%= form.select :signage_convention, [["Buys are positive qty", "inflows_positive"], ["Buys are negative qty", "inflows_negative"]], label: true %>
-  </div>
-
-  <%= form.select :ticker_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Ticker" } %>
-  <%= form.select :price_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Price" } %>
-  <%= form.select :account_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Account (optional)" } %>
-  <%= form.select :name_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Name (optional)" } %>
-
-  <%= form.submit "Apply configuration", class: "w-full btn btn--primary", disabled: import.complete? %>
+  <%= form.submit "Apply configuration", disabled: import.complete? %>
 <% end %>
diff --git a/app/views/import/configurations/_transaction_import.html.erb b/app/views/import/configurations/_transaction_import.html.erb
index 5bc48f75..84301d69 100644
--- a/app/views/import/configurations/_transaction_import.html.erb
+++ b/app/views/import/configurations/_transaction_import.html.erb
@@ -1,21 +1,111 @@
 <%# locals: (import:) %>
 
-<%= styled_form_with model: @import, url: import_configuration_path(@import), scope: :import, method: :patch, class: "space-y-2" do |form| %>
-  <div class="flex items-center gap-2">
-    <%= form.select :date_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Date" }, required: true %>
-    <%= form.select :date_format, [["DD-MM-YYYY", "%d-%m-%Y"], ["MM-DD-YYYY", "%m-%d-%Y"], ["YYYY-MM-DD", "%Y-%m-%d"], ["DD/MM/YYYY", "%d/%m/%Y"], ["YYYY/MM/DD", "%Y/%m/%d"], ["MM/DD/YYYY", "%m/%d/%Y"]], label: true, required: true %>
+<%= styled_form_with model: @import,
+                     url: import_configuration_path(@import),
+                     scope: :import,
+                     method: :patch,
+                     class: "space-y-4",
+                     data: {
+                       controller: "import",
+                       import_csv_value: import.csv_rows.to_json,
+                       import_amount_type_column_key_value: @import.entity_type_col_label
+                     } do |form| %>
+
+  <%# Date Configuration %>
+  <div class="flex items-center gap-4">
+    <%= form.select :date_col_label,
+                    import.csv_headers,
+                    { label: "Date", prompt: "Select column" },
+                    required: true %>
+    <%= form.select :date_format,
+                    Family::DATE_FORMATS,
+                    { label: t(".date_format_label"), prompt: "Select format" },
+                    required: true %>
   </div>
 
-  <div class="flex items-center gap-2">
-    <%= form.select :amount_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Amount" }, required: true %>
-    <%= form.select :signage_convention, [["Incomes are positive", "inflows_positive"], ["Incomes are negative", "inflows_negative"]], label: true %>
+  <%# Amount Configuration %>
+  <div class="flex items-center gap-4">
+    <%= form.select :amount_col_label,
+                    import.csv_headers,
+                    { label: "Amount", container_class: "w-2/5", prompt: "Select column" },
+                    required: true %>
+    <%= form.select :currency_col_label,
+                    import.csv_headers,
+                    { include_blank: "Default", label: "Currency", container_class: "w-1/5" } %>
+    <%= form.select :number_format,
+                    Import::NUMBER_FORMATS.keys,
+                    { label: "Format", prompt: "Select format", container_class: "w-2/5" },
+                    required: true %>
   </div>
 
-  <%= form.select :account_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Account (optional)" } %>
-  <%= form.select :name_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Name (optional)" } %>
-  <%= form.select :category_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Category (optional)" } %>
-  <%= form.select :tags_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Tags (optional)" } %>
-  <%= form.select :notes_col_label, import.csv_headers, { include_blank: "Leave empty", label: "Notes (optional)" } %>
+  <%# Amount Type Strategy %>
+  <%= form.select :amount_type_strategy,
+                  Import::AMOUNT_TYPE_STRATEGIES.map { |strategy| [strategy.humanize, strategy] },
+                  { label: "Amount type strategy", prompt: "Select strategy" },
+                  required: true,
+                  data: {
+                    action: "import#handleAmountTypeStrategyChange",
+                    import_target: "amountTypeStrategySelect"
+                  } %>
 
-  <%= form.submit "Apply configuration", class: "w-full btn btn--primary", disabled: import.complete? %>
+  <%# Signed Amount Configuration %>
+  <%= tag.fieldset data: { import_target: "signedAmountFieldset" },
+                   class: @import.amount_type_strategy == "signed_amount" ? "block" : "hidden" do %>
+    <div class="flex items-center gap-2">
+      <span class="text-sm shrink-0 text-secondary">↪</span>
+      <%= form.select :signage_convention,
+                      [["Incomes are positive", "inflows_positive"], ["Incomes are negative", "inflows_negative"]],
+                      { label: "Amount type", prompt: "Select convention" },
+                      required: @import.amount_type_strategy == "signed_amount" %>
+    </div>
+  <% end %>
+
+  <%# Custom Column Configuration %>
+  <%= tag.fieldset data: { import_target: "customColumnFieldset" },
+                   class: @import.amount_type_strategy == "custom_column" ? "block" : "hidden" do %>
+    <div class="space-y-2">
+      <div class="flex items-center gap-2 text-sm">
+        <span class="shrink-0 text-secondary">↪</span>
+        <span class="text-secondary">Set</span>
+        <%= form.select :entity_type_col_label,
+                        import.csv_headers,
+                        { prompt: "Select column", container_class: "w-48 px-3 py-1.5 border border-secondary rounded-md" },
+                        required: @import.amount_type_strategy == "custom_column",
+                        data: { action: "import#handleAmountTypeChange" } %>
+        <span class="text-secondary">as amount type column</span>
+      </div>
+
+      <div class="items-center gap-2 text-sm <%= @import.entity_type_col_label.nil? ? "hidden" : "flex" %>" data-import-target="amountTypeValue">
+        <span class="shrink-0 text-secondary">↪</span>
+        <span class="text-secondary">Set</span>
+        <%= form.select :amount_type_inflow_value,
+                        @import.selectable_amount_type_values,
+                        { prompt: "Select column", container_class: "w-48 px-3 py-1.5 border border-secondary rounded-md" },
+                        required: @import.amount_type_strategy == "custom_column" %>
+        <span class="text-secondary">as "income" (inflow) value</span>
+      </div>
+    </div>
+  <% end %>
+
+  <%# Optional Fields %>
+  <% unless import.account.present? %>
+    <%= form.select :account_col_label,
+                    import.csv_headers,
+                    { include_blank: "Leave empty", label: "Account" } %>
+  <% end %>
+
+  <%= form.select :name_col_label,
+                  import.csv_headers,
+                  { include_blank: "Leave empty", label: "Name" } %>
+  <%= form.select :category_col_label,
+                  import.csv_headers,
+                  { include_blank: "Leave empty", label: "Category" } %>
+  <%= form.select :tags_col_label,
+                  import.csv_headers,
+                  { include_blank: "Leave empty", label: "Tags" } %>
+  <%= form.select :notes_col_label,
+                  import.csv_headers,
+                  { include_blank: "Leave empty", label: "Notes" } %>
+
+  <%= form.submit "Apply configuration", disabled: import.complete? %>
 <% end %>
diff --git a/app/views/import/configurations/show.html.erb b/app/views/import/configurations/show.html.erb
index 7cde287a..5eb408b1 100644
--- a/app/views/import/configurations/show.html.erb
+++ b/app/views/import/configurations/show.html.erb
@@ -4,19 +4,35 @@
 
 <%= content_for :previous_path, import_upload_path(@import) %>
 
-<div>
-  <div class="space-y-4">
+<% if @import.suggested_template.present? && params[:template_hint] == "true" %>
+  <div class="py-12">
+    <div class="shadow-border-xs rounded-lg p-4 max-w-lg mx-auto">
+      <h3 class="text-sm font-medium mb-2 flex items-center gap-2">
+        <span class="text-success">
+          <%= icon "sparkles" %>
+        </span>
+
+        Template configuration found
+      </h3>
+
+      <p class="text-sm text-secondary">We found a configuration from a previous import for this account.  Would you like to apply it to this import?</p>
+
+      <div class="mt-4 flex gap-2 items-center">
+        <%= render DS::Link.new(text: "Manually configure", href: import_configuration_path(@import), variant: "outline") %>
+        <%= render DS::Button.new(text: "Apply template", href: apply_template_import_path(@import), method: :put, data: { turbo_frame: :_top }) %>
+      </div>
+    </div>
+  </div>
+<% else %>
+  <div class="space-y-6">
     <div class="text-center space-y-2">
-      <h1 class="text-3xl text-gray-900 font-medium"><%= t(".title") %></h1>
-      <p class="text-gray-500 text-sm"><%= t(".description") %></p>
+      <h1 class="text-3xl text-primary font-medium"><%= t(".title") %></h1>
+      <p class="text-secondary text-sm"><%= t(".description") %></p>
     </div>
 
-    <div class="mx-auto max-w-lg">
+    <div class="mx-auto max-w-lg space-y-4">
       <%= render partial: permitted_import_configuration_path(@import), locals: { import: @import } %>
+      <%= render "imports/table", headers: @import.csv_headers, rows: @import.csv_sample, caption: "Sample data from your uploaded CSV" %>
     </div>
   </div>
-
-  <div class="mx-auto max-w-screen-lg my-12">
-    <%= render "imports/table", headers: @import.csv_headers, rows: @import.csv_sample, caption: "Sample data from your uploaded CSV" %>
-  </div>
-</div>
+<% end %>
diff --git a/app/views/import/confirms/_mappings.html.erb b/app/views/import/confirms/_mappings.html.erb
index 75f50532..bd27ff32 100644
--- a/app/views/import/confirms/_mappings.html.erb
+++ b/app/views/import/confirms/_mappings.html.erb
@@ -3,43 +3,70 @@
 <% mappings = mapping_class.for_import(import) %>
 <% is_last_step = step_idx == import.mapping_steps.count - 1 %>
 
-<% if mapping_class == Import::AccountMapping %>
-  <% if import.requires_account? %>
-    <div class="flex items-center justify-between p-4 mb-4 gap-4 text-gray-500 bg-red-100 border border-red-200 rounded-lg w-[650px]">
-      <%= tag.p t(".no_accounts"), class: "text-sm" %>
+<div class="w-full max-w-full">
+  <% if mapping_class == Import::AccountMapping && import.account.nil? %>
+    <% if import.requires_account? %>
+      <div class="w-full max-w-full overflow-hidden mb-4">
+        <div class="overflow-x-auto">
+          <div class="flex items-center justify-between p-4 gap-4 text-secondary bg-red-100 border border-red-200 rounded-lg w-[650px] min-w-0 mx-auto">
+            <%= tag.p t(".no_accounts"), class: "text-sm" %>
 
-      <%= link_to t(".create_account"), new_account_path, class: "btn btn--primary whitespace-nowrap", data: { turbo_frame: :modal } %>
-    </div>
-  <% elsif import.has_unassigned_account? %>
-    <div class="flex items-center justify-between p-4 mb-4 gap-4 text-gray-500 bg-yellow-100 border border-yellow-200 rounded-lg w-[650px]">
-      <%= tag.p t(".unassigned_account"), class: "text-sm" %>
-
-      <%= link_to t(".create_account"), new_account_path, class: "btn btn--primary whitespace-nowrap", data: { turbo_frame: :modal } %>
-    </div>
-  <% end %>
-<% end %>
-
-<div class="space-y-4">
-  <div class="bg-gray-25 rounded-xl p-1 space-y-1 w-[650px]">
-    <div class="grid grid-cols-3 gap-2 text-xs font-medium text-gray-500 uppercase px-5 py-3">
-      <p><%= t(".csv_mapping_label", mapping: mapping_label(mapping_class)) %></p>
-      <p><%= t(".maybe_mapping_label", mapping: mapping_label(mapping_class)) %></p>
-      <p class="justify-self-end"><%= t(".rows_label") %></p>
-    </div>
-
-    <div class="border border-alpha-black-25 rounded-md shadow-xs divide-y divide-alpha-black-100 text-sm">
-      <% mappings.sort_by(&:key).each do |mapping| %>
-        <div class="px-5 py-3 bg-white first:rounded-tl-xl first:rounded-tr-xl last:rounded-bl-xl last:rounded-br-xl">
-          <%= render partial: "import/mappings/form", locals: { mapping: mapping } %>
+            <%= render DS::Link.new(
+              text: "Create account",
+              variant: "primary",
+              href: new_account_path(return_to: import_confirm_path(import)),
+              frame: :modal
+            ) %>
+          </div>
         </div>
-      <% end %>
-    </div>
-  </div>
-
-  <div class="flex justify-center">
-    <%= link_to is_last_step ? import_path(import) : url_for(step: step_idx + 2), class: "btn btn--primary w-36 flex items-center justify-between gap-2" do %>
-      <span>Next</span>
-      <%= lucide_icon "arrow-right", class: "w-5 h-5" %>
+      </div>
+    <% elsif import.has_unassigned_account? %>
+      <div class="w-full max-w-full overflow-hidden mb-4">
+        <div class="overflow-x-auto">
+          <div class="flex items-center justify-between p-4 gap-4 text-secondary bg-yellow-100 border border-yellow-200 rounded-lg w-[650px] min-w-0 mx-auto">
+            <%= tag.p t(".unassigned_account"), class: "text-sm" %>
+            <%= render DS::Link.new(
+              text: t(".create_account"),
+              variant: "primary",
+              href: new_account_path(return_to: import_confirm_path(import)),
+              frame: :modal
+            ) %>
+          </div>
+        </div>
+      </div>
     <% end %>
+  <% end %>
+
+  <div class="space-y-4 w-full max-w-full">
+    <div class="w-full max-w-full overflow-hidden">
+      <div class="overflow-x-auto">
+        <div class="bg-container-inset rounded-xl p-1 space-y-1 w-[650px] min-w-0 mx-auto">
+          <div class="grid grid-cols-3 gap-2 text-xs font-medium text-secondary uppercase px-5 py-3">
+            <p><%= t(".csv_mapping_label", mapping: mapping_label(mapping_class)) %></p>
+            <p><%= t(".maybe_mapping_label", mapping: mapping_label(mapping_class)) %></p>
+            <p class="justify-self-end"><%= t(".rows_label") %></p>
+          </div>
+
+          <div class="shadow-border-xs rounded-md divide-y divide-alpha-black-100 text-sm">
+            <% mappings.sort_by(&:key).each do |mapping| %>
+              <div class="px-5 py-3 bg-container first:rounded-tl-xl first:rounded-tr-xl last:rounded-bl-xl last:rounded-br-xl">
+                <%= render partial: "import/mappings/form", locals: { mapping: mapping } %>
+              </div>
+            <% end %>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="flex justify-center w-full">
+      <%= render DS::Link.new(
+        text: "Next",
+        variant: "primary",
+        href: is_last_step ? import_path(import) : url_for(step: step_idx + 2),
+        icon: "arrow-right",
+        icon_position: "right",
+        class: "w-full md:w-auto"
+      ) %>
+    </div>
   </div>
 </div>
diff --git a/app/views/import/confirms/show.html.erb b/app/views/import/confirms/show.html.erb
index 5d90a91e..d9fa481d 100644
--- a/app/views/import/confirms/show.html.erb
+++ b/app/views/import/confirms/show.html.erb
@@ -19,15 +19,15 @@
   </div>
 
   <div class="text-center space-y-2">
-    <h1 class="text-3xl text-gray-900 font-medium">
+    <h1 class="text-3xl text-primary font-medium">
       <%= t(".#{step_mapping_class.name.demodulize.underscore}_title", import_type: @import.type.underscore.humanize) %>
     </h1>
-    <p class="text-gray-500 text-sm">
+    <p class="text-secondary text-sm">
       <%= t(".#{step_mapping_class.name.demodulize.underscore}_description", import_type: @import.type.underscore.humanize) %>
     </p>
   </div>
 </div>
 
-<div class="max-w-screen-md mx-auto flex flex-col items-center">
+<div class="max-w-3xl mx-auto flex flex-col items-center">
   <%= render partial: "import/confirms/mappings", locals: { import: @import, mapping_class: step_mapping_class, step_idx: step_idx } %>
 </div>
diff --git a/app/views/import/rows/_form.html.erb b/app/views/import/rows/_form.html.erb
index 3f6cfd24..e7f5a4a9 100644
--- a/app/views/import/rows/_form.html.erb
+++ b/app/views/import/rows/_form.html.erb
@@ -1,6 +1,6 @@
 <%# locals: (row:) %>
 
-<div style="grid-template-columns: repeat(<%= row.import.column_keys.count %>, 1fr)" class="first:rounded-tl-lg first:rounded-tr-lg last:rounded-bl-lg last:rounded-br-lg grid divide-x divide-alpha-black-200 group">
+<div style="grid-template-columns: repeat(<%= row.import.column_keys.count %>, minmax(150px, 1fr));" class="first:rounded-tl-lg first:rounded-tr-lg last:rounded-bl-lg last:rounded-br-lg grid divide-x divide-alpha-black-200 theme-dark:divide-alpha-white-200 group">
   <% row.import.column_keys.each_with_index do |key, idx| %>
     <%= turbo_frame_tag dom_id(row, key), title: row.valid? ? nil : row.errors.full_messages.join(", ") do %>
       <%= form_with(
@@ -9,18 +9,39 @@
             url: import_row_path(row.import, row),
             method: :patch,
             data: {
-              controller: "auto-submit-form",
-              auto_submit_form_trigger_event_value: "blur"
+              controller: "auto-submit-form mobile-cell-interaction",
+              auto_submit_form_trigger_value: "blur",
+              mobile_cell_interaction_error_value: !cell_is_valid?(row, key) ? row.errors[key].join(", ") : "",
             }
           ) do |form| %>
-        <%= form.text_field key,
-              "data-auto-submit-form-target": "auto",
-              class: [
-                cell_class(row, key),
-                idx == 0 ? "group-first:rounded-tl-lg group-last:rounded-bl-lg" : "",
-                idx == row.import.column_keys.count - 1 ? "group-first:rounded-tr-lg group-last:rounded-br-lg" : "",
-              ],
-              disabled: row.import.complete? %>
+        <div class="relative">
+          <%= form.text_field key,
+                "data-auto-submit-form-target": "auto",
+                "data-action": "focus->mobile-cell-interaction#highlightCell blur->mobile-cell-interaction#unhighlightCell touchstart->mobile-cell-interaction#handleCellTouch",
+                "data-mobile-cell-interaction-target": "field",
+                class: [
+                  cell_class(row, key),
+                  idx == 0 ? "group-first:rounded-tl-lg group-last:rounded-bl-lg" : "",
+                  idx == row.import.column_keys.count - 1 ? "group-first:rounded-tr-lg group-last:rounded-br-lg" : "",
+                  "focus:outline-none focus:z-10 relative",
+                ],
+                disabled: row.import.complete? %>
+
+          <% if !cell_is_valid?(row, key) %>
+            <span class="absolute right-2 top-1/2 -translate-y-1/2 text-destructive md:hidden"
+                  data-action="click->mobile-cell-interaction#toggleErrorMessage"
+              data-mobile-cell-interaction-target="errorIcon">
+              <%= icon "alert-circle", size: "sm", color: "destructive" %>
+            </span>
+
+            <div class="absolute left-4 right-4 bottom-full mb-2 p-2 bg-red-50 border border-red-200 rounded-lg shadow-lg text-xs text-red-600 hidden md:hidden z-20"
+                 data-mobile-cell-interaction-target="errorTooltip">
+              <%= row.errors[key].join(", ") %>
+            </div>
+          <% end %>
+
+          <div class="absolute inset-0 bg-primary/5 pointer-events-none opacity-0 transition-opacity duration-150 ease-in-out z-0" data-mobile-cell-interaction-target="highlight"></div>
+        </div>
       <% end %>
     <% end %>
   <% end %>
diff --git a/app/views/import/uploads/show.html.erb b/app/views/import/uploads/show.html.erb
index d9d471ea..1115382e 100644
--- a/app/views/import/uploads/show.html.erb
+++ b/app/views/import/uploads/show.html.erb
@@ -4,24 +4,59 @@
 
 <%= content_for :previous_path, imports_path %>
 
-<div class="space-y-12">
+<div class="space-y-4">
   <div class="space-y-4 mx-auto max-w-md">
     <div class="text-center space-y-2">
-      <h1 class="text-3xl text-gray-900 font-medium"><%= t(".title") %></h1>
-      <p class="text-gray-500 text-sm"><%= t(".description") %></p>
+      <h1 class="text-3xl text-primary font-medium"><%= t(".title") %></h1>
+      <p class="text-secondary text-sm"><%= t(".description") %></p>
     </div>
 
-    <div data-controller="tabs" data-tabs-active-class="bg-white" data-tabs-default-tab-value="csv-paste-tab">
-      <div class="flex justify-center mb-4">
-        <div class="bg-gray-50 rounded-lg inline-flex p-1 space-x-2 text-sm text-gray-900 font-medium">
-          <button type="button" data-id="csv-paste-tab" class="p-2 rounded-lg" data-tabs-target="btn" data-action="click->tabs#select">Copy & Paste</button>
-          <button type="button" data-id="csv-upload-tab" class="p-2 rounded-lg" data-tabs-target="btn" data-action="click->tabs#select">Upload CSV</button>
-        </div>
-      </div>
+    <%= render DS::Tabs.new(active_tab: params[:tab] || "csv-upload", url_param_key: "tab", testid: "import-tabs") do |tabs| %>
+      <% tabs.with_nav do |nav| %>
+        <% nav.with_btn(id: "csv-upload", label: "Upload CSV") %>
+        <% nav.with_btn(id: "csv-paste", label: "Copy & Paste") %>
+      <% end %>
 
-      <div data-tabs-target="tab" id="csv-paste-tab">
+      <% tabs.with_panel(tab_id: "csv-upload") do %>
         <%= styled_form_with model: @import, scope: :import, url: import_upload_path(@import), multipart: true, class: "space-y-2" do |form| %>
-          <%= form.select :col_sep, [["Comma (,)", ","], ["Semicolon (;)", ";"]], label: true %>
+          <%= form.select :col_sep, Import::SEPARATORS, label: true %>
+
+          <% if @import.type == "TransactionImport" || @import.type == "TradeImport" %>
+            <%= form.select :account_id, @import.family.accounts.visible.pluck(:name, :id), { label: "Account (optional)", include_blank: "Multi-account import", selected: @import.account_id } %>
+          <% end %>
+
+          <div class="flex flex-col items-center justify-center w-full h-64 border border-secondary border-dashed rounded-xl cursor-pointer" data-controller="file-upload" data-action="click->file-upload#triggerFileInput" data-file-upload-target="uploadArea">
+            <div class="flex flex-col items-center justify-center pt-5 pb-6">
+              <div data-file-upload-target="uploadText" class="flex flex-col items-center">
+                <%= icon("plus", size: "lg", class: "mb-4 mx-auto") %>
+                <p class="mb-2 text-md text-gray text-center">
+                  <span class="font-medium text-primary">Browse</span> to add your CSV file here
+                </p>
+              </div>
+
+              <div class="flex flex-col gap-4 items-center hidden mb-2" data-file-upload-target="fileName">
+                <span class="text-primary">
+                  <%= icon("file-text", size: "lg", color: "current") %>
+                </span>
+                <p class="text-md font-medium text-primary"></p>
+              </div>
+
+              <%= form.file_field :csv_file, class: "hidden", "data-auto-submit-form-target": "auto", "data-file-upload-target": "input" %>
+            </div>
+          </div>
+
+          <%= form.submit "Upload CSV", disabled: @import.complete? %>
+        <% end %>
+      <% end %>
+
+      <% tabs.with_panel(tab_id: "csv-paste") do %>
+        <%= styled_form_with model: @import, scope: :import, url: import_upload_path(@import), multipart: true, class: "space-y-2" do |form| %>
+          <%= form.select :col_sep, Import::SEPARATORS, label: true %>
+
+          <% if @import.type == "TransactionImport" || @import.type == "TradeImport" %>
+            <%= form.select :account_id, @import.family.accounts.visible.pluck(:name, :id), { label: "Account (optional)", include_blank: "Multi-account import", selected: @import.account_id } %>
+          <% end %>
+
           <%= form.text_area :raw_file_str,
                        rows: 10,
                        required: true,
@@ -30,41 +65,13 @@
 
           <%= form.submit "Upload CSV", disabled: @import.complete? %>
         <% end %>
-
-      </div>
-
-      <div data-tabs-target="tab" id="csv-upload-tab" class="hidden">
-        <%= styled_form_with model: @import, scope: :import, url: import_upload_path(@import), multipart: true, class: "space-y-2" do |form| %>
-          <%= form.select :col_sep, [["Comma (,)", ","], ["Semicolon (;)", ";"]], label: true %>
-
-          <label for="import_csv_file" class="flex flex-col items-center justify-center w-full h-56 border-2 border-gray-300 border-dashed rounded-lg cursor-pointer bg-gray-50">
-            <div class="flex flex-col items-center justify-center pt-5 pb-6">
-              <%= form.file_field :csv_file, class: "ml-32", "data-auto-submit-form-target": "auto" %>
-            </div>
-          </label>
-
-          <%= form.submit "Upload CSV", disabled: @import.complete? %>
-        <% end %>
-      </div>
-    </div>
+      <% end %>
+    <% end %>
   </div>
 
-  <div class="bg-alpha-black-25 rounded-xl p-1 mt-5 mx-auto max-w-screen-xl">
-    <div class="text-gray-500 p-2 mb-2">
-      <div class="flex gap-2 mb-2">
-        <%= lucide_icon("info", class: "w-5 h-5 shrink-0") %>
-        <p class="text-sm"><%= t(".instructions_1") %></p>
-
-      </div>
-
-      <ul class="list-disc list-inside text-sm pl-8">
-        <li><%= t(".instructions_2") %></li>
-        <li><%= t(".instructions_3") %></li>
-        <li><%= t(".instructions_4") %></li>
-        <li><%= t(".instructions_5") %></li>
-      </ul>
-    </div>
-
-    <%= render partial: "imports/table", locals: { headers: @import.csv_template.headers, rows: @import.csv_template } %>
+  <div class="flex justify-center">
+    <span class="text-secondary text-sm">
+      <%= link_to "Download a sample CSV", "/imports/#{@import.id}/upload/sample_csv", class: "text-primary underline", data: { turbo: false } %> to see the required CSV format
+    </span>
   </div>
 </div>
diff --git a/app/views/imports/_empty.html.erb b/app/views/imports/_empty.html.erb
index bf0f1e70..dc864ea0 100644
--- a/app/views/imports/_empty.html.erb
+++ b/app/views/imports/_empty.html.erb
@@ -1,9 +1,13 @@
 <div class="flex justify-center items-center py-20">
   <div class="text-center flex flex-col items-center max-w-[300px] gap-4">
-    <p class="text-gray-900 mb-1 font-medium text-sm"><%= t(".message") %></p>
-    <%= link_to new_import_path, class: "btn btn--primary flex items-center gap-2", data: { turbo_frame: "modal" } do %>
-      <%= lucide_icon("plus", class: "w-5 h-5") %>
-      <span><%= t(".new") %></span>
-    <% end %>
+    <p class="text-primary mb-1 font-medium text-sm"><%= t(".message") %></p>
+
+    <%= render DS::Link.new(
+      text: t(".new"),
+      variant: "primary",
+      href: new_import_path,
+      icon: "plus",
+      frame: :modal
+    ) %>
   </div>
 </div>
diff --git a/app/views/imports/_failure.html.erb b/app/views/imports/_failure.html.erb
index 9dc003d8..ee9e8b9f 100644
--- a/app/views/imports/_failure.html.erb
+++ b/app/views/imports/_failure.html.erb
@@ -3,16 +3,14 @@
 <div class="h-full flex flex-col justify-center items-center">
   <div class="space-y-6 max-w-sm">
     <div class="mx-auto bg-red-500/5 h-8 w-8 rounded-full flex items-center justify-center">
-      <%= lucide_icon "alert-octagon", class: "w-5 h-5 text-red-500" %>
+      <%= icon "alert-octagon", color: "destructive" %>
     </div>
 
     <div class="text-center space-y-2">
-      <h1 class="font-medium text-gray-900 text-center text-3xl">Import failed</h1>
-      <p class="text-sm text-gray-500">Please check that your file format, for any errors and that all required fields are filled, then come back and try again.</p>
+      <h1 class="font-medium text-primary text-center text-3xl">Import failed</h1>
+      <p class="text-sm text-secondary">Please check that your file format, for any errors and that all required fields are filled, then come back and try again.</p>
     </div>
 
-    <div>
-      <%= button_to "Try again", publish_import_path(import), class: "btn btn--primary text-center w-full" %>
-    </div>
+    <%= render DS::Button.new(text: "Try again", href: publish_import_path(import), full_width: true) %>
   </div>
 </div>
diff --git a/app/views/imports/_import.html.erb b/app/views/imports/_import.html.erb
index 6620f3b9..106b4d24 100644
--- a/app/views/imports/_import.html.erb
+++ b/app/views/imports/_import.html.erb
@@ -1,12 +1,16 @@
-<div id="<%= dom_id import %>" class="flex items-center justify-between mx-4 py-4 border-b last:border-b-0 border-alpha-black-50">
+<div id="<%= dom_id import %>" class="flex items-center justify-between mx-4 py-4">
 
   <div class="flex items-center gap-2 mb-1">
-    <%= link_to import_path(import), class: "text-sm text-gray-900 hover:underline" do %>
+    <%= link_to import_path(import), class: "text-sm text-primary hover:underline" do %>
+      <% if import.account.present? %>
+        <%= import.account.name + " " %>
+      <% end %>
+
       <%= t(".label", type: import.type.titleize, datetime: import.updated_at.strftime("%b %-d, %Y at %l:%M %p")) %>
     <% end %>
 
     <% if import.pending? %>
-      <span class="px-1 py text-xs rounded-full bg-gray-500/5 text-gray-500 border border-alpha-black-50">
+      <span class="px-1 py text-xs rounded-full bg-gray-500/5 text-secondary border border-alpha-black-50">
         <%= t(".in_progress") %>
       </span>
     <% elsif import.importing? %>
@@ -17,6 +21,14 @@
       <span class="px-1 py text-xs rounded-full bg-red-500/5 text-red-500 border border-alpha-black-50">
         <%= t(".failed") %>
       </span>
+    <% elsif import.reverting? %>
+      <span class="px-1 py text-xs rounded-full bg-orange-500/5 text-orange-500 border border-alpha-black-50">
+        <%= t(".reverting") %>
+      </span>
+    <% elsif import.revert_failed? %>
+      <span class="px-1 py text-xs rounded-full bg-red-500/5 text-red-500 border border-alpha-black-50">
+        <%= t(".revert_failed") %>
+      </span>
     <% elsif import.complete? %>
       <span class="px-1 py text-xs rounded-full bg-green-500/5 text-green-500 border border-alpha-black-50">
         <%= t(".complete") %>
@@ -24,25 +36,30 @@
     <% end %>
   </div>
 
-  <%= contextual_menu do %>
-    <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-      <%= link_to import_path(import),
-                    class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg" do %>
-        <%= lucide_icon "eye", class: "w-5 h-5 text-gray-500" %>
+  <%= render DS::Menu.new do |menu| %>
+    <% menu.with_item(variant: "link", text: t(".view"), href: import_path(import), icon: "eye") %>
 
-        <span><%= t(".view") %></span>
-      <% end %>
+    <% if import.complete? || import.revert_failed? %>
+      <% menu.with_item(
+        variant: "button",
+        text: t(".revert"),
+        href: revert_import_path(import),
+        icon: "rotate-ccw",
+        method: :put,
+        confirm: CustomConfirm.new(
+          title: "Revert import?",
+          body: "This will delete transactions that were imported, but you will still be able to review and re-import your data at any time.",
+          btn_text: "Revert"
+        )) %>
 
-      <% unless import.complete? %>
-        <%= button_to import_path(import),
-                      method: :delete,
-                      class: "block w-full py-2 px-3 space-x-2 text-red-600 hover:bg-red-50 flex items-center rounded-lg",
-                      data: { turbo_confirm: true } do %>
-          <%= lucide_icon "trash-2", class: "w-5 h-5" %>
-
-          <span><%= t(".delete") %></span>
-        <% end %>
-      <% end %>
-    </div>
+    <% else %>
+      <% menu.with_item(
+        variant: "button",
+        text: t(".delete"),
+        href: import_path(import),
+        icon: "trash-2",
+        method: :delete,
+        confirm: CustomConfirm.for_resource_deletion("import")) %>
+    <% end %>
   <% end %>
 </div>
diff --git a/app/views/imports/_importing.html.erb b/app/views/imports/_importing.html.erb
index cf2f136c..43d61f54 100644
--- a/app/views/imports/_importing.html.erb
+++ b/app/views/imports/_importing.html.erb
@@ -3,17 +3,17 @@
 <div class="h-full flex flex-col justify-center items-center">
   <div class="space-y-6 max-w-sm">
     <div class="mx-auto bg-gray-500/5 h-8 w-8 rounded-full flex items-center justify-center">
-      <%= lucide_icon "loader", class: "animate-pulse w-5 h-5 text-gray-500" %>
+      <%= icon "loader", class: "animate-pulse" %>
     </div>
 
     <div class="text-center space-y-2">
-      <h1 class="font-medium text-gray-900 text-center text-3xl">Import in progress</h1>
-      <p class="text-sm text-gray-500">Your import is in progress. Check the imports menu for status updates or click 'Check Status' to refresh the page for updates. Feel free to continue using the app.</p>
+      <h1 class="font-medium text-primary text-center text-3xl">Import in progress</h1>
+      <p class="text-sm text-secondary">Your import is in progress. Check the imports menu for status updates or click 'Check Status' to refresh the page for updates. Feel free to continue using the app.</p>
     </div>
 
-    <div class="space-y-2">
-      <%= link_to "Check status", import_path(import), class: "block btn btn--primary text-center w-full" %>
-      <%= link_to "Back to dashboard", root_path, class: "block btn btn--secondary text-center w-full" %>
+    <div class="space-y-2 flex flex-col">
+      <%= render DS::Link.new(text: "Check status", href: import_path(import), variant: "primary", full_width: true) %>
+      <%= render DS::Link.new(text: "Back to dashboard", href: root_path, variant: "secondary", full_width: true) %>
     </div>
   </div>
 </div>
diff --git a/app/views/imports/_nav.html.erb b/app/views/imports/_nav.html.erb
index 101efcd1..898c7825 100644
--- a/app/views/imports/_nav.html.erb
+++ b/app/views/imports/_nav.html.erb
@@ -6,35 +6,44 @@
   { name: "Clean", path: import_clean_path(import), is_complete: import.cleaned?, step_number: 3 },
   { name: "Map", path: import_confirm_path(import), is_complete: import.publishable?, step_number: 4 },
   { name: "Confirm", path: import_path(import), is_complete: import.complete?, step_number: 5 }
-] %>
+].reject { |step| step[:name] == "Map" && import.mapping_steps.empty? } %>
 
-<ul class="flex items-center gap-2">
+<% content_for :mobile_import_progress do %>
+  <% active_step = steps.detect { |s| request.path.eql?(s[:path]) } %>
+  <% if active_step.present? %>
+    <div class="md:hidden text-center text-secondary text-md my-2">
+      <span class="text-gray-500">Step <%= active_step[:step_number] %> of <%= steps.size %></span>
+    </div>
+  <% end %>
+<% end %>
+
+<ul class="hidden md:flex items-center gap-2">
   <% steps.each_with_index do |step, idx| %>
     <li class="flex items-center gap-2 group">
       <% is_current = request.path == step[:path] %>
 
       <% text_class = if is_current
-                  "text-gray-900"
+                  "text-primary"
                 else
-                  step[:is_complete] ? "text-green-600" : "text-gray-500"
+                  step[:is_complete] ? "text-green-600" : "text-secondary"
                 end %>
       <% step_class = if is_current
-                  "bg-gray-900 text-white"
+                  "bg-surface-inset text-primary"
                 else
-                  step[:is_complete] ? "bg-green-600/10 border-alpha-black-25" : "bg-gray-50"
+                  step[:is_complete] ? "bg-green-600/10 border-alpha-black-25" : "bg-container-inset"
                 end %>
 
       <%= link_to step[:path], class: "flex items-center gap-3" do %>
         <div class="flex items-center gap-2 text-sm font-medium <%= text_class %>">
           <span class="<%= step_class %> w-7 h-7 rounded-full shrink-0 inline-flex items-center justify-center border border-transparent">
-            <%= step[:is_complete] && !is_current ? lucide_icon("check", class: "w-4 h-4") : idx + 1 %>
+            <%= step[:is_complete] && !is_current ? icon("check", size: "sm", color: "current") : idx + 1 %>
           </span>
 
           <span><%= step[:name] %></span>
         </div>
       <% end %>
 
-      <div class="h-px bg-alpha-black-200 w-12 group-last:hidden"></div>
+      <hr class="border border-secondary w-12 group-last:hidden">
     </li>
   <% end %>
 </ul>
diff --git a/app/views/imports/_ready.html.erb b/app/views/imports/_ready.html.erb
index 1800d8b0..9ab7c0eb 100644
--- a/app/views/imports/_ready.html.erb
+++ b/app/views/imports/_ready.html.erb
@@ -1,26 +1,26 @@
 <%# locals: (import:) %>
 
 <div class="text-center space-y-2 mb-4 mx-auto max-w-md">
-  <h1 class="text-3xl text-gray-900 font-medium"><%= t(".title") %></h1>
-  <p class="text-gray-500 text-sm"><%= t(".description") %></p>
+  <h1 class="text-3xl text-primary font-medium"><%= t(".title") %></h1>
+  <p class="text-secondary text-sm"><%= t(".description") %></p>
 </div>
 
-<div class="mx-auto max-w-screen-sm space-y-4">
-  <div class="bg-gray-25 rounded-xl p-1 space-y-1">
-    <div class="flex justify-between items-center text-xs font-medium text-gray-500 uppercase px-5 py-3">
+<div class="mx-auto max-w-2xl space-y-4">
+  <div class="bg-container-inset rounded-xl p-1 space-y-1">
+    <div class="flex justify-between items-center text-xs font-medium text-secondary uppercase px-5 py-3">
       <p>item</p>
       <p class="justify-self-end">count</p>
     </div>
 
-    <div class="bg-white border border-alpha-black-25 rounded-lg shadow-xs text-sm">
+    <div class="bg-container shadow-border-xs rounded-lg text-sm">
       <% import.dry_run.each do |key, count| %>
         <% resource = dry_run_resource(key) %>
 
-        <div class="flex items-center justify-between gap-2 bg-white px-5 py-3 rounded-tl-lg rounded-tr-lg">
+        <div class="flex items-center justify-between gap-2 bg-container px-5 py-3 rounded-lg">
           <div class="flex items-center gap-3">
-            <div class="<%= resource.bg_class %> w-8 h-8 rounded-full flex justify-center items-center">
-              <%= lucide_icon resource.icon, class: "#{resource.text_class} w-5 h-5 shrink-0" %>
-            </div>
+            <%= tag.div class: class_names(resource.bg_class, resource.text_class, "w-8 h-8 rounded-full flex justify-center items-center") do %>
+              <%= icon resource.icon, color: "current" %>
+            <% end %>
 
             <p><%= resource.label %></p>
           </div>
@@ -29,11 +29,11 @@
         </div>
 
         <% if key != import.dry_run.keys.last %>
-          <div class="h-px bg-alpha-black-50 ml-14 mr-5"></div>
+          <%= render "shared/ruler" %>
         <% end %>
       <% end %>
     </div>
   </div>
 
-  <%= button_to "Publish import", publish_import_path(import), class: "btn btn--primary w-full" %>
+  <%= render DS::Button.new(text: "Publish import", href: publish_import_path(import), full_width: true) %>
 </div>
diff --git a/app/views/imports/_revert_failure.html.erb b/app/views/imports/_revert_failure.html.erb
new file mode 100644
index 00000000..ae072b74
--- /dev/null
+++ b/app/views/imports/_revert_failure.html.erb
@@ -0,0 +1,20 @@
+<%# locals: (import:) %>
+
+<div class="h-full flex flex-col justify-center items-center">
+  <div class="space-y-6 max-w-sm">
+    <div class="mx-auto bg-red-500/5 h-8 w-8 rounded-full flex items-center justify-center">
+      <%= icon "alert-octagon", color: "destructive" %>
+    </div>
+
+    <div class="text-center space-y-2">
+      <h1 class="font-medium text-primary text-center text-3xl">Reverting import failed</h1>
+      <p class="text-sm text-secondary">Please try again or contact support.</p>
+    </div>
+
+    <%= render DS::Button.new(
+      text: "Try again",
+      full_width: true,
+      href: revert_import_path(import)
+    ) %>
+  </div>
+</div>
diff --git a/app/views/imports/_success.html.erb b/app/views/imports/_success.html.erb
index a7e035c4..c0849e94 100644
--- a/app/views/imports/_success.html.erb
+++ b/app/views/imports/_success.html.erb
@@ -3,16 +3,19 @@
 <div class="h-full flex flex-col justify-center items-center">
   <div class="space-y-6 max-w-sm">
     <div class="mx-auto bg-green-500/5 h-8 w-8 rounded-full flex items-center justify-center">
-      <%= lucide_icon "check", class: "w-5 h-5 text-green-500" %>
+      <%= icon "check", color: "success" %>
     </div>
 
     <div class="text-center space-y-2">
-      <h1 class="font-medium text-gray-900 text-center text-3xl">Import successful</h1>
-      <p class="text-sm text-gray-500">Your imported data has been successfully added to the app and is now ready for use.</p>
+      <h1 class="font-medium text-primary text-center text-3xl">Import successful</h1>
+      <p class="text-sm text-secondary">Your imported data has been successfully added to the app and is now ready for use.</p>
     </div>
 
-    <div>
-      <%= link_to "Back to dashboard", root_path, class: "block btn btn--primary text-center w-full" %>
-    </div>
+    <%= render DS::Link.new(
+      text: "Back to dashboard",
+      variant: "primary",
+      full_width: true,
+      href: root_path
+    ) %>
   </div>
 </div>
diff --git a/app/views/imports/_table.html.erb b/app/views/imports/_table.html.erb
index 18b963b6..8de7cea3 100644
--- a/app/views/imports/_table.html.erb
+++ b/app/views/imports/_table.html.erb
@@ -1,37 +1,45 @@
 <%# locals: (headers: [], rows: [], caption: nil) %>
-<div class="overflow-x-auto">
-  <div class="border border-alpha-black-200 rounded-md shadow-xs text-sm bg-white w-full">
-    <div class="grid border-b border-b-alpha-black-200" style="grid-template-columns: repeat(<%= headers.length %>, minmax(0, 1fr))">
-      <% headers.each_with_index do |header, index| %>
-        <div class="
-          bg-gray-25 px-3 py-2.5 font-medium whitespace-nowrap overflow-x-auto
-          first:rounded-tl-md last:rounded-tr-md
-          <%= "border-r border-r-alpha-black-200" unless index == headers.length - 1 %>
-        ">
-          <%= header %>
-        </div>
-      <% end %>
+<div class="bg-container-inset rounded-xl overflow-hidden md:mx-auto p-4">
+  <% if caption %>
+    <div class="flex items-center mb-4">
+      <div class="text-gray-500 mr-2">
+        <%= inline_svg_tag "icon-csv.svg", class: "w-4 h-4" %>
+      </div>
+      <h2 class="text-sm text-gray-500 font-medium"><%= caption %></h2>
     </div>
-
-    <% rows.each_with_index do |row, row_index| %>
-      <div class="grid <%= "border-b border-b-alpha-black-200" if row_index < rows.length - 1 || caption %>" style="grid-template-columns: repeat(<%= headers.length %>, minmax(0, 1fr))">
-        <% row.each_with_index do |(header, value), col_index| %>
-          <div class="
-            px-3 py-2.5 whitespace-nowrap overflow-x-auto flex items-start
-            <%= "border-r border-r-alpha-black-200" unless col_index == row.length - 1 %>
-            <%= "rounded-bl-md" if !caption && row_index == rows.length - 1 && col_index == 0 %>
-            <%= "rounded-br-md" if !caption && row_index == rows.length - 1 && col_index == row.length - 1 %>
-          ">
-            <%= value %>
-          </div>
+  <% end %>
+  <div class="inline-block min-w-fit sm:w-full rounded-lg shadow-border-xs text-sm bg-container">
+    <table class="min-w-full">
+      <thead>
+        <tr>
+          <% headers.each_with_index do |header, index| %>
+            <th class="
+              bg-container-inset px-3 py-2 font-medium border-b border-b-alpha-black-200 text-left whitespace-nowrap
+              <%= index == 0 ? "rounded-tl-lg" : "" %>
+              <%= index == headers.length - 1 ? "rounded-tr-lg" : "" %>
+              <%= index < headers.length - 1 ? "border-r border-r-alpha-black-200" : "" %>
+            ">
+              <%= header %>
+            </th>
+          <% end %>
+        </tr>
+      </thead>
+      <tbody class="">
+        <% rows.each_with_index do |row, row_index| %>
+          <tr>
+            <% row.each_with_index do |(header, value), col_index| %>
+              <td class="
+                px-3 py-2 whitespace-nowrap text-left
+                <%= col_index < row.length - 1 ? "border-r border-r-alpha-black-200" : "" %>
+                <%= !caption && row_index == rows.length - 1 && col_index == 0 ? "rounded-bl-md" : "" %>
+                <%= !caption && row_index == rows.length - 1 && col_index == row.length - 1 ? "rounded-br-md" : "" %>
+              ">
+                <%= value %>
+              </td>
+            <% end %>
+          </tr>
         <% end %>
-      </div>
-    <% end %>
-
-    <% if caption %>
-      <div class="px-3 py-2.5 text-center text-xs text-gray-900 rounded-b-md italic bg-gray-25 overflow-x-auto">
-        <%= caption %>
-      </div>
-    <% end %>
+      </tbody>
+    </table>
   </div>
 </div>
diff --git a/app/views/imports/index.html.erb b/app/views/imports/index.html.erb
index 73aecf0d..c2f2660f 100644
--- a/app/views/imports/index.html.erb
+++ b/app/views/imports/index.html.erb
@@ -1,29 +1,25 @@
-<% content_for :sidebar do %>
-  <%= render "settings/nav" %>
-<% end %>
+<div class="flex items-center justify-between">
+  <h1 class="text-xl font-medium text-primary"><%= t(".title") %></h1>
 
-<div class="space-y-4">
-  <div class="flex items-center justify-between">
-    <h1 class="text-xl font-medium text-gray-900"><%= t(".title") %></h1>
-
-    <%= link_to new_import_path, class: "btn btn--primary flex items-center gap-2", data: { turbo_frame: :modal } do %>
-      <%= lucide_icon("plus", class: "w-5 h-5") %>
-      <span><%= t(".new") %></span>
-    <% end %>
-  </div>
-  <div class="bg-white shadow-xs border border-alpha-black-25 rounded-xl p-4">
-    <% if @imports.empty? %>
-      <%= render partial: "imports/empty" %>
-    <% else %>
-      <div class="rounded-xl bg-gray-25 p-1">
-        <h2 class="uppercase px-4 py-2 text-gray-500 text-xs"><%= t(".imports") %> · <%= @imports.size %></h2>
-
-        <div class="border border-alpha-gray-100 rounded-lg bg-white shadow-xs">
-          <%= render partial: "imports/import", collection: @imports.ordered %>
-        </div>
-      </div>
-    <% end %>
-  </div>
-
-  <%= settings_nav_footer %>
+  <%= render DS::Link.new(
+    text: "New import",
+    href: new_import_path,
+    icon: "plus",
+    variant: "primary",
+    frame: :modal
+  ) %>
+</div>
+
+<div class="bg-container shadow-border-xs rounded-xl p-4">
+  <% if @imports.empty? %>
+    <%= render partial: "imports/empty" %>
+  <% else %>
+    <div class="rounded-xl bg-container-inset p-1">
+      <h2 class="uppercase px-4 py-2 text-secondary text-xs"><%= t(".imports") %> · <%= @imports.size %></h2>
+
+      <div class="border border-alpha-black-100 rounded-lg bg-container shadow-xs">
+        <%= render partial: "imports/import", collection: @imports.ordered, spacer_template: "shared/ruler" %>
+      </div>
+    </div>
+  <% end %>
 </div>
diff --git a/app/views/imports/new.html.erb b/app/views/imports/new.html.erb
index b0005dc8..c436cb25 100644
--- a/app/views/imports/new.html.erb
+++ b/app/views/imports/new.html.erb
@@ -1,108 +1,106 @@
-<%= modal do %>
-  <div class="p-4 space-y-4 max-w-[420px]">
-    <div class="space-y-2">
-      <div class="flex justify-between items-center">
-        <h2 class="font-medium text-gray-900"><%= t(".title") %></h2>
-        <button data-action="modal#close" tabindex="-1">
-          <%= lucide_icon("x", class: "w-5 h-5 text-gray-900") %>
-        </button>
-      </div>
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".title"), subtitle: t(".description")) %>
 
-      <p class="text-gray-500 text-sm"><%= t(".description") %></p>
-    </div>
-
-    <div class="rounded-xl bg-gray-25 p-1">
-      <h3 class="uppercase text-gray-500 text-xs font-medium px-3 py-1.5"><%= t(".sources") %></h3>
-      <ul class="bg-white border border-alpha-black-25 rounded-lg shadow-xs">
+  <% dialog.with_body do %>
+    <div class="rounded-xl bg-container-inset p-1">
+      <h3 class="uppercase text-secondary text-xs font-medium px-3 py-1.5"><%= t(".sources") %></h3>
+      <ul class="bg-container shadow-border-xs rounded-lg">
         <li>
-          <% if @pending_import.present? %>
+          <% if @pending_import.present? && (params[:type].nil? || params[:type] == @pending_import.type) %>
             <%= link_to import_path(@pending_import), class: "flex items-center justify-between p-4 group cursor-pointer", data: { turbo: false } do %>
               <div class="flex items-center gap-2">
                 <div class="bg-orange-500/5 rounded-md w-8 h-8 flex items-center justify-center">
-                  <%= lucide_icon("loader", class: "w-5 h-5 text-orange-500") %>
+                  <span class="text-orange-500">
+                    <%= icon("loader", color: "current") %>
+                  </span>
                 </div>
-                <span class="text-sm text-gray-900 group-hover:text-gray-700">
-                  <%= t(".resume") %>
+                <span class="text-sm text-primary group-hover:text-secondary">
+                  <%= t(".resume", type: @pending_import.type.titleize) %>
                 </span>
               </div>
-              <%= lucide_icon("chevron-right", class: "w-5 h-5 text-gray-500") %>
+              <%= icon("chevron-right") %>
             <% end %>
 
-            <div class="pl-14 pr-3">
-              <div class="h-px bg-alpha-black-50"></div>
-            </div>
+            <%= render "shared/ruler" %>
           </li>
         <% end %>
-        <li>
-          <%= button_to imports_path(import: { type: "TransactionImport" }), class: "flex items-center justify-between p-4 group cursor-pointer w-full", data: { turbo: false } do %>
-            <div class="flex items-center gap-2">
-              <div class="bg-indigo-500/5 rounded-md w-8 h-8 flex items-center justify-center">
-                <%= lucide_icon("file-spreadsheet", class: "w-5 h-5 text-indigo-500") %>
+
+        <% if Current.family.accounts.any? && (params[:type].nil? || params[:type] == "TransactionImport") %>
+          <li>
+            <%= button_to imports_path(import: { type: "TransactionImport" }), class: "flex items-center justify-between p-4 group cursor-pointer w-full", data: { turbo: false } do %>
+              <div class="flex items-center gap-2">
+                <div class="bg-indigo-500/5 rounded-md w-8 h-8 flex items-center justify-center">
+                  <span class="text-indigo-500">
+                    <%= icon("file-spreadsheet", color: "current") %>
+                  </span>
+                </div>
+                <span class="text-sm text-primary group-hover:text-secondary">
+                  <%= t(".import_transactions") %>
+                </span>
               </div>
-              <span class="text-sm text-gray-900 group-hover:text-gray-700">
-                <%= t(".import_transactions") %>
-              </span>
-            </div>
-            <%= lucide_icon("chevron-right", class: "w-5 h-5 text-gray-500") %>
-          <% end %>
+              <%= icon("chevron-right") %>
+            <% end %>
 
-          <div class="pl-14 pr-3">
-            <div class="h-px bg-alpha-black-50"></div>
-          </div>
-        </li>
+            <%= render "shared/ruler" %>
+          </li>
+        <% end %>
 
-        <li>
-          <%= button_to imports_path(import: { type: "TradeImport" }), class: "flex items-center justify-between p-4 group cursor-pointer w-full", data: { turbo: false } do %>
-            <div class="flex items-center gap-2">
-              <div class="bg-yellow-500/5 rounded-md w-8 h-8 flex items-center justify-center">
-                <%= lucide_icon("square-percent", class: "w-5 h-5 text-yellow-500") %>
+        <% if Current.family.accounts.any? && (params[:type].nil? || params[:type] == "TradeImport") %>
+          <li>
+            <%= button_to imports_path(import: { type: "TradeImport" }), class: "flex items-center justify-between p-4 group cursor-pointer w-full", data: { turbo: false } do %>
+              <div class="flex items-center gap-2">
+                <div class="bg-yellow-500/5 rounded-md w-8 h-8 flex items-center justify-center">
+                  <span class="text-yellow-500">
+                    <%= icon("square-percent", color: "current") %>
+                  </span>
+                </div>
+                <span class="text-sm text-primary group-hover:text-secondary">
+                  <%= t(".import_portfolio") %>
+                </span>
               </div>
-              <span class="text-sm text-gray-900 group-hover:text-gray-700">
-                <%= t(".import_portfolio") %>
-              </span>
-            </div>
-            <%= lucide_icon("chevron-right", class: "w-5 h-5 text-gray-500") %>
-          <% end %>
+              <%= icon("chevron-right") %>
+            <% end %>
 
-          <div class="pl-14 pr-3">
-            <div class="h-px bg-alpha-black-50"></div>
-          </div>
-        </li>
+            <%= render "shared/ruler" %>
+          </li>
+        <% end %>
 
-        <li>
-          <%= button_to imports_path(import: { type: "AccountImport" }), class: "flex items-center justify-between p-4 group cursor-pointer w-full", data: { turbo: false } do %>
-            <div class="flex items-center gap-2">
-              <div class="bg-violet-500/5 rounded-md w-8 h-8 flex items-center justify-center">
-                <%= lucide_icon("building", class: "w-5 h-5 text-violet-500") %>
+        <% if params[:type].nil? || params[:type] == "AccountImport" %>
+          <li>
+            <%= button_to imports_path(import: { type: "AccountImport" }), class: "flex items-center justify-between p-4 group cursor-pointer w-full", data: { turbo: false } do %>
+              <div class="flex items-center gap-2">
+                <div class="bg-violet-500/5 rounded-md w-8 h-8 flex items-center justify-center">
+                  <span class="text-violet-500">
+                    <%= icon("building", color: "current") %>
+                  </span>
+                </div>
+                <span class="text-sm text-primary group-hover:text-secondary">
+                  <%= t(".import_accounts") %>
+                </span>
               </div>
-              <span class="text-sm text-gray-900 group-hover:text-gray-700">
-                <%= t(".import_accounts") %>
-              </span>
-            </div>
-            <%= lucide_icon("chevron-right", class: "w-5 h-5 text-gray-500") %>
-          <% end %>
+              <%= icon("chevron-right") %>
+            <% end %>
 
-          <div class="pl-14 pr-3">
-            <div class="h-px bg-alpha-black-50"></div>
-          </div>
-        </li>
+            <%= render "shared/ruler" %>
+          </li>
+        <% end %>
 
-        <li>
-          <%= button_to imports_path(import: { type: "MintImport" }), class: "flex items-center justify-between p-4 group w-full", data: { turbo: false } do %>
-            <div class="flex items-center gap-2">
-              <%= image_tag("mint-logo.jpeg", alt: "Mint logo", class: "w-8 h-8 rounded-md") %>
-              <span class="text-sm text-gray-900">
-                <%= t(".import_mint") %>
-              </span>
-            </div>
-            <%= lucide_icon("chevron-right", class: "w-5 h-5 text-gray-500") %>
-          <% end %>
+        <% if Current.family.accounts.any? && (params[:type].nil? || params[:type] == "MintImport" || params[:type] == "TransactionImport") %>
+          <li>
+            <%= button_to imports_path(import: { type: "MintImport" }), class: "flex items-center justify-between p-4 group w-full", data: { turbo: false } do %>
+              <div class="flex items-center gap-2">
+                <%= image_tag("mint-logo.jpeg", alt: "Mint logo", class: "w-8 h-8 rounded-md") %>
+                <span class="text-sm text-primary">
+                  <%= t(".import_mint") %>
+                </span>
+              </div>
+              <%= icon("chevron-right") %>
+            <% end %>
 
-          <div class="pl-14 pr-3">
-            <div class="h-px bg-alpha-black-50"></div>
-          </div>
-        </li>
+            <%= render "shared/ruler" %>
+          </li>
+        <% end %>
       </ul>
     </div>
-  </div>
+  <% end %>
 <% end %>
diff --git a/app/views/imports/show.html.erb b/app/views/imports/show.html.erb
index 163be644..ffa55297 100644
--- a/app/views/imports/show.html.erb
+++ b/app/views/imports/show.html.erb
@@ -10,6 +10,8 @@
   <%= render "imports/success", import: @import %>
 <% elsif @import.failed? %>
   <%= render "imports/failure", import: @import %>
+<% elsif @import.revert_failed? %>
+  <%= render "imports/revert_failure", import: @import %>
 <% else %>
   <%= render "imports/ready", import: @import %>
 <% end %>
diff --git a/app/views/institutions/_form.html.erb b/app/views/institutions/_form.html.erb
deleted file mode 100644
index dd72fb34..00000000
--- a/app/views/institutions/_form.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<%= styled_form_with model: institution, class: "space-y-4", data: { turbo_frame: "_top", controller: "profile-image-preview" } do |f| %>
-  <div class="flex justify-center items-center py-4">
-    <%= f.label :logo do %>
-      <div class="relative cursor-pointer hover:opacity-80 w-16 h-16 rounded-full bg-gray-50">
-        <% persisted_logo = institution_logo(institution) %>
-
-        <% if persisted_logo %>
-          <%= image_tag persisted_logo, class: "absolute inset-0 rounded-full w-full h-full object-cover" %>
-        <% end %>
-
-        <div data-profile-image-preview-target="imagePreview" class="absolute inset-0 h-full w-full flex items-center justify-center">
-          <% unless persisted_logo %>
-            <%= lucide_icon "image-plus", class: "w-5 h-5 text-gray-500 cursor-pointer", data: { profile_image_preview_target: "template" } %>
-          <% end %>
-        </div>
-      </div>
-    <% end %>
-  </div>
-
-  <%= f.file_field :logo,
-                   accept: "image/png, image/jpeg",
-                   class: "hidden",
-                   data: { profile_image_preview_target: "fileField", action: "profile-image-preview#preview" } %>
-  <%= f.text_field :name, label: t(".name") %>
-  <%= f.submit %>
-<% end %>
diff --git a/app/views/institutions/edit.html.erb b/app/views/institutions/edit.html.erb
deleted file mode 100644
index 75c81579..00000000
--- a/app/views/institutions/edit.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= modal_form_wrapper title: t(".edit", institution: @institution.name) do %>
-  <%= render "form", institution: @institution %>
-<% end %>
diff --git a/app/views/institutions/new.html.erb b/app/views/institutions/new.html.erb
deleted file mode 100644
index 94c36193..00000000
--- a/app/views/institutions/new.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= modal_form_wrapper title: t(".new_institution") do %>
-  <%= render "form", institution: @institution %>
-<% end %>
diff --git a/app/views/investments/_form.html.erb b/app/views/investments/_form.html.erb
new file mode 100644
index 00000000..a9387af1
--- /dev/null
+++ b/app/views/investments/_form.html.erb
@@ -0,0 +1,7 @@
+<%# locals: (account:, url:) %>
+
+<%= render "accounts/form", account: account, url: url do |form| %>
+  <%= form.select :subtype,
+                 Investment::SUBTYPES.map { |k, v| [v[:long], k] },
+                 { label: true, prompt: t("investments.form.subtype_prompt"), include_blank: t("investments.form.none") } %>
+<% end %>
diff --git a/app/views/investments/_value_tooltip.html.erb b/app/views/investments/_value_tooltip.html.erb
new file mode 100644
index 00000000..0cdeee27
--- /dev/null
+++ b/app/views/investments/_value_tooltip.html.erb
@@ -0,0 +1,37 @@
+<%# locals: (balance:, holdings:, cash:) %>
+
+<div data-controller="tooltip" data-tooltip-placement-value="right" data-tooltip-offset-value=10 data-tooltip-cross-axis-value=50>
+  <%= icon("info", size: "sm") %>
+  <div role="tooltip" data-tooltip-target="tooltip" class="tooltip bg-gray-700 text-sm p-2 rounded w-64">
+    <div class="fg-inverse">
+      <%= t(".total_value_tooltip") %>
+    </div>
+    <div class="flex pt-3">
+      <div class="text-gray-300">
+        <%= t(".cash") %>
+      </div>
+      <div class="fg-inverse ml-auto">
+        <%= tag.p format_money(cash, precision: 0) %>
+      </div>
+    </div>
+    <div class="flex">
+      <div class="text-gray-300">
+        <%= t(".holdings") %>
+      </div>
+      <div class="fg-inverse ml-auto">
+        <%= tag.p format_money(holdings, precision: 0) %>
+      </div>
+    </div>
+
+    <hr class="my-2 border-secondary">
+
+    <div class="flex">
+      <div class="text-gray-300">
+        <%= t(".total") %>
+      </div>
+      <div class="fg-inverse font-bold ml-auto">
+        <%= tag.p format_money(balance, precision: 0) %>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/app/views/investments/edit.html.erb b/app/views/investments/edit.html.erb
new file mode 100644
index 00000000..b9c83af4
--- /dev/null
+++ b/app/views/investments/edit.html.erb
@@ -0,0 +1,6 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".edit", account: @account.name)) %>
+  <% dialog.with_body do %>
+    <%= render "investments/form", account: @account, url: investment_path(@account) %>
+  <% end %>
+<% end %>
diff --git a/app/views/investments/new.html.erb b/app/views/investments/new.html.erb
new file mode 100644
index 00000000..acfaa6ed
--- /dev/null
+++ b/app/views/investments/new.html.erb
@@ -0,0 +1,14 @@
+<% if params[:step] == "method_select" %>
+  <%= render "accounts/new/method_selector",
+             path: new_investment_path(return_to: params[:return_to]),
+             show_us_link: @show_us_link,
+             show_eu_link: @show_eu_link,
+             accountable_type: "Investment" %>
+<% else %>
+  <%= render DS::Dialog.new do |dialog| %>
+    <% dialog.with_header(title: t(".title")) %>
+    <% dialog.with_body do %>
+      <%= render "investments/form", account: @account, url: investments_path %>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/investments/tabs/_holdings.html.erb b/app/views/investments/tabs/_holdings.html.erb
new file mode 100644
index 00000000..8c53933e
--- /dev/null
+++ b/app/views/investments/tabs/_holdings.html.erb
@@ -0,0 +1,5 @@
+<%# locals: (account:) %>
+
+<%= turbo_frame_tag dom_id(account, :holdings), src: holdings_path(account_id: account.id) do %>
+  <%= render "entries/loading" %>
+<% end %>
diff --git a/app/views/invitation_mailer/invite_email.html.erb b/app/views/invitation_mailer/invite_email.html.erb
new file mode 100644
index 00000000..04a70291
--- /dev/null
+++ b/app/views/invitation_mailer/invite_email.html.erb
@@ -0,0 +1,11 @@
+<h1><%= t(".greeting") %></h1>
+
+<p>
+  <%= t(".body",
+    inviter: @invitation.inviter.display_name,
+    family: @invitation.family.name).html_safe %>
+</p>
+
+<%= link_to t(".accept_button"), @accept_url, class: "button" %>
+
+<p class="footer"><%= t(".expiry_notice", days: 3) %></p>
diff --git a/app/views/invitations/new.html.erb b/app/views/invitations/new.html.erb
new file mode 100644
index 00000000..6968f72d
--- /dev/null
+++ b/app/views/invitations/new.html.erb
@@ -0,0 +1,24 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".title"), subtitle: t(".subtitle")) %>
+
+  <% dialog.with_body do %>
+    <%= styled_form_with model: @invitation, class: "space-y-4", data: { turbo: false } do |form| %>
+      <%= form.email_field :email,
+        required: true,
+        placeholder: t(".email_placeholder"),
+        label: t(".email_label") %>
+
+      <%= form.select :role,
+        options_for_select([
+          [t(".role_member"), "member"],
+          [t(".role_admin"), "admin"]
+        ]),
+        {},
+        { label: t(".role_label") } %>
+
+      <div class="w-full">
+        <%= form.submit t(".submit"), class: "bg-inverse fg-inverse rounded-lg px-4 py-2 w-full" %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/invite_codes/_invite_code.html.erb b/app/views/invite_codes/_invite_code.html.erb
index 6eb1953e..b4f52d45 100644
--- a/app/views/invite_codes/_invite_code.html.erb
+++ b/app/views/invite_codes/_invite_code.html.erb
@@ -4,12 +4,12 @@
     <div>
       <span data-clipboard-target="source" class="text-sm font-medium"><%= invite_code.token %></span>
     </div>
-    <button data-action="clipboard#copy" class="flex-shrink-0 z-10 inline-flex items-center px-1 text-sm text-gray-500 font-sm text-center" type="button">
+    <button data-action="clipboard#copy" class="shrink-0 z-10 inline-flex items-center px-1 text-sm text-secondary font-sm text-center" type="button">
       <span data-clipboard-target="iconDefault">
-        <%= lucide_icon "copy", class: "w-5 h-5" %>
+        <%= icon "copy" %>
       </span>
       <span class="hidden inline-flex items-center" data-clipboard-target="iconSuccess">
-        <%= lucide_icon "check", class: "w-5 h-4" %>
+        <%= icon "check" %>
       </span>
     </button>
   </div>
diff --git a/app/views/invite_codes/index.html.erb b/app/views/invite_codes/index.html.erb
index d4d881d9..467037c4 100644
--- a/app/views/invite_codes/index.html.erb
+++ b/app/views/invite_codes/index.html.erb
@@ -3,10 +3,10 @@
   <% if @invite_codes.present? %>
     <%= render @invite_codes %>
   <% else %>
-    <div class="flex flex-col items-center w-full h-64 bg-white text-center justify-center">
-      <%= lucide_icon "binary", class: "w-6 h-6 text-sm text-gray-500" %>
+    <div class="flex flex-col items-center w-full h-64 bg-container text-center justify-center">
+      <%= icon "binary", size: "lg" %>
       <p class="text-base pt-4"><%= t(".no_invite_codes") %></p>
-      <p class="text-sm text-gray-500 pt-2 w-2/3"><%= t(".invite_code_description") %></p>
+      <p class="text-sm text-secondary pt-2 w-2/3"><%= t(".invite_code_description") %></p>
     </div>
   <% end %>
 <% end %>
diff --git a/app/views/issue/_request_synth_data_action.html.erb b/app/views/issue/_request_synth_data_action.html.erb
deleted file mode 100644
index a805524b..00000000
--- a/app/views/issue/_request_synth_data_action.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<p>The Synth data provider could not find the requested data.</p>
-
-<p>We are actively developing Synth to be a low cost and easy to use data provider. You can help us improve Synth by
-  requesting the data you need.</p>
-
-<p>Please post in our <%= link_to "Discord server", "https://link.maybe.co/discord", target: "_blank" %> with the
-  following information:</p>
-
-<ul>
-  <li>What type of data is missing?</li>
-  <li>Any other information you think might be helpful</li>
-</ul>
diff --git a/app/views/issue/exchange_rate_provider_missings/show.html.erb b/app/views/issue/exchange_rate_provider_missings/show.html.erb
deleted file mode 100644
index a00cef56..00000000
--- a/app/views/issue/exchange_rate_provider_missings/show.html.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<%= content_for :title, @issue.title %>
-
-<%= content_for :description do %>
-  <p>You have set your family currency preference to <%= Current.family.currency %>.  <%= @issue.issuable.name %> has
-    entries in another currency, which means we have to fetch exchange rates from a data provider to accurately show
-    historical results.</p>
-
-  <p>We have detected that your exchange rates provider is not configured yet.</p>
-<% end %>
-
-<%= content_for :action do %>
-  <% if self_hosted? %>
-    <p>To fix this issue, you need to provide an API key for your exchange rate provider.</p>
-
-    <p>Currently, we support <%= link_to "Synth Finance", "https://synthfinance.com", target: "_blank" %>, so you need
-      to
-      get a free API key from the link provided.</p>
-
-    <p>Once you have your API key, paste it below to configure it.</p>
-
-    <%= styled_form_with model: @issue, url: issue_exchange_rate_provider_missing_path(@issue), method: :patch, class: "space-y-3" do |form| %>
-      <%= form.text_field :synth_api_key, label: "Synth API Key", placeholder: "Synth API Key", type: "password", class: "w-full", value: Setting.synth_api_key %>
-      <%= form.submit "Save and Re-Sync Account", class: "btn-primary" %>
-    <% end %>
-  <% else %>
-    <p>Please contact the Maybe team.</p>
-  <% end %>
-<% end %>
diff --git a/app/views/issue/exchange_rates_missings/show.html.erb b/app/views/issue/exchange_rates_missings/show.html.erb
deleted file mode 100644
index 65c624ed..00000000
--- a/app/views/issue/exchange_rates_missings/show.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<%= content_for :title, @issue.title %>
-
-<%= content_for :description do %>
-  <p>Some exchange rates are missing for this account.</p>
-
-  <pre><code><%= JSON.pretty_generate(@issue.data) %></code></pre>
-<% end %>
-
-<%= content_for :action do %>
-  <%= render "issue/request_synth_data_action" %>
-<% end %>
diff --git a/app/views/issue/prices_missings/show.html.erb b/app/views/issue/prices_missings/show.html.erb
deleted file mode 100644
index c71e7bff..00000000
--- a/app/views/issue/prices_missings/show.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<%= content_for :title, @issue.title %>
-
-<%= content_for :description do %>
-  <p>Some stock prices are missing for this account.</p>
-
-  <pre><code><%= JSON.pretty_generate(@issue.data) %></code></pre>
-<% end %>
-
-<%= content_for :action do %>
-  <%= render "issue/request_synth_data_action" %>
-<% end %>
diff --git a/app/views/issue/unknowns/show.html.erb b/app/views/issue/unknowns/show.html.erb
deleted file mode 100644
index a6ba2084..00000000
--- a/app/views/issue/unknowns/show.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<%= content_for :title, @issue.title %>
-
-<%= content_for :description do %>
-  <p>An unknown issue has occurred.</p>
-
-  <pre><code><%= JSON.pretty_generate(@issue.data || "No data provided for this issue") %></code></pre>
-<% end %>
-
-<%= content_for :action do %>
-  <p>There is no fix for this issue yet.</p>
-
-  <p>Maybe is in active development and we value your feedback. There are a couple ways you can report this issue to
-    help us make Maybe better:</p>
-
-  <ul>
-    <li>Post in our <%= link_to "Discord server", "https://link.maybe.co/discord", target: "_blank" %></li>
-    <li>Open an issue on
-      our <%= link_to "Github repository", "https://github.com/maybe-finance/maybe/issues", target: "_blank" %></li>
-  </ul>
-
-  <p>If there is data shown in the code block above that you think might be helpful, please include it in your
-    report.</p>
-<% end %>
diff --git a/app/views/issues/_issue.html.erb b/app/views/issues/_issue.html.erb
deleted file mode 100644
index cabb360c..00000000
--- a/app/views/issues/_issue.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<%# locals: (issue:) %>
-
-<% priority_class = issue.critical? || issue.error? ? "bg-error/5" : "bg-warning/5" %>
-<% text_class = issue.critical? || issue.error? ? "text-error" : "text-warning" %>
-
-<%= tag.div class: "flex gap-6 items-center rounded-xl px-4 py-3 #{priority_class}" do %>
-  <div class="flex gap-3 items-center grow overflow-x-scroll <%= text_class %>">
-    <%= lucide_icon("alert-octagon", class: "w-5 h-5 shrink-0") %>
-    <p class="text-sm whitespace-nowrap"><%= issue.title %></p>
-  </div>
-
-  <div class="flex items-center gap-4 ml-auto">
-    <%= link_to "Troubleshoot", issue_path(issue), class: "#{text_class} font-medium hover:underline", data: { turbo_frame: :drawer } %>
-  </div>
-<% end %>
diff --git a/app/views/layouts/_sidebar.html.erb b/app/views/layouts/_sidebar.html.erb
deleted file mode 100644
index e62a104a..00000000
--- a/app/views/layouts/_sidebar.html.erb
+++ /dev/null
@@ -1,123 +0,0 @@
-<div class="flex items-center justify-between">
-  <%= link_to root_path do %>
-    <%= image_tag "logo.svg", alt: "Maybe", class: "h-[22px]" %>
-  <% end %>
-  <div id="user-menu" data-controller="menu">
-    <button data-menu-target="button">
-      <% profile_image_attached = Current.user.profile_image.attached? %>
-      <% if profile_image_attached %>
-        <div class="text-white w-9 h-9">
-          <%= render "shared/user_profile_image", user: Current.user %>
-        </div>
-      <% else %>
-        <div class="text-white w-9 h-9 bg-gray-400 rounded-full flex items-center justify-center text-lg uppercase"><%= Current.user.initial %></div>
-      <% end %>
-    </button>
-    <div data-menu-target="content" class="hidden absolute w-[240px] z-10 left-[255px] top-[72px] bg-white rounded-sm shadow-xs border border-alpha-black-25">
-      <div class="p-3 flex items-center gap-3">
-        <% if profile_image_attached %>
-          <div class="text-white shrink-0 w-9 h-9">
-            <%= render "shared/user_profile_image", user: Current.user %>
-          </div>
-        <% else %>
-          <div class="text-white shrink-0 w-9 h-9 bg-gray-400 rounded-full flex items-center justify-center text-lg uppercase"><%= Current.user.initial %></div>
-        <% end %>
-        <div class="overflow-hidden text-ellipsis">
-          <span class="text-gray-900 font-medium text-sm"><%= Current.user.display_name %></span>
-          <% if Current.user.display_name != Current.user.email %>
-            <span class="text-gray-500 text-sm"><%= Current.user.email %></span>
-          <% end %>
-        </div>
-      </div>
-      <div class="border-t border-b border-alpha-black-100 p-1">
-        <%= link_to settings_profile_path(return_to: request.fullpath), class: "flex gap-2 items-center hover:bg-gray-50 rounded-lg px-3 py-2" do %>
-          <%= lucide_icon("settings", class: "w-5 h-5 text-gray-500 shrink-0") %>
-          <span class="text-gray-900 text-sm">Settings</span>
-        <% end %>
-        <div class="flex justify-between items-center gap-2">
-          <div class="flex items-center gap-2 rounded-lg px-3 py-2">
-            <%= lucide_icon("app-window", class: "w-5 h-5 text-gray-500 shrink-0") %>
-            <div>
-              <span class="text-gray-900 text-sm">Demo mode</span>
-              <span class="text-gray-500 text-xs block">Coming soon...</span>
-            </div>
-          </div>
-          <%# TODO: This will be a form toggle when implemented %>
-          <div class="relative inline-block cursor-not-allowed" title="Coming soon...">
-            <label class="cursor-not-allowed block bg-gray-100 w-9 h-5 rounded-full after:content-[''] after:block after:absolute after:top-0.5 after:left-0.5 after:bg-white after:w-4 after:h-4 after:rounded-full after:transition-transform after:duration-300 after:ease-in-out peer-checked:bg-green-600 peer-checked:after:translate-x-4"></label>
-          </div>
-        </div>
-      </div>
-      <div class="border-t border-b border-alpha-black-100 p-1">
-        <%= link_to changelog_path, class: "flex gap-2 items-center hover:bg-gray-50 rounded-lg px-3 py-2" do %>
-          <%= lucide_icon("box", class: "w-5 h-5 text-gray-500 shrink-0") %>
-          <span class="text-gray-900 text-sm">Changelog</span>
-        <% end %>
-        <%= link_to feedback_path, class: "flex gap-2 items-center hover:bg-gray-50 rounded-lg px-3 py-2" do %>
-          <%= lucide_icon("megaphone", class: "w-5 h-5 text-gray-500 shrink-0") %>
-          <span class="text-gray-900 text-sm">Feedback</span>
-        <% end %>
-        <% if self_hosted? %>
-          <%= link_to "https://link.maybe.co/discord", class: "flex gap-2 items-center hover:bg-gray-50 rounded-lg px-3 py-2" do %>
-            <%= lucide_icon("message-square-more", class: "w-5 h-5 text-gray-500 shrink-0") %>
-            <span class="text-gray-900 text-sm">Contact</span>
-          <% end %>
-        <% else %>
-          <%= link_to "mailto:hello@maybe.co", class: "flex gap-2 items-center hover:bg-gray-50 rounded-lg px-3 py-2", onclick: "Intercom('showNewMessage'); return false;" do %>
-            <%= lucide_icon("message-square-more", class: "w-5 h-5 text-gray-500 shrink-0") %>
-            <span class="text-gray-900 text-sm">Contact</span>
-          <% end %>
-        <% end %>
-      </div>
-      <div class="p-1">
-        <%= button_to session_path(Current.session), method: :delete, class: "w-full text-red-400 flex gap-1 items-center hover:bg-gray-50 rounded-lg px-3 py-2" do %>
-          <%= lucide_icon("log-out", class: "w-5 h-5 shrink-0") %>
-          <span class="text-sm">Logout</span>
-        <% end %>
-      </div>
-    </div>
-  </div>
-</div>
-<nav>
-  <ul class="mt-6 space-y-1">
-    <li>
-      <%= sidebar_link_to t(".dashboard"), root_path, icon: "layout-grid" %>
-    </li>
-    <li>
-      <%= sidebar_link_to t(".accounts"), summary_accounts_path, icon: "layers" %>
-    </li>
-    <li>
-      <%= sidebar_link_to t(".transactions"), transactions_path, icon: "credit-card" %>
-    </li>
-  </ul>
-</nav>
-<div class="flex flex-col mt-6">
-  <div class="flex items-center justify-between px-3 py-2 mb-2">
-    <div class="flex items-center gap-2 text-xs uppercase text-gray-500">
-      <%= link_to accounts_path, class: "text-xs uppercase text-gray-500 font-bold tracking-wide" do %>
-        <%= t(".portfolio") %>
-      <% end %>
-      <span class="font-bold tracking-wide">&bull;</span>
-
-      <%= form_with url: list_accounts_path, method: :get, data: { controller: Current.family.accounts.any? ? "auto-submit-form" : nil, turbo_frame: "account-list" } do |form| %>
-        <%= period_select form: form, selected: "last_30_days", classes: "w-full border-none pl-2 pr-7 text-xs bg-transparent gap-1 cursor-pointer font-semibold tracking-wide focus:outline-none focus:ring-0" %>
-      <% end %>
-    </div>
-    <%= link_to new_account_path, id: "sidebar-new-account", class: "block hover:bg-gray-100 font-semibold text-gray-900 flex items-center rounded", title: t(".new_account"), data: { turbo_frame: "modal" } do %>
-      <%= lucide_icon("plus", class: "w-5 h-5 text-gray-500") %>
-    <% end %>
-  </div>
-
-  <%= turbo_frame_tag "account-list", target: "_top" do %>
-    <% if Current.family.accounts.any? %>
-      <% account_groups.each do |group| %>
-        <%= render "accounts/account_list", group: group %>
-      <% end %>
-    <% else %>
-      <%= link_to new_account_path, class: "flex items-center min-h-10 gap-4 px-3 py-2 mb-1 text-gray-500 text-sm font-medium rounded-[10px] hover:bg-gray-100", data: { turbo_frame: "modal" } do %>
-        <%= lucide_icon("plus", class: "w-5 h-5") %>
-        <%= tag.p t(".new_account") %>
-      <% end %>
-    <% end %>
-  <% end %>
-</div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index e7712e13..c053e04d 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,48 +1,164 @@
-<!DOCTYPE html>
-<html class="h-full" lang="en">
-  <head>
-    <title><%= content_for(:title) || "Maybe" %></title>
+<% mobile_nav_items = [
+  { name: "Home", path: root_path, icon: "pie-chart", icon_custom: false, active: page_active?(root_path) },
+  { name: "Transactions", path: transactions_path, icon: "credit-card", icon_custom: false, active: page_active?(transactions_path) },
+  { name: "Budgets", path: budgets_path, icon: "map", icon_custom: false, active: page_active?(budgets_path) },
+  { name: "Assistant", path: chats_path, icon: "icon-assistant", icon_custom: true, active: page_active?(chats_path), mobile_only: true }
+] %>
 
-    <%= csrf_meta_tags %>
-    <%= csp_meta_tag %>
+<% desktop_nav_items = mobile_nav_items.reject { |item| item[:mobile_only] } %>
+<% expanded_sidebar_class = "w-full" %>
+<% collapsed_sidebar_class = "w-0" %>
 
-    <%= stylesheet_link_tag "tailwind", "inter-font", "data-turbo-track": "reload" %>
-    <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-
-    <%= javascript_importmap_tags %>
-    <%= hotwire_livereload_tags if Rails.env.development? %>
-    <%= turbo_refreshes_with method: :morph, scroll: :preserve %>
-
-    <meta name="viewport"
-          content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-    <meta name="mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-    <meta name="apple-mobile-web-app-title" content="Maybe">
-    <meta name="msapplication-TileColor" content="#ffffff">
-    <meta name="theme-color" content="#ffffff">
-
-    <%= yield :head %>
-  </head>
-
-  <body class="h-full">
-    <div class="fixed z-50 space-y-1 top-6 right-10">
-      <div id="notification-tray">
-        <%= render_flash_notifications %>
+<%= render "layouts/shared/htmldoc" do %>
+  <div
+    class="flex flex-col lg:flex-row h-full bg-surface"
+    data-controller="app-layout"
+    data-app-layout-expanded-sidebar-class="<%= expanded_sidebar_class %>"
+    data-app-layout-collapsed-sidebar-class="<%= collapsed_sidebar_class %>"
+    data-app-layout-user-id-value="<%= Current.user.id %>">
+    <div
+      class="hidden fixed inset-0 bg-surface z-20 h-full w-full pt-[calc(env(safe-area-inset-top)+0.75rem)] pr-3 pb-[calc(env(safe-area-inset-bottom)+0.75rem)] pl-3 overflow-y-auto transition-all duration-300"
+      data-app-layout-target="mobileSidebar">
+      <div class="mb-2">
+        <%= icon("x", as_button: true, data: { action: "app-layout#closeMobileSidebar" }) %>
       </div>
+
+      <%= render(
+        "accounts/account_sidebar_tabs",
+        family: Current.family,
+        active_tab: @account_group_tab,
+        mobile: true
+      ) %>
     </div>
 
-    <%= family_notifications_stream %>
-    <%= family_stream %>
+    <%# MOBILE - Top nav %>
+    <nav class="lg:hidden flex justify-between items-center p-3">
+      <%= icon("panel-left", as_button: true, data: { action: "app-layout#openMobileSidebar"}) %>
 
-    <%= content_for?(:content) ? yield(:content) : yield %>
+      <%= link_to root_path, class: "block" do %>
+        <%= image_tag "logomark-color.svg", class: "w-9 h-9 mx-auto" %>
+      <% end %>
 
-    <%= turbo_frame_tag "modal" %>
-    <%= turbo_frame_tag "drawer" %>
+      <%= render "users/user_menu", user: Current.user, placement: "bottom-end", offset: 12 %>
+    </nav>
 
-    <%= render "shared/confirm_modal" %>
+    <%# DESKTOP - Left navbar %>
+    <div class="hidden lg:block">
+      <nav class="h-full flex flex-col shrink-0 w-[84px] py-4 mr-3">
+        <div class="pl-2 mb-3">
+          <%= link_to root_path, class: "block" do %>
+            <%= image_tag "logomark-color.svg", class: "w-9 h-9 mx-auto" %>
+          <% end %>
+        </div>
 
-    <% if self_hosted? %>
-      <%= render "shared/app_version" %>
+        <ul class="space-y-0.5">
+          <% desktop_nav_items.reject { |item| item[:mobile_only] }.each do |nav_item| %>
+            <li>
+              <%= render "layouts/shared/nav_item", **nav_item %>
+            </li>
+          <% end %>
+        </ul>
+
+        <div class="pl-2 mt-auto mx-auto flex flex-col gap-2">
+          <%= render DS::Button.new(
+            variant: "icon",
+            icon: "message-circle-question",
+            data: { action: "intercom#show" }
+          ) %>
+
+          <%= render "users/user_menu", user: Current.user %>
+        </div>
+      </nav>
+    </div>
+
+    <%# DESKTOP - Left sidebar %>
+    <%= tag.div class: class_names(
+        "hidden lg:block py-4 overflow-y-auto shrink-0 max-w-[320px] transition-all duration-300",
+        Current.user.show_sidebar? ? expanded_sidebar_class : collapsed_sidebar_class,
+       ),
+       data: { app_layout_target: "leftSidebar" } do %>
+      <% if content_for?(:sidebar) %>
+        <%= yield :sidebar %>
+      <% else %>
+        <div class="h-full flex flex-col">
+          <div class="overflow-y-auto grow">
+            <%= render "accounts/account_sidebar_tabs", family: Current.family, active_tab: @account_group_tab %>
+          </div>
+
+          <% if Current.family.trialing? && !self_hosted? %>
+            <div class="px-4 py-3 space-y-4 bg-container shadow-border-xs rounded-xl">
+              <div class="flex items-start justify-between">
+                <div>
+                  <p class="text-sm font-medium text-primary">Free trial</p>
+                  <p class="text-sm text-secondary"><%= Current.family.days_left_in_trial %> days remaining</p>
+                </div>
+
+                <%= render DS::Link.new(
+                  text: "Upgrade",
+                  href: upgrade_subscription_path,
+                ) %>
+              </div>
+
+              <div class="flex items-center gap-0.5 h-1.5">
+                <div class="h-full bg-warning rounded-full" style="width: <%= Current.family.percentage_of_trial_completed %>%"></div>
+                <div class="h-full bg-surface-inset rounded-full" style="width: <%= Current.family.percentage_of_trial_remaining %>%"></div>
+              </div>
+            </div>
+          <% end %>
+        </div>
+      <% end %>
     <% end %>
-  </body>
-</html>
+
+    <%# SHARED - Main content %>
+    <%= tag.main class: class_names("grow overflow-y-auto px-3 lg:px-10 py-4 w-full mx-auto max-w-5xl"), data: { app_layout_target: "content" } do %>
+      <div class="hidden lg:flex gap-2 items-center justify-between mb-6">
+        <div class="flex items-center gap-2">
+          <%= icon("panel-left", as_button: true, data: { action: "app-layout#toggleLeftSidebar" }) %>
+
+          <% if content_for?(:breadcrumbs) %>
+            <%= yield :breadcrumbs %>
+          <% else %>
+            <%= render "layouts/shared/breadcrumbs", breadcrumbs: @breadcrumbs %>
+          <% end %>
+        </div>
+        <%= icon("panel-right", as_button: true, data: { action: "app-layout#toggleRightSidebar" }) %>
+      </div>
+
+      <% if content_for?(:page_header) %>
+        <%= yield :page_header %>
+      <% end %>
+
+      <%= yield %>
+    <% end %>
+
+    <%# DESKTOP - Right sidebar %>
+    <%= tag.div class: class_names(
+          "hidden lg:block h-full overflow-y-auto shrink-0 max-w-[400px] transition-all duration-300",
+          Current.user.show_ai_sidebar? ? expanded_sidebar_class : collapsed_sidebar_class,
+        ),
+        data: { app_layout_target: "rightSidebar" } do %>
+      <%= tag.div id: "chat-container", class: "relative h-full", data: { controller: "chat hotkey", turbo_permanent: true } do %>
+        <div class="flex flex-col h-full justify-between shrink-0">
+          <%= turbo_frame_tag chat_frame, src: chat_view_path(@chat), loading: "lazy", class: "h-full" do %>
+            <div class="flex justify-center items-center h-full">
+              <%= icon("loader-circle", class: "animate-spin") %>
+            </div>
+          <% end %>
+        </div>
+
+        <% unless Current.user.ai_enabled? %>
+          <div class="absolute backdrop-blur-lg inset-0 h-full w-full flex flex-col justify-center items-center pl-0.5 pr-4">
+            <%= render "chats/ai_consent" %>
+          </div>
+        <% end %>
+      <% end %>
+    <% end %>
+
+    <%# MOBILE - Bottom Nav %>
+    <%= tag.nav class: "lg:hidden bg-surface shrink-0 z-10 pb-[env(safe-area-inset-bottom)] border-t border-tertiary flex justify-around" do %>
+      <% mobile_nav_items.each do |nav_item| %>
+        <%= render "layouts/shared/nav_item", **nav_item %>
+      <% end %>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/layouts/auth.html.erb b/app/views/layouts/auth.html.erb
index 4bed502e..56be3236 100644
--- a/app/views/layouts/auth.html.erb
+++ b/app/views/layouts/auth.html.erb
@@ -1,31 +1,47 @@
-<%= content_for :content do %>
-  <div class="flex flex-col justify-center min-h-full px-6 py-12">
-    <div class="sm:mx-auto sm:w-full sm:max-w-md">
-      <%= render "shared/logo" %>
+<%= render "layouts/shared/htmldoc" do %>
+  <div class="flex flex-col h-full">
+    <div class="flex flex-col h-full px-6 py-12 bg-surface">
+      <div class="grow flex flex-col justify-center">
+        <div class="sm:mx-auto sm:w-full sm:max-w-md">
+          <div class="flex justify-center mt-2 md:mb-6">
+            <%= image_tag "logo-color.png", class: "w-16 mb-6" %>
+          </div>
+          <div class="space-y-2">
+            <h2 class="text-3xl font-medium text-primary text-center">
+              <%= content_for?(:header_title) ? yield(:header_title).html_safe : t(".your_account") %>
+            </h2>
+            <% if (controller_name == "sessions" && action_name == "new") || (controller_name == "registrations" && action_name == "new") %>
+              <div class="space-y-3 md:hidden w-full my-4">
+                <div class="bg-surface-inset rounded-lg p-1 flex">
+                  <%= link_to new_session_path,
+      class: "w-1/2 px-2 py-1 rounded-md text-sm text-center font-medium #{current_page?(new_session_path) ? 'bg-surface shadow-sm text-primary' : 'text-secondary'}" do %>
+                    <%= t("layouts.auth.sign_in") %>
+                  <% end %>
+                  <%= link_to new_registration_path,
+      class: "w-1/2 px-2 py-1 rounded-md text-sm text-center font-medium #{!current_page?(new_session_path) ? 'bg-surface shadow-sm text-primary' : 'text-secondary'}" do %>
+                    <%= t("layouts.auth.sign_up") %>
+                  <% end %>
+                </div>
+              </div>
+            <% end %>
+            <% if controller_name == "sessions" %>
+              <p class="text-sm text-center hidden md:block">
+                <%= tag.span t(".no_account"), class: "text-secondary" %> <%= link_to t(".sign_up"), new_registration_path, class: "font-medium text-primary hover:underline transition" %>
+              </p>
+            <% elsif controller_name == "registrations" %>
+              <p class="text-sm text-center text-gray-600 hidden md:block">
+                <%= t(".existing_account") %> <%= link_to t(".sign_in"), new_session_path, class: "font-medium text-primary hover:underline transition" %>
+              </p>
+            <% end %>
+          </div>
+        </div>
 
-      <h2 class="mt-6 text-3xl font-semibold tracking-tight text-center font-display">
-        <%= content_for?(:header_title) ? yield(:header_title).html_safe : t(".your_account") %>
-      </h2>
+        <div class="mt-0 md:mt-8 sm:mx-auto sm:w-full sm:max-w-lg">
+          <%= yield %>
+        </div>
+      </div>
 
-      <% if controller_name == "sessions" %>
-        <p class="mt-2 text-sm text-center text-gray-600">
-          <%= t(".or") %> <%= link_to t(".sign_up"), new_registration_path, class: "font-medium text-gray-600 hover:text-gray-400 transition" %>
-        </p>
-      <% elsif controller_name == "registrations" %>
-        <p class="mt-2 text-sm text-center text-gray-600">
-          <%= t(".or") %> <%= link_to t(".sign_in"), new_session_path, class: "font-medium text-gray-600 hover:text-gray-400 transition" %>
-        </p>
-      <% end %>
-    </div>
-
-    <div class="mt-8 sm:mx-auto sm:w-full sm:max-w-lg">
-      <%= yield %>
-    </div>
-
-    <div class="p-8 mt-2 text-center">
-      <p class="mt-6 text-sm text-black"><%= link_to t(".privacy_policy"), "https://maybe.co/privacy", class: "font-medium text-gray-600 hover:text-gray-400 transition" %> &bull; <%= link_to t(".terms_of_service"), "https://maybe.co/tos", class: "font-medium text-gray-600 hover:text-gray-400 transition" %></p>
+      <%= render "layouts/shared/footer" %>
     </div>
   </div>
 <% end %>
-
-<%= render template: "layouts/application" %>
diff --git a/app/views/layouts/blank.html.erb b/app/views/layouts/blank.html.erb
new file mode 100644
index 00000000..7193dcb6
--- /dev/null
+++ b/app/views/layouts/blank.html.erb
@@ -0,0 +1,13 @@
+<%= render "layouts/shared/htmldoc" do %>
+  <div class="min-h-screen bg-surface text-primary font-medium flex flex-col">
+    <div class="flex-1">
+      <%= yield %>
+    </div>
+
+    <% if content_for?(:footer) %>
+      <%= yield :footer %>
+    <% else %>
+      <%= render "layouts/shared/footer" %>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/layouts/doorkeeper/admin.html.erb b/app/views/layouts/doorkeeper/admin.html.erb
new file mode 100644
index 00000000..54be4935
--- /dev/null
+++ b/app/views/layouts/doorkeeper/admin.html.erb
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title><%= t("doorkeeper.layouts.admin.title") %></title>
+  <%= stylesheet_link_tag "doorkeeper/admin/application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark mb-5">
+  <%= link_to t("doorkeeper.layouts.admin.nav.oauth2_provider"), oauth_applications_path, class: "navbar-brand" %>
+
+  <div class="collapse navbar-collapse">
+    <ul class="navbar-nav mr-auto">
+      <li class="nav-item <%= "active" if request.path == oauth_applications_path %>">
+        <%= link_to t("doorkeeper.layouts.admin.nav.applications"), oauth_applications_path, class: "nav-link" %>
+      </li>
+      <% if respond_to?(:root_path) %>
+        <li class="nav-item">
+          <%= link_to t("doorkeeper.layouts.admin.nav.home"), root_path, class: "nav-link" %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</nav>
+
+<div class="doorkeeper-admin container">
+  <%- if flash[:notice].present? %>
+    <div class="alert alert-info">
+      <%= flash[:notice] %>
+    </div>
+  <% end -%>
+
+  <%= yield %>
+</div>
+</body>
+</html>
diff --git a/app/views/layouts/doorkeeper/application.html.erb b/app/views/layouts/doorkeeper/application.html.erb
new file mode 100644
index 00000000..375f1323
--- /dev/null
+++ b/app/views/layouts/doorkeeper/application.html.erb
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<% theme = Current.user&.theme || "system" %>
+<html
+  lang="en"
+  data-theme="<%= theme %>"
+  data-controller="theme"
+  data-theme-user-preference-value="<%= Current.user&.theme || "system" %>"
+  class="h-full text-primary overflow-hidden lg:overflow-auto font-sans">
+  <head>
+    <%= render "layouts/shared/head" %>
+  </head>
+
+  <body class="h-full overflow-hidden lg:overflow-auto antialiased">
+    <div class="flex flex-col h-full">
+      <div class="flex flex-col h-full px-6 py-12 bg-surface">
+        <div class="grow flex flex-col justify-center">
+          <div class="sm:mx-auto sm:w-full sm:max-w-md">
+            <div class="flex justify-center mt-2 md:mb-6">
+              <%= image_tag "logo-color.png", class: "w-16 mb-6" %>
+            </div>
+            <div class="space-y-2">
+              <h2 class="text-3xl font-medium text-primary text-center">
+                Maybe Authorization
+              </h2>
+            </div>
+          </div>
+
+          <div class="mt-5 md:mt-8 sm:mx-auto sm:w-full sm:max-w-lg">
+            <%- if flash[:notice].present? %>
+              <div class="mb-4 p-3 rounded-lg bg-surface-inset text-sm text-secondary">
+                <%= flash[:notice] %>
+              </div>
+            <% end -%>
+            <%- if flash[:alert].present? %>
+              <div class="mb-4 p-3 rounded-lg bg-destructive-surface text-sm text-destructive">
+                <%= flash[:alert] %>
+              </div>
+            <% end -%>
+
+            <%= yield %>
+          </div>
+        </div>
+
+        <%= render "layouts/shared/footer" %>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/app/views/layouts/imports.html.erb b/app/views/layouts/imports.html.erb
index 699ab61e..09f15cf0 100644
--- a/app/views/layouts/imports.html.erb
+++ b/app/views/layouts/imports.html.erb
@@ -1,23 +1,29 @@
-<%= content_for :content do %>
-  <div class="flex flex-col h-dvh">
+<%= render "layouts/shared/htmldoc" do %>
+  <div class="flex flex-col h-full bg-container">
     <header class="flex items-center justify-between p-8">
-      <%= link_to content_for(:previous_path) || imports_path do %>
-        <%= lucide_icon "arrow-left", class: "w-5 h-5 text-gray-500" %>
-      <% end %>
+      <%= render DS::Link.new(
+        variant: "icon",
+        icon: "arrow-left",
+        href: content_for(:previous_path) || imports_path
+      ) %>
 
       <nav>
         <%= yield :header_nav %>
       </nav>
 
-      <%= link_to imports_path do %>
-        <%= lucide_icon "x", class: "text-gray-500 w-5 h-5" %>
-      <% end %>
+      <%= render DS::Link.new(
+        variant: "icon",
+        icon: "x",
+        href: imports_path
+      ) %>
     </header>
 
-    <main class="flex-grow px-8 pt-12 pb-32 overflow-y-auto">
+    <main class="grow px-8 md:pt-12 pb-32 overflow-y-auto">
+      <div class="flex md:hidden justify-center w-full">
+        <%= yield :mobile_import_progress %>
+      </div>
+
       <%= yield %>
     </main>
   </div>
 <% end %>
-
-<%= render template: "layouts/application" %>
diff --git a/app/views/layouts/issues.html.erb b/app/views/layouts/issues.html.erb
deleted file mode 100644
index 1a606279..00000000
--- a/app/views/layouts/issues.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<%= drawer do %>
-  <article class="prose">
-    <%= tag.h2 do %>
-      <%= yield :title %>
-    <% end %>
-
-    <%= tag.h3 t(".description") %>
-    <%= yield :description %>
-
-    <%= tag.h3 t(".action") %>
-    <%= yield :action %>
-  </article>
-<% end %>
-
-<%= render template: "layouts/application" %>
diff --git a/app/views/layouts/lookbooks.html.erb b/app/views/layouts/lookbooks.html.erb
new file mode 100644
index 00000000..de1b9dc9
--- /dev/null
+++ b/app/views/layouts/lookbooks.html.erb
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html data-theme="<%= params.dig(:lookbook, :display, :theme) %>">
+  <head>
+    <title>Component Preview</title>
+    <%= csrf_meta_tags %>
+    <%= csp_meta_tag %>
+    <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
+    <%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %>
+    <%= javascript_importmap_tags %>
+  </head>
+  <body class="p-4 h-full bg-container <%= params.dig(:lookbook, :display, :container_classes) %>">
+    <%= yield %>
+  </body>
+</html>
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index 3aac9002..2d6f8c06 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -2,12 +2,56 @@
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <style>
-      /* Email styles need to be inline */
+      /* Email-safe styles that work across clients */
+      body {
+        background-color: #f8fafc;
+        font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;
+        line-height: 1.5;
+        margin: 0;
+        padding: 0;
+      }
+      .container {
+        background-color: #ffffff;
+        border-radius: 8px;
+        margin: 20px auto;
+        max-width: 600px;
+        padding: 32px;
+        text-align: center;
+      }
+      h1 {
+        color: #1e293b;
+        font-size: 24px;
+        margin-bottom: 24px;
+      }
+      p {
+        color: #475569;
+        font-size: 16px;
+        margin-bottom: 16px;
+      }
+      .button {
+        background-color: #3b82f6;
+        border-radius: 6px;
+        color: #ffffff;
+        display: inline-block;
+        font-weight: 600;
+        margin: 16px 0;
+        padding: 12px 24px;
+        text-decoration: none;
+      }
+      .footer {
+        color: #64748b;
+        font-size: 14px;
+        margin-top: 32px;
+        text-align: center;
+      }
     </style>
   </head>
 
   <body>
-    <%= yield %>
+    <div class="container">
+      <%= yield %>
+    </div>
   </body>
 </html>
diff --git a/app/views/layouts/onboardings.html.erb b/app/views/layouts/onboardings.html.erb
new file mode 100644
index 00000000..cf7c394c
--- /dev/null
+++ b/app/views/layouts/onboardings.html.erb
@@ -0,0 +1,3 @@
+<%= render "layouts/shared/htmldoc" do %>
+  <%= yield %>
+<% end %>
diff --git a/app/views/layouts/settings.html.erb b/app/views/layouts/settings.html.erb
new file mode 100644
index 00000000..7a6aec97
--- /dev/null
+++ b/app/views/layouts/settings.html.erb
@@ -0,0 +1,32 @@
+<%= render "layouts/shared/htmldoc" do %>
+  <div class="flex flex-col lg:flex-row h-full bg-surface">
+    <div class="p-4 w-full md:w-96 shrink-0 md:h-full md:overflow-y-auto">
+      <%= render "settings/settings_nav" %>
+    </div>
+
+    <main class="px-4 pt-2 md:py-4 md:px-10 grow flex h-full overflow-y-auto">
+      <div class="relative max-w-4xl mx-auto flex flex-col w-full h-full">
+        <div class="grow space-y-4 overflow-y-auto -mx-1 px-1 pb-12">
+          <% if content_for?(:breadcrumbs) %>
+            <%= yield :breadcrumbs %>
+          <% else %>
+            <%= render "layouts/shared/breadcrumbs", breadcrumbs: @breadcrumbs %>
+          <% end %>
+
+          <% if content_for?(:page_title) %>
+            <h1 class="text-primary text-3xl md:text-xl font-medium">
+              <%= content_for :page_title %>
+            </h1>
+          <% end %>
+
+          <%= yield %>
+          <%= settings_nav_footer_mobile %>
+        </div>
+
+        <div class="mt-4">
+          <%= settings_nav_footer %>
+        </div>
+      </div>
+    </main>
+  </div>
+<% end %>
diff --git a/app/views/layouts/shared/_breadcrumbs.html.erb b/app/views/layouts/shared/_breadcrumbs.html.erb
new file mode 100644
index 00000000..665fa4be
--- /dev/null
+++ b/app/views/layouts/shared/_breadcrumbs.html.erb
@@ -0,0 +1,17 @@
+<%# locals: (breadcrumbs:) %>
+
+<div class="py-2 flex items-center gap-2">
+  <% breadcrumbs.each_with_index do |(name, path), index| %>
+    <% if index > 0 %>
+      <%= icon("chevron-right", color: "gray", size: "sm") %>
+    <% end %>
+
+    <% if path.present? && index < breadcrumbs.size - 1 %>
+      <%= link_to name, path, class: "text-sm text-gray-500 font-medium" %>
+    <% elsif index == breadcrumbs.size - 1 %>
+      <span class="text-primary font-medium text-sm"><%= name %></span>
+    <% else %>
+      <span class="text-sm text-gray-500 font-medium"><%= name %></span>
+    <% end %>
+  <% end %>
+</div>
diff --git a/app/views/layouts/shared/_confirm_dialog.html.erb b/app/views/layouts/shared/_confirm_dialog.html.erb
new file mode 100644
index 00000000..03e92381
--- /dev/null
+++ b/app/views/layouts/shared/_confirm_dialog.html.erb
@@ -0,0 +1,30 @@
+<%# This dialog is used as an override to the browser's confirm API when submitting forms with data-turbo-confirm %>
+<%# See confirm_dialog_controller.js and _htmldoc.html.erb  %>
+<%= render DS::Dialog.new(id: "confirm-dialog", auto_open: false, data: { controller: "confirm-dialog" }, width: "sm", disable_frame: true) do |dialog| %>
+  <% dialog.with_body do %>
+    <form method="dialog" class="space-y-4">
+      <div class="space-y-2">
+        <div class="flex items-center justify-between gap-2">
+          <h3 class="font-medium text-primary" data-confirm-dialog-target="title">Are you sure?</h3>
+          <%= icon("x", as_button: true, type: "submit", value: "cancel") %>
+        </div>
+
+        <p class="text-sm text-secondary" data-confirm-dialog-target="subtitle">This action cannot be undone.</p>
+      </div>
+
+      <div>
+        <% ["primary", "outline-destructive", "destructive"].each do |variant| %>
+          <%= render DS::Button.new(
+          text: "Confirm",
+          variant: variant,
+          autofocus: true,
+          full_width: true,
+          value: "confirm",
+          data: { variant: variant, confirm_dialog_target: "confirmButton" },
+          hidden: true,
+        ) %>
+        <% end %>
+      </div>
+    </form>
+  <% end %>
+<% end %>
diff --git a/app/views/layouts/shared/_footer.html.erb b/app/views/layouts/shared/_footer.html.erb
new file mode 100644
index 00000000..029a0b5a
--- /dev/null
+++ b/app/views/layouts/shared/_footer.html.erb
@@ -0,0 +1,10 @@
+<footer class="p-6">
+  <div class="space-y-2 text-center text-xs text-secondary">
+    <p>&copy; <%= Date.current.year %>, Maybe Finance, Inc.</p>
+    <div class="flex justify-center items-center gap-2">
+      <%= link_to "Privacy Policy", privacy_path, class: "text-secondary", target: "_blank" %>
+      <span>&bull;</span>
+      <%= link_to "Terms of Service", terms_path, class: "text-secondary", target: "_blank" %>
+    </div>
+  </div>
+</footer>
diff --git a/app/views/layouts/shared/_head.html.erb b/app/views/layouts/shared/_head.html.erb
new file mode 100644
index 00000000..c3b74447
--- /dev/null
+++ b/app/views/layouts/shared/_head.html.erb
@@ -0,0 +1,30 @@
+<head>
+  <title><%= content_for(:title) || "Maybe" %></title>
+
+  <%= csrf_meta_tags %>
+  <%= csp_meta_tag %>
+
+  <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
+
+  <%= javascript_include_tag "https://cdn.plaid.com/link/v2/stable/link-initialize.js" %>
+  <%= combobox_style_tag %>
+
+  <%= javascript_importmap_tags %>
+  <%= turbo_refreshes_with method: :morph, scroll: :preserve %>
+
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, viewport-fit=cover">
+
+  <meta name="mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+  <meta name="apple-mobile-web-app-title" content="Maybe">
+
+  <meta name="msapplication-TileColor" content="#F9F9F9">
+  <meta name="theme-color" content="#F9F9F9">
+
+  <link rel="manifest" href="<%= pwa_manifest_path %>">
+  <link rel="apple-touch-icon" href="/logo-pwa.png">
+  <link rel="apple-touch-icon" sizes="512x512" href="/logo-pwa.png">
+
+  <%= yield :head %>
+</head>
diff --git a/app/views/layouts/shared/_htmldoc.html.erb b/app/views/layouts/shared/_htmldoc.html.erb
new file mode 100644
index 00000000..30887f7b
--- /dev/null
+++ b/app/views/layouts/shared/_htmldoc.html.erb
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+
+<% theme = Current.user&.theme || "system" %>
+
+<html
+  lang="en"
+  data-theme="<%= theme %>"
+  data-controller="theme intercom"
+  data-theme-user-preference-value="<%= Current.user&.theme || "system" %>"
+  class="h-full text-primary overflow-hidden lg:overflow-auto font-sans <%= @os %>">
+  <head>
+    <%= render "layouts/shared/head" %>
+    <%= yield :head %>
+  </head>
+
+  <body class="h-full overflow-hidden lg:overflow-auto antialiased">
+    <% if Rails.env.development? %>
+      <button hidden data-controller="hotkey" data-hotkey="t t /" data-action="theme#toggle"></button>
+    <% end %>
+
+    <div class="fixed z-50 top-6 md:top-4 left-1/2 -translate-x-1/2 w-full md:w-80 px-4 md:px-0 mx-auto md:mx-0 md:right-auto mt-safe">
+      <div id="notification-tray" class="space-y-1 w-full">
+        <%= render_flash_notifications %>
+
+        <div id="cta"></div>
+      </div>
+    </div>
+
+    <% if Current.family %>
+      <%= turbo_stream_from Current.family %>
+    <% end %>
+
+    <%= turbo_frame_tag "modal" %>
+    <%= turbo_frame_tag "drawer" %>
+
+    <%# Custom overrides for browser's confirm API  %>
+    <%= render "layouts/shared/confirm_dialog" %>
+
+    <%= render "impersonation_sessions/super_admin_bar" if Current.true_user&.super_admin? && show_super_admin_bar? %>
+    <%= render "impersonation_sessions/approval_bar" if Current.true_user&.impersonated_support_sessions&.initiated&.any? %>
+
+    <%= yield %>
+  </body>
+</html>
diff --git a/app/views/layouts/shared/_nav_item.html.erb b/app/views/layouts/shared/_nav_item.html.erb
new file mode 100644
index 00000000..7ab4888b
--- /dev/null
+++ b/app/views/layouts/shared/_nav_item.html.erb
@@ -0,0 +1,20 @@
+<%# locals:(name:, path:, icon:, icon_custom:, active:, mobile_only: false) %>
+
+<%= link_to path, class: "space-y-1 group block relative pb-1" do %>
+  <div class="grow flex flex-col lg:flex-row gap-1 items-center">
+    <%= tag.div class: class_names("w-4 h-1 lg:w-1 lg:h-4 rounded-bl-sm rounded-br-sm lg:rounded-tr-sm lg:rounded-br-sm lg:rounded-bl-none", "bg-nav-indicator" => active) %>
+
+    <%= tag.div class: class_names(
+      "w-8 h-8 flex items-center justify-center mx-auto rounded-lg",
+      active ? "bg-container shadow-xs text-primary" : "group-hover:bg-surface-hover text-secondary"
+    ) do %>
+      <%= icon(icon, color: active ? "current" : "default", custom: icon_custom) %>
+    <% end %>
+  </div>
+
+  <div class="grow flex justify-center lg:pl-2">
+    <%= tag.p class: class_names("font-medium text-[11px]", active ? "text-primary" : "text-secondary") do %>
+      <%= name %>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/layouts/shared/_page_header.html.erb b/app/views/layouts/shared/_page_header.html.erb
new file mode 100644
index 00000000..018195fe
--- /dev/null
+++ b/app/views/layouts/shared/_page_header.html.erb
@@ -0,0 +1,11 @@
+<%# This partial renders the page header with title and optional subtitle %>
+<header class="space-y-6">
+  <% if local_assigns[:title].present? %>
+    <div class="space-y-1">
+      <h1 class="text-3xl font-medium text-primary"><%= title %></h1>
+      <% if local_assigns[:subtitle].present? %>
+        <p class="text-gray-500"><%= subtitle %></p>
+      <% end %>
+    </div>
+  <% end %>
+</header>
diff --git a/app/views/layouts/with_sidebar.html.erb b/app/views/layouts/with_sidebar.html.erb
deleted file mode 100644
index ca824d45..00000000
--- a/app/views/layouts/with_sidebar.html.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<%= content_for :content do %>
-  <div class="flex h-full bg-gray-25">
-    <div class="p-6 pb-20 w-[368px] shrink-0 h-full overflow-y-auto">
-      <% if content_for?(:sidebar) %>
-        <%= yield :sidebar %>
-      <% else %>
-        <%= render "layouts/sidebar" %>
-      <% end %>
-    </div>
-    <main class="grow px-20 py-6 h-full overflow-y-auto">
-      <%= yield %>
-    </main>
-  </div>
-
-  <% if (upgrade = get_upgrade_for_notification(Current.user, Setting.upgrades_mode)) %>
-    <%= render partial: "shared/upgrade_notification", locals: { upgrade: upgrade } %>
-  <% end %>
-<% end %>
-
-<%= render template: "layouts/application" %>
diff --git a/app/views/layouts/wizard.html.erb b/app/views/layouts/wizard.html.erb
new file mode 100644
index 00000000..3e82583e
--- /dev/null
+++ b/app/views/layouts/wizard.html.erb
@@ -0,0 +1,37 @@
+<%= render "layouts/shared/htmldoc" do %>
+  <div class="bg-surface flex flex-col h-full">
+    <header class="flex items-center justify-between p-8">
+      <% if content_for?(:prev_nav) %>
+        <%= yield :prev_nav %>
+      <% else %>
+        <%= render DS::Link.new(
+          variant: "icon",
+          icon: "arrow-left",
+          href: content_for(:previous_path) || root_path
+        ) %>
+      <% end %>
+
+      <nav>
+        <%= yield :header_nav %>
+      </nav>
+
+      <% if content_for?(:cancel_action) %>
+        <%= yield :cancel_action %>
+      <% else %>
+        <%= render DS::Link.new(
+          variant: "icon",
+          icon: "x",
+          href: content_for(:cancel_path) || root_path
+        ) %>
+      <% end %>
+    </header>
+
+    <main class="grow px-8 pt-12 pb-32 overflow-y-auto">
+      <%= yield %>
+    </main>
+
+    <% if content_for?(:footer) %>
+      <%= yield :footer %>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/loans/_form.html.erb b/app/views/loans/_form.html.erb
new file mode 100644
index 00000000..48d7a0ce
--- /dev/null
+++ b/app/views/loans/_form.html.erb
@@ -0,0 +1,33 @@
+<%# locals: (account:, url:) %>
+
+<%= render "accounts/form", account: account, url: url do |form| %>
+  <%= render "shared/ruler", classes: "my-4" %>
+
+  <div class="space-y-2">
+    <%= form.fields_for :accountable do |loan_form| %>
+      <div class="flex items-center gap-2">
+        <%= loan_form.money_field :initial_balance,
+                                 label: t("loans.form.initial_balance"),
+                                 default_currency: Current.family.currency,
+                                 required: true %>
+      </div>
+
+      <div class="flex items-center gap-2">
+        <%= loan_form.number_field :interest_rate,
+                                 label: t("loans.form.interest_rate"),
+                                 placeholder: t("loans.form.interest_rate_placeholder"),
+                                 min: 0,
+                                 step: 0.005 %>
+        <%= loan_form.select :rate_type,
+                           [["Fixed", "fixed"], ["Variable", "variable"], ["Adjustable", "adjustable"]],
+                           { label: t("loans.form.rate_type") } %>
+      </div>
+
+      <div class="flex items-center gap-2">
+        <%= loan_form.number_field :term_months,
+                                 label: t("loans.form.term_months"),
+                                 placeholder: t("loans.form.term_months_placeholder") %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/loans/edit.html.erb b/app/views/loans/edit.html.erb
new file mode 100644
index 00000000..19ca2f82
--- /dev/null
+++ b/app/views/loans/edit.html.erb
@@ -0,0 +1,6 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".edit", account: @account.name)) %>
+  <% dialog.with_body do %>
+    <%= render "form", account: @account, url: loan_path(@account) %>
+  <% end %>
+<% end %>
diff --git a/app/views/loans/new.html.erb b/app/views/loans/new.html.erb
new file mode 100644
index 00000000..74d66496
--- /dev/null
+++ b/app/views/loans/new.html.erb
@@ -0,0 +1,14 @@
+<% if params[:step] == "method_select" %>
+  <%= render "accounts/new/method_selector",
+             path: new_loan_path(return_to: params[:return_to]),
+             show_us_link: @show_us_link,
+             show_eu_link: @show_eu_link,
+             accountable_type: "Loan" %>
+<% else %>
+  <%= render DS::Dialog.new do |dialog| %>
+    <% dialog.with_header(title: t(".title")) %>
+    <% dialog.with_body do %>
+      <%= render "loans/form", account: @account, url: loans_path %>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/accounts/accountables/loan/_overview.html.erb b/app/views/loans/tabs/_overview.html.erb
similarity index 84%
rename from app/views/accounts/accountables/loan/_overview.html.erb
rename to app/views/loans/tabs/_overview.html.erb
index ac32f413..41167e6f 100644
--- a/app/views/accounts/accountables/loan/_overview.html.erb
+++ b/app/views/loans/tabs/_overview.html.erb
@@ -2,7 +2,7 @@
 
 <div class="grid grid-cols-3 gap-2">
   <%= summary_card title: t(".original_principal") do %>
-    <%= format_money account.original_balance %>
+    <%= format_money account.loan.original_balance %>
   <% end %>
 
   <%= summary_card title: t(".remaining_principal") do %>
@@ -11,7 +11,7 @@
 
   <%= summary_card title: t(".interest_rate") do %>
     <% if account.loan.interest_rate.present? %>
-      <%= number_to_percentage(account.loan.interest_rate, precision: 2) %>
+      <%= number_to_percentage(account.loan.interest_rate, precision: 3) %>
     <% else %>
       <%= t(".unknown") %>
     <% end %>
@@ -43,3 +43,12 @@
     <%= account.loan.rate_type&.titleize || t(".unknown") %>
   <% end %>
 </div>
+
+<div class="flex justify-center py-8">
+  <%= render DS::Link.new(
+    text: "Edit loan details",
+    variant: "ghost",
+    href: edit_loan_path(account),
+    frame: :modal
+  ) %>
+</div>
diff --git a/app/views/merchants/_merchant.html.erb b/app/views/merchants/_merchant.html.erb
deleted file mode 100644
index 33fba7ee..00000000
--- a/app/views/merchants/_merchant.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<%# locals: (merchant:) %>
-
-<div class="flex justify-between items-center p-4 bg-white">
-  <div class="flex w-full items-center gap-2.5">
-    <%= render partial: "shared/color_avatar", locals: { name: merchant.name, color: merchant.color } %>
-    <p class="text-gray-900 text-sm truncate">
-      <%= merchant.name %>
-    </p>
-  </div>
-  <div class="justify-self-end">
-    <%= contextual_menu do %>
-      <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-        <%= contextual_menu_modal_action_item t(".edit"), edit_merchant_path(merchant) %>
-
-        <%= contextual_menu_destructive_item t(".delete"),
-                                             merchant_path(merchant),
-                                             turbo_frame: "_top",
-                                             turbo_confirm: {
-                                               title: t(".confirm_title"),
-                                               body: t(".confirm_body"),
-                                               accept: t(".confirm_accept")
-                                             } %>
-      </div>
-    <% end %>
-  </div>
-</div>
diff --git a/app/views/merchants/_ruler.html.erb b/app/views/merchants/_ruler.html.erb
deleted file mode 100644
index 70442f58..00000000
--- a/app/views/merchants/_ruler.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="bg-white">
-  <div class="h-px bg-alpha-black-50 ml-14 mr-6"></div>
-</div>
diff --git a/app/views/merchants/edit.html.erb b/app/views/merchants/edit.html.erb
deleted file mode 100644
index a8776d3a..00000000
--- a/app/views/merchants/edit.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= modal_form_wrapper title: t(".title") do %>
-  <%= render "form", merchant: @merchant %>
-<% end %>
diff --git a/app/views/merchants/index.html.erb b/app/views/merchants/index.html.erb
deleted file mode 100644
index e5fcfbfa..00000000
--- a/app/views/merchants/index.html.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-<% content_for :sidebar do %>
-  <%= render "settings/nav" %>
-<% end %>
-
-<section class="space-y-4">
-  <header class="flex items-center justify-between">
-    <h1 class="text-gray-900 text-xl font-medium"><%= t(".title") %></h1>
-
-    <%= link_to new_merchant_path, class: "btn btn--primary flex items-center gap-1 justify-center", data: { turbo_frame: :modal } do %>
-      <%= lucide_icon "plus", class: "w-5 h-5" %>
-      <p><%= t(".new") %></p>
-    <% end %>
-  </header>
-
-  <div class="bg-white shadow-xs border border-alpha-black-25 rounded-xl p-4">
-    <% if @merchants.any? %>
-      <div class="rounded-xl bg-gray-25 space-y-1 p-1">
-        <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-gray-500 uppercase">
-          <p><%= t(".title") %></p>
-          <span class="text-gray-400">&middot;</span>
-          <p><%= @merchants.count %></p>
-        </div>
-
-        <div class="border border-alpha-black-25 rounded-md bg-white shadow-xs">
-          <div class="overflow-hidden rounded-md">
-            <%= render partial: @merchants, spacer_template: "merchants/ruler" %>
-          </div>
-        </div>
-      </div>
-    <% else %>
-      <div class="flex justify-center items-center py-20">
-        <div class="text-center flex flex-col items-center max-w-[300px]">
-          <p class="text-gray-900 mb-1 font-medium text-sm"><%= t(".empty") %></p>
-          <%= link_to new_merchant_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>
-            <%= lucide_icon("plus", class: "w-5 h-5") %>
-            <span><%= t(".new") %></span>
-          <% end %>
-        </div>
-      </div>
-    <% end %>
-  </div>
-
-  <%= settings_nav_footer %>
-</div>
diff --git a/app/views/merchants/new.html.erb b/app/views/merchants/new.html.erb
deleted file mode 100644
index a8776d3a..00000000
--- a/app/views/merchants/new.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= modal_form_wrapper title: t(".title") do %>
-  <%= render "form", merchant: @merchant %>
-<% end %>
diff --git a/app/views/messages/_chat_form.html.erb b/app/views/messages/_chat_form.html.erb
new file mode 100644
index 00000000..0f7c1ce9
--- /dev/null
+++ b/app/views/messages/_chat_form.html.erb
@@ -0,0 +1,31 @@
+<%# locals: (chat: nil, message_hint: nil) %>
+
+<div id="chat-form" class="space-y-2">
+  <% model = chat && chat.persisted? ? [chat, Message.new] : Chat.new %>
+
+  <%= form_with model: model,
+                class: "flex lg:flex-col gap-2 bg-container px-2 py-1.5 rounded-full lg:rounded-lg shadow-border-xs",
+                data: { chat_target: "form" } do |f| %>
+
+    <%# In the future, this will be a dropdown with different AI models %>
+    <%= f.hidden_field :ai_model, value: "gpt-4.1" %>
+
+    <%= f.text_area :content, placeholder: "Ask anything ...", value: message_hint,
+                  class: "w-full border-0 focus:ring-0 text-sm resize-none px-1 bg-transparent",
+                  data: { chat_target: "input", action: "input->chat#autoResize keydown->chat#handleInputKeyDown" },
+                  rows: 1 %>
+
+    <div class="flex items-center justify-between gap-1">
+      <div class="items-center gap-1 hidden lg:flex">
+        <%# These are disabled for now, but in the future, will all open specific menus with their own context and search %>
+        <% ["plus", "command", "at-sign", "mouse-pointer-click"].each do |icon| %>
+          <%= icon(icon, as_button: true, disabled: true, class: "cursor-not-allowed", title: "Coming soon") %>
+        <% end %>
+      </div>
+
+      <%= icon("arrow-up", as_button: true, type: "submit") %>
+    </div>
+  <% end %>
+
+  <p class="text-xs text-secondary">AI responses are informational only and are not financial advice.</p>
+</div>
diff --git a/app/views/mfa/backup_codes.html.erb b/app/views/mfa/backup_codes.html.erb
new file mode 100644
index 00000000..4c095979
--- /dev/null
+++ b/app/views/mfa/backup_codes.html.erb
@@ -0,0 +1,32 @@
+<%
+  header_title t(".title")
+  header_description t(".description")
+%>
+
+<% content_for :sidebar do %>
+  <%= render "settings/settings_nav" %>
+<% end %>
+
+<div class="space-y-4">
+  <h1 class="text-primary text-xl font-medium mb-4"><%= t(".page_title") %></h1>
+  <%= settings_section title: t(".backup_codes_title"), subtitle: t(".backup_codes_description") do %>
+    <div class="space-y-6">
+      <div class="grid grid-cols-2 gap-4">
+        <% @backup_codes.each do |code| %>
+          <div class="p-3 bg-surface-inset rounded-lg font-mono text-lg">
+            <%= code %>
+          </div>
+        <% end %>
+      </div>
+
+      <%= render DS::Link.new(
+        text: t(".continue"),
+        href: settings_security_path,
+        variant: "primary",
+        full_width: true
+      ) %>
+    </div>
+  <% end %>
+
+  <%= settings_nav_footer %>
+</div>
diff --git a/app/views/mfa/new.html.erb b/app/views/mfa/new.html.erb
new file mode 100644
index 00000000..c8ad0892
--- /dev/null
+++ b/app/views/mfa/new.html.erb
@@ -0,0 +1,68 @@
+<%
+  header_title t(".title")
+  header_description t(".description")
+%>
+
+<% content_for :sidebar do %>
+  <%= render "settings/settings_nav" %>
+<% end %>
+
+<div class="space-y-4">
+  <h1 class="text-primary text-xl font-medium mb-4"><%= t(".page_title") %></h1>
+  <%= settings_section title: t(".scan_title"), subtitle: t(".scan_description") do %>
+    <div class="space-y-6">
+      <div class="qrcode">
+        <%= generate_mfa_qr_code(Current.user.provisioning_uri) %>
+      </div>
+
+      <div class="mt-6">
+        <h3 class="text-sm font-medium text-primary"><%= t(".secret_title") %></h3>
+        <div class="mt-2 text-sm text-secondary">
+          <p><%= t(".secret_description") %></p>
+        </div>
+        <div class="mt-2 flex items-center gap-2" data-controller="clipboard">
+          <span data-clipboard-target="source" class="hidden"><%= Current.user.otp_secret %></span>
+          <input type="text"
+                 readonly
+                 autocomplete="off"
+                 value="<%= Current.user.otp_secret %>"
+                 class="text-sm bg-container px-2 py-1 rounded border border-secondary w-96 font-mono">
+          <button data-action="clipboard#copy" class="text-secondary hover:text-gray-700">
+            <span data-clipboard-target="iconDefault">
+              <%= icon "copy" %>
+            </span>
+            <span class="hidden" data-clipboard-target="iconSuccess">
+              <%= icon "check" %>
+            </span>
+          </button>
+        </div>
+      </div>
+
+      <div>
+        <h3 class="text-lg font-medium leading-6 text-primary"><%= t(".verify_title") %></h3>
+        <div class="mt-2 text-sm text-secondary">
+          <p><%= t(".verify_description") %></p>
+        </div>
+      </div>
+
+      <%= styled_form_with url: mfa_path, method: :post, class: "mt-5", data: { turbo: false } do |f| %>
+        <div>
+          <%= f.text_field :code,
+            required: true,
+            autofocus: true,
+            autocomplete: "one-time-code",
+            inputmode: "numeric",
+            pattern: "[0-9]*",
+            label: t(".code_label"),
+            placeholder: t(".code_placeholder") %>
+
+          <div class="flex justify-end mt-4">
+            <%= f.submit t(".verify_button") %>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+
+  <%= settings_nav_footer %>
+</div>
diff --git a/app/views/mfa/verify.html.erb b/app/views/mfa/verify.html.erb
new file mode 100644
index 00000000..3652c183
--- /dev/null
+++ b/app/views/mfa/verify.html.erb
@@ -0,0 +1,15 @@
+<%
+  header_title t(".title")
+  header_description t(".description")
+%>
+
+<%= styled_form_with url: verify_mfa_path, method: :post, class: "space-y-4 mt-4 md:mt-0", data: { turbo: false } do |form| %>
+  <%= form.text_field :code,
+    required: true,
+    autofocus: true,
+    autocomplete: "one-time-code",
+    type: "number",
+    label: t(".page_title") %>
+
+  <%= form.submit t(".verify_button") %>
+<% end %>
diff --git a/app/views/onboardings/_logout.html.erb b/app/views/onboardings/_logout.html.erb
new file mode 100644
index 00000000..09d631c0
--- /dev/null
+++ b/app/views/onboardings/_logout.html.erb
@@ -0,0 +1,8 @@
+ <%= render DS::Button.new(
+        text: "Sign out",
+        icon: "log-out",
+        icon_position: :right,
+        variant: "ghost",
+        href: session_path(Current.session),
+        method: :delete
+      ) %>
diff --git a/app/views/onboardings/_onboarding_nav.html.erb b/app/views/onboardings/_onboarding_nav.html.erb
new file mode 100644
index 00000000..7a2e010a
--- /dev/null
+++ b/app/views/onboardings/_onboarding_nav.html.erb
@@ -0,0 +1,42 @@
+<%# locals: (user:) %>
+
+<% steps = [
+  { name: "Setup", path: onboarding_path, is_complete: user.first_name.present?, step_number: 1 },
+  { name: "Preferences", path: preferences_onboarding_path, is_complete: user.set_onboarding_preferences_at.present?, step_number: 2 },
+  { name: "Goals", path: goals_onboarding_path , is_complete: user.set_onboarding_goals_at.present?, step_number: 3 },
+  { name: "Start", path: trial_onboarding_path, is_complete: user.onboarded?, step_number: 4 },
+] %>
+
+<%# Don't show last step if self hosted %>
+<% steps.pop if self_hosted? %>
+
+<ul class="hidden md:flex items-center gap-2">
+  <% steps.each_with_index do |step, idx| %>
+    <li class="flex items-center gap-2 group">
+      <% is_current = request.path == step[:path] %>
+
+      <% text_class = if is_current
+                  "text-primary"
+                else
+                  step[:is_complete] ? "text-green-600" : "text-secondary"
+                end %>
+      <% step_class = if is_current
+                  "bg-surface-inset text-primary"
+                else
+                  step[:is_complete] ? "bg-green-600/10 border-alpha-black-25" : "bg-container-inset"
+                end %>
+
+      <%= link_to step[:path], class: "flex items-center gap-3" do %>
+        <div class="flex items-center gap-2 text-sm font-medium <%= text_class %>">
+          <span class="<%= step_class %> w-7 h-7 rounded-full shrink-0 inline-flex items-center justify-center border border-transparent">
+            <%= step[:is_complete] && !is_current ? icon("check", size: "sm", color: "current") : idx + 1 %>
+          </span>
+
+          <span><%= step[:name] %></span>
+        </div>
+      <% end %>
+
+      <hr class="border border-secondary w-12 group-last:hidden">
+    </li>
+  <% end %>
+</ul>
diff --git a/app/views/onboardings/goals.html.erb b/app/views/onboardings/goals.html.erb
new file mode 100644
index 00000000..93c34818
--- /dev/null
+++ b/app/views/onboardings/goals.html.erb
@@ -0,0 +1,54 @@
+<%= content_for :previous_path, preferences_onboarding_path %>
+
+<%= content_for :header_nav do %>
+  <%= render "onboardings/onboarding_nav", user: @user %>
+<% end %>
+
+<%= content_for :cancel_action do %>
+  <%= render "onboardings/logout" %>
+<% end %>
+
+<%= content_for :footer do %>
+  <%= render "layouts/shared/footer" %>
+<% end %>
+
+<div class="grow max-w-lg w-full mx-auto bg-surface flex flex-col justify-center md:py-0 py-6 px-4 md:px-0">
+  <div>
+    <div class="space-y-1 mb-6 text-center">
+      <h1 class="text-2xl font-medium md:text-2xl">What brings you to Maybe?</h1>
+      <p class="text-secondary text-sm">Select one or more goals that you have with using Maybe as your personal finance tool.</p>
+    </div>
+
+    <%= form_with model: @user do |form| %>
+      <%= form.hidden_field :redirect_to, value: self_hosted? ? "home" : "trial" %>
+      <%= form.hidden_field :set_onboarding_goals_at, value: Time.current %>
+      <%= form.hidden_field :onboarded_at, value: Time.current %>
+
+      <div class="space-y-3">
+        <% [
+          { icon: "layers", label: "See all my accounts in one place", value: "unified_accounts" },
+          { icon: "banknote", label: "Understand cashflow and expenses", value: "cashflow" },
+          { icon: "pie-chart", label: "Manage financial plans and budgeting", value: "budgeting" },
+          { icon: "users", label: "Manage finances with a partner", value: "partner" },
+          { icon: "area-chart", label: "Track investments", value: "investments" },
+          { icon: "bot", label: "Let AI help me understand my finances", value: "ai_insights" },
+          { icon: "settings-2", label: "Analyze and optimize accounts", value: "optimization" },
+          { icon: "frown", label: "Reduce financial stress or anxiety", value: "reduce_stress" }
+        ].each do |goal| %>
+          <label class="flex items-center gap-2.5 p-4 rounded-lg border border-tertiary cursor-pointer hover:bg-container transition-colors [&:has(input:checked)]:border-solid [&:has(input:checked)]:bg-container">
+            <%= form.check_box :goals, { multiple: true, class: "sr-only" }, goal[:value], nil %>
+            <%= icon goal[:icon] %>
+            <span class="text-primary text-sm"><%= goal[:label] %></span>
+          </label>
+        <% end %>
+      </div>
+
+      <div class="mt-6">
+        <%= render DS::Button.new(
+          text: "Next",
+          full_width: true
+        ) %>
+      </div>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/onboardings/preferences.html.erb b/app/views/onboardings/preferences.html.erb
new file mode 100644
index 00000000..a017f64d
--- /dev/null
+++ b/app/views/onboardings/preferences.html.erb
@@ -0,0 +1,98 @@
+<%= content_for :previous_path, onboarding_path %>
+
+<%= content_for :header_nav do %>
+  <%= render "onboardings/onboarding_nav", user: @user %>
+<% end %>
+
+<%= content_for :cancel_action do %>
+  <%= render "onboardings/logout" %>
+<% end %>
+
+<div class="grow max-w-lg w-full mx-auto bg-surface flex flex-col justify-center md:py-0 py-6 px-4 md:px-0" data-controller="onboarding">
+  <div>
+    <div class="space-y-1 mb-6">
+      <h1 class="text-2xl font-medium"><%= t(".title") %></h1>
+      <p class="text-secondary text-sm"><%= t(".subtitle") %></p>
+    </div>
+
+    <div class="p-1 bg-alpha-black-25 mb-2 rounded-lg">
+      <div class="bg-container p-4 rounded-lg flex gap-8 shadow-border-xs">
+        <div class="space-y-2">
+          <%= tag.p t(".example"), class: "text-secondary text-sm" %>
+          <%= tag.p format_money(Money.new(2325.25, params[:currency] || @user.family.currency)), class: "text-primary font-medium text-2xl" %>
+          <p class="text-sm">
+            <span class="text-green-500 font-medium">+<%= format_money(Money.new(78.90, params[:currency] || @user.family.currency)) %></span>
+            <span class="text-green-500 font-medium">(+<%= format_money(Money.new(6.39, params[:currency] || @user.family.currency)) %>)</span>
+            <span class="text-secondary">as of <%= format_date(Date.parse("2024-10-23"), :default, format_code: params[:date_format] || @user.family.date_format) %></span>
+          </p>
+        </div>
+
+        <% placeholder_series_data = [
+            { date: Date.current - 14.days, value: 200 },
+            { date: Date.current - 13.days, value: 200 },
+            { date: Date.current - 12.days, value: 220 },
+            { date: Date.current - 11.days, value: 220 },
+            { date: Date.current - 10.days, value: 220 },
+            { date: Date.current - 9.days, value: 220 },
+            { date: Date.current - 8.days, value: 220 },
+            { date: Date.current - 7.days, value: 220 },
+            { date: Date.current - 6.days, value: 230 },
+            { date: Date.current - 5.days, value: 230 },
+            { date: Date.current - 4.days, value: 250 },
+            { date: Date.current - 3.days, value: 250 },
+            { date: Date.current - 2.days, value: 265 },
+            { date: Date.current - 1.day, value: 265 },
+            { date: Date.current, value: 265 }
+          ] %>
+
+        <% placeholder_series = Series.from_raw_values(placeholder_series_data) %>
+
+        <div class="flex items-center w-2/5">
+          <div class="h-12 w-full">
+            <div
+                id="previewChart"
+                class="h-full w-full"
+                data-controller="time-series-chart"
+                data-time-series-chart-data-value="<%= placeholder_series.to_json %>"
+                data-time-series-chart-use-labels-value="false"
+                data-time-series-chart-use-tooltip-value="false"></div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <p class="text-secondary text-xs mb-4"><%= t(".preview") %></p>
+
+    <%= styled_form_with model: @user, data: { turbo: false } do |form| %>
+      <%= form.hidden_field :set_onboarding_preferences_at, value: Time.current %>
+      <%= form.hidden_field :redirect_to, value: "goals" %>
+
+      <div class="mb-4">
+        <%= form.select :theme, [["System", "system"], ["Light", "light"], ["Dark", "dark"]], { label: "Color theme" }, data: { action: "onboarding#setTheme" } %>
+      </div>
+
+      <div class="space-y-4 mb-4">
+        <%= form.fields_for :family do |family_form| %>
+
+          <%= family_form.select :locale,
+            language_options,
+            { label: t(".locale"), required: true, selected: params[:locale] || @user.family.locale },
+            { data: { action: "onboarding#setLocale" } } %>
+
+          <%= family_form.select :currency,
+            Money::Currency.as_options.map { |currency| [ "#{currency.name} (#{currency.iso_code})", currency.iso_code ] },
+            { label: t(".currency"), required: true, selected: params[:currency] || @user.family.currency },
+            { data: { action: "onboarding#setCurrency" } } %>
+
+          <%= family_form.select :date_format,
+            Family::DATE_FORMATS,
+            { label: t(".date_format"), required: true, selected: params[:date_format] || @user.family.date_format },
+            { data: { action: "onboarding#setDateFormat" } } %>
+
+        <% end %>
+      </div>
+
+      <%= form.submit t(".submit") %>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/onboardings/show.html.erb b/app/views/onboardings/show.html.erb
new file mode 100644
index 00000000..43510796
--- /dev/null
+++ b/app/views/onboardings/show.html.erb
@@ -0,0 +1,52 @@
+<%= content_for :prev_nav do %>
+  <%= image_tag "logomark-color.svg", class: "w-10 h-10" %>
+<% end %>
+
+<%= content_for :header_nav do %>
+  <%= render "onboardings/onboarding_nav", user: @user %>
+<% end %>
+
+<%= content_for :cancel_action do %>
+  <%= render "onboardings/logout" %>
+<% end %>
+
+<div class="grow max-w-lg w-full mx-auto bg-surface flex flex-col justify-center md:py-0 py-6 px-4 md:px-0">
+  <div>
+    <div class="space-y-1 mb-6 text-center">
+      <h1 class="text-2xl font-medium md:text-2xl">Let's set up your account</h1>
+      <p class="text-secondary text-sm">First things first, let's get your profile set up.</p>
+    </div>
+
+    <%= styled_form_with model: @user do |form| %>
+      <%= form.hidden_field :redirect_to, value: @invitation ? "home" : "onboarding_preferences" %>
+      <%= form.hidden_field :onboarded_at, value: Time.current if @invitation %>
+
+      <div class="mb-6">
+        <%= render "settings/user_avatar_field", form: form, user: @user %>
+      </div>
+
+      <div class="flex flex-col md:flex-row md:justify-between md:items-center md:gap-4 space-y-4 md:space-y-0 mb-4">
+        <%= form.text_field :first_name, placeholder: "First name", label: "First name", container_class: "bg-container md:w-1/2 w-full", required: true %>
+        <%= form.text_field :last_name, placeholder: "Last name", label: "Last name", container_class: "bg-container md:w-1/2 w-full", required: true %>
+      </div>
+
+      <% unless @invitation %>
+        <div class="space-y-4 mb-4">
+          <%= form.fields_for :family do |family_form| %>
+            <%= family_form.text_field :name, placeholder: "Household name", label: "Household name" %>
+
+            <%= family_form.select :country,
+              country_options,
+              { label: "Country" },
+              required: true %>
+          <% end %>
+        </div>
+      <% end %>
+
+      <%= form.submit "Continue" %>
+    <% end %>
+  </div>
+</div>
+
+<%= render "layouts/shared/footer" %>
+</div>
diff --git a/app/views/onboardings/trial.html.erb b/app/views/onboardings/trial.html.erb
new file mode 100644
index 00000000..a3566c26
--- /dev/null
+++ b/app/views/onboardings/trial.html.erb
@@ -0,0 +1,134 @@
+<%= content_for :previous_path, goals_onboarding_path %>
+
+<%= content_for :header_nav do %>
+  <%= render "onboardings/onboarding_nav", user: @user %>
+<% end %>
+
+<%= content_for :cancel_action do %>
+  <%= render "onboardings/logout" %>
+<% end %>
+
+<%= content_for :footer do %>
+  <%= render "layouts/shared/footer" %>
+<% end %>
+
+<div class="grow flex flex-col gap-12 items-center justify-center">
+  <div class="max-w-sm mx-auto flex flex-col items-center">
+    <%= image_tag "logo-color.png", class: "w-16 mb-6" %>
+
+    <p class="text-xl lg:text-3xl text-primary font-display font-medium">
+      Try Maybe for 14 days.
+    </p>
+
+    <h2 class="text-xl lg:text-3xl font-display text-secondary font-medium mb-2">
+      No credit card required
+    </h2>
+
+    <p class="text-sm text-secondary text-center mb-8">
+      Starting the trial activates your account for Maybe.  You won't need to enter payment details.
+    </p>
+
+    <div class="w-full">
+      <% if Current.family.can_start_trial? %>
+        <%= render DS::Button.new(
+        text: "Try Maybe for 14 days",
+        href: subscription_path,
+        full_width: true,
+        data: { turbo: false }
+      ) %>
+      <% elsif Current.family.trialing? %>
+        <%= render DS::Link.new(
+          text: "Continue trial",
+          href: root_path,
+          full_width: true,
+        ) %>
+      <% else %>
+        <%= render DS::Link.new(
+          text: "Upgrade",
+          href: upgrade_subscription_path,
+          full_width: true,
+        ) %>
+      <% end %>
+    </div>
+  </div>
+
+  <div class="space-y-8">
+    <h2 class="text-center text-lg lg:text-2xl font-medium text-primary">How your trial will work</h2>
+
+    <div class="flex gap-3">
+      <div class="rounded-xl p-1 bg-gray-400/20 theme-dark:bg-gray-500/20 flex flex-col justify-between items-center text-secondary">
+        <%= render DS::FilledIcon.new(icon: "unlock-keyhole", variant: :inverse) %>
+        <%= render DS::FilledIcon.new(icon: "bell", variant: :inverse) %>
+        <%= render DS::FilledIcon.new(icon: "credit-card", variant: :inverse) %>
+      </div>
+
+      <div class="space-y-12">
+        <div class="space-y-1.5 text-sm">
+          <p class="text-primary font-medium">Today</p>
+          <p class="text-secondary">You'll get free access to Maybe for 14 days</p>
+        </div>
+
+        <div class="space-y-1.5 text-sm">
+          <p class="text-primary font-medium">In 13 days (<%= 13.days.from_now.strftime("%B %d") %>)</p>
+          <p class="text-secondary">We'll notify you to remind you when your trial will end.</p>
+        </div>
+
+        <div class="space-y-1.5 text-sm">
+          <p class="text-primary font-medium">In 14 days (<%= 14.days.from_now.strftime("%B %d") %>)</p>
+          <p class="text-secondary">Your trial ends &mdash; subscribe to continue using Maybe</p>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="space-y-8 max-w-2xl mx-auto">
+    <h2 class="text-center text-lg lg:text-2xl font-medium text-primary">Here's what's included</h2>
+
+    <div class="grid grid-cols-1 lg:grid-cols-3 gap-x-12 gap-y-6 text-secondary">
+      <div class="flex flex-col gap-4 items-center">
+        <%= render DS::FilledIcon.new(icon: "landmark", variant: :surface) %>
+        <p class="text-sm text-primary text-center">More than 10,000 institutions to connect to</p>
+      </div>
+
+      <div class="flex flex-col gap-4 items-center">
+        <%= render DS::FilledIcon.new(icon: "layers", variant: :surface) %>
+        <p class="text-sm text-primary text-center">Connect unlimited accounts and account types</p>
+      </div>
+
+      <div class="flex flex-col gap-4 items-center">
+        <%= render DS::FilledIcon.new(icon: "line-chart", variant: :surface) %>
+        <p class="text-sm text-primary text-center">Performance and investment returns across portfolio</p>
+      </div>
+
+      <div class="flex flex-col gap-4 items-center">
+        <%= render DS::FilledIcon.new(icon: "credit-card", variant: :surface) %>
+        <p class="text-sm text-primary text-center">Comprehensive transaction tracking experience</p>
+      </div>
+
+      <div class="flex flex-col gap-4 items-center">
+        <%= render "chats/ai_avatar" %>
+        <p class="text-sm text-primary text-center">Unlimited access and chats with Maybe AI</p>
+      </div>
+
+      <div class="flex flex-col gap-4 items-center">
+        <%= render DS::FilledIcon.new(icon: "keyboard", variant: :surface) %>
+        <p class="text-sm text-primary text-center">Manual account tracking that works well</p>
+      </div>
+
+      <div class="flex flex-col gap-4 items-center">
+        <%= render DS::FilledIcon.new(icon: "globe-2", variant: :surface) %>
+        <p class="text-sm text-primary text-center">Multiple currencies and near global coverage</p>
+      </div>
+
+      <div class="flex flex-col gap-4 items-center">
+        <%= render DS::FilledIcon.new(icon: "ship", variant: :surface) %>
+        <p class="text-sm text-primary text-center">Early access to newly released features</p>
+      </div>
+
+      <div class="flex flex-col gap-4 items-center">
+        <%= render DS::FilledIcon.new(icon: "messages-square", variant: :surface) %>
+        <p class="text-sm text-primary text-center">Priority human support from team</p>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/app/views/other_assets/_form.html.erb b/app/views/other_assets/_form.html.erb
new file mode 100644
index 00000000..8895b27a
--- /dev/null
+++ b/app/views/other_assets/_form.html.erb
@@ -0,0 +1,3 @@
+<%# locals: (account:, url:) %>
+
+<%= render "accounts/form", account: account, url: url %>
diff --git a/app/views/other_assets/edit.html.erb b/app/views/other_assets/edit.html.erb
new file mode 100644
index 00000000..930ce27a
--- /dev/null
+++ b/app/views/other_assets/edit.html.erb
@@ -0,0 +1,6 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".edit", account: @account.name)) %>
+  <% dialog.with_body do %>
+    <%= render "form", account: @account, url: other_asset_path(@account) %>
+  <% end %>
+<% end %>
diff --git a/app/views/other_assets/new.html.erb b/app/views/other_assets/new.html.erb
new file mode 100644
index 00000000..75737ada
--- /dev/null
+++ b/app/views/other_assets/new.html.erb
@@ -0,0 +1,6 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".title")) %>
+  <% dialog.with_body do %>
+    <%= render "form", account: @account, url: other_assets_path %>
+  <% end %>
+<% end %>
diff --git a/app/views/other_liabilities/_form.html.erb b/app/views/other_liabilities/_form.html.erb
new file mode 100644
index 00000000..8895b27a
--- /dev/null
+++ b/app/views/other_liabilities/_form.html.erb
@@ -0,0 +1,3 @@
+<%# locals: (account:, url:) %>
+
+<%= render "accounts/form", account: account, url: url %>
diff --git a/app/views/other_liabilities/edit.html.erb b/app/views/other_liabilities/edit.html.erb
new file mode 100644
index 00000000..57d8b2b4
--- /dev/null
+++ b/app/views/other_liabilities/edit.html.erb
@@ -0,0 +1,6 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".edit", account: @account.name)) %>
+  <% dialog.with_body do %>
+    <%= render "form", account: @account, url: other_liability_path(@account) %>
+  <% end %>
+<% end %>
diff --git a/app/views/other_liabilities/new.html.erb b/app/views/other_liabilities/new.html.erb
new file mode 100644
index 00000000..b32439b2
--- /dev/null
+++ b/app/views/other_liabilities/new.html.erb
@@ -0,0 +1,6 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".title")) %>
+  <% dialog.with_body do %>
+    <%= render "form", account: @account, url: other_liabilities_path %>
+  <% end %>
+<% end %>
diff --git a/app/views/pages/_account_group_disclosure.erb b/app/views/pages/_account_group_disclosure.erb
deleted file mode 100644
index 6fc6f7e9..00000000
--- a/app/views/pages/_account_group_disclosure.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-<%# locals: (accountable_group:) %>
-<% text_class = accountable_text_class(accountable_group.name) %>
-<details class="open:bg-gray-25 group">
-  <summary class="flex p-4 items-center w-full rounded-lg font-medium hover:bg-gray-50 text-gray-500 text-sm font-medium cursor-pointer">
-    <%= lucide_icon("chevron-down", class: "hidden group-open:block w-5 h-5") %>
-    <%= lucide_icon("chevron-right", class: "group-open:hidden w-5 h-5") %>
-    <div class="ml-4 h-2.5 w-2.5 rounded-full <%= accountable_bg_class(accountable_group.name) %>"></div>
-    <p class="text-gray-900 ml-2"><%= to_accountable_title(Accountable.from_type(accountable_group.name)) %></p>
-    <span class="mx-1">&middot;</span>
-    <div><%= accountable_group.children.count %></div>
-    <div class="ml-auto text-right flex items-center gap-10 text-sm font-medium text-gray-900">
-      <div class="flex items-center justify-end gap-2 w-24">
-        <%= render partial: "shared/progress_circle", locals: { progress: accountable_group.percent_of_total, text_class: text_class } %>
-        <p><%= accountable_group.percent_of_total.round(1) %>%</p>
-      </div>
-      <div class="w-24">
-        <p><%= format_money accountable_group.sum %></p>
-      </div>
-      <div class="w-40">
-        <%= render partial: "shared/trend_change", locals: { trend: accountable_group.series.trend } %>
-      </div>
-    </div>
-  </summary>
-  <div class="px-4 py-3 space-y-4">
-    <% accountable_group.children.map do |account_value_node| %>
-      <div class="flex items-center justify-between text-sm font-medium text-gray-900">
-        <div class="flex items-center gap-4">
-          <%= image_tag account_logo_url(account_value_node.original), class: "w-8 h-8" %>
-          <div>
-            <p><%= account_value_node.name %></p>
-          </div>
-        </div>
-        <div class="flex gap-10 items-center text-right">
-          <div class="flex items-center justify-end gap-2 w-24">
-            <%= render partial: "shared/progress_circle", locals: { progress: account_value_node.percent_of_total, text_class: text_class } %>
-            <p><%= account_value_node.percent_of_total %>%</p>
-          </div>
-          <div class="w-24">
-            <p><%= format_money account_value_node.original.balance_money %></p>
-          </div>
-          <div class="w-40">
-            <%= render partial: "shared/trend_change", locals: { trend: account_value_node.original.series.trend } %>
-          </div>
-        </div>
-      </div>
-    <% end %>
-  </div>
-</details>
diff --git a/app/views/pages/_account_percentages_bar.html.erb b/app/views/pages/_account_percentages_bar.html.erb
deleted file mode 100644
index f7394a60..00000000
--- a/app/views/pages/_account_percentages_bar.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<%# locals: (account_groups:) %>
-<div class="space-y-4">
-  <div class="flex gap-1">
-    <% account_groups.sort_by(&:percent_of_total).reverse.each do |group| %>
-      <div class="h-1.5 rounded-sm w-12 <%= accountable_bg_class(group.name) %>" style="width: <%= group.percent_of_total %>%;"></div>
-    <% end %>
-  </div>
-  <div class="flex gap-4">
-    <% account_groups.sort_by(&:percent_of_total).reverse.each do |group| %>
-      <div class="flex items-center gap-2 text-sm">
-        <div class="h-2.5 w-2.5 rounded-full <%= accountable_bg_class(group.name) %>"></div>
-        <p class="text-gray-500"><%= to_accountable_title(Accountable.from_type(group.name)) %></p>
-        <p class="text-black"><%= group.percent_of_total.round(1) %>%</p>
-      </div>
-    <% end %>
-  </div>
-</div>
diff --git a/app/views/pages/_account_percentages_table.html.erb b/app/views/pages/_account_percentages_table.html.erb
deleted file mode 100644
index 3fa8126d..00000000
--- a/app/views/pages/_account_percentages_table.html.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<%# locals: (account_groups:) %>
-<div class="bg-gray-25 p-1 rounded-xl">
-  <div class="px-4 py-2 flex items-center uppercase text-xs font-medium text-gray-500">
-    <div>Name</div>
-    <div class="ml-auto text-right flex items-center gap-10">
-      <div class="w-24">
-        <p>% of total</p>
-      </div>
-      <div class="w-24">
-        <p>Value</p>
-      </div>
-      <div class="w-40">
-        <p>Change</p>
-      </div>
-    </div>
-  </div>
-  <div class="bg-white border border-alpha-black-25 shadow-xs rounded-lg divide-y divide-alpha-black-50">
-    <%= render partial: "pages/account_group_disclosure", collection: account_groups.sort_by(&:percent_of_total).reverse, as: :accountable_group %>
-  </div>
-</div>
diff --git a/app/views/pages/changelog.html.erb b/app/views/pages/changelog.html.erb
index 99d9a9c9..d401f0d8 100644
--- a/app/views/pages/changelog.html.erb
+++ b/app/views/pages/changelog.html.erb
@@ -1,30 +1,27 @@
-<% content_for :sidebar do %>
-  <%= render "settings/nav" %>
-<% end %>
+<%= content_for :page_title, t(".title") %>
 
-<div class="space-y-4 flex flex-col h-full">
-  <h1 class="text-gray-900 text-xl font-medium mb-4"><%= t(".title") %></h1>
-  <div class="bg-white shadow-xs border border-alpha-black-25 rounded-xl p-4 flex-grow overflow-y-auto">
-    <div class="flex justify-between gap-4 mb-12 last:mb-0">
-      <div class="w-1/3">
-        <div class="px-3 flex items-center gap-3">
-          <div class="text-white shrink-0 w-9 h-9">
+<div class="bg-container shadow-border-xs rounded-xl p-4 grow overflow-y-auto">
+  <div class="flex flex-col md:flex-row justify-between gap-4 mb-12 last:mb-0">
+    <div class="w-full md:w-1/3">
+      <div class="md:px-3 flex items-center gap-3">
+        <% if @release_notes[:avatar].present? %>
+          <div class="fg-inverse shrink-0 w-9 h-9">
             <%= image_tag @release_notes[:avatar], class: "rounded-full w-full h-full object-cover" %>
           </div>
-          <div>
-            <a class="text-gray-900 font-medium text-sm" href="https://github.com/<%= @release_notes[:username] %>"><%= "@#{@release_notes[:username]}" %></a>
-            <div class="text-gray-500 text-sm"><%= @release_notes[:published_at].strftime("%B %d, %Y") %></div>
+        <% else %>
+          <div class="bg-gray-300 text-gray-600 shrink-0 w-9 h-9 rounded-full flex items-center justify-center text-sm font-medium">
+            <%= @release_notes[:username]&.first&.upcase || "?" %>
           </div>
+        <% end %>
+        <div>
+          <a class="text-primary font-medium text-sm" href="https://github.com/<%= @release_notes[:username] %>"><%= "@#{@release_notes[:username]}" %></a>
+          <div class="text-secondary text-sm"><%= @release_notes[:published_at]&.strftime("%B %d, %Y") || "Date unavailable" %></div>
         </div>
       </div>
-      <div class="w-2/3 text-gray-500 text-sm prose prose--github-release-notes">
-        <h2 class="mb-5 text-xl text-gray-900"><%= @release_notes[:name] %></h2>
-        <%= @release_notes[:body].html_safe %>
-      </div>
+    </div>
+    <div class="w-full md:w-2/3 text-secondary text-sm prose prose--github-release-notes">
+      <h2 class="mb-5 text-xl text-primary"><%= @release_notes[:name] %></h2>
+      <%= (@release_notes[:body] || "No release notes available").html_safe %>
     </div>
   </div>
-
-  <div class="mt-auto">
-    <%= settings_nav_footer %>
-  </div>
 </div>
diff --git a/app/views/pages/dashboard.html.erb b/app/views/pages/dashboard.html.erb
index 64fecd9f..2444f6cf 100644
--- a/app/views/pages/dashboard.html.erb
+++ b/app/views/pages/dashboard.html.erb
@@ -1,191 +1,51 @@
-<div class="space-y-4">
-  <header class="flex items-center justify-between">
-    <div>
-      <h1 class="sr-only"><%= t(".title") %></h1>
-      <p class="text-xl font-medium text-gray-900 mb-1">
-        <%= Current.user.first_name.present? ? t(".greeting", name: Current.user.first_name ) : t(".fallback_greeting") %>
-      </p>
-      <% unless @accounts.blank? %>
-        <p class="text-gray-500 text-sm"><%= t(".subtitle") %></p>
-      <% end %>
+<% content_for :page_header do %>
+  <div class="space-y-1 mb-6 flex gap-4 justify-between items-center lg:items-start">
+    <div class="space-y-1">
+      <h1 class="text-xl lg:text-3xl font-medium text-primary">Welcome back, <%= Current.user.first_name %></h1>
+      <p class="text-sm lg:text-base text-secondary">Here's what's happening with your finances</p>
     </div>
 
-    <div class="flex items-center gap-2">
-      <%= contextual_menu do %>
-        <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-          <%= contextual_menu_modal_action_item t(".import"), new_import_path, icon: "hard-drive-upload" %>
-        </div>
-      <% end %>
+    <%= render DS::Link.new(
+      icon: "plus",
+      text: "New",
+      href: new_account_path,
+      frame: :modal,
+      class: "hidden lg:inline-flex"
+    ) %>
 
-      <%= link_to new_account_path, class: "flex items-center gap-1 btn btn--primary", data: { turbo_frame: "modal" } do %>
-        <%= lucide_icon("plus", class: "w-5 h-5") %>
-        <span><%= t(".new") %></span>
-      <% end %>
-    </div>
-  </header>
+    <%= render DS::Link.new(
+        variant: "icon-inverse",
+        icon: "plus",
+        href: new_account_path,
+        frame: :modal,
+        class: "rounded-full lg:hidden"
+      ) %>
+  </div>
+<% end %>
 
-  <% if !Current.family.subscribed? && !self_hosted? %>
-    <%= render "shared/subscribe_prompt" %>
-  <% elsif @accounts.empty? %>
-    <%= render "shared/no_account_empty_state" %>
+<div class="w-full space-y-6 pb-24">
+  <% if Current.family.accounts.any? %>
+    <section class="bg-container py-4 rounded-xl shadow-border-xs">
+      <%= render partial: "pages/dashboard/net_worth_chart", locals: {
+        balance_sheet: @balance_sheet,
+        period: @period
+      } %>
+    </section>
+    <section>
+      <%= render "pages/dashboard/balance_sheet", balance_sheet: @balance_sheet %>
+    </section>
+
+    <%= turbo_frame_tag "cashflow_sankey_section" do %>
+      <section class="bg-container py-4 rounded-xl shadow-border-xs">
+        <%= render partial: "pages/dashboard/cashflow_sankey", locals: {
+          sankey_data: @cashflow_sankey_data,
+          period: @cashflow_period
+        } %>
+      </section>
+    <% end %>
   <% else %>
-    <section class="flex gap-4">
-      <div class="bg-white border border-alpha-black-25 shadow-xs rounded-xl w-3/4 min-h-48 flex flex-col">
-        <div class="flex justify-between p-4">
-          <div>
-            <%= render partial: "shared/value_heading", locals: {
-            label: t(".net_worth"),
-            period: @period,
-            value: Current.family.net_worth,
-            trend: @net_worth_series.trend
-          } %>
-          </div>
-          <%= form_with url: root_path, method: :get, class: "flex items-center gap-4", data: { controller: "auto-submit-form" } do |form| %>
-            <%= period_select form: form, selected: @period.name %>
-          <% end %>
-        </div>
-        <%= render partial: "pages/dashboard/net_worth_chart", locals: { series: @net_worth_series } %>
-      </div>
-      <div class="bg-white p-4 border border-alpha-black-25 shadow-xs rounded-xl w-1/4">
-        <%= render partial: "pages/dashboard/allocation_chart", locals: { account_groups: @account_groups } %>
-      </div>
-    </section>
-    <section class="grid grid-cols-2 gap-4">
-      <div class="bg-white p-4 border border-alpha-black-25 shadow-xs rounded-xl">
-        <div class="flex flex-col gap-4 h-full">
-          <div class="flex gap-4">
-            <div class="grow">
-              <%= render partial: "shared/value_heading", locals: {
-            label: t(".income"),
-              period: Period.last_30_days,
-              value: @income_series.last&.value,
-              trend: @income_series.trend
-            } %>
-            </div>
-            <div
-            id="incomeChart"
-            class="h-full w-2/5"
-            data-controller="time-series-chart"
-            data-time-series-chart-data-value="<%= @income_series.to_json %>"
-            data-time-series-chart-use-labels-value="false"
-            data-time-series-chart-use-tooltip-value="false"></div>
-          </div>
-          <div class="flex gap-1.5">
-            <% @top_earners.first(3).each do |account| %>
-              <%= link_to account, class: "border border-alpha-black-25 rounded-full p-1 pr-2 flex items-center gap-1 text-xs text-gray-900 font-medium hover:bg-gray-25" do %>
-                <%= image_tag account_logo_url(account), class: "w-5 h-5" %>
-                <span>+<%= Money.new(account.income, account.currency) %></span>
-              <% end %>
-            <% end %>
-            <% if @top_earners.count > 3 %>
-              <div class="bg-gray-25 rounded-full flex h-full aspect-1 items-center justify-center text-xs font-medium text-gray-500">+<%= @top_earners.count - 3 %></div>
-            <% end %>
-          </div>
-        </div>
-      </div>
-      <div class="bg-white p-4 border border-alpha-black-25 shadow-xs rounded-xl">
-        <div class="flex flex-col gap-4 h-full">
-          <div class="flex gap-4">
-            <div class="grow">
-              <%= render partial: "shared/value_heading", locals: {
-            label: t(".spending"),
-              period: Period.last_30_days,
-              value: @spending_series.last&.value,
-              trend: @spending_series.trend
-            } %>
-            </div>
-            <div
-            id="spendingChart"
-            class="h-full w-2/5"
-            data-controller="time-series-chart"
-            data-time-series-chart-data-value="<%= @spending_series.to_json %>"
-            data-time-series-chart-use-labels-value="false"
-            data-time-series-chart-use-tooltip-value="false"></div>
-          </div>
-          <div class="flex gap-1.5">
-            <% @top_spenders.first(3).each do |account| %>
-              <%= link_to account, class: "border border-alpha-black-25 rounded-full p-1 pr-2 flex items-center gap-1 text-xs text-gray-900 font-medium hover:bg-gray-25" do %>
-                <%= image_tag account_logo_url(account), class: "w-5 h-5" %>
-                -<%= Money.new(account.spending, account.currency) %>
-              <% end %>
-            <% end %>
-            <% if @top_spenders.count > 3 %>
-              <div class="bg-gray-25 rounded-full flex h-full aspect-1 items-center justify-center text-xs font-medium text-gray-500">+<%= @top_spenders.count - 3 %></div>
-            <% end %>
-          </div>
-        </div>
-      </div>
-      <div class="bg-white p-4 border border-alpha-black-25 shadow-xs rounded-xl">
-        <div class="flex flex-col gap-4 h-full">
-          <div class="flex gap-4">
-            <div class="grow">
-              <%= render partial: "shared/value_heading", locals: {
-            label: t(".savings_rate"),
-              period: Period.last_30_days,
-              value: @savings_rate_series.last&.value,
-              trend: @savings_rate_series.trend,
-              is_percentage: true
-            } %>
-            </div>
-            <div
-            id="savingsRateChart"
-            class="h-full w-2/5"
-            data-controller="time-series-chart"
-            data-time-series-chart-data-value="<%= @savings_rate_series.to_json %>"
-            data-time-series-chart-use-labels-value="false"
-            data-time-series-chart-use-tooltip-value="false"></div>
-          </div>
-          <div class="flex gap-1.5">
-            <% @top_savers.first(3).each do |account| %>
-              <% unless account.savings_rate.infinite? %>
-                <%= link_to account, class: "border border-alpha-black-25 rounded-full p-1 pr-2 flex items-center gap-1 text-xs text-gray-900 font-medium hover:bg-gray-25" do %>
-                  <%= image_tag account_logo_url(account), class: "w-5 h-5" %>
-                  <span><%= account.savings_rate > 0 ? "+" : "-" %><%= number_to_percentage(account.savings_rate.abs * 100, precision: 2) %></span>
-                <% end %>
-              <% end %>
-            <% end %>
-            <% if @top_savers.count > 3 %>
-              <div class="bg-gray-25 rounded-full flex h-full aspect-1 items-center justify-center text-xs font-medium text-gray-500">+<%= @top_savers.count - 3 %></div>
-            <% end %>
-          </div>
-        </div>
-      </div>
-      <div class="bg-white p-4 border border-alpha-black-25 shadow-xs rounded-xl">
-        <div class="flex gap-4 h-full">
-          <div class="grow">
-            <%= render partial: "shared/value_heading", locals: {
-          label: t(".investing"),
-            period: @period,
-            value: @investing_series.last.value,
-            trend: @investing_series.trend
-          } %>
-          </div>
-          <div
-          id="investingChart"
-          class="h-full w-2/5"
-          data-controller="time-series-chart"
-          data-time-series-chart-data-value="<%= @investing_series.to_json %>"
-          data-time-series-chart-use-labels-value="false"></div>
-        </div>
-      </div>
-    </section>
-    <section class="w-full">
-      <div class="bg-white p-4 border border-alpha-black-25 shadow-xs rounded-xl space-y-4">
-        <h2 class="text-lg font-medium text-gray-900"><%= t(".transactions") %></h2>
-        <% if @transaction_entries.empty? %>
-          <div class="text-gray-500 flex items-center justify-center py-12">
-            <p><%= t(".no_transactions") %></p>
-          </div>
-        <% else %>
-          <div class="text-gray-500 p-1 space-y-1 bg-gray-25 rounded-xl">
-            <%= entries_by_date(@transaction_entries, selectable: false) do |entries| %>
-              <%= render entries, selectable: false, editable: false %>
-            <% end %>
-
-            <p class="py-2 text-sm text-center"><%= link_to t(".view_all"), transactions_path %></p>
-          </div>
-        <% end %>
-      </div>
+    <section>
+      <%= render "pages/dashboard/no_accounts_graph_placeholder" %>
     </section>
   <% end %>
 </div>
diff --git a/app/views/pages/dashboard/_allocation_chart.html.erb b/app/views/pages/dashboard/_allocation_chart.html.erb
deleted file mode 100644
index f61573b6..00000000
--- a/app/views/pages/dashboard/_allocation_chart.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<%# locals: (account_groups:) -%>
-<div data-controller="tabs" data-tabs-active-class="bg-white border-alpha-black-25 shadow-xs text-gray-900" data-tabs-default-tab-value="asset-tab">
-  <div class="bg-gray-25 rounded-lg p-1 flex gap-1 text-sm text-gray-500 font-medium">
-    <button data-id="asset-tab" class="w-1/2 px-2 py-1 rounded-md border border-transparent" data-tabs-target="btn" data-action="tabs#select"><%= t(".assets") %></button>
-    <button data-id="liability-tab" class="w-1/2 px-2 py-1 rounded-md border border-transparent" data-tabs-target="btn" data-action="tabs#select"><%= t(".debts") %></button>
-  </div>
-  <div>
-    <div data-tabs-target="tab" id="asset-tab" class="space-y-6">
-      <div class="text-gray-500 flex items-center justify-center py-6">
-        <div
-          data-controller="pie-chart"
-          class="w-full aspect-1"
-          data-pie-chart-data-value="<%= value_group_pie_data(account_groups[:assets]) %>"
-          data-pie-chart-total-value="<%= format_money(account_groups[:assets].sum, precision: 0) %>">
-        </div>
-      </div>
-    </div>
-    <div data-tabs-target="tab" id="liability-tab" class="space-y-6 hidden">
-      <div class="text-gray-500 flex items-center justify-center py-6">
-        <div
-          data-controller="pie-chart"
-          class="w-full aspect-1"
-          data-pie-chart-data-value="<%= value_group_pie_data(account_groups[:liabilities]) %>"
-          data-pie-chart-total-value="<%= format_money(account_groups[:liabilities].sum, precision: 0) %>">
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/app/views/pages/dashboard/_balance_sheet.html.erb b/app/views/pages/dashboard/_balance_sheet.html.erb
new file mode 100644
index 00000000..30573324
--- /dev/null
+++ b/app/views/pages/dashboard/_balance_sheet.html.erb
@@ -0,0 +1,133 @@
+<%# locals: (balance_sheet:, **args) %>
+
+<div class="space-y-4" id="balance-sheet">
+  <% balance_sheet.classification_groups.each do |classification_group| %>
+    <div class="bg-container shadow-border-xs rounded-xl space-y-4 p-4">
+      <div class="flex items-center gap-2">
+        <h2 class="text-lg font-medium inline-flex items-center gap-1.5">
+          <span class="<%= "animate-pulse" if classification_group.syncing? %>">
+            <%= classification_group.name %>
+          </span>
+
+          <% if classification_group.account_groups.any? %>
+            <span class="text-secondary">&middot;</span>
+            <span class="text-secondary font-medium text-lg"><%= classification_group.total_money.format(precision: 0) %></span>
+          <% end %>
+        </h2>
+      </div>
+
+      <% if classification_group.account_groups.any? %>
+        <div class="space-y-4">
+          <div class="flex gap-1">
+            <% classification_group.account_groups.each do |account_group| %>
+              <div class="h-1.5 rounded-sm" style="width: <%= account_group.weight %>%; background-color: <%= account_group.color %>;"></div>
+            <% end %>
+          </div>
+
+          <div class="flex flex-wrap gap-4">
+            <% classification_group.account_groups.each do |account_group| %>
+              <div class="flex items-center gap-2 text-sm">
+                <div class="h-2.5 w-2.5 rounded-full" style="background-color: <%= account_group.color %>;"></div>
+                <p class="text-secondary"><%= account_group.name %></p>
+                <p class="text-primary font-mono"><%= number_to_percentage(account_group.weight, precision: 0) %></p>
+              </div>
+            <% end %>
+          </div>
+        </div>
+
+        <div class="bg-surface rounded-xl p-1 space-y-1 overflow-x-auto">
+          <div class="px-4 py-2 flex items-center uppercase text-xs font-medium text-secondary">
+            <div class="w-40">Name</div>
+            <div class="ml-auto text-right flex items-center gap-6">
+              <div class="w-24">
+                <p>Weight</p>
+              </div>
+              <div class="w-40">
+                <p>Value</p>
+              </div>
+            </div>
+          </div>
+
+          <div class="shadow-border-xs rounded-lg bg-container font-medium text-sm min-w-fit">
+            <% classification_group.account_groups.each_with_index do |account_group, idx| %>
+              <details class="group open:bg-surface
+                <%= idx == 0 ? "rounded-t-lg" : "" %>
+                <%= idx == classification_group.account_groups.size - 1 ? "rounded-b-lg" : "" %>
+              ">
+                <summary class="cursor-pointer p-4 group-open:bg-surface rounded-lg flex items-center justify-between">
+                  <div class="w-40 shrink-0 flex items-center gap-4">
+                    <%= icon("chevron-right", class: "group-open:rotate-90") %>
+
+                    <p><%= account_group.name %></p>
+                  </div>
+
+                  <div class="flex items-center justify-between text-right gap-6">
+                    <div class="w-28 shrink-0 flex items-center justify-end gap-2">
+                      <%= render "pages/dashboard/group_weight", weight: account_group.weight, color: account_group.color %>
+                    </div>
+
+                    <div class="w-40 shrink-0">
+                      <p><%= format_money(account_group.total_money) %></p>
+                    </div>
+                  </div>
+                </summary>
+
+                <div>
+                  <% account_group.accounts.each_with_index do |account, idx| %>
+                    <div class="pl-12 pr-4 py-3 flex items-center justify-between text-sm font-medium">
+                      <div class="flex items-center gap-3">
+                        <%= render "accounts/logo", account: account, size: "sm", color: account_group.color %>
+
+                        <%= link_to account.name, account_path(account) %>
+                      </div>
+
+                      <div class="ml-auto flex items-center text-right gap-6">
+                        <div class="w-28 shrink-0 flex items-center justify-end gap-2">
+                          <%
+                              # Calculate weight as percentage of classification total
+                              classification_total = classification_group.total_money.amount
+                              account_weight = classification_total.zero? ? 0 : account.converted_balance / classification_total * 100
+                          %>
+                          <%= render "pages/dashboard/group_weight", weight: account_weight, color: account_group.color %>
+                        </div>
+
+                        <div class="w-40 shrink-0">
+                          <p><%= format_money(account.balance_money) %></p>
+                        </div>
+                      </div>
+                    </div>
+
+                    <% if idx < account_group.accounts.size - 1 %>
+                      <%= render "shared/ruler", classes: "ml-21 mr-4" %>
+                    <% end %>
+                  <% end %>
+                </div>
+              </details>
+              <% unless idx == classification_group.account_groups.size - 1 %>
+                <%= render "shared/ruler", classes: "mx-4 group-ruler" %>
+              <% end %>
+            <% end %>
+          </div>
+        </div>
+
+      <% else %>
+        <div class="py-10 flex flex-col items-center">
+          <%= render DS::FilledIcon.new(
+            variant: :container,
+            icon: classification_group.icon,
+          ) %>
+
+          <p class="text-primary text-sm font-medium mb-1 mt-4">No <%= classification_group.name %> yet</p>
+          <p class="text-secondary text-sm text-center"><%= "Add your #{classification_group.name} accounts to see a full breakdown" %></p>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+</div>
+
+<%# Custom style for hiding ruler when details are open %>
+<style>
+  details[open] + .group-ruler {
+    display: none;
+  }
+</style>
diff --git a/app/views/pages/dashboard/_cashflow_sankey.html.erb b/app/views/pages/dashboard/_cashflow_sankey.html.erb
new file mode 100644
index 00000000..ec03f841
--- /dev/null
+++ b/app/views/pages/dashboard/_cashflow_sankey.html.erb
@@ -0,0 +1,44 @@
+<%# locals: (sankey_data:, period:) %>
+<div id="cashflow-sankey-chart">
+  <div class="flex justify-between items-center gap-4 px-4 mb-4">
+    <h2 class="text-lg font-medium inline-flex items-center gap-1.5">
+      Cashflow
+    </h2>
+
+    <%= form_with url: root_path, method: :get, data: { controller: "auto-submit-form", turbo_frame: "cashflow_sankey_section" } do |form| %>
+      <%= form.select :cashflow_period,
+                Period.as_options,
+                { selected: period.key },
+                data: { "auto-submit-form-target": "auto" },
+                class: "bg-container border border-secondary font-medium rounded-lg px-3 py-2 text-sm pr-7 cursor-pointer text-primary focus:outline-hidden focus:ring-0" %>
+    <% end %>
+  </div>
+
+  <% if sankey_data[:links].present? %>
+    <div class="w-full h-96">
+      <div
+        data-controller="sankey-chart"
+        data-sankey-chart-data-value="<%= sankey_data.to_json %>"
+        data-sankey-chart-currency-symbol-value="<%= sankey_data[:currency_symbol] %>"
+        class="w-full h-full"></div>
+    </div>
+  <% else %>
+    <div class="h-[300px] lg:h-[340px] bg-container py-4 flex flex-col items-center justify-center">
+      <div class="space-y-3 text-center flex flex-col items-center">
+        <%= render DS::FilledIcon.new(
+          variant: :container,
+          icon: "activity" # cashflow placeholder icon
+        ) %>
+
+        <p class="text-sm font-medium text-primary">No cash flow data for this time period</p>
+        <p class="text-secondary text-sm">Add transactions to display cash flow data or expand the time period</p>
+        <%= render DS::Link.new(
+          text: "Add transaction",
+          icon: "plus",
+          href: new_transaction_path,
+          frame: :modal
+        ) %>
+      </div>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/pages/dashboard/_group_weight.html.erb b/app/views/pages/dashboard/_group_weight.html.erb
new file mode 100644
index 00000000..c00655a2
--- /dev/null
+++ b/app/views/pages/dashboard/_group_weight.html.erb
@@ -0,0 +1,12 @@
+<%# locals: (weight:, color:) %>
+
+<% effective_weight = weight.presence || 0 %>
+
+<div class="w-full flex items-center justify-between gap-2">
+  <div class="flex gap-[3px]">
+    <% 10.times do |i| %>
+      <div class="w-0.5 h-2.5 rounded-lg <%= i < (effective_weight / 10.0).ceil ? "" : "opacity-20" %>" style="background-color: <%= color %>;"></div>
+    <% end %>
+  </div>
+  <p class="text-sm"><%= number_to_percentage(effective_weight, precision: 2) %></p>
+</div>
diff --git a/app/views/pages/dashboard/_net_worth_chart.html.erb b/app/views/pages/dashboard/_net_worth_chart.html.erb
index f6bc9b5e..56a31f24 100644
--- a/app/views/pages/dashboard/_net_worth_chart.html.erb
+++ b/app/views/pages/dashboard/_net_worth_chart.html.erb
@@ -1,12 +1,45 @@
-<%# locals: (series:) %>
-<% if series %>
-  <div
+<%# locals: (balance_sheet:, period:, **args) %>
+
+<div id="net-worth-chart">
+  <% series = balance_sheet.net_worth_series(period: period) %>
+  <div class="flex justify-between gap-4 px-4">
+    <div class="space-y-2">
+      <div class="space-y-2">
+        <div class="flex items-center gap-2">
+          <p class="text-sm text-secondary font-medium"><%= t(".title") %></p>
+        </div>
+
+        <p class="text-primary -space-x-0.5 text-3xl font-medium <%= "animate-pulse" if balance_sheet.syncing? %>">
+          <%= series.trend.current.format %>
+        </p>
+
+        <% if series.trend.nil? %>
+          <p class="text-sm text-secondary"><%= t(".data_not_available") %></p>
+        <% else %>
+          <%= render partial: "shared/trend_change", locals: { trend: series.trend, comparison_label: period.comparison_label } %>
+        <% end %>
+      </div>
+    </div>
+
+    <%= form_with url: root_path, method: :get, data: { controller: "auto-submit-form" } do |form| %>
+      <%= form.select :period,
+                    Period.as_options,
+                    { selected: period.key },
+                    data: { "auto-submit-form-target": "auto" },
+                    class: "bg-container border border-secondary font-medium rounded-lg px-3 py-2 text-sm pr-7 cursor-pointer text-primary focus:outline-hidden focus:ring-0" %>
+    <% end %>
+  </div>
+
+  <% if series.any? %>
+    <div
     id="netWorthChart"
     class="w-full flex-1 min-h-52"
     data-controller="time-series-chart"
     data-time-series-chart-data-value="<%= series.to_json %>"></div>
-<% else %>
-  <div class="w-full h-full flex items-center justify-center">
-    <p class="text-gray-500">No data available for the selected period.</p>
-  </div>
-<% end %>
+  <% else %>
+    <div class="w-full h-full flex items-center justify-center">
+      <p class="text-secondary text-sm"><%= t(".data_not_available") %></p>
+    </div>
+  <% end %>
+
+</div>
diff --git a/app/views/pages/dashboard/_no_accounts_graph_placeholder.html.erb b/app/views/pages/dashboard/_no_accounts_graph_placeholder.html.erb
new file mode 100644
index 00000000..5b0909c1
--- /dev/null
+++ b/app/views/pages/dashboard/_no_accounts_graph_placeholder.html.erb
@@ -0,0 +1,17 @@
+<div class="h-[300px] lg:h-[340px] bg-container shadow-border-xs rounded-xl py-4 flex flex-col items-center justify-center">
+  <div class="space-y-3 text-center flex flex-col items-center">
+    <%= render DS::FilledIcon.new(
+      variant: :container,
+      icon: "layers",
+    ) %>
+
+    <p class="text-sm font-medium text-primary">No accounts yet</p>
+    <p class="text-secondary text-sm">Add accounts to display net worth data</p>
+    <%= render DS::Link.new(
+      text: "Add account",
+      icon: "plus",
+      href: new_account_path,
+      frame: :modal
+    ) %>
+  </div>
+</div>
diff --git a/app/views/pages/early_access.html.erb b/app/views/pages/early_access.html.erb
deleted file mode 100644
index 6ec820e1..00000000
--- a/app/views/pages/early_access.html.erb
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html class="h-full" lang="en">
-  <head>
-    <title><%= content_for(:title) || "🔒 Maybe Early Access" %></title>
-
-    <%= csrf_meta_tags %>
-    <%= csp_meta_tag %>
-
-    <%= stylesheet_link_tag "tailwind", "inter-font", "data-turbo-track": "reload" %>
-    <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-
-    <%= javascript_importmap_tags %>
-    <%= hotwire_livereload_tags if Rails.env.development? %>
-    <%= turbo_refreshes_with method: :morph, scroll: :preserve %>
-
-    <meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-    <meta name="mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-    <meta name="apple-mobile-web-app-title" content="Maybe">
-    <meta name="msapplication-TileColor" content="#ffffff">
-    <meta name="theme-color" content="#ffffff">
-
-    <%= yield :head %>
-  </head>
-
-  <body class="subpixel-antialiased h-full bg-black text-white flex flex-col bg-top bg-no-repeat bg-cover" style="background-image: url('<%= asset_path("bg-grid.png") %>');">
-    <div class="flex-grow flex items-center justify-center p-4 sm:p-6 md:p-8">
-      <div class="w-full max-w-sm mx-auto text-center rounded-lg p-6">
-        <%= image_tag "logo-squircle.svg", alt: "Maybe Logo", class: "w-16 h-16 sm:w-18 sm:h-18 mx-auto mb-6 sm:mb-8" %>
-        <h1 class="text-2xl font-normal my-4">Maybe Early Access</h1>
-        <% if @invite_codes_count > 0 %>
-          <p class="text-base text-gray-400">There <%= @invite_codes_count == 1 ? "is" : "are" %> <span class="text-white"><%= @invite_codes_count %> invite <%= "code".pluralize(@invite_codes_count) %></span> remaining.</p>
-          <div class="bg-gray-900 border border-gray-800 p-2 rounded-xl my-4">
-            <p class="text-sm text-gray-400 mt-1 mb-3 sm:mb-4">Your invite code is <span class="font-mono text-white"><%= @invite_code.token %></span></p>
-            <p><%= link_to "Sign up with this code", new_registration_path(invite: @invite_code.token), class: "block w-full bg-white text-black py-2 px-3 rounded-lg no-underline text-sm sm:text-base hover:bg-gray-200 transition duration-150" %></p>
-          </div>
-
-          <p class="text-sm text-gray-400">You may need to refresh the page to get a new invite code if someone else claimed it before you.</p>
-
-          <p class="mt-4 sm:mt-6">
-            <%= link_to early_access_path, class: "w-full block text-center justify-center inline-flex items-center text-white hover:bg-gray-800 p-2 rounded-md text-base transition duration-150", data: { turbo_method: :get } do %>
-              <%= lucide_icon "refresh-cw", class: "w-4 h-4 sm:w-5 sm:h-5 mr-2 text-gray-400" %>
-              <span>Refresh page</span>
-            <% end %>
-          </p>
-        <% else %>
-          <p class="text-base text-gray-400 mb-6 sm:mb-8">Sorry, there are <span class="text-white">no invite codes</span> remaining. Join our <%= link_to "Discord server", "https://link.maybe.co/discord", target: "_blank", class: "text-white hover:text-gray-300" %> to get notified when new invite codes are available.</p>
-          <p><%= link_to "Join Discord server", "https://link.maybe.co/discord", target: "_blank", class: "bg-white text-black px-3 py-2 rounded-md no-underline text-base hover:bg-gray-200 transition duration-150" %></p>
-        <% end %>
-      </div>
-    </div>
-    <footer class="pb-6 sm:pb-10 text-center text-gray-400 text-sm">
-      ©2024 Maybe Finance, Inc.
-    </footer>
-  </body>
-</html>
diff --git a/app/views/pages/feedback.html.erb b/app/views/pages/feedback.html.erb
index fdc5c4ad..e2e1ab05 100644
--- a/app/views/pages/feedback.html.erb
+++ b/app/views/pages/feedback.html.erb
@@ -1,35 +1,29 @@
-<% content_for :sidebar do %>
-  <%= render "settings/nav" %>
-<% end %>
+<%= content_for :page_title, "Feedback" %>
 
-<div class="space-y-4">
-  <h1 class="text-gray-900 text-xl font-medium mb-4">Feedback</h1>
-  <div class="bg-white shadow-xs border border-alpha-black-25 rounded-xl p-4">
-    <h2 class="text-lg font-medium text-gray-900 mb-1">Leave feedback</h2>
-    <p class="text-sm text-gray-500 mb-4">Let us know if you have any specific feedback. Feel free to include links to videos or screenshots.</p>
-    <div class="flex gap-2">
-      <%= link_to "https://github.com/maybe-finance/maybe/discussions/categories/feature-requests", target: "_blank", rel: "noopener noreferrer", class: "w-1/3 flex flex-col items-center p-4 border border-alpha-black-25 rounded-xl hover:bg-gray-50" do %>
+<div class="bg-container shadow-border-xs rounded-xl p-4">
+  <h2 class="text-lg font-medium text-primary mb-1">Leave feedback</h2>
+  <p class="text-sm text-secondary mb-4">Let us know if you have any specific feedback. Feel free to include links to videos or screenshots.</p>
+  <div class="flex flex-col md:flex-row gap-4">
+    <%= link_to "https://github.com/maybe-finance/maybe/discussions/categories/feature-requests", target: "_blank", rel: "noopener noreferrer", class: "w-full md:w-1/3 flex flex-col items-center p-4 border border-alpha-black-25 rounded-xl hover:bg-container-hover" do %>
+      <%= image_tag "github-icon.svg", class: "w-8 h-8 mb-2" %>
+      <span class="text-sm font-medium text-primary text-center">Write a feature request</span>
+    <% end %>
+
+    <% if self_hosted? %>
+      <%= link_to "https://github.com/maybe-finance/maybe/issues/new?assignees=&labels=bug&template=bug_report.md&title=", target: "_blank", rel: "noopener noreferrer", class: "w-full md:w-1/3 flex flex-col items-center p-4 border border-alpha-black-25 rounded-xl hover:bg-container-hover" do %>
         <%= image_tag "github-icon.svg", class: "w-8 h-8 mb-2" %>
-        <span class="text-sm font-medium text-gray-900">Write a feature request</span>
+        <span class="text-sm font-medium text-primary text-center">File a bug report</span>
       <% end %>
-      <% if self_hosted? %>
-        <%= link_to "https://github.com/maybe-finance/maybe/issues/new?assignees=&labels=bug&template=bug_report.md&title=", target: "_blank", rel: "noopener noreferrer", class: "w-1/3 flex flex-col items-center p-4 border border-alpha-black-25 rounded-xl hover:bg-gray-50" do %>
-          <%= image_tag "github-icon.svg", class: "w-8 h-8 mb-2" %>
-          <span class="text-sm font-medium text-gray-900">File a bug report</span>
-        <% end %>
-      <% else %>
-        <%= link_to "mailto:hello@maybe.co", class: "w-1/3 flex flex-col items-center p-4 border border-alpha-black-25 rounded-xl hover:bg-gray-50", onclick: "Intercom('showNewMessage'); return false;" do %>
-          <%= lucide_icon "bug", class: "w-8 h-8 mb-2" %>
-          <span class="text-sm font-medium text-gray-900">File a bug report</span>
-        <% end %>
+    <% else %>
+      <%= tag.button class: "w-full md:w-1/3 flex flex-col gap-2 items-center p-4 border border-alpha-black-25 rounded-xl hover:bg-container-hover", data: { action: "intercom#show" } do %>
+        <%= image_tag "github-icon.svg", class: "w-8 h-8 mb-2" %>
+        <span class="text-sm font-medium text-primary text-center">File a bug report</span>
       <% end %>
+    <% end %>
 
-      <%= link_to "https://link.maybe.co/discord", target: "_blank", rel: "noopener noreferrer", class: "w-1/3 flex flex-col items-center p-4 border border-alpha-black-25 rounded-xl hover:bg-gray-50" do %>
-        <%= image_tag "discord-icon.svg", class: "w-8 h-8 mb-2" %>
-        <span class="text-sm font-medium text-gray-900">Discuss Maybe with others</span>
-      <% end %>
-    </div>
+    <%= link_to "https://link.maybe.co/discord", target: "_blank", rel: "noopener noreferrer", class: "w-full md:w-1/3 flex flex-col items-center p-4 border border-alpha-black-25 rounded-xl hover:bg-container-hover" do %>
+      <%= image_tag "discord-icon.svg", class: "w-8 h-8 mb-2" %>
+      <span class="text-sm font-medium text-primary text-center">Discuss Maybe with others</span>
+    <% end %>
   </div>
-
-  <%= settings_nav_footer %>
 </div>
diff --git a/app/views/pages/redis_configuration_error.html.erb b/app/views/pages/redis_configuration_error.html.erb
new file mode 100644
index 00000000..bf165ccb
--- /dev/null
+++ b/app/views/pages/redis_configuration_error.html.erb
@@ -0,0 +1,59 @@
+<% content_for :title, "Redis Configuration Required - Maybe" %>
+
+<div class="flex items-center justify-center h-full p-4 sm:p-6 lg:p-8">
+  <div class="w-full max-w-md sm:max-w-lg lg:max-w-2xl">
+    <div class="bg-container border border-primary rounded-xl p-6 sm:p-8 shadow-sm">
+      <!-- Icon and Header -->
+      <div class="text-center mb-8">
+        <div class="mx-auto w-16 h-16 bg-red-100 rounded-full flex items-center justify-center mb-4">
+          <%= icon "alert-triangle", class: "w-8 h-8 text-red-600" %>
+        </div>
+        <h1 class="text-xl sm:text-2xl font-bold text-primary mb-2">Redis Configuration Required</h1>
+        <p class="text-sm sm:text-base text-muted">Your self-hosted Maybe installation needs Redis to be properly configured.</p>
+      </div>
+
+      <!-- Explanation -->
+      <div class="mb-8">
+        <div class="bg-amber-50 border border-amber-200 rounded-lg p-4 mb-6">
+          <div class="flex items-start">
+            <%= icon "info", class: "w-5 h-5 text-amber-600 mt-0.5 mr-3 flex-shrink-0" %>
+            <div class="text-sm text-amber-800">
+              <p><strong>Why is Redis required?</strong></p>
+              <p class="mt-1">Maybe uses Redis to power Sidekiq background jobs for tasks like syncing account data, processing imports, and other background operations that keep your financial data up to date.</p>
+            </div>
+          </div>
+        </div>
+
+        <!-- Primary CTA -->
+        <div class="text-center space-y-4">
+          <%= render DS::Link.new(
+            text: "View Setup Guide",
+            href: "https://github.com/maybe-finance/maybe/blob/main/docs/hosting/docker.md",
+            variant: "primary",
+            size: "lg",
+            icon: "external-link",
+            full_width: true,
+            target: "_blank",
+            rel: "noopener noreferrer"
+          ) %>
+          <p class="text-sm text-muted">Follow our complete Docker setup guide to configure Redis</p>
+        </div>
+      </div>
+
+      <!-- Secondary CTA -->
+      <div class="pt-6 border-t border-primary">
+        <div class="text-center space-y-3">
+          <p class="text-sm text-muted">Once you've configured Redis, refresh this page to continue.</p>
+          <%= render DS::Button.new(
+            text: "Refresh Page",
+            variant: "secondary",
+            icon: "refresh-cw",
+            type: "button",
+            full_width: true,
+            onclick: "window.location.reload()"
+          ) %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/app/views/password_resets/edit.html.erb b/app/views/password_resets/edit.html.erb
index dcf563a7..8cb258ad 100644
--- a/app/views/password_resets/edit.html.erb
+++ b/app/views/password_resets/edit.html.erb
@@ -3,17 +3,8 @@
 %>
 
 <%= styled_form_with model: @user, url: password_reset_path(token: params[:token]), method: :patch, class: "space-y-4" do |form| %>
-  <div class="relative border border-gray-100 bg-gray-25 rounded-xl focus-within:bg-white focus-within:shadow focus-within:opacity-100">
-    <%= form.label :password, class: "p-4 pb-0 block text-sm font-medium text-gray-700" %>
-    <%= form.password_field :password, required: "required", class: "p-4 pt-1 bg-transparent border-none opacity-50 focus:outline-none focus:ring-0 focus-within:opacity-100 w-full" %>
-  </div>
+  <%= form.password_field :password, required: true, label: true %>
+  <%= form.password_field :password_confirmation, required: true, label: true %>
 
-  <div class="relative border border-gray-100 bg-gray-25 rounded-xl focus-within:bg-white focus-within:shadow focus-within:opacity-100">
-    <%= form.label :password_confirmation, class: "p-4 pb-0 block text-sm font-medium text-gray-700" %>
-    <%= form.password_field :password_confirmation, required: "required", class: "p-4 pt-1 bg-transparent border-none opacity-50 focus:outline-none focus:ring-0 focus-within:opacity-100 w-full" %>
-  </div>
-
-  <div>
-    <%= form.submit t(".submit"), class: "flex justify-center w-full px-4 py-3 text-sm font-medium text-white bg-black rounded-xl hover:bg-black focus:outline-none focus:ring-2 focus:ring-gray-200 shadow" %>
-  </div>
+  <%= form.submit %>
 <% end %>
diff --git a/app/views/password_resets/new.html.erb b/app/views/password_resets/new.html.erb
index f869c3f8..0cea29a1 100644
--- a/app/views/password_resets/new.html.erb
+++ b/app/views/password_resets/new.html.erb
@@ -1,9 +1,11 @@
-<%
-  header_title t(".title")
-%>
+<% header_title t(".title") %>
 
-<%= styled_form_with url: password_reset_path, class: "space-y-4" do |form| %>
-  <%= form.email_field :email, label: true, autofocus: false, autocomplete: "email", required: "required", placeholder: "you@example.com" %>
+<% if params[:step] == "pending" %>
+  <p class="text-sm text-secondary text-center"><%= t(".requested") %></p>
+<% else %>
+  <%= styled_form_with url: password_reset_path, class: "space-y-4" do |form| %>
+    <%= form.email_field :email, label: true, autofocus: false, autocomplete: "email", required: "required", placeholder: "you@example.com" %>
 
-  <%= form.submit t(".submit") %>
+    <%= form.submit t(".submit") %>
+  <% end %>
 <% end %>
diff --git a/app/views/plaid_items/_auto_link_opener.html.erb b/app/views/plaid_items/_auto_link_opener.html.erb
new file mode 100644
index 00000000..7e9c7695
--- /dev/null
+++ b/app/views/plaid_items/_auto_link_opener.html.erb
@@ -0,0 +1,9 @@
+<%# locals: (link_token:, region:, item_id:, is_update: false) %>
+
+<%= tag.div data: {
+              controller: "plaid",
+              plaid_link_token_value: link_token,
+              plaid_region_value: region,
+              plaid_item_id_value: item_id,
+              plaid_is_update_value: is_update
+            } %>
diff --git a/app/views/plaid_items/_plaid_item.html.erb b/app/views/plaid_items/_plaid_item.html.erb
new file mode 100644
index 00000000..9a7397a7
--- /dev/null
+++ b/app/views/plaid_items/_plaid_item.html.erb
@@ -0,0 +1,92 @@
+<%# locals: (plaid_item:) %>
+
+<%= tag.div id: dom_id(plaid_item) do %>
+  <details open class="group bg-container p-4 shadow-border-xs rounded-xl">
+    <summary class="flex items-center justify-between gap-2 focus-visible:outline-hidden">
+      <div class="flex items-center gap-2">
+        <%= icon "chevron-right", class: "group-open:transform group-open:rotate-90" %>
+
+        <div class="flex items-center justify-center h-8 w-8 bg-blue-600/10 rounded-full">
+          <% if plaid_item.logo.attached? %>
+            <%= image_tag plaid_item.logo, class: "rounded-full h-full w-full", loading: "lazy" %>
+          <% else %>
+            <div class="flex items-center justify-center">
+              <%= tag.p plaid_item.name.first.upcase, class: "text-blue-600 text-xs font-medium" %>
+            </div>
+          <% end %>
+        </div>
+
+        <div class="pl-1 text-sm">
+          <div class="flex items-center gap-2">
+            <%= tag.p plaid_item.name, class: "font-medium text-primary" %>
+            <% if plaid_item.scheduled_for_deletion? %>
+              <p class="text-destructive text-sm animate-pulse">(deletion in progress...)</p>
+            <% end %>
+          </div>
+          <% if plaid_item.syncing? %>
+            <div class="text-secondary flex items-center gap-1">
+              <%= icon "loader", size: "sm", class: "animate-pulse" %>
+              <%= tag.span t(".syncing") %>
+            </div>
+          <% elsif plaid_item.requires_update? %>
+            <div class="text-warning flex items-center gap-1">
+              <%= icon "alert-triangle", size: "sm", color: "warning" %>
+              <%= tag.span t(".requires_update") %>
+            </div>
+          <% elsif plaid_item.sync_error.present? %>
+            <div class="text-secondary flex items-center gap-1">
+              <%= icon "alert-circle", size: "sm", color: "destructive" %>
+              <%= tag.span t(".error"), class: "text-destructive" %>
+            </div>
+          <% else %>
+            <p class="text-secondary">
+              <%= plaid_item.last_synced_at ? t(".status", timestamp: time_ago_in_words(plaid_item.last_synced_at)) : t(".status_never") %>
+            </p>
+          <% end %>
+        </div>
+      </div>
+
+      <div class="flex items-center gap-2">
+        <% if plaid_item.requires_update? %>
+          <%= render DS::Link.new(
+            text: t(".update"),
+            icon: "refresh-cw",
+            variant: "secondary",
+            href: edit_plaid_item_path(plaid_item),
+            frame: "modal"
+          ) %>
+        <% elsif Rails.env.development? %>
+          <%= icon(
+            "refresh-cw",
+            as_button: true,
+            href: sync_plaid_item_path(plaid_item)
+          ) %>
+        <% end %>
+
+        <%= render DS::Menu.new do |menu| %>
+          <% menu.with_item(
+            variant: "button",
+            text: t(".delete"),
+            icon: "trash-2",
+            href: plaid_item_path(plaid_item),
+            method: :delete,
+            confirm: CustomConfirm.for_resource_deletion(plaid_item.name, high_severity: true)
+          ) %>
+        <% end %>
+      </div>
+    </summary>
+
+    <% unless plaid_item.scheduled_for_deletion? %>
+      <div class="space-y-4 mt-4">
+        <% if plaid_item.accounts.any? %>
+          <%= render "accounts/index/account_groups", accounts: plaid_item.accounts %>
+        <% else %>
+          <div class="p-4 flex flex-col gap-3 items-center justify-center">
+            <p class="text-primary font-medium text-sm"><%= t(".no_accounts_title") %></p>
+            <p class="text-secondary text-sm"><%= t(".no_accounts_description") %></p>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+  </details>
+<% end %>
diff --git a/app/views/plaid_items/edit.html.erb b/app/views/plaid_items/edit.html.erb
new file mode 100644
index 00000000..4830ad4e
--- /dev/null
+++ b/app/views/plaid_items/edit.html.erb
@@ -0,0 +1,8 @@
+<%# We render this in the empty modal frame so if Plaid flow is closed, user stays on same page they were on %>
+<%= turbo_frame_tag "modal" do %>
+  <%= render "plaid_items/auto_link_opener",
+           link_token: @link_token,
+           region: @plaid_item.plaid_region,
+           item_id: @plaid_item.id,
+           is_update: true %>
+<% end %>
diff --git a/app/views/plaid_items/new.html.erb b/app/views/plaid_items/new.html.erb
new file mode 100644
index 00000000..b927d375
--- /dev/null
+++ b/app/views/plaid_items/new.html.erb
@@ -0,0 +1,8 @@
+<%# We render this in the empty modal frame so if Plaid flow is closed, user stays on same page they were on %>
+<%= turbo_frame_tag "modal" do %>
+  <%= render "plaid_items/auto_link_opener",
+           link_token: @link_token,
+           region: params[:region],
+           item_id: "",
+           is_update: false %>
+<% end %>
diff --git a/app/views/properties/_form.html.erb b/app/views/properties/_form.html.erb
new file mode 100644
index 00000000..ea7b7ae0
--- /dev/null
+++ b/app/views/properties/_form.html.erb
@@ -0,0 +1,54 @@
+<%# locals: (account:, url:) %>
+
+<%= render "accounts/form", account: account, url: url do |form| %>
+  <%= form.select :subtype,
+                 Property::SUBTYPES.map { |k, v| [v[:long], k] },
+                 { label: true, prompt: t("properties.form.subtype_prompt"), include_blank: t("properties.form.none") } %>
+
+  <%= render "shared/ruler", classes: "my-4" %>
+
+  <div class="space-y-2">
+    <%= form.fields_for :accountable do |property_form| %>
+      <div class="flex items-center gap-2">
+        <%= property_form.number_field :year_built,
+                                       label: t("properties.form.year_built"),
+                                       placeholder: t("properties.form.year_built_placeholder"),
+                                       min: 1800,
+                                       max: Time.current.year %>
+      </div>
+
+      <div class="flex items-center gap-2">
+        <%= property_form.number_field :area_value,
+                                       label: t("properties.form.area"),
+                                       placeholder: t("properties.form.area_placeholder"),
+                                       min: 0 %>
+        <%= property_form.select :area_unit,
+                                 [["Square Feet", "sqft"], ["Square Meters", "sqm"]],
+                                 { label: t("properties.form.area_unit") } %>
+      </div>
+
+      <%= property_form.fields_for :address do |address_form| %>
+        <%= address_form.text_field :line1,
+                                    label: t("properties.form.address_line1"),
+                                    placeholder: t("properties.form.address_line1_placeholder") %>
+        <div class="flex items-center gap-2">
+          <%= address_form.text_field :locality,
+                                    label: t("properties.form.locality"),
+                                    placeholder: t("properties.form.locality_placeholder") %>
+          <%= address_form.text_field :region,
+                                    label: t("properties.form.region"),
+                                    placeholder: t("properties.form.region_placeholder") %>
+        </div>
+
+        <div class="flex items-center gap-2">
+          <%= address_form.text_field :postal_code,
+                                      label: t("properties.form.postal_code"),
+                                      placeholder: t("properties.form.postal_code_placeholder") %>
+          <%= address_form.text_field :country,
+                                      label: t("properties.form.country"),
+                                      placeholder: t("properties.form.country_placeholder") %>
+        </div>
+      <% end %>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/properties/_form_alert.html.erb b/app/views/properties/_form_alert.html.erb
new file mode 100644
index 00000000..948e0c88
--- /dev/null
+++ b/app/views/properties/_form_alert.html.erb
@@ -0,0 +1,7 @@
+<%# locals: (notice: nil, error: nil) %>
+
+<% if notice.present? %>
+  <%= render DS::Alert.new(message: notice, variant: :success) %>
+<% elsif error.present? %>
+  <%= render DS::Alert.new(message: error, variant: :error) %>
+<% end %>
diff --git a/app/views/properties/_form_tab.html.erb b/app/views/properties/_form_tab.html.erb
new file mode 100644
index 00000000..f23c0937
--- /dev/null
+++ b/app/views/properties/_form_tab.html.erb
@@ -0,0 +1,16 @@
+<%# locals: (label:, href: nil, active: false) %>
+
+<% classes = class_names(
+  "flex items-center px-3 py-2 rounded-lg text-sm font-medium",
+  active ? "bg-surface-inset text-primary" : "text-secondary",
+) %>
+
+<% if href.present? %>
+  <%= link_to href, data: { turbo_frame: :modal }, class: class_names(classes, "cursor-pointer hover:bg-surface-inset-hover hover:text-primary") do %>
+    <%= label %>
+  <% end %>
+<% else %>
+  <%= tag.span class: classes do %>
+    <%= label %>
+  <% end %>
+<% end %>
diff --git a/app/views/properties/_form_tabs.html.erb b/app/views/properties/_form_tabs.html.erb
new file mode 100644
index 00000000..0693c7c9
--- /dev/null
+++ b/app/views/properties/_form_tabs.html.erb
@@ -0,0 +1,7 @@
+<%# locals: (account:, active_tab:) %>
+
+<div class="flex flex-col gap-0.5 w-[156px] shrink-0">
+  <%= render "properties/form_tab", label: "Overview", href: account.new_record? ? nil : edit_property_path(@account), active: active_tab == "overview" %>
+  <%= render "properties/form_tab", label: "Value", href: account.new_record? ? nil : balances_property_path(@account), active: active_tab == "value" %>
+  <%= render "properties/form_tab", label: "Address", href: account.new_record? ? nil : address_property_path(@account), active: active_tab == "address" %>
+</div>
diff --git a/app/views/properties/_overview_fields.html.erb b/app/views/properties/_overview_fields.html.erb
new file mode 100644
index 00000000..cd263ae9
--- /dev/null
+++ b/app/views/properties/_overview_fields.html.erb
@@ -0,0 +1,35 @@
+<%# locals: (form:) %>
+
+<div class="flex flex-col gap-2">
+  <%= form.text_field :name,
+                  label: "Name",
+                  placeholder: "Vacation home",
+                  required: true %>
+
+  <%= form.select :subtype,
+                Property::SUBTYPES.map { |k, v| [v[:long], k] },
+                { prompt: "Select type", label: "Property type" }, required: true %>
+
+  <%= form.hidden_field :accountable_type, value: "Property" %>
+
+  <%= form.fields_for :accountable do |property_form| %>
+    <div class="flex items-center gap-2">
+      <%= property_form.number_field :year_built,
+                    label: "Year Built (optional)",
+                    placeholder: "1990",
+                    min: 1800,
+                    max: Time.current.year %>
+    </div>
+
+    <div class="flex items-center gap-2">
+      <%= property_form.number_field :area_value,
+                      label: "Area (optional)",
+                      placeholder: "1200",
+                      min: 0 %>
+      <%= property_form.select :area_unit,
+                      [["Square Feet", "sqft"], ["Square Meters", "sqm"]],
+                      { label: "Area Unit" } %>
+    </div>
+  <% end %>
+
+</div>
diff --git a/app/views/properties/address.html.erb b/app/views/properties/address.html.erb
new file mode 100644
index 00000000..834f7c95
--- /dev/null
+++ b/app/views/properties/address.html.erb
@@ -0,0 +1,50 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: "Enter property manually") %>
+  <% dialog.with_body do %>
+    <div class="flex gap-4">
+      <!-- Left sidebar with tabs -->
+      <%= render "properties/form_tabs", account: @account, active_tab: "address" %>
+
+      <!-- Right content area with form -->
+      <div class="flex-1">
+        <%= styled_form_with model: @property, url: update_address_property_path(@account), method: :patch, data: { turbo_frame: @property.address.persisted? ? nil : :_top } do |form| %>
+          <div class="flex flex-col gap-2 min-h-[320px]">
+            <%= render "properties/form_alert", notice: @success_message, error: @error_message %>
+
+            <%= form.fields_for :address do |address_form| %>
+              <%= address_form.text_field :line1,
+                    label: "Address Line 1",
+                    placeholder: "123 Main Street" %>
+
+              <div class="flex items-center gap-2">
+                <%= address_form.text_field :locality,
+                      label: "City",
+                      placeholder: "San Francisco" %>
+                <%= address_form.text_field :region,
+                      label: "State/Region",
+                      placeholder: "CA" %>
+              </div>
+
+              <div class="flex items-center gap-2">
+                <%= address_form.text_field :postal_code,
+                      label: "Postal Code",
+                      placeholder: "12345" %>
+                <%= address_form.text_field :country,
+                      label: "Country",
+                      placeholder: "USA" %>
+              </div>
+            <% end %>
+          </div>
+
+          <!-- Save button -->
+          <div class="flex justify-end mt-4">
+            <%= render DS::Button.new(
+              text: "Save",
+              variant: "primary",
+            ) %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/properties/balances.html.erb b/app/views/properties/balances.html.erb
new file mode 100644
index 00000000..a25f7793
--- /dev/null
+++ b/app/views/properties/balances.html.erb
@@ -0,0 +1,30 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: "Enter property manually") %>
+  <% dialog.with_body do %>
+    <div class="flex gap-4">
+      <%= render "properties/form_tabs", account: @account, active_tab: "value" %>
+
+      <!-- Right content area with form -->
+      <div class="flex-1">
+        <%= styled_form_with model: @account, url: update_balances_property_path(@account), method: :patch do |form| %>
+          <div class="flex flex-col gap-4 min-h-[320px]">
+            <%= render "properties/form_alert", notice: @success_message, error: @error_message %>
+
+            <%= form.money_field :balance,
+                label: "Estimated market value",
+                label_tooltip: "The estimated market value of your property. This number can often be found on sites like Zillow or Redfin, and is never an exact number.",
+                placeholder: "0" %>
+          </div>
+
+          <!-- Next button -->
+          <div class="flex justify-end mt-4">
+            <%= render DS::Button.new(
+              text: @account.active? ? "Save" : "Next",
+              variant: "primary",
+            ) %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/properties/edit.html.erb b/app/views/properties/edit.html.erb
new file mode 100644
index 00000000..51d674f9
--- /dev/null
+++ b/app/views/properties/edit.html.erb
@@ -0,0 +1,27 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: "Enter property manually") %>
+  <% dialog.with_body do %>
+    <div class="flex gap-4">
+      <!-- Left sidebar with tabs -->
+      <%= render "properties/form_tabs", account: @account, active_tab: "overview" %>
+
+      <!-- Right content area with form -->
+      <div class="flex-1">
+        <%= styled_form_with model: @account, url: property_path(@account), method: :patch do |form| %>
+          <div class="flex flex-col gap-2 min-h-[320px]">
+            <%= render "properties/form_alert", notice: @success_message, error: @error_message %>
+            <%= render "properties/overview_fields", form: form %>
+          </div>
+
+          <!-- Save button -->
+          <div class="flex justify-end mt-4">
+            <%= render DS::Button.new(
+              text: @account.active? ? "Save" : "Next",
+              variant: "primary",
+            ) %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/properties/new.html.erb b/app/views/properties/new.html.erb
new file mode 100644
index 00000000..03feb04a
--- /dev/null
+++ b/app/views/properties/new.html.erb
@@ -0,0 +1,27 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: "Enter property manually") %>
+  <% dialog.with_body do %>
+    <div class="flex gap-4">
+      <!-- Left sidebar with tabs -->
+      <%= render "properties/form_tabs", account: @account, active_tab: "overview" %>
+
+      <!-- Right content area with form -->
+      <div class="flex-1">
+        <%= styled_form_with model: @account, url: properties_path do |form| %>
+          <div class="flex flex-col gap-2 min-h-[320px]">
+            <%= render "properties/form_alert", notice: @success_message, error: @error_message %>
+            <%= render "properties/overview_fields", form: form %>
+          </div>
+
+          <!-- Create button -->
+          <div class="flex justify-end mt-4">
+            <%= render DS::Button.new(
+              text: "Next",
+              variant: "primary",
+            ) %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/accounts/accountables/property/_overview.html.erb b/app/views/properties/tabs/_overview.html.erb
similarity index 82%
rename from app/views/accounts/accountables/property/_overview.html.erb
rename to app/views/properties/tabs/_overview.html.erb
index f7ede76a..3a33e092 100644
--- a/app/views/accounts/accountables/property/_overview.html.erb
+++ b/app/views/properties/tabs/_overview.html.erb
@@ -27,3 +27,12 @@
     <%= account.property.area || t(".unknown") %>
   <% end %>
 </div>
+
+<div class="flex justify-center py-8">
+  <%= render DS::Link.new(
+    text: "Edit account details",
+    href: edit_property_path(account),
+    variant: "ghost",
+    frame: :modal
+  ) %>
+</div>
diff --git a/app/views/pwa/manifest.json.erb b/app/views/pwa/manifest.json.erb
index ad3f681c..11442c23 100644
--- a/app/views/pwa/manifest.json.erb
+++ b/app/views/pwa/manifest.json.erb
@@ -1,13 +1,14 @@
 {
   "name": "Maybe",
+  "short_name": "Maybe",
   "icons": [
     {
-      "src": "/icon.png",
+      "src": "/logo-pwa.png",
       "type": "image/png",
       "sizes": "512x512"
     },
     {
-      "src": "/icon.png",
+      "src": "/logo-pwa.png",
       "type": "image/png",
       "sizes": "512x512",
       "purpose": "maskable"
@@ -15,8 +16,9 @@
   ],
   "start_url": "/",
   "display": "standalone",
+  "display_override": ["fullscreen", "minimal-ui"],
   "scope": "/",
-  "description": "Maybe.",
-  "theme_color": "red",
-  "background_color": "red"
+  "description": "Maybe is your personal finance assistant.",
+  "theme_color": "#F9F9F9",
+  "background_color": "#F9F9F9"
 }
diff --git a/app/views/registrations/new.html.erb b/app/views/registrations/new.html.erb
index 653c7f76..6d63d0cb 100644
--- a/app/views/registrations/new.html.erb
+++ b/app/views/registrations/new.html.erb
@@ -1,20 +1,95 @@
 <%
-  header_title t(".title")
+  header_title @invitation ? t(".join_family_title", family: @invitation.family.name) : t(".title")
 %>
 
 <% if self_hosted_first_login? %>
-  <div class="fixed inset-0 w-full h-fit bg-gray-25 p-5 border-b border-alpha-black-200 flex flex-col gap-3 items-center text-center mb-12">
-    <h2 class="font-bold text-xl"><%= t(".welcome_title") %></h2>
-    <p class="text-gray-500 text-sm"><%= t(".welcome_body") %></p>
+  <div class="fixed inset-0 w-full h-fit bg-container p-5 border-b border-secondary flex flex-col gap-3 items-center text-center mb-12">
+    <h2 class="font-bold text-primary text-xl"><%= t(".welcome_title") %></h2>
+    <p class="text-secondary text-secondary text-sm"><%= t(".welcome_body") %></p>
+  </div>
+<% elsif @invitation %>
+  <div class="space-y-1 mb-6 text-center">
+    <p class="text-secondary">
+      <%= t(".invitation_message",
+            inviter: @invitation.inviter.display_name,
+            role: t(".role_#{@invitation.role}")) %>
+    </p>
+  </div>
+<% end %>
+
+<% if @user.errors.present? %>
+  <div class="text-red-600 flex items-center gap-2">
+    <%= icon("circle-alert") %>
+    <p class="text-sm"><%= @user.errors.full_messages.to_sentence %></p>
   </div>
 <% end %>
 
 <%= styled_form_with model: @user, url: registration_path, class: "space-y-4" do |form| %>
-  <%= form.email_field :email, autofocus: false, autocomplete: "email", required: "required", placeholder: "you@example.com", label: true %>
-  <%= form.password_field :password, autocomplete: "new-password", required: "required", label: true %>
-  <%= form.password_field :password_confirmation, autocomplete: "new-password", required: "required", label: true %>
-  <% if invite_code_required? %>
+  <%= form.email_field :email,
+      autofocus: false,
+      autocomplete: "email",
+      required: "required",
+      placeholder: "you@example.com",
+      label: true,
+      disabled: @invitation.present? %>
+
+  <% if invite_code_required? && !@invitation %>
     <%= form.text_field :invite_code, required: "required", label: true, value: params[:invite] %>
   <% end %>
-  <%= form.submit %>
+
+  <%= form.hidden_field :invitation, value: @invitation&.token %>
+
+  <div data-controller="password-validator">
+    <div data-controller="password-visibility" class="relative">
+      <%= form.password_field :password,
+          autocomplete: "new-password",
+          required: "required",
+          placeholder: t(".password_placeholder"),
+          label: true,
+          maxlength: 72,
+          data: {
+            password_validator_target: "input",
+            password_visibility_target: "input",
+            action: "input->password-validator#validate"
+          } %>
+      <button type="button"
+              class="absolute right-3 top-1/2 -translate-y-1/2 text-gray-500 hover:text-gray-700 focus:outline-none"
+              data-action="click->password-visibility#toggle">
+        <div data-password-visibility-target="showIcon">
+          <%= icon("eye") %>
+        </div>
+        <div data-password-visibility-target="hideIcon">
+          <%= icon("eye-off") %>
+        </div>
+      </button>
+    </div>
+
+    <div class="flex gap-4 my-4">
+      <div class="h-1 bg-gray-200 rounded-full flex-grow" data-password-validator-target="blockLine" data-requirement-type="length"></div>
+      <div class="h-1 bg-gray-200 rounded-full flex-grow" data-password-validator-target="blockLine" data-requirement-type="case"></div>
+      <div class="h-1 bg-gray-200 rounded-full flex-grow" data-password-validator-target="blockLine" data-requirement-type="number"></div>
+      <div class="h-1 bg-gray-200 rounded-full flex-grow" data-password-validator-target="blockLine" data-requirement-type="special"></div>
+    </div>
+
+    <div class="space-y-1 my-4">
+      <div class="flex items-center gap-2 text-secondary text-sm" data-password-validator-target="requirementType" data-requirement-type="length">
+        <%= icon("check", size: "sm") %>
+        <span>Minimum 8 characters</span>
+      </div>
+      <div class="flex items-center gap-2 text-secondary text-sm" data-password-validator-target="requirementType" data-requirement-type="case">
+        <%= icon("check", size: "sm") %>
+        <span>Upper and lowercase letters</span>
+      </div>
+      <div class="flex items-center gap-2 text-secondary text-sm" data-password-validator-target="requirementType" data-requirement-type="number">
+        <%= icon("check", size: "sm") %>
+        <span>A number (0-9)</span>
+      </div>
+      <div class="flex items-center gap-2 text-secondary text-sm" data-password-validator-target="requirementType" data-requirement-type="special">
+        <%= icon("check", size: "sm") %>
+        <span>A special character (!, @, #, $, %, etc)</span>
+      </div>
+    </div>
+  </div>
+
+  <%= form.submit t(".submit") %>
 <% end %>
diff --git a/app/views/rule/actions/_action.html.erb b/app/views/rule/actions/_action.html.erb
new file mode 100644
index 00000000..0f3ebeac
--- /dev/null
+++ b/app/views/rule/actions/_action.html.erb
@@ -0,0 +1,42 @@
+<%# locals: (form:) %>
+
+<% action = form.object %>
+<% rule = action.rule %>
+
+<li data-controller="rule--actions" data-rule--actions-action-executors-value="<%= rule.action_executors.to_json %>" class="flex items-center gap-3">
+  <%= form.hidden_field :_destroy, value: false, data: { rule__actions_target: "destroyField" } %>
+
+  <div class="grow flex gap-2 items-center h-full">
+    <div class="grow">
+      <%= form.select :action_type, rule.action_executors.map { |executor| [ executor.label, executor.key ] }, {}, data: { action: "rule--actions#handleActionTypeChange" } %>
+    </div>
+
+    <%= tag.div class: class_names("min-w-1/2 flex items-center gap-2"),
+                data: { rule__actions_target: "actionValue" } do %>
+      <%# Initial rendering based on rule.action_executors.first from the rule form. %>
+      <%# This is currently always SetTransactionCategory from transaction_resource.rb, which is a select type. %>
+      <%# Subsequent renders are injected by the Stimulus controller, which uses the templates from below. %>
+      <span class="font-medium text-primary uppercase text-xs">to</span>
+      <%= form.select :value, action.options || [], {} %>
+    <% end %>
+  </div>
+
+  <%= icon(
+    "trash-2",
+    size: "sm",
+    as_button: true,
+    data: { action: "rule--actions#remove", rule__actions_destroy_param: action.persisted? }) %>
+
+  <%# Templates for different input types - these will be cloned and used by the Stimulus controller %>
+  <template data-rule--actions-target="selectTemplate">
+    <span class="font-medium text-primary uppercase text-xs">to</span>
+    <%= form.select :value, [], {} %>
+  </template>
+
+  <template data-rule--actions-target="textTemplate">
+    <span class="font-medium text-primary uppercase text-xs">to</span>
+    <%= form.text_field :value, placeholder: "Enter a value" %>
+  </template>
+
+  <%# The function type doesn't need an input, so no template is required.%>
+</li>
diff --git a/app/views/rule/conditions/_condition.html.erb b/app/views/rule/conditions/_condition.html.erb
new file mode 100644
index 00000000..60c38eab
--- /dev/null
+++ b/app/views/rule/conditions/_condition.html.erb
@@ -0,0 +1,44 @@
+<%# locals: (form:, show_prefix: true) %>
+
+<% condition = form.object %>
+<% rule = condition.rule %>
+
+<li data-controller="rule--conditions" data-rule--conditions-condition-filters-value="<%= rule.condition_filters.to_json %>" class="flex items-center gap-3">
+
+  <%# Conditionally render the prefix %>
+  <%# Condition groups pass in show_prefix: false for subconditions since the ANY/ALL selector makes that clear %>
+  <% if show_prefix %>
+    <div class="pl-2" data-condition-prefix>
+      <span class="font-medium uppercase text-xs">and</span>
+    </div>
+  <% end %>
+
+  <div class="grow flex gap-2 items-center h-full">
+    <%= form.hidden_field :_destroy, value: false, data: { rule__conditions_target: "destroyField" } %>
+
+    <div class="w-2/5 shrink-0">
+      <%= form.select :condition_type, rule.condition_filters.map { |filter| [ filter.label, filter.key ] }, {}, data: { action: "rule--conditions#handleConditionTypeChange" } %>
+    </div>
+
+    <%= form.select :operator, condition.operators, { container_class: "w-fit min-w-36" }, data: { rule__conditions_target: "operatorSelect" } %>
+
+    <div data-rule--conditions-target="filterValue" class="grow">
+      <% if condition.filter.type == "select" %>
+        <%= form.select :value, condition.options, {} %>
+      <% else %>
+        <% if condition.filter.type == "number" %>
+          <%= form.number_field :value, placeholder: "10", step: 0.01 %>
+        <% else %>
+          <%= form.text_field :value, placeholder: "Enter a value" %>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+
+  <%= icon(
+    "trash-2",
+    as_button: true,
+    size: "sm",
+    data: { action: "rule--conditions#remove", rule__conditions_destroy_param: condition.persisted? }
+  ) %>
+</li>
diff --git a/app/views/rule/conditions/_condition_group.html.erb b/app/views/rule/conditions/_condition_group.html.erb
new file mode 100644
index 00000000..54f056ba
--- /dev/null
+++ b/app/views/rule/conditions/_condition_group.html.erb
@@ -0,0 +1,49 @@
+<%# locals: (form:) %>
+
+<% condition = form.object %>
+<% rule = condition.rule %>
+
+<li data-controller="rule--conditions" class="border border-secondary rounded-md p-4 space-y-3">
+
+  <%= form.hidden_field :condition_type, value: "compound" %>
+
+  <div class="flex items-center justify-between gap-2">
+    <div class="flex items-center gap-2">
+      <%# Show prefix on condition groups, except the first one %>
+      <div class="pl-2" data-condition-prefix>
+        <span class="font-medium uppercase text-xs">and</span>
+      </div>
+      <p class="text-sm text-secondary">match</p>
+      <%= form.select :operator, [["all", "and"], ["any", "or"]], { container_class: "w-fit" }, data: { rules_target: "operatorField" } %>
+      <p class="text-sm text-secondary">of the following conditions</p>
+    </div>
+
+    <%= icon(
+      "trash-2",
+      as_button: true,
+      size: "sm",
+      data: { action: "rule--conditions#remove" }
+    ) %>
+  </div>
+
+  <%# Sub-condition template, used by Stimulus controller to add new sub-conditions dynamically %>
+  <template data-rule--conditions-target="subConditionTemplate">
+    <%= form.fields_for :sub_conditions, Rule::Condition.new(parent: condition, condition_type: rule.condition_filters.first.key), child_index: "IDX_CHILD_PLACEHOLDER" do |scf| %>
+      <%= render "rule/conditions/condition", form: scf, show_prefix: false %>
+    <% end %>
+  </template>
+
+  <ul data-rule--conditions-target="subConditionsList" class="space-y-3">
+    <%= form.fields_for :sub_conditions, condition.sub_conditions.select(&:persisted?) do |scf| %>
+      <%= render "rule/conditions/condition", form: scf, show_prefix: false %>
+    <% end %>
+  </ul>
+
+  <%= render DS::Button.new(
+    text: "Add condition",
+    leading_icon: "plus",
+    variant: "ghost",
+    type: "button",
+    data: { action: "rule--conditions#addSubCondition" }
+  ) %>
+</li>
diff --git a/app/views/rules/_category_rule_cta.html.erb b/app/views/rules/_category_rule_cta.html.erb
new file mode 100644
index 00000000..fb601b2d
--- /dev/null
+++ b/app/views/rules/_category_rule_cta.html.erb
@@ -0,0 +1,21 @@
+<%# locals: (cta:) %>
+
+<% message = "Updated to #{cta[:category_name]}" %>
+<% description = "You can create a rule to automatically categorize transactions like this one" %>
+
+<%= render "shared/notifications/cta", message: message, description: description do %>
+  <%= form_with model: Current.user, url: rule_prompt_settings_user_path(Current.user), method: :patch do |f| %>
+    <div class="flex gap-2 items-center mb-3 -mt-1">
+      <%= f.check_box :rule_prompts_disabled, class: "checkbox checkbox--light" %>
+      <%= f.label :rule_prompts_disabled, "Don't show this again", class: "text-xs text-secondary" %>
+    </div>
+
+    <%= f.hidden_field :rule_prompt_dismissed_at, value: Time.current %>
+
+    <%= tag.div class:"flex gap-2 justify-end" do %>
+      <%= render DS::Button.new(text: "Dismiss", variant: "secondary") %>
+      <% rule_href = new_rule_path(resource_type: "transaction", action_type: "set_transaction_category", action_value: cta[:category_id]) %>
+      <%= render DS::Link.new(text: "Create rule", variant: "primary", href: rule_href, frame: :modal) %>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/rules/_form.html.erb b/app/views/rules/_form.html.erb
new file mode 100644
index 00000000..d15ad471
--- /dev/null
+++ b/app/views/rules/_form.html.erb
@@ -0,0 +1,103 @@
+<%# locals: (rule:) %>
+
+<%= styled_form_with model: rule, class: "space-y-6",
+                     data: { controller: "rules", rule_registry_value: rule.registry.to_json } do |f| %>
+
+  <%= f.hidden_field :resource_type, value: rule.resource_type %>
+
+  <% if @rule.errors.any? %>
+    <%= render "shared/form_errors", model: @rule %>
+  <% end %>
+
+  <section class="space-y-4">
+    <div class="flex items-center gap-1 text-secondary">
+      <%= icon "tag", size: "sm" %>
+      <h3 class="text-sm font-medium text-primary">Rule name (optional)</h3>
+    </div>
+    <div class="ml-6">
+      <%= f.text_field :name, placeholder: "Enter a name for this rule", class: "form-field__input" %>
+    </div>
+  </section>
+
+  <section class="space-y-4">
+    <div class="flex items-center gap-1 text-secondary">
+      <h3 class="text-sm font-medium text-primary">IF</h3>
+    </div>
+
+    <%# Condition Group template, used by Stimulus controller to add new conditions dynamically %>
+    <template data-rules-target="conditionGroupTemplate">
+      <%= f.fields_for :conditions, Rule::Condition.new(rule: rule, condition_type: "compound", operator: "and"), child_index: "IDX_PLACEHOLDER" do |cf| %>
+        <%= render "rule/conditions/condition_group", form: cf %>
+      <% end %>
+    </template>
+
+    <%# Condition template, used by Stimulus controller to add new conditions dynamically %>
+    <template data-rules-target="conditionTemplate">
+      <%= f.fields_for :conditions, Rule::Condition.new(rule: rule, condition_type: rule.condition_filters.first.key), child_index: "IDX_PLACEHOLDER" do |cf| %>
+        <%= render "rule/conditions/condition", form: cf %>
+      <% end %>
+    </template>
+
+    <div class="ml-6 space-y-4">
+      <ul data-rules-target="conditionsList" class="space-y-3">
+        <%= f.fields_for :conditions do |cf| %>
+          <% if cf.object.compound? %>
+            <%= render "rule/conditions/condition_group", form: cf %>
+          <% else %>
+            <%= render "rule/conditions/condition", form: cf %>
+          <% end %>
+        <% end %>
+      </ul>
+
+    <div class="flex items-center gap-2">
+      <%= render DS::Button.new(text: "Add condition", icon: "plus", variant: "ghost", type: "button", data: { action: "rules#addCondition" }) %>
+      <%= render DS::Button.new(text: "Add condition group", icon: "copy-plus", variant: "ghost", type: "button", data: { action: "rules#addConditionGroup" }) %>
+    </div>
+  </section>
+
+  <section class="space-y-4">
+    <div class="flex items-center gap-1 text-secondary">
+      <h3 class="text-sm font-medium text-primary">THEN</h3>
+    </div>
+
+    <%# Action template, used by Stimulus controller to add new actions dynamically %>
+    <template data-rules-target="actionTemplate">
+      <%= f.fields_for :actions, Rule::Action.new(rule: rule, action_type: rule.action_executors.first.key), child_index: "IDX_PLACEHOLDER" do |af| %>
+        <%= render "rule/actions/action", form: af %>
+      <% end %>
+    </template>
+
+    <div class="ml-6 space-y-4">
+      <ul data-rules-target="actionsList" class="space-y-3">
+        <%= f.fields_for :actions do |af| %>
+          <%= render "rule/actions/action", form: af %>
+        <% end %>
+      </ul>
+
+    <%= render DS::Button.new(text: "Add action", icon: "plus", variant: "ghost", type: "button", data: { action: "rules#addAction" }) %>
+  </section>
+
+  <section class="space-y-4">
+    <div class="flex items-center gap-1 text-secondary">
+      <h3 class="text-sm font-medium text-primary">FOR</h3>
+    </div>
+
+    <div class="ml-6 space-y-3">
+      <div class="flex items-center gap-2">
+        <%= f.radio_button :effective_date_enabled, false, checked: rule.effective_date.nil?, data: { action: "rules#clearEffectiveDate" } %>
+        <%= f.label :effective_date_enabled_false, "All past and future #{rule.resource_type}s", class: "text-sm text-primary" %>
+      </div>
+
+      <div class="flex items-center gap-2">
+        <div class="flex items-center gap-2">
+          <%= f.radio_button :effective_date_enabled, true, checked: rule.effective_date.present? %>
+          <%= f.label :effective_date_enabled_true, "Starting from", class: "text-sm text-primary" %>
+        </div>
+
+        <%= f.date_field :effective_date, container_class: "w-fit", data: { rules_target: "effectiveDateInput" } %>
+      </div>
+    </div>
+  </section>
+
+  <%= f.submit %>
+<% end %>
diff --git a/app/views/rules/_rule.html.erb b/app/views/rules/_rule.html.erb
new file mode 100644
index 00000000..e562cb95
--- /dev/null
+++ b/app/views/rules/_rule.html.erb
@@ -0,0 +1,75 @@
+<%# locals: (rule:) %>
+<div id="<%= dom_id(rule) %>" class="flex justify-between items-center p-4 <%= rule.active? ? "text-primary" : "text-secondary" %>">
+
+  <div class="text-sm space-y-1.5">
+    <% if rule.name.present? %>
+      <h3 class="font-medium text-md"><%= rule.name %></h3>
+    <% end %>
+    <% if rule.conditions.any? %>
+      <div class="flex items-center gap-2 mt-1">
+        <div class="flex items-center gap-1 text-secondary w-16 shrink-0">
+          <span class="font-mono text-xs">IF</span>
+        </div>
+        <p class="flex items-center flex-wrap gap-1.5 m-0">
+          <span class="px-2 py-1 border border-secondary rounded-full">
+            <% if rule.conditions.first.compound? %>
+              <%= rule.conditions.first.sub_conditions.first.filter.label %> <%= rule.conditions.first.sub_conditions.first.operator %> <%= rule.conditions.first.sub_conditions.first.value_display %>
+            <% else %>
+              <%= rule.conditions.first.filter.label %> <%= rule.conditions.first.operator %> <%= rule.conditions.first.value_display %>
+            <% end %>
+          </span>
+          <% if rule.conditions.count > 1 %>
+            and <%= rule.conditions.count - 1 %> more <%= rule.conditions.count - 1 == 1 ? "condition" : "conditions" %>
+          <% end %>
+        </p>
+      </div>
+    <% end %>
+    <div class="flex items-center gap-2 mt-1">
+      <div class="flex items-center gap-1 text-secondary w-16 shrink-0">
+        <span class="font-mono text-xs">THEN</span>
+      </div>
+      <p class="flex items-center flex-wrap gap-1.5 m-0">
+        <span class="px-2 py-1 border border-secondary rounded-full">
+          <% if rule.actions.first.value && rule.actions.first.options %>
+            <%= rule.actions.first.executor.label %> to <%= rule.actions.first.value_display %>
+          <% else %>
+            <%= rule.actions.first.executor.label %>
+          <% end %>
+        </span>
+        <% if rule.actions.count > 1 %>
+          and <%= rule.actions.count - 1 %> more <%= rule.actions.count - 1 == 1 ? "action" : "actions" %>
+        <% end %>
+      </p>
+    </div>
+    <div class="flex items-center gap-2 mt-1">
+      <div class="flex items-center gap-1 text-secondary w-16 shrink-0">
+        <span class="font-mono text-xs">FOR</span>
+      </div>
+      <p class="flex items-center flex-wrap gap-1.5 m-0">
+        <span class="px-2 py-1 border border-secondary rounded-full">
+          <% if rule.effective_date.nil? %>
+            All past and future <%= rule.resource_type.pluralize %>
+          <% else %>
+            <%= rule.resource_type.pluralize %> on or after <%= rule.effective_date.strftime("%b %-d, %Y") %>
+          <% end %>
+        </span>
+      </p>
+    </div>
+  </div>
+  <div class="flex items-center gap-4">
+    <%= styled_form_with model: rule, data: { controller: "auto-submit-form" } do |f| %>
+      <%= f.toggle :active, { data: { auto_submit_form_target: "auto" } } %>
+    <% end %>
+    <%= render DS::Menu.new do |menu| %>
+      <% menu.with_item(variant: "link", text: "Edit", href: edit_rule_path(rule), icon: "pencil", data: { turbo_frame: "modal" }) %>
+      <% menu.with_item(variant: "link", text: "Re-apply rule", href: confirm_rule_path(rule), icon: "refresh-cw", data: { turbo_frame: "modal" }) %>
+      <% menu.with_item(
+        variant: "button",
+        text: "Delete",
+        href: rule_path(rule),
+        icon: "trash-2",
+        method: :delete,
+        confirm: CustomConfirm.for_resource_deletion("rule")) %>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/rules/confirm.html.erb b/app/views/rules/confirm.html.erb
new file mode 100644
index 00000000..5307eaaf
--- /dev/null
+++ b/app/views/rules/confirm.html.erb
@@ -0,0 +1,25 @@
+<%= render DS::Dialog.new(reload_on_close: true) do |dialog| %>
+  <%
+    title = if @rule.name.present?
+              "Confirm changes to \"#{@rule.name}\""
+            else
+              "Confirm changes"
+            end
+  %>
+  <% dialog.with_header(title: title) %>
+
+  <% dialog.with_body do %>
+    <p class="text-secondary text-sm mb-4">
+      You are about to apply this rule to
+      <span class="text-primary font-medium"><%= @rule.affected_resource_count %> <%= @rule.resource_type.pluralize %></span>
+      that meet the specified rule criteria.  Please confirm if you wish to proceed with this change.
+    </p>
+
+    <%= render DS::Button.new(
+      text: "Confirm changes",
+      href: apply_rule_path(@rule),
+      method: :post,
+      full_width: true,
+      data: { turbo_frame: "_top" }) %>
+  <% end %>
+<% end %>
diff --git a/app/views/rules/edit.html.erb b/app/views/rules/edit.html.erb
new file mode 100644
index 00000000..b3c4bffa
--- /dev/null
+++ b/app/views/rules/edit.html.erb
@@ -0,0 +1,16 @@
+<%= link_to "Back to rules", rules_path %>
+
+<%= render DS::Dialog.new do |dialog| %>
+  <%
+    title = if @rule.name.present?
+              "Edit #{@rule.resource_type} rule \"#{@rule.name}\""
+            else
+              "Edit #{@rule.resource_type} rule"
+            end
+  %>
+  <% dialog.with_header(title: title) %>
+
+  <% dialog.with_body do %>
+    <%= render "rules/form", rule: @rule %>
+  <% end %>
+<% end %>
diff --git a/app/views/rules/index.html.erb b/app/views/rules/index.html.erb
new file mode 100644
index 00000000..49062f69
--- /dev/null
+++ b/app/views/rules/index.html.erb
@@ -0,0 +1,83 @@
+<header class="flex items-center justify-between">
+  <h1 class="text-primary text-xl font-medium">Rules</h1>
+  <div class="flex items-center gap-2">
+    <% if @rules.any? %>
+      <%= render DS::Menu.new do |menu| %>
+        <% menu.with_item(
+          variant: "button",
+          text: "Delete all rules",
+          href: destroy_all_rules_path,
+          icon: "trash-2",
+          method: :delete,
+          confirm: CustomConfirm.for_resource_deletion("all rules", high_severity: true)) %>
+      <% end %>
+    <% end %>
+    <%= render DS::Link.new(
+      text: "New rule",
+      variant: "primary",
+      href: new_rule_path(resource_type: "transaction"),
+      icon: "plus",
+      frame: :modal
+    ) %>
+  </div>
+</header>
+<% if self_hosted? %>
+  <div class="flex items-center gap-2 mb-2 py-4">
+    <%= icon("circle-alert", size: "sm") %>
+    <p class="text-sm text-secondary">
+      AI-enabled rule actions will cost money.  Be sure to filter as narrowly as possible to avoid unnecessary costs.
+    </p>
+  </div>
+<% end %>
+<div class="bg-container rounded-xl shadow-border-xs p-4">
+  <% if @rules.any? %>
+    <div class="bg-container-inset rounded-xl">
+      <div class="flex justify-between px-4 py-2 text-xs uppercase">
+        <div class="flex items-center gap-1.5 font-medium text-secondary">
+          <p>Rules</p>
+          <span class="text-subdued">&middot;</span>
+          <p><%= @rules.count %></p>
+        </div>
+        <div class="flex items-center gap-1">
+          <span class="text-secondary">Sort by:</span>
+          <%= form_with url: rules_path, method: :get, local: true, class: "flex items-center", data: { controller: "auto-submit-form" } do |form| %>
+            <%= form.select :sort_by,
+                      options_for_select([["Name", "name"], ["Updated At", "updated_at"]], @sort_by),
+                      {},
+                      class: "min-w-[120px] bg-transparent rounded border-none cursor-pointer text-primary uppercase text-xs w-auto",
+                      data: { auto_submit_form_target: "auto", autosubmit_trigger_event: "change" } %>
+            <%= form.hidden_field :direction, value: @direction %>
+          <% end %>
+          <%= render DS::Link.new(
+            href: rules_path(direction: @direction == "asc" ? "desc" : "asc", sort_by: @sort_by),
+            variant: "icon",
+            icon: "arrow-up-down",
+            size: :sm,
+            title: "Toggle sort direction"
+          ) %>
+        </div>
+      </div>
+      <div class="p-1">
+        <div class="flex flex-col bg-container rounded-lg shadow-border-xs">
+          <%= render partial: "rule", collection: @rules, spacer_template: "shared/ruler" %>
+        </div>
+      </div>
+    </div>
+  <% else %>
+    <div class="flex justify-center items-center py-20">
+      <div class="text-center flex flex-col items-center max-w-[500px]">
+        <p class="text-sm text-primary font-medium mb-1">No rules yet</p>
+        <p class="text-sm text-secondary mb-4">Set up rules to perform actions to your transactions and other data on every account sync.</p>
+        <div class="flex items-center gap-2">
+          <%= render DS::Link.new(
+            text: "New rule",
+            variant: "primary",
+            href: new_rule_path(resource_type: "transaction"),
+            icon: "plus",
+            frame: :modal
+          ) %>
+        </div>
+      </div>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/rules/new.html.erb b/app/views/rules/new.html.erb
new file mode 100644
index 00000000..859a9b27
--- /dev/null
+++ b/app/views/rules/new.html.erb
@@ -0,0 +1,8 @@
+<%= link_to "Back to rules", rules_path %>
+
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: "New #{@rule.resource_type} rule") %>
+  <% dialog.with_body do %>
+    <%= render "rules/form", rule: @rule %>
+  <% end %>
+<% end %>
diff --git a/app/views/securities/_combobox_security.turbo_stream.erb b/app/views/securities/_combobox_security.turbo_stream.erb
new file mode 100644
index 00000000..ef2fd8ba
--- /dev/null
+++ b/app/views/securities/_combobox_security.turbo_stream.erb
@@ -0,0 +1,24 @@
+<div class="flex items-center">
+  <%= image_tag(combobox_security.logo_url, class: "rounded-full h-8 w-8 inline-block mr-2" ) %>
+  <div class="flex items-center justify-between w-full">
+    <div class="flex flex-col">
+      <span class="text-sm font-medium">
+        <%= combobox_security.name.presence || combobox_security.symbol %>
+      </span>
+      <span class="text-xs text-secondary">
+        <%= "#{combobox_security.symbol} (#{combobox_security.exchange_operating_mic})" %>
+      </span>
+    </div>
+    <% if combobox_security.country_code.present? %>
+      <div class="flex items-center bg-container-inset rounded-sm px-1.5 py-1 gap-1">
+        <%= image_tag("https://hatscripts.github.io/circle-flags/flags/#{combobox_security.country_code.downcase}.svg",
+                      class: "h-4 rounded-sm", # h-3 (12px) matches text-xs, w-5 for 3:5 aspect ratio
+                      alt: "#{combobox_security.country_code.upcase} flag",
+                      title: combobox_security.country_code.upcase) %>
+        <span class="text-xs text-secondary">
+          <%= combobox_security.country_code.upcase %>
+        </span>
+      </div>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/securities/index.turbo_stream.erb b/app/views/securities/index.turbo_stream.erb
new file mode 100644
index 00000000..43b41c2b
--- /dev/null
+++ b/app/views/securities/index.turbo_stream.erb
@@ -0,0 +1,2 @@
+<%= async_combobox_options @securities.map(&:to_combobox_option),
+    render_in: { partial: "securities/combobox_security" } %>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index a3233d1b..6dfa1237 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -2,14 +2,14 @@
   header_title t(".title")
 %>
 
-<%= styled_form_with url: sessions_path, class: "space-y-4" do |form| %>
+<%= styled_form_with url: sessions_path, class: "space-y-4", data: { turbo: false } do |form| %>
   <%= form.email_field :email, label: t(".email"), autofocus: false, autocomplete: "email", required: "required", placeholder: t(".email_placeholder") %>
 
-  <%= form.password_field :password, label: t(".password"), required: "required" %>
+  <%= form.password_field :password, label: t(".password"), required: "required", placeholder: t(".password_placeholder") %>
 
   <%= form.submit t(".submit") %>
 <% end %>
 
 <div class="mt-6 text-center">
-  <p class="text-sm text-gray-600"><%= t(".forgot_password") %> <%= link_to t(".reset_password"), new_password_reset_path, class: "font-medium text-gray-600 hover:text-gray-400 transition" %></p>
+  <%= link_to t(".forgot_password"), new_password_reset_path, class: "font-medium text-sm text-primary hover:underline transition" %>
 </div>
diff --git a/app/views/settings/_nav.html.erb b/app/views/settings/_nav.html.erb
deleted file mode 100644
index cd321c1b..00000000
--- a/app/views/settings/_nav.html.erb
+++ /dev/null
@@ -1,80 +0,0 @@
-<div class="space-y-4">
-  <div class="flex items-center gap-2 p-2">
-    <%= link_to previous_path, class: "flex items-center gap-1 text-gray-900 font-medium text-sm" do %>
-      <%= lucide_icon "chevron-left", class: "w-5 h-5 text-gray-500" %>
-      <span>Back</span>
-    <% end %>
-    <%= link_to previous_path, class: "uppercase bg-gray-100 rounded-sm px-1 py-0.5 text-xs text-gray-500 shadow-sm ml-1 pointer-events-none", data: { controller: "hotkey", hotkey: "Escape" } do %>
-      esc
-    <% end %>
-  </div>
-  <nav class="space-y-4">
-    <section class="space-y-2">
-      <div class="flex items-center gap-2 px-3">
-        <h3 class="uppercase text-gray-500 font-medium text-xs"><%= t(".general_section_title") %></h3>
-        <div class="h-px bg-alpha-black-100 w-full"></div>
-      </div>
-      <ul class="space-y-1">
-        <li>
-          <%= sidebar_link_to t(".profile_label"), settings_profile_path, icon: "circle-user" %>
-        </li>
-        <li>
-          <%= sidebar_link_to t(".preferences_label"), settings_preferences_path, icon: "bolt" %>
-        </li>
-        <% if self_hosted? %>
-          <li>
-            <%= sidebar_link_to t(".self_hosting_label"), settings_hosting_path, icon: "database" %>
-          </li>
-        <% end %>
-        <li>
-          <%= sidebar_link_to t(".billing_label"), settings_billing_path, icon: "circle-dollar-sign" %>
-        </li>
-        <li>
-          <%= sidebar_link_to t(".accounts_label"), accounts_path, icon: "layers" %>
-        </li>
-
-        <li>
-          <%= sidebar_link_to t(".imports_label"), imports_path, icon: "download" %>
-        </li>
-      </ul>
-    </section>
-
-    <section class="space-y-2">
-      <div class="flex items-center gap-2 px-3">
-        <h3 class="uppercase text-gray-500 font-medium text-xs"><%= t(".transactions_section_title") %></h3>
-        <div class="h-px bg-alpha-black-100 w-full"></div>
-      </div>
-      <ul class="space-y-1">
-        <li>
-          <%= sidebar_link_to t(".tags_label"), tags_path, icon: "tags" %>
-        </li>
-        <li>
-          <%= sidebar_link_to t(".categories_label"), categories_path, icon: "shapes" %>
-        </li>
-        <li>
-          <%= sidebar_link_to t(".merchants_label"), merchants_path, icon: "store" %>
-        </li>
-      </ul>
-    </section>
-
-    <section class="space-y-2">
-      <div class="flex items-center gap-2 px-3">
-        <h3 class="uppercase text-gray-500 font-medium text-xs"><%= t(".other_section_title") %></h3>
-        <div class="h-px bg-alpha-black-100 w-full"></div>
-      </div>
-      <ul class="space-y-1">
-        <li>
-          <%= sidebar_link_to t(".whats_new_label"), changelog_path, icon: "box" %>
-          <%= sidebar_link_to t(".feedback_label"), feedback_path, icon: "megaphone" %>
-        </li>
-      </ul>
-    </section>
-
-    <section>
-      <%= button_to session_path(Current.session), method: :delete, class: "flex items-center gap-2 px-3 py-2 rounded-xl border text-sm font-medium w-full text-error hover:bg-gray-100 border-transparent" do %>
-        <%= lucide_icon("log-out", class: "w-5 h-5 shrink-0") %>
-        <span><%= t(".logout") %></span>
-      <% end %>
-    </section>
-  </nav>
-</div>
diff --git a/app/views/settings/_nav_link_large.html.erb b/app/views/settings/_nav_link_large.html.erb
deleted file mode 100644
index 3b1b2b50..00000000
--- a/app/views/settings/_nav_link_large.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<%# locals: path, direction, title %>
-<%= link_to path, class: "w-full bg-white hover:bg-gray-50 rounded-xl border border-alpha-black-25 shadow-xs p-4 flex items-center justify-between" do %>
-  <% if direction == 'previous' %>
-    <div class="w-5 h-5 text-gray-500">
-      <%= lucide_icon("arrow-left") %>
-    </div>
-  <% end %>
-  <div class="<%= "flex-grow" if direction == "next" %> <%= "text-right" if direction == "previous" %>">
-    <span class="block text-sm text-gray-500"><%= t(".#{direction}") %></span>
-    <span class="block text-sm font-medium text-gray-900"><%= title %></span>
-  </div>
-  <% if direction == 'next' %>
-    <div class="w-5 h-5 text-gray-500">
-      <%= lucide_icon("arrow-right") %>
-    </div>
-  <% end %>
-<% end %>
diff --git a/app/views/settings/_section.html.erb b/app/views/settings/_section.html.erb
index cd0e3a3f..01ed0e95 100644
--- a/app/views/settings/_section.html.erb
+++ b/app/views/settings/_section.html.erb
@@ -1,9 +1,9 @@
 <%# locals: (title:, subtitle: nil, content:) %>
-<section class="bg-white border border-alpha-black-25 shadow-xs rounded-xl p-4 space-y-4">
+<section class="bg-container shadow-border-xs rounded-xl p-4 space-y-4">
   <div>
-    <h2 class="text-lg font-medium text-gray-900"><%= title %></h2>
+    <h2 class="text-lg font-medium text-primary"><%= title %></h2>
     <% if subtitle.present? %>
-      <p class="text-gray-500 text-sm mt-1"><%= subtitle %></p>
+      <p class="text-secondary text-sm mt-1"><%= subtitle %></p>
     <% end %>
   </div>
   <div>
diff --git a/app/views/settings/_settings_nav.html.erb b/app/views/settings/_settings_nav.html.erb
new file mode 100644
index 00000000..bd488774
--- /dev/null
+++ b/app/views/settings/_settings_nav.html.erb
@@ -0,0 +1,95 @@
+<%
+nav_sections = [
+  {
+    header: t(".general_section_title"),
+    items: [
+      { label: t(".profile_label"), path: settings_profile_path, icon: "circle-user" },
+      { label: t(".preferences_label"), path: settings_preferences_path, icon: "bolt" },
+      { label: t(".security_label"), path: settings_security_path, icon: "shield-check" },
+      { label: "API Key", path: settings_api_key_path, icon: "key" },
+      { label: t(".self_hosting_label"), path: settings_hosting_path, icon: "database", if: self_hosted? },
+      { label: t(".billing_label"), path: settings_billing_path, icon: "circle-dollar-sign", if: !self_hosted? },
+      { label: t(".accounts_label"), path: accounts_path, icon: "layers" },
+      { label: t(".imports_label"), path: imports_path, icon: "download" }
+    ]
+  },
+  {
+    header: t(".transactions_section_title"),
+    items: [
+      { label: t(".tags_label"), path: tags_path, icon: "tags" },
+      { label: t(".categories_label"), path: categories_path, icon: "shapes" },
+      { label: t(".rules_label"), path: rules_path, icon: "git-branch" },
+      { label: t(".merchants_label"), path: family_merchants_path, icon: "store" }
+    ]
+  },
+  {
+    header: t(".other_section_title"),
+    items: [
+      { label: t(".whats_new_label"), path: changelog_path, icon: "box" },
+      { label: t(".feedback_label"), path: feedback_path, icon: "megaphone" }
+    ]
+  }
+]
+%>
+
+<div class="space-y-4">
+  <div class="hidden lg:flex items-center gap-2 p-1.5">
+    <%= render DS::Link.new(
+      text: "Back",
+      icon: "chevron-left",
+      href: previous_path,
+      variant: "ghost",
+    ) %>
+    <%= link_to previous_path, class: "hidden md:block uppercase bg-surface-inset-hover rounded-sm px-1 py-0.5 text-xs text-secondary shadow-sm ml-1 pointer-events-none", data: { controller: "hotkey", hotkey: "Escape" } do %>
+      <kbd>esc</kbd>
+    <% end %>
+  </div>
+  <nav class="space-y-4 hidden md:block">
+    <% nav_sections.each do |section| %>
+      <section class="space-y-2">
+        <div class="flex items-center gap-2 px-3">
+          <h3 class="uppercase text-secondary font-medium text-xs"><%= section[:header] %></h3>
+          <%= render "shared/ruler", classes: "w-full" %>
+        </div>
+        <ul class="space-y-1">
+          <% section[:items].each do |item| %>
+            <% next if item[:if] == false %>
+            <li>
+              <%= render "settings/settings_nav_item", name: item[:label], path: item[:path], icon: item[:icon] %>
+            </li>
+          <% end %>
+        </ul>
+      </section>
+    <% end %>
+    <section>
+      <%= button_to session_path(Current.session), method: :delete, class: "flex items-center gap-2 px-3 py-2 rounded-lg text-sm text-destructive hover:bg-surface-hover w-full" do %>
+        <%= icon("log-out", color: "current") %>
+        <span><%= t(".logout") %></span>
+      <% end %>
+    </section>
+  </nav>
+  <nav class="space-y-4 overflow-y-auto md:hidden" id="mobile-settings-nav" data-controller="preserve-scroll scroll-on-connect">
+    <ul class="flex space-y-1">
+      <li>
+        <%= render DS::Link.new(
+          text: "Back",
+          icon: "chevron-left",
+          href: previous_path,
+          variant: "ghost",
+        ) %>
+      </li>
+      <% nav_sections.each do |section| %>
+        <% section[:items].each do |item| %>
+          <% next if item[:if] == false %>
+          <li>
+            <%= render "settings/settings_nav_item", name: item[:label], path: item[:path], icon: item[:icon] %>
+          </li>
+        <% end %>
+      <% end %>
+      <%= button_to session_path(Current.session), method: :delete, class: "flex items-center gap-2 px-3 py-2 rounded-lg text-sm text-destructive hover:bg-surface-hover w-full" do %>
+        <%= icon("log-out", color: "current") %>
+        <span><%= t(".logout") %></span>
+      <% end %>
+    </ul>
+  </nav>
+</div>
diff --git a/app/views/settings/_settings_nav_item.html.erb b/app/views/settings/_settings_nav_item.html.erb
new file mode 100644
index 00000000..cbf51311
--- /dev/null
+++ b/app/views/settings/_settings_nav_item.html.erb
@@ -0,0 +1,9 @@
+<%# locals: (name:, path:, icon:) %>
+
+<%= link_to path, class: class_names(
+  "flex items-center gap-2 whitespace-nowrap px-3 py-2 rounded-lg text-sm",
+  page_active?(path) ? "text-primary bg-container shadow-border-xs" : "text-secondary hover:bg-surface-hover border-transparent"
+), aria: { current: ("page" if page_active?(path)) } do %>
+  <%= icon(icon) if icon %>
+  <%= name %>
+<% end %>
diff --git a/app/views/settings/_settings_nav_link_large.html.erb b/app/views/settings/_settings_nav_link_large.html.erb
new file mode 100644
index 00000000..73265aed
--- /dev/null
+++ b/app/views/settings/_settings_nav_link_large.html.erb
@@ -0,0 +1,36 @@
+<%# locals: path, direction, title %>
+<%= link_to path, class: "hidden md:flex w-full bg-container hover:bg-container-inset rounded-xl border border-alpha-black-25 shadow-xs p-4 items-center justify-between" do %>
+  <% if direction == 'previous' %>
+    <%= icon("arrow-left") %>
+  <% end %>
+  <div class="<%= "grow" if direction == "next" %> <%= "text-right" if direction == "previous" %>">
+    <span class="block text-sm text-secondary"><%= t(".#{direction}") %></span>
+    <span class="block text-sm font-medium text-primary"><%= title %></span>
+  </div>
+  <% if direction == 'next' %>
+    <%= icon("arrow-right") %>
+  <% end %>
+<% end %>
+
+<%# Mobile version %>
+<%= link_to path, class: "md:hidden w-full bg-container hover:bg-container-inset rounded-xl border border-alpha-black-25 shadow-xs py-3 px-4" do %>
+  <div class="flex items-center justify-between">
+    <% if direction == 'previous' %>
+      <div class="flex items-center gap-3">
+        <%= icon("arrow-left") %>
+        <span class="text-sm text-secondary">Back</span>
+      </div>
+      <div>
+        <span class="text-sm font-medium text-primary"><%= title %></span>
+      </div>
+    <% else %>
+      <div>
+        <span class="text-sm text-secondary">Next</span>
+      </div>
+      <div class="flex items-center gap-3">
+        <span class="text-sm font-medium text-primary"><%= title %></span>
+        <%= icon("arrow-right") %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/settings/_user_avatar.html.erb b/app/views/settings/_user_avatar.html.erb
new file mode 100644
index 00000000..67da90cd
--- /dev/null
+++ b/app/views/settings/_user_avatar.html.erb
@@ -0,0 +1,7 @@
+<%# locals: (avatar_url: nil, initials: "U", lazy: false) %>
+
+<% if avatar_url.present? %>
+  <%= image_tag avatar_url, class: "rounded-full w-full h-full object-cover", loading: lazy ? "lazy" : "eager" %>
+<% else %>
+  <div class="w-full h-full bg-surface-inset hover:bg-surface-inset-hover text-secondary rounded-full flex items-center justify-center text-lg uppercase"><%= initials %></div>
+<% end %>
diff --git a/app/views/settings/_user_avatar_field.html.erb b/app/views/settings/_user_avatar_field.html.erb
new file mode 100644
index 00000000..1bedac90
--- /dev/null
+++ b/app/views/settings/_user_avatar_field.html.erb
@@ -0,0 +1,61 @@
+<%# locals: (form:, user:) %>
+
+<div class="flex flex-col items-center gap-4" data-controller="profile-image-preview">
+  <div class="relative">
+    <button type="button"
+            data-profile-image-preview-target="clearBtn"
+            data-action="click->profile-image-preview#clearFileInput"
+      class="<%= user.profile_image.attached? ? "" : "hidden" %> z-50 cursor-pointer absolute bottom-0 right-0 w-8 h-8 bg-gray-50 rounded-full flex justify-center items-center border border-white border-2">
+      <%= icon "x", size: "sm" %>
+    </button>
+
+    <div class="relative flex justify-center items-center bg-surface-inset size-26 md:size-24 rounded-full border-primary border border-dashed overflow-hidden">
+      <%# The image preview once user has uploaded a new file  %>
+      <div data-profile-image-preview-target="previewImage" class="h-full w-full flex justify-center items-center hidden">
+        <img src="" alt="Preview" class="w-full h-full rounded-full object-cover">
+      </div>
+
+      <%# The placeholder image for empty avatar field  %>
+      <div data-profile-image-preview-target="placeholderImage"
+         class="h-full w-full flex justify-center  items-center <%= user.profile_image.attached? ? "hidden" : "" %>">
+        <div class="h-full w-full flex justify-center items-center bg-surface-inset">
+          <%= icon "image-plus", size: "lg" %>
+        </div>
+      </div>
+
+      <%# The attached image if user has already uploaded one %>
+      <div data-profile-image-preview-target="attachedImage"
+         class="h-full w-full flex justify-center items-center <%= user.profile_image.attached? ? "" : "hidden" %>">
+        <% if user.profile_image.attached? %>
+          <div class="h-full w-full">
+            <%= render "settings/user_avatar", avatar_url: user.profile_image.url %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+
+  <div class="text-center">
+    <%= form.hidden_field :delete_profile_image, value: "0", data: { profile_image_preview_target: "deleteProfileImage" } %>
+
+    <%= form.label :profile_image, class: "px-3 py-2 rounded-lg text-sm hover:bg-surface-hover border border-secondary inline-flex items-center gap-2 cursor-pointer", data: { profile_image_preview_target: "uploadButton" } do %>
+      <%= icon "camera", data: { profile_image_preview_target: "cameraIcon" } %>
+      <span data-profile-image-preview-target="uploadText">
+        <%= t(".choose") %> <span class="text-secondary"><%= t(".choose_label") %></span>
+      </span>
+      <span data-profile-image-preview-target="changeText" class="hidden" aria-hidden="true">
+        <%= t(".change") %>
+      </span>
+    <% end %>
+
+    <p class="mt-2 text-xs text-secondary"><%= t(".accepted_formats") %></p>
+
+    <%= form.file_field :profile_image,
+        accept: "image/png, image/jpeg",
+        class: "hidden px-3 py-2 bg-gray-50 text-primary rounded-md text-sm font-medium",
+        data: {
+          profile_image_preview_target: "input",
+          action: "change->profile-image-preview#showFileInputPreview"
+        } %>
+  </div>
+</div>
diff --git a/app/views/settings/api_keys/created.html.erb b/app/views/settings/api_keys/created.html.erb
new file mode 100644
index 00000000..5e7eb833
--- /dev/null
+++ b/app/views/settings/api_keys/created.html.erb
@@ -0,0 +1,94 @@
+<%= content_for :page_title, "API Key Created" %>
+
+<%= settings_section title: "API Key Created Successfully", subtitle: "Your new API key has been generated successfully." do %>
+  <div class="space-y-4">
+    <div class="p-3 shadow-border-xs bg-container rounded-lg">
+      <div class="flex items-start gap-3">
+        <%= render DS::FilledIcon.new(
+          icon: "check-circle",
+          rounded: true,
+          size: "lg",
+          variant: :success
+        ) %>
+        <div class="flex-1">
+          <h3 class="font-medium text-primary">API Key Created Successfully!</h3>
+          <p class="text-secondary text-sm mt-1">Your new API key "<%= @api_key.name %>" has been created and is ready to use.</p>
+        </div>
+      </div>
+    </div>
+
+    <div class="bg-surface-inset rounded-xl p-4">
+      <h4 class="font-medium text-primary mb-3">Your API Key</h4>
+      <p class="text-secondary text-sm mb-3">Copy and store this key securely. You'll need it to authenticate your API requests.</p>
+
+      <div class="bg-container rounded-lg p-3 border border-primary" data-controller="clipboard">
+        <div class="flex items-center justify-between gap-3">
+          <code id="api-key-display" class="font-mono text-sm text-primary break-all" data-clipboard-target="source"><%= @api_key.plain_key %></code>
+          <%= render DS::Button.new(
+            text: "Copy API Key",
+            variant: "ghost",
+            icon: "copy",
+            data: { action: "clipboard#copy" }
+          ) %>
+        </div>
+      </div>
+    </div>
+
+    <div class="bg-surface-inset rounded-xl p-4">
+      <h4 class="font-medium text-primary mb-3">Key Details</h4>
+      <div class="space-y-2 text-sm">
+        <div class="flex justify-between">
+          <span class="text-secondary">Name:</span>
+          <span class="text-primary font-medium"><%= @api_key.name %></span>
+        </div>
+        <div class="flex justify-between">
+          <span class="text-secondary">Permissions:</span>
+          <span class="text-primary">
+            <%= @api_key.scopes.map { |scope|
+              case scope
+              when "read_accounts" then "View Accounts"
+              when "read_transactions" then "View Transactions"
+              when "read_balances" then "View Balances"
+              when "write_transactions" then "Create Transactions"
+              else scope.humanize
+              end
+            }.join(", ") %>
+          </span>
+        </div>
+        <div class="flex justify-between">
+          <span class="text-secondary">Created:</span>
+          <span class="text-primary"><%= @api_key.created_at.strftime("%B %d, %Y at %I:%M %p") %></span>
+        </div>
+      </div>
+    </div>
+
+    <div class="bg-warning-50 border border-warning-200 rounded-xl p-4">
+      <div class="flex items-start gap-2">
+        <%= icon("alert-triangle", class: "w-5 h-5 text-warning-600 mt-0.5") %>
+        <div>
+          <h4 class="font-medium text-warning-800 text-sm">Important Security Note</h4>
+          <p class="text-warning-700 text-sm mt-1">
+            This is the only time your API key will be displayed. Make sure to copy it now and store it securely.
+            If you lose this key, you'll need to generate a new one.
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="bg-surface-inset rounded-xl p-4">
+      <h4 class="font-medium text-primary mb-3">How to use your API key</h4>
+      <p class="text-secondary text-sm mb-3">Include your API key in the X-Api-Key header when making requests:</p>
+      <div class="bg-container rounded-lg p-3 font-mono text-sm text-primary border border-primary">
+        curl -H "X-Api-Key: <%= @api_key.plain_key %>" <%= request.base_url %>/api/v1/accounts
+      </div>
+    </div>
+
+    <div class="flex justify-end pt-4 border-t border-primary">
+      <%= render DS::Link.new(
+        text: "Continue to API Key Settings",
+        href: settings_api_key_path,
+        variant: "primary"
+      ) %>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/settings/api_keys/created.turbo_stream.erb b/app/views/settings/api_keys/created.turbo_stream.erb
new file mode 100644
index 00000000..89dab090
--- /dev/null
+++ b/app/views/settings/api_keys/created.turbo_stream.erb
@@ -0,0 +1,102 @@
+<%= turbo_stream.update "main" do %>
+  <div class="relative max-w-4xl mx-auto flex flex-col w-full h-full">
+    <div class="grow space-y-4 overflow-y-auto -mx-1 px-1 pb-12">
+      <h1 class="text-primary text-3xl md:text-xl font-medium">
+        API Key Created
+      </h1>
+
+      <%= settings_section title: "API Key Created Successfully", subtitle: "Your new API key has been generated successfully." do %>
+        <div class="space-y-4">
+          <div class="p-3 shadow-border-xs bg-container rounded-lg">
+            <div class="flex items-start gap-3">
+              <%= render DS::FilledIcon.new(
+                icon: "check-circle",
+                rounded: true,
+                size: "lg",
+                variant: :success
+              ) %>
+              <div class="flex-1">
+                <h3 class="font-medium text-primary">API Key Created Successfully!</h3>
+                <p class="text-secondary text-sm mt-1">Your new API key "<%= @api_key.name %>" has been created and is ready to use.</p>
+              </div>
+            </div>
+          </div>
+
+          <div class="bg-surface-inset rounded-xl p-4">
+            <h4 class="font-medium text-primary mb-3">Your API Key</h4>
+            <p class="text-secondary text-sm mb-3">Copy and store this key securely. You'll need it to authenticate your API requests.</p>
+
+            <div class="bg-container rounded-lg p-3 border border-primary" data-controller="clipboard">
+              <div class="flex items-center justify-between gap-3">
+                <code id="api-key-display" class="font-mono text-sm text-primary break-all" data-clipboard-target="source"><%= @api_key.plain_key %></code>
+                <%= render DS::Button.new(
+                  text: "Copy API Key",
+                  variant: "ghost",
+                  icon: "copy",
+                  data: { action: "clipboard#copy" }
+                ) %>
+              </div>
+            </div>
+          </div>
+
+          <div class="bg-surface-inset rounded-xl p-4">
+            <h4 class="font-medium text-primary mb-3">Key Details</h4>
+            <div class="space-y-2 text-sm">
+              <div class="flex justify-between">
+                <span class="text-secondary">Name:</span>
+                <span class="text-primary font-medium"><%= @api_key.name %></span>
+              </div>
+              <div class="flex justify-between">
+                <span class="text-secondary">Permissions:</span>
+                <span class="text-primary">
+                  <%= @api_key.scopes.map { |scope|
+                    case scope
+                    when "read_accounts" then "View Accounts"
+                    when "read_transactions" then "View Transactions"
+                    when "read_balances" then "View Balances"
+                    when "write_transactions" then "Create Transactions"
+                    else scope.humanize
+                    end
+                  }.join(", ") %>
+                </span>
+              </div>
+              <div class="flex justify-between">
+                <span class="text-secondary">Created:</span>
+                <span class="text-primary"><%= @api_key.created_at.strftime("%B %d, %Y at %I:%M %p") %></span>
+              </div>
+            </div>
+          </div>
+
+          <div class="bg-warning-50 border border-warning-200 rounded-xl p-4">
+            <div class="flex items-start gap-2">
+              <%= icon("alert-triangle", class: "w-5 h-5 text-warning-600 mt-0.5") %>
+              <div>
+                <h4 class="font-medium text-warning-800 text-sm">Important Security Note</h4>
+                <p class="text-warning-700 text-sm mt-1">
+                  This is the only time your API key will be displayed. Make sure to copy it now and store it securely.
+                  If you lose this key, you'll need to generate a new one.
+                </p>
+              </div>
+            </div>
+          </div>
+
+          <div class="bg-surface-inset rounded-xl p-4">
+            <h4 class="font-medium text-primary mb-3">How to use your API key</h4>
+            <p class="text-secondary text-sm mb-3">Include your API key in the X-Api-Key header when making requests:</p>
+            <div class="bg-container rounded-lg p-3 font-mono text-sm text-primary border border-primary">
+              curl -H "X-Api-Key: <%= @api_key.plain_key %>" <%= request.base_url %>/api/v1/accounts
+            </div>
+          </div>
+
+          <div class="flex justify-end pt-4 border-t border-primary">
+            <%= render DS::Link.new(
+              text: "Continue to API Key Settings",
+              href: settings_api_key_path,
+              variant: "primary"
+            ) %>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/settings/api_keys/new.html.erb b/app/views/settings/api_keys/new.html.erb
new file mode 100644
index 00000000..d4e2ddc7
--- /dev/null
+++ b/app/views/settings/api_keys/new.html.erb
@@ -0,0 +1,60 @@
+<%= content_for :page_title, "Create New API Key" %>
+
+<%= settings_section title: "Create New API Key", subtitle: "Generate a new API key to access your Maybe data programmatically." do %>
+  <%= styled_form_with model: @api_key, url: settings_api_key_path, class: "space-y-4" do |form| %>
+    <%= form.text_field :name,
+        placeholder: "e.g., My Budget App, Portfolio Tracker",
+        label: "API Key Name",
+        help_text: "Choose a descriptive name to help you identify this key later." %>
+
+    <div>
+      <%= form.label :scopes, "Permissions", class: "block text-sm font-medium text-primary mb-2" %>
+      <p class="text-sm text-secondary mb-3">Select the permissions this API key should have:</p>
+
+      <div class="space-y-2">
+        <% [
+          ["read", "Read Only", "View your accounts, transactions, and balances"],
+          ["read_write", "Read/Write", "View your data and create new transactions"]
+        ].each do |value, label, description| %>
+          <div class="bg-surface-inset rounded-lg p-3 border border-primary">
+            <label class="flex items-start gap-3 cursor-pointer">
+              <%= radio_button_tag "api_key[scopes]", value, (@api_key&.scopes || []).include?(value),
+                  class: "mt-1" %>
+              <div class="flex-1">
+                <div class="font-medium text-primary"><%= label %></div>
+                <div class="text-sm text-secondary mt-1"><%= description %></div>
+              </div>
+            </label>
+          </div>
+        <% end %>
+      </div>
+    </div>
+
+    <div class="bg-warning-50 border border-warning-200 rounded-xl p-4">
+      <div class="flex items-start gap-2">
+        <%= icon("alert-triangle", class: "w-5 h-5 text-warning-600 mt-0.5") %>
+        <div>
+          <h4 class="font-medium text-warning-800 text-sm">Security Warning</h4>
+          <p class="text-warning-700 text-sm mt-1">
+            Your API key will be displayed only once after creation. Make sure to copy and store it securely.
+            Anyone with access to this key can access your data according to the permissions you select.
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div class="flex justify-end gap-3 pt-4 border-t border-primary">
+      <%= render DS::Link.new(
+        text: "Cancel",
+        href: settings_api_key_path,
+        variant: "ghost"
+      ) %>
+
+      <%= render DS::Button.new(
+        text: "Create API Key",
+        variant: "primary",
+        type: "submit"
+      ) %>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/settings/api_keys/show.html.erb b/app/views/settings/api_keys/show.html.erb
new file mode 100644
index 00000000..e1c82904
--- /dev/null
+++ b/app/views/settings/api_keys/show.html.erb
@@ -0,0 +1,192 @@
+<%= content_for :page_title, "API Key" %>
+
+<% if @newly_created && @plain_key %>
+  <%= settings_section title: "API Key Created Successfully", subtitle: "Your new API key has been generated successfully." do %>
+    <div class="space-y-4">
+      <div class="p-3 shadow-border-xs bg-container rounded-lg">
+        <div class="flex items-start gap-3">
+          <%= render DS::FilledIcon.new(
+            icon: "check-circle",
+            rounded: true,
+            size: "lg",
+            variant: :success
+          ) %>
+          <div class="flex-1">
+            <h3 class="font-medium text-primary">API Key Created Successfully!</h3>
+            <p class="text-secondary text-sm mt-1">Your new API key "<%= @current_api_key.name %>" has been created and is ready to use.</p>
+          </div>
+        </div>
+      </div>
+
+      <div class="bg-surface-inset rounded-xl p-4">
+        <h4 class="font-medium text-primary mb-3">Your API Key</h4>
+        <p class="text-secondary text-sm mb-3">Copy and store this key securely. You'll need it to authenticate your API requests.</p>
+
+        <div class="bg-container rounded-lg p-3 border border-primary" data-controller="clipboard">
+          <div class="flex items-center justify-between gap-3">
+            <code id="api-key-display" class="font-mono text-sm text-primary break-all" data-clipboard-target="source"><%= @current_api_key.plain_key %></code>
+            <%= render DS::Button.new(
+              text: "Copy API Key",
+              variant: "ghost",
+              icon: "copy",
+              data: { action: "clipboard#copy" }
+            ) %>
+          </div>
+        </div>
+      </div>
+
+      <div class="bg-surface-inset rounded-xl p-4">
+        <h4 class="font-medium text-primary mb-3">How to use your API key</h4>
+        <p class="text-secondary text-sm mb-3">Include your API key in the X-Api-Key header when making requests:</p>
+        <div class="bg-container rounded-lg p-3 font-mono text-sm text-primary border border-primary">
+          curl -H "X-Api-Key: <%= @current_api_key.plain_key %>" <%= request.base_url %>/api/v1/accounts
+        </div>
+      </div>
+
+      <div class="flex justify-end pt-4 border-t border-primary">
+        <%= render DS::Link.new(
+          text: "Continue to API Key Settings",
+          href: settings_api_key_path,
+          variant: "primary"
+        ) %>
+      </div>
+    </div>
+  <% end %>
+<% elsif @current_api_key %>
+  <%= settings_section title: "Your API Key", subtitle: "Manage your API key for programmatic access to your Maybe data." do %>
+    <div class="space-y-4">
+      <div class="p-3 shadow-border-xs bg-container rounded-lg flex justify-between items-center">
+        <div class="flex items-center gap-3">
+          <%= render DS::FilledIcon.new(
+            icon: "key",
+            rounded: true,
+            size: "lg"
+          ) %>
+
+          <div class="text-sm space-y-1">
+            <p class="text-primary font-medium"><%= @current_api_key.name %></p>
+            <p class="text-secondary">
+              Created <%= time_ago_in_words(@current_api_key.created_at) %> ago
+              <% if @current_api_key.last_used_at %>
+                • Last used <%= time_ago_in_words(@current_api_key.last_used_at) %> ago
+              <% else %>
+                • Never used
+              <% end %>
+            </p>
+          </div>
+        </div>
+
+        <div class="rounded-md bg-success px-2 py-1">
+          <p class="text-success-foreground font-medium text-xs">Active</p>
+        </div>
+      </div>
+
+      <div class="bg-surface-inset rounded-xl p-4">
+        <h4 class="font-medium text-primary mb-3">Permissions</h4>
+        <div class="flex flex-wrap gap-2">
+          <% @current_api_key.scopes.each do |scope| %>
+            <span class="inline-flex items-center gap-1 px-2 py-1 bg-primary text-primary-foreground rounded-full text-xs font-medium">
+              <%= icon("shield-check", class: "w-3 h-3") %>
+              <%= case scope
+                  when "read" then "Read Only"
+                  when "read_write" then "Read/Write"
+                  else scope.humanize
+                  end %>
+            </span>
+          <% end %>
+        </div>
+      </div>
+
+      <div class="bg-surface-inset rounded-xl p-4">
+        <h4 class="font-medium text-primary mb-3">Your API Key</h4>
+        <p class="text-secondary text-sm mb-3">Copy and store this key securely. You'll need it to authenticate your API requests.</p>
+
+        <div class="bg-container rounded-lg p-3 border border-primary" data-controller="clipboard">
+          <div class="flex items-center justify-between gap-3">
+            <code id="api-key-display" class="font-mono text-sm text-primary break-all" data-clipboard-target="source"><%= @current_api_key.plain_key %></code>
+            <%= render DS::Button.new(
+              text: "Copy API Key",
+              variant: "ghost",
+              icon: "copy",
+              data: { action: "clipboard#copy" }
+            ) %>
+          </div>
+        </div>
+      </div>
+
+      <div class="bg-surface-inset rounded-xl p-4">
+        <h4 class="font-medium text-primary mb-3">How to use your API key</h4>
+        <p class="text-secondary text-sm mb-3">Include your API key in the X-Api-Key header when making requests:</p>
+        <div class="bg-container rounded-lg p-3 font-mono text-sm text-primary border border-primary">
+          curl -H "X-Api-Key: <%= @current_api_key.plain_key %>" <%= request.base_url %>/api/v1/accounts
+        </div>
+      </div>
+
+      <div class="flex flex-col sm:flex-row gap-3 pt-4 border-t border-primary">
+        <%= render DS::Link.new(
+          text: "Create New Key",
+          href: new_settings_api_key_path(regenerate: true),
+          variant: "secondary"
+        ) %>
+
+        <%= render DS::Button.new(
+          text: "Revoke Key",
+          href: settings_api_key_path,
+          method: :delete,
+          variant: "destructive",
+          data: {
+            turbo_confirm: "Are you sure you want to revoke this API key?"
+          }
+        ) %>
+      </div>
+    </div>
+  <% end %>
+<% else %>
+  <%= settings_section title: "Create Your API Key", subtitle: "Get programmatic access to your Maybe data" do %>
+    <div class="space-y-4">
+      <div class="p-3 shadow-border-xs bg-container rounded-lg">
+        <div class="flex items-start gap-3">
+          <%= render DS::FilledIcon.new(
+            icon: "key",
+            rounded: true,
+            size: "lg"
+          ) %>
+          <div class="flex-1">
+            <h3 class="font-medium text-primary">Access your account data programmatically</h3>
+            <p class="text-secondary text-sm mt-1">Generate an API key to integrate with your applications and access your financial data securely.</p>
+          </div>
+        </div>
+      </div>
+
+      <div class="bg-surface-inset rounded-xl p-4">
+        <h4 class="font-medium text-primary mb-3">What you can do with API keys:</h4>
+        <ul class="space-y-2 text-sm text-secondary">
+          <li class="flex items-start gap-2">
+            <%= icon("check", class: "w-4 h-4 text-primary mt-0.5") %>
+            <span>Access your accounts and balances</span>
+          </li>
+          <li class="flex items-start gap-2">
+            <%= icon("check", class: "w-4 h-4 text-primary mt-0.5") %>
+            <span>View transaction history</span>
+          </li>
+          <li class="flex items-start gap-2">
+            <%= icon("check", class: "w-4 h-4 text-primary mt-0.5") %>
+            <span>Create new transactions</span>
+          </li>
+          <li class="flex items-start gap-2">
+            <%= icon("check", class: "w-4 h-4 text-primary mt-0.5") %>
+            <span>Integrate with third-party applications</span>
+          </li>
+        </ul>
+      </div>
+
+      <div class="flex justify-start">
+        <%= render DS::Link.new(
+          text: "Create API Key",
+          href: new_settings_api_key_path,
+          variant: "primary"
+        ) %>
+      </div>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/settings/billings/show.html.erb b/app/views/settings/billings/show.html.erb
index 93de6099..9c96b18f 100644
--- a/app/views/settings/billings/show.html.erb
+++ b/app/views/settings/billings/show.html.erb
@@ -1,16 +1,61 @@
-<% content_for :sidebar do %>
-  <%= render "settings/nav" %>
+<%= content_for :page_title, t(".page_title") %>
+
+<%= settings_section title: t(".subscription_title"), subtitle: t(".subscription_subtitle") do %>
+  <div class="space-y-4">
+    <div class="p-3 shadow-border-xs bg-container rounded-lg flex justify-between items-center">
+      <div class="flex items-center gap-3">
+        <%= render DS::FilledIcon.new(
+          icon: "gem",
+          rounded: true,
+          size: "lg"
+        ) %>
+
+        <div class="text-sm space-y-1">
+          <% if @family.has_active_subscription? %>
+            <p class="text-primary">
+              <span>You are currently subscribed to the <span class="font-medium"><%= @family.subscription.name %></span>.</span>
+
+              <% if @family.next_billing_date %>
+                <span>Your plan renews on <span class="font-medium"><%= @family.next_billing_date.strftime("%B %d, %Y") %></span>.</span>
+              <% end %>
+            </p>
+          <% elsif @family.trialing? %>
+            <p class="text-primary">
+              You are currently trialing Maybe
+              <span class="text-secondary">
+                (<%= @family.days_left_in_trial %> days remaining)
+              </span>
+            </p>
+          <% else %>
+            <p class="text-primary">You are currently <span class="font-medium">not subscribed</span></p>
+            <p class="text-secondary">Once you subscribe to Maybe+, you'll see your billing settings here.</p>
+          <% end %>
+        </div>
+      </div>
+
+      <% if @family.has_active_subscription? %>
+        <%= render DS::Link.new(
+          text: "Manage",
+          icon: "external-link",
+          variant: "primary",
+          icon_position: "right",
+          href: subscription_path,
+          rel: "noopener"
+        ) %>
+      <% else %>
+        <%= render DS::Link.new(
+          text: "Choose plan",
+          variant: "primary",
+          icon: "plus",
+          icon_position: "right",
+          href: upgrade_subscription_path(view: "upgrade"),
+          rel: "noopener") %>
+      <% end %>
+    </div>
+
+    <div class="flex items-center gap-2">
+      <%= image_tag "stripe-logo.svg", class: "w-5 h-5 shrink-0" %>
+      <p class="text-secondary text-sm">Billing via Stripe</p>
+    </div>
+  </div>
 <% end %>
-
-<div class="space-y-4">
-  <h1 class="text-gray-900 text-xl font-medium mb-4"><%= t(".page_title") %></h1>
-  <%= settings_section title: t(".subscription_title"), subtitle: t(".subscription_subtitle") do %>
-    <% if Current.family.stripe_plan_id.blank? %>
-      <%= link_to t(".subscribe_button"), new_subscription_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2", data: { turbo: false } %>
-    <% else %>
-      <%= link_to t(".manage_subscription_button"), subscription_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2", data: { turbo: false } %>
-    <% end %>
-  <% end %>
-
-  <%= settings_nav_footer %>
-</div>
diff --git a/app/views/settings/hostings/_danger_zone_settings.html.erb b/app/views/settings/hostings/_danger_zone_settings.html.erb
new file mode 100644
index 00000000..18cfd4d0
--- /dev/null
+++ b/app/views/settings/hostings/_danger_zone_settings.html.erb
@@ -0,0 +1,20 @@
+<% if Current.user.admin? %>
+  <div class="space-y-4">
+    <div class="flex flex-col md:flex-row md:items-center md:justify-between gap-4">
+      <div class="w-full md:w-2/3">
+        <h3 class="font-medium text-primary"><%= t("settings.hostings.show.clear_cache") %></h3>
+        <p class="text-secondary text-sm"><%= t("settings.hostings.show.clear_cache_warning") %></p>
+      </div>
+      <%=
+            button_to t("settings.hostings.show.clear_cache"), clear_cache_settings_hosting_path, method: :delete,
+              class: "w-full md:w-auto bg-yellow-600 fg-inverse text-sm font-medium rounded-lg px-4 py-2",
+              data: { turbo_confirm: {
+                title: t("settings.hostings.show.confirm_clear_cache.title"),
+                body: t("settings.hostings.show.confirm_clear_cache.body"),
+                accept: t("settings.hostings.show.clear_cache"),
+                acceptClass: "w-full bg-yellow-600 fg-inverse rounded-xl text-center p-[10px] border mb-2"
+              }}
+      %>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/settings/hostings/_invite_code_settings.html.erb b/app/views/settings/hostings/_invite_code_settings.html.erb
index 49828365..63a5a335 100644
--- a/app/views/settings/hostings/_invite_code_settings.html.erb
+++ b/app/views/settings/hostings/_invite_code_settings.html.erb
@@ -2,26 +2,40 @@
   <div class="flex items-center justify-between">
     <div class="space-y-1">
       <p class="text-sm"><%= t(".title") %></p>
-      <p class="text-gray-500 text-sm"><%= t(".description") %></p>
+      <p class="text-secondary text-sm"><%= t(".description") %></p>
     </div>
 
-    <%= styled_form_with model: Setting.new, url: settings_hosting_path, method: :patch, data: { controller: "auto-submit-form", "auto-submit-form-trigger-event-value" => "blur" } do |form| %>
-      <div class="relative inline-block select-none">
-        <%= form.check_box :require_invite_for_signup, class: "sr-only peer", "data-auto-submit-form-target": "auto", "data-autosubmit-trigger-event": "input" %>
-        <%= form.label :require_invite_for_signup, "&nbsp;".html_safe, class: "maybe-switch" %>
-      </div>
+    <%= styled_form_with model: Setting.new,
+                         url: settings_hosting_path,
+                         method: :patch,
+                         data: { controller: "auto-submit-form", auto_submit_form_trigger_event_value: "change" } do |form| %>
+      <%= form.toggle :require_invite_for_signup, { data: { auto_submit_form_target: "auto" } } %>
+    <% end %>
+  </div>
+
+  <div class="flex items-center justify-between">
+    <div class="space-y-1">
+      <p class="text-sm"><%= t(".email_confirmation_title") %></p>
+      <p class="text-secondary text-sm"><%= t(".email_confirmation_description") %></p>
+    </div>
+
+    <%= styled_form_with model: Setting.new,
+                         url: settings_hosting_path,
+                         method: :patch,
+                         data: { controller: "auto-submit-form", auto_submit_form_trigger_event_value: "change" } do |form| %>
+      <%= form.toggle :require_email_confirmation, { data: { auto_submit_form_target: "auto" } } %>
     <% end %>
   </div>
 
   <% if Setting.require_invite_for_signup %>
     <div class="flex items-center justify-between mb-4">
       <div>
-        <span class="text-gray-900 text-base font-medium"><%= t(".generated_tokens") %></span>
+        <span class="text-primary text-base font-medium"><%= t(".generated_tokens") %></span>
       </div>
       <div>
         <%= button_to invite_codes_path,
                         method: :post,
-                        class: "flex gap-1 bg-gray-50 text-gray-900 text-sm rounded-lg px-3 py-2" do %>
+                        class: "flex gap-1 bg-gray-50 text-primary text-sm rounded-lg px-3 py-2" do %>
           <span><%= t(".generate_tokens") %></span>
         <% end %>
       </div>
diff --git a/app/views/settings/hostings/_provider_settings.html.erb b/app/views/settings/hostings/_provider_settings.html.erb
deleted file mode 100644
index c4aef548..00000000
--- a/app/views/settings/hostings/_provider_settings.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% if ENV["HOSTING_PLATFORM"] == "render" %>
-  <%= styled_form_with model: Setting.new, url: settings_hosting_path, method: :patch, data: { controller: "auto-submit-form", "auto-submit-form-trigger-event-value" => "blur" } do |form| %>
-    <div class="space-y-4">
-      <h2 class="font-medium mb-1"><%= t(".title") %></h2>
-      <p class="text-gray-500 text-sm mb-4"><%= t(".description") %></p>
-      <%= form.url_field :render_deploy_hook, label: t(".render_deploy_hook_label"), placeholder: t(".render_deploy_hook_placeholder"), value: Setting.render_deploy_hook, data: { "auto-submit-form-target" => "auto" } %>
-    </div>
-  <% end %>
-<% end %>
diff --git a/app/views/settings/hostings/_synth_settings.html.erb b/app/views/settings/hostings/_synth_settings.html.erb
index 30445b00..d8f71839 100644
--- a/app/views/settings/hostings/_synth_settings.html.erb
+++ b/app/views/settings/hostings/_synth_settings.html.erb
@@ -1,7 +1,11 @@
 <div class="space-y-4">
   <div>
     <h2 class="font-medium mb-1"><%= t(".title") %></h2>
-    <p class="text-gray-500 text-sm mb-4"><%= t(".description") %></p>
+    <% if ENV["SYNTH_API_KEY"].present? %>
+      <p class="text-sm text-secondary">You have successfully configured your Synth API key through the SYNTH_API_KEY environment variable.</p>
+    <% else %>
+      <p class="text-secondary text-sm mb-4"><%= t(".description") %></p>
+    <% end %>
   </div>
 
   <%= styled_form_with model: Setting.new,
@@ -15,7 +19,8 @@
                         label: t(".label"),
                         type: "password",
                         placeholder: t(".placeholder"),
-                        value: Setting.synth_api_key,
+                        value: ENV.fetch("SYNTH_API_KEY", Setting.synth_api_key),
+                        disabled: ENV["SYNTH_API_KEY"].present?,
                         container_class: @synth_usage.present? && !@synth_usage.success? ? "border-red-500" : "",
                         data: { "auto-submit-form-target": "auto" } %>
   <% end %>
@@ -23,20 +28,20 @@
   <% if @synth_usage.present? && @synth_usage.success? %>
     <div class="space-y-4">
       <div class="space-y-2">
-        <p class="text-sm text-gray-500">
+        <p class="text-sm text-secondary">
           <%= t(".api_calls_used",
-                used: number_with_delimiter(@synth_usage.used),
-                limit: number_with_delimiter(@synth_usage.limit),
-                percentage: number_to_percentage(@synth_usage.utilization, precision: 1)) %>
+                used: number_with_delimiter(@synth_usage.data.used),
+                limit: number_with_delimiter(@synth_usage.data.limit),
+                percentage: number_to_percentage(@synth_usage.data.utilization, precision: 1)) %>
         </p>
         <div class="w-52 h-1.5 bg-gray-100 rounded-2xl">
           <div class="h-full bg-green-500 rounded-2xl"
-               style="width: <%= [@synth_usage.utilization, 2].max %>%;"></div>
+               style="width: <%= [@synth_usage.data.utilization, 2].max %>%;"></div>
         </div>
       </div>
       <div class="bg-gray-100 rounded-md px-1.5 py-0.5 w-fit">
-        <p class="text-xs font-medium text-gray-500 uppercase">
-          <%= t(".plan", plan: @synth_usage.plan) %>
+        <p class="text-xs font-medium text-secondary uppercase">
+          <%= t(".plan", plan: @synth_usage.data.plan) %>
         </p>
       </div>
     </div>
diff --git a/app/views/settings/hostings/_upgrade_settings.html.erb b/app/views/settings/hostings/_upgrade_settings.html.erb
deleted file mode 100644
index 50594584..00000000
--- a/app/views/settings/hostings/_upgrade_settings.html.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-<% if ENV["HOSTING_PLATFORM"] == "render" %>
-  <div>
-    <h2 class="font-medium mb-1"><%= t(".title") %></h2>
-    <p class="text-gray-500 text-sm mb-4"><%= t(".description") %></p>
-
-    <%= styled_form_with model: Setting.new, url: settings_hosting_path, method: :patch, data: { controller: "auto-submit-form", "auto-submit-form-trigger-event-value" => "blur" } do |form| %>
-      <div class="space-y-4">
-        <div class="flex items-center gap-4">
-          <%= form.radio_button :upgrades_setting, "manual", checked: Setting.upgrades_mode == "manual", data: { "auto-submit-form-target" => "auto", "autosubmit-trigger-event": "input" } %>
-          <%= form.label :upgrades_mode_manual, t(".manual_title"), class: "text-gray-900 text-sm" do %>
-            <span class="font-medium"><%= t(".manual_title") %></span>
-            <br>
-            <span class="text-gray-500">
-              <%= t(".manual_description") %>
-            </span>
-          <% end %>
-        </div>
-        <div class="flex items-center gap-4">
-          <%= form.radio_button :upgrades_setting, "release", checked: Setting.upgrades_mode == "auto" && Setting.upgrades_target == "release", data: { "auto-submit-form-target" => "auto", "autosubmit-trigger-event": "input" } %>
-          <%= form.label :upgrades_mode_release, t(".latest_release_title"), class: "text-gray-900 text-sm" do %>
-            <span class="font-medium"><%= t(".latest_release_title") %></span>
-            <br>
-            <span class="text-gray-500">
-              <%= t(".latest_release_description") %>
-            </span>
-          <% end %>
-        </div>
-        <div class="flex items-center gap-4">
-          <%= form.radio_button :upgrades_setting, "commit", checked: Setting.upgrades_mode == "auto" && Setting.upgrades_target == "commit", data: { "auto-submit-form-target" => "auto", "autosubmit-trigger-event": "input" } %>
-          <%= form.label :upgrades_mode_commit, t(".latest_commit_title"), class: "text-gray-900 text-sm" do %>
-            <span class="font-medium"><%= t(".latest_commit_title") %></span>
-            <br>
-            <span class="text-gray-500">
-              <%= t(".latest_commit_description") %>
-            </span>
-          <% end %>
-        </div>
-      </div>
-    <% end %>
-  </div>
-<% end %>
diff --git a/app/views/settings/hostings/show.html.erb b/app/views/settings/hostings/show.html.erb
index ba4b7d5d..8f944323 100644
--- a/app/views/settings/hostings/show.html.erb
+++ b/app/views/settings/hostings/show.html.erb
@@ -1,21 +1,15 @@
-<% content_for :sidebar do %>
-  <%= render "settings/nav" %>
+<%= content_for :page_title, t(".title") %>
+
+<%= settings_section title: t(".general") do %>
+  <div class="space-y-6">
+    <%= render "settings/hostings/synth_settings" %>
+  </div>
 <% end %>
 
-<div class="space-y-4 pb-32">
-  <h1 class="text-gray-900 text-xl font-medium mb-4"><%= t(".title") %></h1>
+<%= settings_section title: t(".invites") do %>
+  <%= render "settings/hostings/invite_code_settings" %>
+<% end %>
 
-  <%= settings_section title: t(".general") do %>
-    <div class="space-y-6">
-      <%= render "settings/hostings/upgrade_settings" %>
-      <%= render "settings/hostings/provider_settings" %>
-      <%= render "settings/hostings/synth_settings" %>
-    </div>
-  <% end %>
-
-  <%= settings_section title: t(".invites") do %>
-    <%= render "settings/hostings/invite_code_settings" %>
-  <% end %>
-
-  <%= settings_nav_footer %>
-</div>
+<%= settings_section title: t(".danger_zone") do %>
+  <%= render "settings/hostings/danger_zone_settings" %>
+<% end %>
diff --git a/app/views/settings/preferences/show.html.erb b/app/views/settings/preferences/show.html.erb
index 75482a43..fae15f30 100644
--- a/app/views/settings/preferences/show.html.erb
+++ b/app/views/settings/preferences/show.html.erb
@@ -1,55 +1,70 @@
-<% content_for :sidebar do %>
-  <%= render "settings/nav" %>
+<%= content_for :page_title, t(".page_title") %>
+
+<%= settings_section title: t(".general_title"), subtitle: t(".general_subtitle") do %>
+  <div>
+    <%= styled_form_with model: @user, class: "space-y-4", data: { controller: "auto-submit-form" } do |form| %>
+      <%= form.hidden_field :redirect_to, value: "preferences" %>
+
+      <%= form.fields_for :family do |family_form| %>
+        <%= family_form.select :currency,
+            Money::Currency.as_options.map { |currency| [ "#{currency.name} (#{currency.iso_code})", currency.iso_code ] },
+            { label: t(".currency") }, disabled: true %>
+
+        <%= family_form.select :locale,
+            language_options,
+            { label: t(".language") },
+            { data: { auto_submit_form_target: "auto" } } %>
+
+        <%= family_form.select :timezone,
+            timezone_options,
+            { label: t(".timezone") },
+            { data: { auto_submit_form_target: "auto" } } %>
+
+        <%= family_form.select :date_format,
+            Family::DATE_FORMATS,
+            { label: t(".date_format") },
+            { data: { auto_submit_form_target: "auto" } } %>
+
+        <%= form.select :default_period,
+            Period.all.map { |period| [ period.label, period.key ] },
+            { label: t(".default_period") },
+            { data: { auto_submit_form_target: "auto" } } %>
+
+        <%= family_form.select :country,
+            country_options,
+            { label: t(".country") },
+            { data: { auto_submit_form_target: "auto" } } %>
+
+        <p class="text-xs italic pl-2 text-secondary">Please note, we are still working on translations for various languages.  Please see the <%= link_to "I18n issue", "https://github.com/maybe-finance/maybe/issues/1225", target: "_blank", class: "underline" %> for more information.</p>
+      <% end %>
+    <% end %>
+  </div>
 <% end %>
 
-<div class="space-y-4">
-  <h1 class="text-gray-900 text-xl font-medium mb-4"><%= t(".page_title") %></h1>
-  <%= settings_section title: t(".general_title"), subtitle: t(".general_subtitle") do %>
-    <div>
-      <%= styled_form_with model: Current.user, url: settings_preferences_path, class: "space-y-4", data: { controller: "auto-submit-form" } do |form| %>
-        <%= form.fields_for :family_attributes do |family_form| %>
-          <%= family_form.select :currency,
-            currencies_for_select.map { |currency| [ "#{currency.name} (#{currency.iso_code})", currency.iso_code ] },
-            { label: "Currency", selected: Current.family.currency },
-            { data: { auto_submit_form_target: "auto" } } %>
+<%= settings_section title: t(".theme_title"), subtitle: t(".theme_subtitle") do %>
+  <div data-controller="theme" data-theme-user-preference-value="<%= @user.theme %>">
+    <%= form_with model: @user, class: "flex flex-col md:flex-row justify-between items-center gap-4", id: "theme_form",
+        data: { controller: "auto-submit-form", auto_submit_form_trigger_event_value: "change" } do |form| %>
+      <%= form.hidden_field :redirect_to, value: "preferences" %>
 
-          <%= family_form.select :locale,
-            I18n.available_locales,
-            { label: "Locale", selected: Current.family.locale },
-            { data: { auto_submit_form_target: "auto" } } %>
+      <% theme_option_class = "text-center transition-all duration-200 p-3 rounded-lg hover:bg-surface-hover cursor-pointer [&:has(input:checked)]:bg-surface-hover [&:has(input:checked)]:border [&:has(input:checked)]:border-primary [&:has(input:checked)]:shadow-xs" %>
 
-          <p class="text-xs italic pl-2 text-gray-500">Please note, we are still working on translations for various languages.  Please see the <%= link_to "I18n issue", "https://github.com/maybe-finance/maybe/issues/1225", target: "_blank", class: "underline" %> for more information.</p>
+      <% [
+        { value: "light", image: "light-mode-preview.png" },
+        { value: "dark", image: "dark-mode-preview.png" },
+        { value: "system", image: "system-mode-preview.png" }
+      ].each do |theme| %>
+        <%= form.label :"theme_#{theme[:value]}", class: "group" do %>
+          <div class="<%= theme_option_class %>">
+            <%= image_tag(theme[:image], alt: "#{theme[:value].titleize} Theme Preview", class: "h-44 mb-2") %>
+            <div class="<%= theme[:value] == "system" ? "flex items-center gap-2 justify-center" : "text-sm font-medium text-primary" %>">
+              <%= form.radio_button :theme, theme[:value], checked: @user.theme == theme[:value], class: "sr-only",
+                data: { auto_submit_form_target: "auto", autosubmit_trigger_event: "change", action: "theme#updateTheme" } %>
+              <%= t(".theme_#{theme[:value]}") %>
+            </div>
+          </div>
         <% end %>
       <% end %>
-    </div>
-  <% end %>
-  <%= settings_section title: t(".theme_title"), subtitle: t(".theme_subtitle") do %>
-    <div>
-      <%= styled_form_with model: Current.user, url: settings_preferences_path, local: true, class: "flex justify-between items-center" do |form| %>
-        <div class="text-center">
-          <%= image_tag("light-mode-preview.png", alt: "Light Theme Preview", class: "h-44 mb-4") %>
-          <div class="flex justify-center items-center gap-2">
-            <%= form.radio_button :theme, t(".theme_light"), checked: true %>
-            <%= form.label :theme_light, t(".theme_light"), value: "light" %>
-          </div>
-        </div>
-        <div class="text-center">
-          <%= image_tag("dark-mode-preview.png", alt: "Dark Theme Preview", class: "h-44 mb-4") %>
-          <div class="flex justify-center items-center gap-2">
-            <%= form.radio_button :theme, t(".theme_dark"), disabled: true, class: "cursor-not-allowed" %>
-            <%= form.label :theme_dark, t(".theme_dark"), value: "dark" %>
-          </div>
-        </div>
-        <div class="text-center">
-          <%= image_tag("system-mode-preview.png", alt: "System Theme Preview", class: "h-44 mb-4") %>
-          <div class="flex items-center gap-2 justify-center">
-            <%= form.radio_button :theme, t(".theme_system"), disabled: true, class: "cursor-not-allowed" %>
-            <%= form.label :theme_system, t(".theme_system"), value: "system" %>
-          </div>
-        </div>
-      <% end %>
-    </div>
-  <% end %>
-
-  <%= settings_nav_footer %>
-</div>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/settings/profiles/show.html.erb b/app/views/settings/profiles/show.html.erb
index c937fd73..e1f0d653 100644
--- a/app/views/settings/profiles/show.html.erb
+++ b/app/views/settings/profiles/show.html.erb
@@ -1,88 +1,164 @@
-<% content_for :sidebar do %>
-  <%= render "settings/nav" %>
+<%= content_for :page_title, t(".page_title") %>
+
+<%= settings_section title: t(".profile_title"), subtitle: t(".profile_subtitle") do %>
+  <%= styled_form_with model: @user, url: user_path(@user), class: "space-y-4" do |form| %>
+    <%= render "settings/user_avatar_field", form: form, user: @user %>
+
+    <div>
+      <%= form.email_field :email, placeholder: t(".email"), label: t(".email") %>
+
+      <% if @user.unconfirmed_email.present? %>
+        <p class="mt-2 text-sm text-gray-600">
+          You have requested to change your email to <%= @user.unconfirmed_email %>. Please go to your email and confirm for the change to take effect.
+        </p>
+      <% end %>
+
+      <div class="grid grid-cols-1 md:grid-cols-2 gap-4 mt-4">
+        <%= form.text_field :first_name, placeholder: t(".first_name"), label: t(".first_name") %>
+        <%= form.text_field :last_name, placeholder: t(".last_name"), label: t(".last_name") %>
+      </div>
+
+      <div class="flex justify-end mt-4">
+        <%= render DS::Button.new(text: t(".save"), class: "md:w-auto w-full justify-center") %>
+      </div>
+    </div>
+  <% end %>
 <% end %>
-<div class="space-y-4">
-  <h1 class="text-gray-900 text-xl font-medium mb-4"><%= t(".page_title") %></h1>
+
+<%= settings_section title: t(".household_title"), subtitle: t(".household_subtitle") do %>
   <div class="space-y-4">
-    <%= settings_section title: t(".profile_title"), subtitle: t(".profile_subtitle") do %>
-      <%= styled_form_with model: Current.user, url: settings_profile_path, class: "space-y-4", data: { controller: "profile-image-preview" } do |form| %>
-        <div class="flex items-center gap-4">
-          <div class="relative flex justify-center items-center bg-gray-50 w-24 h-24 rounded-full border border-alpha-black-25">
-            <div data-profile-image-preview-target="imagePreview" class="h-full w-full flex justify-center items-center">
-              <% profile_image_attached = Current.user.profile_image.attached? %>
-              <% if profile_image_attached %>
-                <div class="h-24 w-24">
-                  <%= render "shared/user_profile_image", user: Current.user %>
-                </div>
-              <% else %>
-                <%= lucide_icon "image-plus", class: "w-6 h-6 text-gray-500" %>
-              <% end %>
-            </div>
-            <%= lucide_icon "image-plus", class: "hidden w-6 h-6 text-gray-500", data: { profile_image_preview_target: "template" } %>
-            <div data-profile-image-preview-target="clearBtn" data-action="click->profile-image-preview#clear" class="<%= profile_image_attached ? "" : "hidden" %> cursor-pointer absolute bottom-0 right-0 w-8 h-8 bg-gray-50 rounded-full flex justify-center items-center border border-white border-2">
-              <%= lucide_icon "x", class: "w-4 h-4 text-gray-500" %>
-            </div>
-          </div>
-          <div class="space-y-3">
-            <p><%= t(".profile_image_type") %></p>
-            <%= form.label :profile_image, t(".profile_image_choose"), class: "inline-block cursor-pointer px-3 py-2 bg-gray-50 text-gray-900 rounded-md text-sm font-medium" %>
-            <%= form.file_field :profile_image, accept: "image/png, image/jpeg", class: "hidden px-3 py-2 bg-gray-50 text-gray-900 rounded-md text-sm font-medium", data: {profile_image_preview_target: "fileField", action: "change->profile-image-preview#preview"} %>
-            <%= form.hidden_field :delete_profile_image, value: false, data: {profile_image_preview_target: "deleteField"} %>
-          </div>
-        </div>
-        <div>
-          <div class="grid grid-cols-2 gap-4 mt-4">
-            <%= form.text_field :first_name, placeholder: "First name", value: Current.user.first_name, label: true %>
-            <%= form.text_field :last_name, placeholder: "Last name", value: Current.user.last_name, label: true %>
-          </div>
-          <div class="flex justify-end mt-4">
-            <%= form.submit t(".save"), class: "bg-gray-900 hover:bg-gray-700 cursor-pointer text-white rounded-lg px-3 py-2" %>
-          </div>
-        </div>
+    <%= styled_form_with model: Current.user, class: "space-y-4", data: { controller: "auto-submit-form" } do |form| %>
+      <%= form.fields_for :family do |family_fields| %>
+        <%= family_fields.text_field :name,
+              placeholder: t(".household_form_input_placeholder"),
+              label: t(".household_form_label"),
+              disabled: !Current.user.admin?,
+              "data-auto-submit-form-target": "auto" %>
       <% end %>
     <% end %>
-    <%= settings_section title: t(".household_title"), subtitle: t(".household_subtitle") do %>
-      <div class="space-y-4">
-        <%= styled_form_with model: Current.user, url: settings_profile_path, class: "space-y-4", data: { controller: "auto-submit-form", "auto-submit-form-trigger-event-value": "blur" } do |form| %>
-          <%= form.fields_for :family_attributes do |family_fields| %>
-            <%= family_fields.text_field :name, placeholder: t(".household_form_input_placeholder"), value: Current.family.name, label: t(".household_form_label"), disabled: !Current.user.admin?, "data-auto-submit-form-target": "auto" %>
+    <div class="bg-container-inset rounded-xl p-1">
+      <div class="px-4 py-2">
+        <p class="uppercase text-xs text-secondary font-medium"><%= Current.family.name %> &middot; <%= Current.family.users.size %></p>
+      </div>
+      <% @users.each do |user| %>
+        <div class="flex gap-2 mt-2 items-center bg-container p-4 shadow-border-xs rounded-lg">
+          <div class="w-9 h-9 shrink-0">
+            <%= render "settings/user_avatar", avatar_url: user.profile_image&.variant(:small)&.url, initials: user.initials %>
+          </div>
+          <p class="text-primary font-medium text-sm"><%= user.display_name %></p>
+          <div class="rounded-md bg-surface px-1.5 py-0.5">
+            <p class="uppercase text-secondary font-medium text-xs"><%= user.role %></p>
+          </div>
+          <% if Current.user.admin? && user != Current.user %>
+            <div class="ml-auto">
+              <%= render DS::Button.new(
+                variant: "icon",
+                icon: "x",
+                href: settings_profile_path(user_id: user),
+                method: :delete,
+                confirm: CustomConfirm.for_resource_deletion(user.display_name, high_severity: true)
+              ) %>
+            </div>
           <% end %>
-        <% end %>
-        <div class="bg-gray-25 rounded-xl p-1">
-          <div class="px-4 py-2">
-            <p class="uppercase text-xs text-gray-500 font-medium"><%= Current.family.name %> &middot; <%= Current.family.users.size %></p>
-          </div>
-          <div class="flex gap-2 items-center bg-white p-4 border border-alpha-black-25 rounded-lg">
-            <div class="mr-1 flex justify-center items-center bg-gray-50 w-8 h-8 rounded-full border border-alpha-black-25">
-              <p class="uppercase text-xs text-gray-500"><%= Current.user.initial %></p>
-            </div>
-            <p class="text-gray-900 font-medium text-sm"><%= Current.user.display_name %></p>
-            <div class="rounded-md bg-gray-100 px-1.5 py-0.5">
-              <p class="uppercase text-gray-500 font-medium text-xs"><%= Current.user.role %></p>
-            </div>
-          </div>
         </div>
-      </div>
-    <% end %>
-    <%= settings_section title: t(".danger_zone_title") do %>
-      <div class="flex items-center justify-between">
-        <div>
-          <h3 class="font-medium text-gray-900"><%= t(".delete_account") %></h3>
-          <p class="text-gray-500 text-sm"><%= t(".delete_account_warning") %></p>
-        </div>
-        <%=
-          button_to t(".delete_account"), settings_profile_path, method: :delete,
-            class: "bg-red-500 text-white text-sm font-medium rounded-lg px-3 py-2",
-            data: { turbo_confirm: {
-              title: t(".confirm_delete.title"),
-              body: t(".confirm_delete.body"),
-              accept: t(".delete_account"),
-              acceptClass: "w-full bg-red-500 text-white rounded-xl text-center p-[10px] border mb-2"
-            }}
-        %>
-      </div>
-    <% end %>
-  </div>
+      <% end %>
+      <% if @pending_invitations.any? %>
+        <% @pending_invitations.each do |invitation| %>
+          <div class="flex gap-2 items-center justify-between bg-container p-4 border border-alpha-black-25 rounded-lg">
+            <div class="flex gap-2 items-center">
+              <div class="w-9 h-9 shrink-0">
+                <div class="fg-inverse w-full h-full bg-surface-inset rounded-full flex items-center justify-center text-lg uppercase"><%= invitation.email[0] %></div>
+              </div>
+              <div class="flex">
+                <p class="text-primary font-medium text-sm"><%= invitation.email %></p>
+                <div class="rounded-md bg-surface px-1.5 py-0.5">
+                  <p class="uppercase text-secondary font-medium text-xs"><%= t(".pending") %></p>
+                </div>
+              </div>
+            </div>
+            <div class="flex items-center gap-4">
+              <% if self_hosted? %>
+                <div class="flex items-center gap-2" data-controller="clipboard">
+                  <p class="text-secondary text-sm"><%= t(".invitation_link") %></p>
+                  <span data-clipboard-target="source" class="hidden"><%= accept_invitation_url(invitation.token) %></span>
+                  <input type="text"
+                             readonly
+                             autocomplete="off"
+                             value="<%= accept_invitation_url(invitation.token) %>"
+                             class="text-sm bg-gray-50 px-2 py-1 rounded border border-secondary w-72">
+                  <button data-action="clipboard#copy" class="text-secondary hover:text-gray-700">
+                    <span data-clipboard-target="iconDefault">
+                      <%= icon "copy" %>
+                    </span>
+                    <span class="hidden" data-clipboard-target="iconSuccess">
+                      <%= icon "check" %>
+                    </span>
+                  </button>
+                </div>
+              <% end %>
 
-  <%= settings_nav_footer %>
-</div>
+              <% if Current.user.admin? %>
+                <%= render DS::Button.new(
+                  variant: "icon",
+                  icon: "x",
+                  href: invitation_path(invitation),
+                  method: :delete,
+                  confirm: CustomConfirm.for_resource_deletion(invitation.email, high_severity: true)
+                ) %>
+              <% end %>
+            </div>
+          </div>
+        <% end %>
+      <% end %>
+      <% if Current.user.admin? %>
+        <%= link_to new_invitation_path,
+                class: "bg-container-inset flex items-center justify-center gap-2 text-secondary mt-1 hover:bg-container-inset-hover rounded-lg px-4 py-2 w-full text-center",
+                data: { turbo_frame: :modal } do %>
+          <%= icon("plus") %>
+          <%= t(".invite_member") %>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+<% end %>
+
+<%= settings_section title: t(".danger_zone_title") do %>
+  <div class="space-y-4">
+    <% if Current.user.admin? %>
+      <div class="flex flex-col md:flex-row md:items-center md:justify-between gap-4">
+        <div class="w-full md:w-2/3">
+          <h3 class="font-medium text-primary"><%= t(".reset_account") %></h3>
+          <p class="text-secondary text-sm"><%= t(".reset_account_warning") %></p>
+        </div>
+
+        <%= render DS::Button.new(
+          text: t(".reset_account"),
+          variant: "destructive",
+          href: reset_user_path(@user),
+          method: :delete,
+          confirm: CustomConfirm.new(
+            title: "Reset account?",
+            body: "This will delete all data associated with your account. Your user profile will remain active.",
+            btn_text: "Reset account",
+            destructive: true,
+            high_severity: true
+          )
+        ) %>
+      </div>
+    <% end %>
+    <div class="flex flex-col md:flex-row md:items-center md:justify-between gap-4">
+      <div class="w-full md:w-2/3">
+        <h3 class="font-medium text-primary"><%= t(".delete_account") %></h3>
+        <p class="text-secondary text-sm"><%= t(".delete_account_warning") %></p>
+      </div>
+
+      <%= render DS::Button.new(
+        text: t(".delete_account"),
+        variant: "destructive",
+        href: user_path(@user),
+        method: :delete,
+        confirm: CustomConfirm.for_resource_deletion("your account", high_severity: true)
+      ) %>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/settings/securities/show.html.erb b/app/views/settings/securities/show.html.erb
new file mode 100644
index 00000000..1d3a7350
--- /dev/null
+++ b/app/views/settings/securities/show.html.erb
@@ -0,0 +1,46 @@
+<%= content_for :page_title, t(".page_title") %>
+
+<%= settings_section title: t(".mfa_title"), subtitle: t(".mfa_description") do %>
+  <div class="space-y-4">
+    <div class="p-3 shadow-border-xs bg-container rounded-lg md:flex md:justify-between md:items-center">
+      <div class="flex items-center gap-3">
+        <div class="w-9 h-9 rounded-full bg-gray-25 flex justify-center items-center">
+          <%= icon "shield-check" %>
+        </div>
+
+        <div class="text-sm space-y-1">
+          <% if Current.user.otp_required? %>
+            <p class="text-primary">Two-factor authentication is <span class="font-medium text-green-600">enabled</span></p>
+            <p class="text-secondary">Your account is protected with an additional layer of security.</p>
+          <% else %>
+            <p class="text-primary">Two-factor authentication is <span class="font-medium text-red-600">disabled</span></p>
+            <p class="text-secondary">Enable 2FA to add an extra layer of security to your account.</p>
+          <% end %>
+        </div>
+      </div>
+
+      <div class="mt-4 md:mt-0">
+        <% if Current.user.otp_required? %>
+          <%= render DS::Button.new(
+            text: t(".disable_mfa"),
+            variant: "secondary",
+            href: disable_mfa_path,
+            method: :delete,
+            confirm: CustomConfirm.new(
+              title: t(".disable_mfa_confirm"),
+              body: t(".disable_mfa_confirm"),
+              btn_text: t(".disable_mfa"),
+              destructive: true
+            )
+          ) %>
+        <% else %>
+          <%= render DS::Link.new(
+            text: t(".enable_mfa"),
+            variant: "primary",
+            href: new_mfa_path
+          ) %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/shared/_app_version.html.erb b/app/views/shared/_app_version.html.erb
index 0632359e..d8bc02ca 100644
--- a/app/views/shared/_app_version.html.erb
+++ b/app/views/shared/_app_version.html.erb
@@ -1,6 +1,3 @@
-<div class="flex items-center py-0.5 px-0.5 gap-1 fixed bottom-2 right-2 shadow-xs border border-alpha-black-50 rounded-md bg-white">
-  <p class="text-xs text-gray-500 pl-2">Version: <%= Maybe.version.to_release_tag %></p>
-  <%= link_to settings_hosting_path, class: "flex gap-1 items-center hover:bg-gray-50 rounded-md p-2" do %>
-    <%= lucide_icon("settings", class: "w-4 h-4 text-gray-500 shrink-0") %>
-  <% end %>
+<div class="flex items-center py-0.5 px-0.5 gap-1 fixed right-1 top-1 shadow-xs border border-alpha-black-50 rounded-md bg-container">
+  <p class="text-xs text-secondary pl-2">Version: <%= Maybe.version.to_release_tag %></p>
 </div>
diff --git a/app/views/shared/_auth_messages.html.erb b/app/views/shared/_auth_messages.html.erb
deleted file mode 100644
index 79de7718..00000000
--- a/app/views/shared/_auth_messages.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% flash.each do |type, msg| %>
-  <div class="p-4 <%= type == "notice" ? "bg-blue-200" : "bg-red-200" %> rounded-lg"><%= msg %></div>
-<% end %>
-
-<% errors.each do |message| %>
-  <div class="p-4 bg-red-200 rounded-lg"><%= message %></div>
-<% end %>
diff --git a/app/views/shared/_circle_logo.html.erb b/app/views/shared/_circle_logo.html.erb
deleted file mode 100644
index 328cb476..00000000
--- a/app/views/shared/_circle_logo.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<%# locals: (name:, hex: nil, size: "md") %>
-
-<% size_classes = {
-  "sm" => "w-6 h-6",
-  "md" => "w-8 h-8",
-  "lg" => "w-10 h-10",
-  "full" => "w-full h-full"
-} %>
-
-<%= tag.div style: mixed_hex_styles(hex),
-            class: [size_classes[size], "flex shrink-0 items-center justify-center rounded-full"] do %>
-  <%= tag.span name[0].upcase, class: ["font-medium", size == "sm" ? "text-xs" : "text-sm"] %>
-<% end %>
diff --git a/app/views/shared/_confirm_modal.html.erb b/app/views/shared/_confirm_modal.html.erb
deleted file mode 100644
index 5a935d22..00000000
--- a/app/views/shared/_confirm_modal.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<dialog id="turbo-confirm" class="max-w-[420px] w-full rounded-xl">
-  <form method="dialog" class="p-4">
-    <div class="flex flex-col mb-4">
-      <div class="flex justify-between mb-2 gap-4">
-        <h3 id="turbo-confirm-title" class="font-medium text-md"><%= t(".title") %></h3>
-        <button value="cancel">
-          <%= lucide_icon("x", class: "w-5 h-5 shrink-0 text-gray-500") %>
-        </button>
-      </div>
-      <div id="turbo-confirm-body" class="text-gray-500 text-sm">
-        <%= t(".body_html") %>
-      </div>
-    </div>
-    <button id="turbo-confirm-accept" class="w-full text-red-600 rounded-xl text-center p-[10px] border mb-2" value="confirm"><%= t(".accept") %></button>
-    <button class="w-full rounded-xl text-center p-[10px] border" value="cancel"><%= t(".cancel") %></button>
-  </form>
-</dialog>
diff --git a/app/views/shared/_disclosure.html.erb b/app/views/shared/_disclosure.html.erb
deleted file mode 100644
index 747d3345..00000000
--- a/app/views/shared/_disclosure.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<%# locals: (title:, content:, open: true) %>
-
-<details class="group space-y-2" <%= "open" if open %>>
-  <summary class="flex list-none items-center justify-between rounded-xl px-3 py-2 text-xs font-medium
-                        uppercase text-gray-500 bg-gray-25 focus-visible:outline-none">
-    <h3><%= title %></h3>
-    <%= lucide_icon "chevron-down",
-              class: "group-open:transform group-open:rotate-180 text-gray-500 w-5 h-5" %>
-  </summary>
-
-  <%= content %>
-</details>
diff --git a/app/views/shared/_drawer.html.erb b/app/views/shared/_drawer.html.erb
deleted file mode 100644
index de796424..00000000
--- a/app/views/shared/_drawer.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<%= turbo_frame_tag "drawer" do %>
-  <dialog class="bg-white border border-alpha-black-25 rounded-2xl max-w-[480px] w-full shadow-xs h-full mt-4 mr-4 focus-visible:outline-none" data-controller="modal" data-action="click->modal#clickOutside">
-    <div class="flex flex-col h-full">
-      <div class="flex justify-end items-center p-4">
-        <div data-action="click->modal#close" class="cursor-pointer p-2">
-          <%= lucide_icon("x", class: "w-5 h-5 shrink-0") %>
-        </div>
-      </div>
-      <div class="flex-1 overflow-y-auto px-4 pb-4">
-        <%= content %>
-      </div>
-    </div>
-  </dialog>
-<% end %>
diff --git a/app/views/shared/_form_errors.html.erb b/app/views/shared/_form_errors.html.erb
new file mode 100644
index 00000000..f2d703e2
--- /dev/null
+++ b/app/views/shared/_form_errors.html.erb
@@ -0,0 +1,6 @@
+<%# locals: (model:) %>
+
+<div class="flex items-center gap-2">
+  <%= icon("alert-circle", size: "sm", color: "destructive") %>
+  <p class="text-destructive text-sm"><%= model.errors.full_messages.to_sentence %></p>
+</div>
diff --git a/app/views/shared/_line_chart.html.erb b/app/views/shared/_line_chart.html.erb
deleted file mode 100644
index d72f5564..00000000
--- a/app/views/shared/_line_chart.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<%# locals: (series:) %>
-<% if series %>
-  <div
-    id="lineChart"
-    class="w-full h-full"
-    data-controller="time-series-chart"
-    data-time-series-chart-data-value="<%= series.to_json %>"></div>
-<% else %>
-  <div class="w-full h-full flex items-center justify-center">
-    <p class="text-gray-500">No data available for the selected period.</p>
-  </div>
-<% end %>
diff --git a/app/views/shared/_list_group.html.erb b/app/views/shared/_list_group.html.erb
deleted file mode 100644
index 526bb503..00000000
--- a/app/views/shared/_list_group.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<%# locals: (header:, content:) %>
-<div class="bg-gray-25 rounded-xl p-1 w-full">
-  <div class="py-2 px-4 flex items-center justify-between font-medium text-xs text-gray-500">
-    <%= header %>
-  </div>
-  <div class="bg-white shadow-xs rounded-md border border-alpha-black-25 divide-y divide-alpha-black-50">
-    <%= content %>
-  </div>
-</div>
diff --git a/app/views/shared/_modal.html.erb b/app/views/shared/_modal.html.erb
deleted file mode 100644
index 18dea29d..00000000
--- a/app/views/shared/_modal.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<%# locals: (content:, classes:) -%>
-<%= turbo_frame_tag "modal" do %>
-  <dialog class="bg-white border border-alpha-black-25 rounded-2xl max-w-[580px] w-min-content shadow-xs h-fit <%= classes %>" data-controller="modal" data-action="click->modal#clickOutside">
-    <div class="flex flex-col">
-      <%= content %>
-    </div>
-  </dialog>
-<% end %>
diff --git a/app/views/shared/_modal_form.html.erb b/app/views/shared/_modal_form.html.erb
deleted file mode 100644
index 68a462ee..00000000
--- a/app/views/shared/_modal_form.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<%# locals: (title:, content:, subtitle: nil) %>
-
-<%= modal do %>
-  <article class="mx-auto w-full p-4 space-y-4 min-w-[450px] max-w-xl">
-    <div class="space-y-2">
-      <header class="flex justify-between">
-        <h2 class="font-medium text-xl"><%= title %></h2>
-        <%= lucide_icon("x", class: "w-5 h-5 text-gray-500", data: { action: "click->modal#close" }) %>
-      </header>
-
-      <% if subtitle.present? %>
-        <%= tag.p subtitle, class: "text-gray-500 font-light" %>
-      <% end %>
-    </div>
-
-    <%= content %>
-  </article>
-<% end %>
diff --git a/app/views/shared/_money_field.html.erb b/app/views/shared/_money_field.html.erb
index fc788bad..05929401 100644
--- a/app/views/shared/_money_field.html.erb
+++ b/app/views/shared/_money_field.html.erb
@@ -1,54 +1,85 @@
 <%# locals: (form:, amount_method:, currency_method:, **options) %>
 
-<% currency_value = if form.object && form.object.respond_to?(currency_method)
-                      form.object.public_send(currency_method)
-                    end
+<% currency_value = if options[:currency_value_override].present?
+                     options[:currency_value_override]
+                   elsif form.object && form.object.respond_to?(currency_method)
+                     form.object.public_send(currency_method)
+                   end
    currency = Money::Currency.new(currency_value || options[:default_currency] || "USD") %>
 
-<div class="form-field pr-0 <%= options[:container_class] %>" data-controller="money-field">
-  <%= form.label options[:label] || t(".label"), class: "form-field__label" %>
-
-  <div class="flex items-center gap-1">
-    <div class="flex items-center grow gap-1">
-      <span class="text-gray-500 text-sm" data-money-field-target="symbol">
-        <%= currency.symbol %>
-      </span>
-
-      <%= form.number_field amount_method,
-        class: "form-field__input",
-        inline: true,
-        placeholder: "100",
-        value: if options[:value]
-          sprintf("%.#{currency.default_precision}f", options[:value])
-        elsif form.object && form.object.respond_to?(amount_method)
-          form.object.public_send(amount_method)
-        end,
-        min: options[:min] || -99999999999999,
-        max: options[:max] || 99999999999999,
-        step: currency.step,
-        data: {
-          "money-field-target": "amount",
-          action: "change->money-field#handleAmountChange",
-          "auto-submit-form-target": ("auto" if options[:auto_submit])
-        }.compact,
-        required: options[:required] %>
-    </div>
-
-    <% unless options[:hide_currency] %>
-      <div>
-        <%= form.select currency_method,
-                      currencies_for_select.map(&:iso_code),
-                      { inline: true },
-                      {
-                        class: "w-fit pr-5 disabled:text-gray-400 form-field__input",
-                        disabled: options[:disable_currency],
-                        data: {
-                          "money-field-target": "currency",
-                          action: "change->money-field#handleCurrencyChange",
-                          "auto-submit-form-target": ("auto" if options[:auto_submit])
-                        }.compact
-                      } %>
+<div class="form-field <%= options[:container_class] %>" data-controller="money-field">
+  <% if options[:label_tooltip] %>
+    <div class="form-field__header">
+      <%= form.label options[:label] || t(".label"), class: "form-field__label" do %>
+        <%= options[:label] || t(".label") %>
+        <% if options[:required] %>
+          <span class="text-red-500 ml-0.5">*</span>
+        <% end %>
+      <% end %>
+      <div class="form-field__actions">
+        <div data-controller="tooltip">
+          <%= icon "help-circle", size: "sm", color: "default", class: "cursor-help" %>
+          <div role="tooltip" data-tooltip-target="tooltip" class="tooltip bg-gray-700 text-sm p-2 rounded w-64 text-white">
+            <%= options[:label_tooltip] %>
+          </div>
+        </div>
       </div>
+    </div>
+  <% end %>
+
+  <div class="form-field__body">
+    <% unless options[:label_tooltip] %>
+      <%= form.label options[:label] || t(".label"), class: "form-field__label" do %>
+        <%= options[:label] || t(".label") %>
+        <% if options[:required] %>
+          <span class="text-red-500 ml-0.5">*</span>
+        <% end %>
+      <% end %>
     <% end %>
+
+    <div class="flex items-center gap-1">
+      <div class="flex items-center grow gap-1">
+        <span class="text-subdued text-sm" data-money-field-target="symbol">
+          <%= currency.symbol %>
+        </span>
+
+        <%= form.number_field amount_method,
+          class: "form-field__input",
+          inline: true,
+          placeholder: "100",
+          value: if options[:value]
+            sprintf("%.#{currency.default_precision}f", options[:value])
+          elsif form.object && form.object.respond_to?(amount_method)
+            val = form.object.public_send(amount_method)
+            sprintf("%.#{currency.default_precision}f", val) if val.present?
+          end,
+          min: options[:min] || -99999999999999,
+          max: options[:max] || 99999999999999,
+          step: currency.step,
+          disabled: options[:disabled],
+          data: {
+            "money-field-target": "amount",
+            "auto-submit-form-target": ("auto" if options[:auto_submit])
+          }.compact,
+          required: options[:required] %>
+      </div>
+
+      <% unless options[:hide_currency] %>
+        <div>
+          <%= form.select currency_method,
+                        Money::Currency.as_options.map(&:iso_code),
+                        { inline: true, selected: currency.iso_code },
+                        {
+                          class: "w-fit pr-5 disabled:text-subdued form-field__input",
+                          disabled: options[:disable_currency],
+                          data: {
+                            "money-field-target": "currency",
+                            action: "change->money-field#handleCurrencyChange",
+                            "auto-submit-form-target": ("auto" if options[:auto_submit])
+                          }.compact
+                        } %>
+        </div>
+      <% end %>
+    </div>
   </div>
 </div>
diff --git a/app/views/shared/_no_account_empty_state.html.erb b/app/views/shared/_no_account_empty_state.html.erb
deleted file mode 100644
index cfb79003..00000000
--- a/app/views/shared/_no_account_empty_state.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="flex justify-center items-center h-[800px]">
-  <div class="text-center flex flex-col gap-4 items-center max-w-[300px]">
-    <%= lucide_icon "layers", class: "w-6 h-6 text-gray-500" %>
-
-    <div class="space-y-1 text-sm">
-      <p class="text-gray-900 font-medium"><%= t(".no_account_title") %></p>
-      <p class="text-gray-500"><%= t(".no_account_subtitle") %></p>
-    </div>
-
-    <%= link_to new_account_path, class: "btn btn--primary flex items-center gap-1", data: { turbo_frame: "modal" } do %>
-      <%= lucide_icon("plus", class: "w-5 h-5") %>
-      <span><%= t(".new_account") %></span>
-    <% end %>
-  </div>
-</div>
diff --git a/app/views/shared/_notification.html.erb b/app/views/shared/_notification.html.erb
deleted file mode 100644
index 48e4c731..00000000
--- a/app/views/shared/_notification.html.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-<%# locals: (message:, type: "notice", id: nil, **_opts) %>
-
-<% type = type.to_sym %>
-<% action = "animationend->element-removal#remove" if type == :notice %>
-
-<%= tag.div class: "flex gap-3 rounded-lg border bg-white p-4 group max-w-80 shadow-xs border-alpha-black-25",
-            id: id,
-            data: {
-              controller: "element-removal",
-              action: action
-            } do %>
-
-  <div class="h-5 w-5 shrink-0 p-px text-white">
-    <% case type %>
-    <% when :notice %>
-      <div class="flex h-full items-center justify-center rounded-full bg-success">
-        <%= lucide_icon "check", class: "w-3 h-3" %>
-      </div>
-    <% when :alert %>
-      <div class="flex h-full items-center justify-center rounded-full bg-error">
-        <%= lucide_icon "x", class: "w-3 h-3" %>
-      </div>
-    <% when :processing %>
-      <%= lucide_icon "loader", class: "w-5 h-5 text-gray-500 animate-pulse" %>
-    <% end %>
-  </div>
-
-  <%= tag.p message, class: "text-gray-900 text-sm font-medium" %>
-
-  <div class="ml-auto">
-    <% if type.to_sym == :notice %>
-      <div class="h-5 shrink-0">
-        <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" class="shrink-0">
-          <path d="M18 10C18 14.4183 14.4183 18 10 18C5.58172 18 2 14.4183 2 10C2 5.58172 5.58172 2 10 2C14.4183 2 18 5.58172 18 10ZM3.6 10C3.6 13.5346 6.46538 16.4 10 16.4C13.5346 16.4 16.4 13.5346 16.4 10C16.4 6.46538 13.5346 3.6 10 3.6C6.46538 3.6 3.6 6.46538 3.6 10Z" fill="#E5E5E5" />
-          <circle class="origin-center -rotate-90 animate-[stroke-fill_5s_300ms_forwards]" stroke="#141414" stroke-opacity="0.4" r="7.2" cx="10" cy="10" stroke-dasharray="43.9822971503" stroke-dashoffset="43.9822971503" />
-        </svg>
-        <div class="absolute -top-2 -right-2">
-          <%= lucide_icon "x", class: "w-5 h-5 p-0.5 hidden group-hover:inline-block border border-alpha-black-50 border-solid rounded-lg bg-white text-gray-400 cursor-pointer", data: { action: "click->element-removal#remove" } %>
-        </div>
-      </div>
-    <% elsif type.to_sym == :alert %>
-      <%= lucide_icon "x", data: { action: "click->element-removal#remove" }, class: "w-5 h-5 text-gray-500 hover:text-gray-600 cursor-pointer" %>
-    <% end %>
-  </div>
-<% end %>
diff --git a/app/views/shared/_pagination.html.erb b/app/views/shared/_pagination.html.erb
new file mode 100644
index 00000000..afc047de
--- /dev/null
+++ b/app/views/shared/_pagination.html.erb
@@ -0,0 +1,57 @@
+<%# locals: (pagy:) %>
+
+<nav class="flex w-full items-center justify-between">
+  <div class="flex items-center gap-1">
+    <div>
+      <% if pagy.prev %>
+        <%= link_to pagy_url_for(pagy, pagy.prev),
+              data: { turbo_frame: :_top },
+              class: "inline-flex items-center p-2 text-sm font-medium text-secondary bg-container-inset hover:border-secondary hover:text-secondary" do %>
+          <%= icon("chevron-left") %>
+        <% end %>
+      <% else %>
+        <div class="inline-flex items-center p-2 text-sm font-medium hover:border-secondary">
+          <%= icon("chevron-left") %>
+        </div>
+      <% end %>
+    </div>
+    <div class="rounded-xl p-1 bg-container-inset">
+      <% pagy.series.each do |series_item| %>
+        <% if series_item.is_a?(Integer) %>
+          <%= link_to pagy_url_for(pagy, series_item),
+                data: { turbo_frame: :_top },
+                class: "rounded-md px-2 py-1 inline-flex items-center text-sm font-medium text-secondary hover:border-secondary hover:text-secondary" do %>
+            <%= series_item %>
+          <% end %>
+        <% elsif series_item.is_a?(String) %>
+          <%= link_to pagy_url_for(pagy, series_item),
+                data: { turbo_frame: :_top },
+                class: "rounded-md px-2 py-1 bg-container border border-secondary shadow-xs inline-flex items-center text-sm font-medium text-primary" do %>
+            <%= series_item %>
+          <% end %>
+        <% elsif series_item == :gap %>
+          <span class="inline-flex items-center px-2 py-1 text-sm font-medium text-secondary">...</span>
+        <% end %>
+      <% end %>
+    </div>
+    <div>
+      <% if pagy.next %>
+        <%= link_to pagy_url_for(pagy, pagy.next),
+              data: { turbo_frame: :_top },
+              class: "inline-flex items-center p-2 text-sm font-medium text-secondary hover:border-secondary hover:text-secondary" do %>
+          <%= icon("chevron-right") %>
+        <% end %>
+      <% else %>
+        <div class="inline-flex items-center p-2 text-sm font-medium hover:border-secondary">
+          <%= icon("chevron-right") %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+  <div class="flex items-center gap-4">
+    <%= select_tag :per_page,
+                   options_for_select(["10", "20", "30", "50"], pagy.limit),
+                   data: { controller: "selectable-link" },
+                   class: "py-1.5 pr-8 text-sm text-primary font-medium bg-container-inset border border-secondary rounded-lg focus:border-secondary focus:ring-secondary focus-visible:ring-secondary" %>
+  </div>
+</nav>
diff --git a/app/views/shared/_progress_circle.html.erb b/app/views/shared/_progress_circle.html.erb
index 3f7ec528..11322d14 100644
--- a/app/views/shared/_progress_circle.html.erb
+++ b/app/views/shared/_progress_circle.html.erb
@@ -1,10 +1,30 @@
-<%# locals: (progress:, radius: 7, stroke: 2, text_class: "text-green-500") %>
-<% circumference = Math::PI * 2 * radius %>
-<% progress_percent = progress.clamp(0, 100) %>
-<% stroke_dashoffset = ((100 - progress_percent) * circumference) / 100 %>
+<%# locals: (progress:, radius: 7, stroke: 2, color: nil) %>
+
+<%
+  circumference = Math::PI * 2 * radius
+  progress_percent = progress.clamp(0, 100)
+  stroke_dashoffset = ((100 - progress_percent) * circumference) / 100
+  center = radius + stroke / 2
+%>
+
 <svg width="<%= radius * 2 + stroke %>" height="<%= radius * 2 + stroke %>">
   <!-- Background Circle -->
-  <circle class="fill-transparent stroke-current text-gray-300" r="<%= radius %>" cx="<%= radius + stroke / 2 %>" cy="<%= radius + stroke / 2 %>" stroke-width="<%= stroke %>" />
+  <circle
+    class="fill-transparent stroke-current text-gray-300"
+    r="<%= radius %>"
+    cx="<%= center %>"
+    cy="<%= center %>"
+    stroke-width="<%= stroke %>"></circle>
+
   <!-- Foreground Circle -->
-  <circle class="fill-transparent stroke-current <%= text_class %>" r="<%= radius %>" cx="<%= radius + stroke / 2 %>" cy="<%= radius + stroke / 2 %>" stroke-width="<%= stroke %>" stroke-dasharray="<%= circumference %>" stroke-dashoffset="<%= stroke_dashoffset %>" transform="rotate(-90, <%= radius + stroke / 2 %>, <%= radius + stroke / 2 %>)" />
-  </svg>
+  <circle
+    class="fill-transparent"
+    style="stroke: <%= color || "var(--color-blue-500)" %>"
+    r="<%= radius %>"
+    cx="<%= center %>"
+    cy="<%= center %>"
+    stroke-width="<%= stroke %>"
+    stroke-dasharray="<%= circumference %>"
+    stroke-dashoffset="<%= stroke_dashoffset %>"
+    transform="rotate(-90, <%= center %>, <%= center %>)"></circle>
+</svg>
diff --git a/app/views/shared/_ruler.html.erb b/app/views/shared/_ruler.html.erb
new file mode 100644
index 00000000..faf96d8e
--- /dev/null
+++ b/app/views/shared/_ruler.html.erb
@@ -0,0 +1,2 @@
+<%# locals: (classes: nil) %>
+<hr class="border-divider <%= classes || "mx-4" %>">
diff --git a/app/views/shared/_sparkline.html.erb b/app/views/shared/_sparkline.html.erb
new file mode 100644
index 00000000..719103d9
--- /dev/null
+++ b/app/views/shared/_sparkline.html.erb
@@ -0,0 +1,13 @@
+<%# locals: (series:, id:, stroke_width: 1) %>
+
+<%= tag.div(
+  id: id,
+  class: "h-full w-full",
+  data: {
+    controller: "time-series-chart",
+    "time-series-chart-data-value": series.to_json,
+    "time-series-chart-stroke-width-value": stroke_width,
+    "time-series-chart-use-labels-value": false,
+    "time-series-chart-use-tooltip-value": false
+  }
+) %>
diff --git a/app/views/shared/_subscribe_prompt.html.erb b/app/views/shared/_subscribe_prompt.html.erb
deleted file mode 100644
index 35315af4..00000000
--- a/app/views/shared/_subscribe_prompt.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="flex justify-center items-center h-[800px]">
-  <div class="text-center flex flex-col gap-4 items-center max-w-[300px]">
-    <%= lucide_icon "circle-fading-arrow-up", class: "w-8 h-8 text-green-500" %>
-
-    <div class="space-y-1 text-sm">
-      <p class="text-gray-900 font-medium"><%= t(".title") %></p>
-      <p class="text-gray-500"><%= t(".subtitle") %></p>
-      <p class="text-gray-400 text-xs"><%= t(".guarantee") %></p>
-    </div>
-
-    <%= link_to new_subscription_path, class: "btn btn--primary flex items-center gap-1" do %>
-      <%= lucide_icon("credit-card", class: "w-5 h-5") %>
-      <span><%= t(".subscribe") %></span>
-    <% end %>
-  </div>
-</div>
diff --git a/app/views/shared/_text_tooltip.erb b/app/views/shared/_text_tooltip.erb
new file mode 100644
index 00000000..a576b114
--- /dev/null
+++ b/app/views/shared/_text_tooltip.erb
@@ -0,0 +1,5 @@
+<div role="tooltip" data-tooltip-target="tooltip" class="tooltip bg-gray-700 text-sm px-1.5 py-1 rounded-md">
+  <div class="fg-inverse font-normal max-w-[200px]">
+    <%= tooltip_text %>
+  </div>
+</div>
diff --git a/app/views/shared/_transaction_type_tabs.html.erb b/app/views/shared/_transaction_type_tabs.html.erb
new file mode 100644
index 00000000..b2cfe0fd
--- /dev/null
+++ b/app/views/shared/_transaction_type_tabs.html.erb
@@ -0,0 +1,24 @@
+<%# locals: (active_tab:, account_id: nil) %>
+
+<fieldset class="bg-surface-inset rounded-lg p-1 grid grid-flow-col justify-stretch gap-x-2">
+  <%= link_to new_transaction_path(nature: "outflow", account_id: account_id),
+              data: { turbo_frame: :modal },
+              class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-sm #{active_tab == 'expense' ? 'bg-container text-primary shadow-sm' : 'hover:bg-container text-subdued hover:text-primary hover:shadow-sm'}" do %>
+    <%= icon "minus-circle" %>
+    <%= tag.span t("shared.transaction_tabs.expense") %>
+  <% end %>
+
+  <%= link_to new_transaction_path(nature: "inflow", account_id: account_id),
+              data: { turbo_frame: :modal },
+              class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-sm #{active_tab == 'income' ? 'bg-container text-primary shadow-sm' : 'hover:bg-container text-subdued hover:text-primary hover:shadow-sm'}" do %>
+    <%= icon "plus-circle" %>
+    <%= tag.span t("shared.transaction_tabs.income") %>
+  <% end %>
+
+  <%= link_to new_transfer_path,
+              data: { turbo_frame: :modal },
+              class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-sm #{active_tab == 'transfer' ? 'bg-container text-primary shadow-sm' : 'hover:bg-container text-subdued hover:text-primary hover:shadow-sm'}" do %>
+    <%= icon "arrow-right-left" %>
+    <%= tag.span t("shared.transaction_tabs.transfer") %>
+  <% end %>
+</fieldset>
diff --git a/app/views/shared/_trend_change.html.erb b/app/views/shared/_trend_change.html.erb
index 8df76179..ad9c44cf 100644
--- a/app/views/shared/_trend_change.html.erb
+++ b/app/views/shared/_trend_change.html.erb
@@ -1,14 +1,17 @@
-<%# locals: { trend: } %>
+<%# locals: { trend:, comparison_label: nil } %>
 
-<% styles = trend_styles(trend) %>
-
-<p class="text-sm <%= styles[:text_class] %>">
+<p class="text-sm" style="color: <%= trend.color %>">
   <% if trend.direction.flat? %>
-    <span>No change</span>
+    <%= t(".no_change") %><%= " #{comparison_label}" if defined?(comparison_label) && comparison_label.present? %>
   <% else %>
-    <span><%= styles[:symbol] %><%= trend.value.is_a?(Money) ? format_money(trend.value.abs) : trend.value.abs.round(2) %></span>
+    <span class="font-mono">
+      <%= trend.value.is_a?(Money) ? format_money(trend.value) : trend.value.round(2) %>
+    </span>
     <% unless trend.percent.infinite? %>
-      <span>(<%= lucide_icon(styles[:icon], class: "w-4 h-4 align-text-bottom inline") %><%= trend.percent.abs %>%)</span>
+      <span class="font-mono">(<%= icon(trend.icon, size: "sm", color: "current", class: "mb-0.5 inline") %><%= trend.percent_formatted %>)</span>
     <% end %>
+    <span class="text-secondary">
+      <%= " #{comparison_label}" if defined?(comparison_label) && comparison_label.present? %>
+    </span>
   <% end %>
 </p>
diff --git a/app/views/shared/_upgrade_notification.html.erb b/app/views/shared/_upgrade_notification.html.erb
deleted file mode 100644
index d285d678..00000000
--- a/app/views/shared/_upgrade_notification.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<%# locals: (upgrade:) %>
-<div class="bg-white space-y-4 text-right fixed bottom-10 right-10 p-5 border border-alpha-black-200 shadow-xs rounded-md z-50 max-w-[350px]">
-  <div>
-    <p><%= link_to upgrade.to_s, upgrade.url, class: "text-sm text-blue-500 underline hover:text-blue-700", target: "_blank" %></p>
-    <% if upgrade.complete? %>
-      <p class="text-gray-900"><%= t(".app_upgraded", version: upgrade.to_s) %></p>
-    <% else %>
-      <p class="text-gray-900"><%= t(".new_version_available") %></p>
-    <% end %>
-  </div>
-  <div class="flex justify-end items-center gap-2">
-    <%= button_to t(".dismiss"), acknowledge_upgrade_path(upgrade.commit_sha), method: :post, class: "#{upgrade.complete? ? 'bg-gray-900 text-white' : 'bg-gray-100 text-gray-900'} text-sm font-bold p-2 rounded-lg" %>
-    <% if upgrade.available? %>
-      <%= button_to t(".upgrade_now"), deploy_upgrade_path(upgrade.commit_sha), method: :post, class: "bg-gray-900 hover:bg-gray-700 text-white font-medium text-sm p-2 rounded-lg" %>
-    <% end %>
-  </div>
-</div>
diff --git a/app/views/shared/_user_profile_image.html.erb b/app/views/shared/_user_profile_image.html.erb
deleted file mode 100644
index bd261619..00000000
--- a/app/views/shared/_user_profile_image.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= image_tag user.profile_image.variant(:thumbnail), class: "rounded-full w-full h-full object-cover" %>
diff --git a/app/views/shared/_value_heading.html.erb b/app/views/shared/_value_heading.html.erb
deleted file mode 100644
index fcdf384d..00000000
--- a/app/views/shared/_value_heading.html.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<%# locals: (label:, period:, value:, trend:, size: "lg", is_percentage: false)%>
-<div class="space-y-2">
-  <p class="text-sm text-gray-500 font-medium"><%= label %></p>
-  <p class="text-gray-900 -space-x-0.5">
-    <% if value.is_a?(Money) %>
-      <span class="<%= size == "lg" ? "text-xl" : "text-lg" %> font-medium"><%= format_money value %></span>
-    <% else %>
-      <span class="<%= size == "lg" ? "text-xl" : "text-lg" %> font-medium"><%= is_percentage ? number_to_percentage(value, precision: 2) : value %></span>
-    <% end %>
-  </p>
-  <% if trend.nil? %>
-    <p class="text-sm text-gray-500">Data not available for the selected period</p>
-  <% elsif trend.direction.flat? %>
-    <p class="text-sm text-gray-500">No change vs. prior period</p>
-  <% else %>
-    <div class="flex items-center gap-2">
-      <%= render partial: "shared/trend_change", locals: { trend: trend } %>
-      <span class="text-sm text-gray-500"><%= period_label(period) %></span>
-    </div>
-  <% end %>
-</div>
diff --git a/app/views/shared/notifications/_alert.html.erb b/app/views/shared/notifications/_alert.html.erb
new file mode 100644
index 00000000..d53793df
--- /dev/null
+++ b/app/views/shared/notifications/_alert.html.erb
@@ -0,0 +1,16 @@
+<%# locals: (message:) %>
+
+<%= tag.div class: "flex gap-3 rounded-lg bg-container p-4 group w-full md:max-w-80 shadow-border-lg",
+            data: { controller: "element-removal" } do %>
+  <div class="h-5 w-5 shrink-0 p-px text-primary">
+    <div class="flex h-full items-center justify-center rounded-full bg-destructive">
+      <%= icon "x", size: "xs", color: "white" %>
+    </div>
+  </div>
+
+  <%= tag.p message, class: "text-primary text-sm font-medium" %>
+
+  <div class="ml-auto">
+    <%= icon "x", data: { action: "click->element-removal#remove" }, class: "cursor-pointer" %>
+  </div>
+<% end %>
diff --git a/app/views/shared/notifications/_cta.html.erb b/app/views/shared/notifications/_cta.html.erb
new file mode 100644
index 00000000..c428b66d
--- /dev/null
+++ b/app/views/shared/notifications/_cta.html.erb
@@ -0,0 +1,20 @@
+<%# locals: (message:, description:) %>
+
+<div id="cta">
+  <%= tag.div class: "relative flex gap-3 rounded-lg bg-container p-4 group w-full md:max-w-80 shadow-border-xs", data: { controller: "element-removal" } do %>
+    <div class="h-5 w-5 shrink-0 p-px text-primary">
+      <div class="flex h-full items-center justify-center rounded-full bg-success fg-inverse">
+        <%= icon "check", size: "xs", color: "current" %>
+      </div>
+    </div>
+
+    <div class="space-y-4">
+      <div class="space-y-1">
+        <%= tag.p message, class: "text-primary text-sm font-medium" %>
+        <%= tag.p description, class: "text-secondary text-sm" %>
+      </div>
+
+      <%= yield %>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/shared/notifications/_notice.html.erb b/app/views/shared/notifications/_notice.html.erb
new file mode 100644
index 00000000..5081cfc9
--- /dev/null
+++ b/app/views/shared/notifications/_notice.html.erb
@@ -0,0 +1,36 @@
+<%# locals: (message:, description: nil) %>
+
+<%= tag.div class: "relative flex gap-3 rounded-lg bg-container p-4 group w-full md:max-w-80 shadow-border-xs",
+            data: {
+              controller: "element-removal",
+              action: "animationend->element-removal#remove"
+            } do %>
+  <div class="h-5 w-5 shrink-0 p-px text-primary">
+    <div class="flex h-full items-center justify-center rounded-full bg-success">
+      <%= icon "check", size: "xs", color: "white" %>
+    </div>
+  </div>
+
+  <div class="space-y-4">
+    <div class="space-y-1">
+      <%= tag.p message, class: "text-primary text-sm font-medium" %>
+
+      <% if description %>
+        <%= tag.p description, class: "text-secondary text-sm" %>
+      <% end %>
+    </div>
+  </div>
+
+  <div class="ml-auto">
+    <div class="h-5 shrink-0">
+      <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" class="shrink-0">
+        <path d="M18 10C18 14.4183 14.4183 18 10 18C5.58172 18 2 14.4183 2 10C2 5.58172 5.58172 2 10 2C14.4183 2 18 5.58172 18 10ZM3.6 10C3.6 13.5346 6.46538 16.4 10 16.4C13.5346 16.4 16.4 13.5346 16.4 10C16.4 6.46538 13.5346 3.6 10 3.6C6.46538 3.6 3.6 6.46538 3.6 10Z" fill="#E5E5E5" />
+        <circle class="origin-center -rotate-90 animate-stroke-fill" stroke="#141414" stroke-opacity="0.4" r="7.2" cx="10" cy="10" stroke-dasharray="43.9822971503" stroke-dashoffset="43.9822971503" />
+      </svg>
+    </div>
+  </div>
+
+  <div class="absolute -top-2 -right-2">
+    <%= icon "x", class: "p-0.5 hidden group-hover:inline-block border border-alpha-black-50 border-solid rounded-lg bg-container text-subdued cursor-pointer", data: { action: "click->element-removal#remove" } %>
+  </div>
+<% end %>
diff --git a/app/views/subscriptions/_plan_choice.html.erb b/app/views/subscriptions/_plan_choice.html.erb
new file mode 100644
index 00000000..b1a2b5eb
--- /dev/null
+++ b/app/views/subscriptions/_plan_choice.html.erb
@@ -0,0 +1,31 @@
+<%# locals: (plan:, form:, checked: false) %>
+
+<% price = plan == "annual" ? 90 : 9 %>
+<% frequency = plan == "annual" ? "/year" : "/month" %>
+
+<div class="relative">
+  <%= form.radio_button :plan, plan, class: "peer sr-only", checked: checked %>
+  <%= form.label "plan_#{plan}", class: class_names(
+    "flex flex-col gap-1 p-4 cursor-pointer rounded-lg border border-primary hover:bg-container",
+    "peer-checked:bg-container peer-checked:rounded-2xl peer-checked:border-solid peer-checked:ring-4 peer-checked:ring-shadow",
+    "transition-all duration-300"
+  ) do %>
+    <h3 class="text-sm text-secondary"><%= plan.titleize %></h3>
+
+    <div class="mt-auto flex items-end gap-1">
+      <p class="font-display text-xl lg:text-3xl font-medium text-primary">$<%= price %><%= frequency %></p>
+
+      <% if plan == "annual" %>
+        <span class="text-sm text-secondary mb-1">or <%= Money.new(price.to_f / 52).format %>/week</span>
+      <% end %>
+    </div>
+
+    <p class="text-sm text-secondary">
+      <% if plan == "annual" %>
+        Billed annually, 2 months free
+      <% else %>
+        Billed monthly
+      <% end %>
+    </p>
+  <% end %>
+</div>
diff --git a/app/views/subscriptions/upgrade.html.erb b/app/views/subscriptions/upgrade.html.erb
new file mode 100644
index 00000000..959babf6
--- /dev/null
+++ b/app/views/subscriptions/upgrade.html.erb
@@ -0,0 +1,62 @@
+<div class="flex flex-col h-full justify-between bg-surface">
+  <nav class="p-4">
+    <h1 class="sr-only">Upgrade</h1>
+
+    <div class="flex justify-end gap-2">
+      <%= render DS::Link.new(
+        text: "Account Settings",
+        icon: "settings",
+        variant: "ghost",
+        href: settings_profile_path,
+      ) %>
+
+      <%= render DS::Button.new(
+        text: "Sign out",
+        icon: "log-out",
+        icon_position: :right,
+        variant: "ghost",
+        href: session_path(Current.session),
+        method: :delete
+      ) %>
+    </div>
+  </nav>
+
+  <div class="grow flex flex-col items-center justify-center">
+    <%= image_tag "logo-color.png", class: "w-16 mb-6" %>
+
+    <% if Current.family.trialing? %>
+      <p class="text-xl lg:text-3xl text-primary font-display font-medium">Your trial has <%= Current.family.days_left_in_trial %> days remaining</p>
+    <% else %>
+      <p class="text-xl lg:text-3xl text-primary font-display font-medium">Your trial is over</p>
+    <% end %>
+
+    <h2 class="text-xl lg:text-3xl font-display font-medium mb-2">
+      <span class="text-secondary">Unlock</span>
+      <span class="bg-gradient-to-r from-[#EABE7F] to-[#957049] bg-clip-text text-transparent">Maybe</span>
+      <span class="text-secondary">today</span>
+    </h2>
+
+    <p class="text-sm text-secondary mb-8">To continue using Maybe pick a plan below.</p>
+
+    <%= form_with url: new_subscription_path, method: :get, class: "max-w-xs", data: { turbo: false } do |form| %>
+      <div class="space-y-4 mb-6">
+        <%= render "subscriptions/plan_choice", form: form, plan: "annual", checked: @plan == "annual" %>
+        <%= render "subscriptions/plan_choice", form: form, plan: "monthly", checked: @plan == "monthly" %>
+      </div>
+
+      <div class="text-center space-y-2">
+        <%= render DS::Button.new(
+          text: "Subscribe and unlock Maybe",
+          variant: "primary",
+          full_width: true
+        ) %>
+
+        <p class="text-xs text-secondary">
+          In the next step, you'll be redirected to Stripe which handles our billing.
+        </p>
+      </div>
+    <% end %>
+  </div>
+
+  <%= render "layouts/shared/footer" %>
+</div>
diff --git a/app/views/tag/deletions/new.html.erb b/app/views/tag/deletions/new.html.erb
index 8d6dd067..4370d3da 100644
--- a/app/views/tag/deletions/new.html.erb
+++ b/app/views/tag/deletions/new.html.erb
@@ -1,21 +1,32 @@
-<%= modal_form_wrapper title: t(".delete_tag"), subtitle: t(".explanation", tag_name: @tag.name) do %>
-  <%= styled_form_with url: tag_deletions_path(@tag),
-                       class: "space-y-4",
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".delete_tag"), subtitle: t(".explanation", tag_name: @tag.name)) %>
+
+  <% dialog.with_body do %>
+    <%= styled_form_with url: tag_deletions_path(@tag),
                        data: {
                          turbo: false,
                          controller: "deletion",
-                         deletion_dangerous_action_class: "form-field__submit bg-white text-red-600 border hover:bg-red-50",
-                         deletion_safe_action_class: "form-field__submit border border-transparent",
                          deletion_submit_text_when_not_replacing_value: t(".delete_and_leave_uncategorized", tag_name: @tag.name),
                          deletion_submit_text_when_replacing_value: t(".delete_and_recategorize", tag_name: @tag.name) } do |f| %>
-    <%= f.collection_select :replacement_tag_id,
+      <%= f.collection_select :replacement_tag_id,
                             Current.family.tags.alphabetically.without(@tag),
                             :id, :name,
-                            { prompt: t(".replacement_tag_prompt"), label: t(".tag") },
-                            { data: { deletion_target: "replacementField", action: "deletion#updateSubmitButton" } } %>
+                            { prompt: t(".replacement_tag_prompt"), label: t(".tag"), container_class: "mb-4" },
+                            data: { deletion_target: "replacementField", action: "deletion#chooseSubmitButton" } %>
 
-    <%= f.submit t(".delete_and_leave_uncategorized", tag_name: @tag.name),
-                 class: "form-field__submit bg-white text-red-600 border hover:bg-red-50",
-                 data: { deletion_target: "submitButton" } %>
+      <%= render DS::Button.new(
+        variant: "destructive",
+        text: t(".delete_and_leave_uncategorized", tag_name: @tag.name),
+        full_width: true,
+        data: { deletion_target: "destructiveSubmitButton" }
+      ) %>
+
+      <%= render DS::Button.new(
+        text: "Delete and reassign",
+        data: { deletion_target: "safeSubmitButton" },
+        hidden: true,
+        full_width: true
+      ) %>
+    <% end %>
   <% end %>
 <% end %>
diff --git a/app/views/tags/_form.html.erb b/app/views/tags/_form.html.erb
index 99b1c706..3419331f 100644
--- a/app/views/tags/_form.html.erb
+++ b/app/views/tags/_form.html.erb
@@ -1,5 +1,5 @@
 <div data-controller="color-avatar">
-  <%= styled_form_with model: tag, class: "space-y-4", data: { turbo: false } do |f| %>
+  <%= styled_form_with model: tag, class: "space-y-4", data: { turbo_frame: :_top } do |f| %>
     <section class="space-y-4">
       <div class="w-fit m-auto">
         <%= render partial: "shared/color_avatar", locals: { name: tag.name, color: tag.color } %>
@@ -12,8 +12,8 @@
           </label>
         <% end %>
       </div>
-      <div class="relative flex items-center border border-gray-200 rounded-lg">
-        <%= f.text_field :name, placeholder: t(".placeholder"), class: "text-sm font-normal placeholder:text-gray-500 h-10 relative pl-3 w-full border-none rounded-lg", required: true, data: { color_avatar_target: "name" } %>
+      <div class="relative flex items-center border border-secondary rounded-lg text-subdued">
+        <%= f.text_field :name, placeholder: t(".placeholder"), autofocus: true, required: true, data: { color_avatar_target: "name" } %>
       </div>
     </section>
 
diff --git a/app/views/tags/_ruler.html.erb b/app/views/tags/_ruler.html.erb
deleted file mode 100644
index fc1d8ce9..00000000
--- a/app/views/tags/_ruler.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="bg-white">
-  <div class="h-px bg-alpha-black-50 ml-4 mr-6"></div>
-</div>
diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb
index 5a65a341..aadbc63a 100644
--- a/app/views/tags/_tag.html.erb
+++ b/app/views/tags/_tag.html.erb
@@ -1,24 +1,34 @@
 <%# locals: (tag:) %>
 
-<div id="<%= dom_id(tag) %>" class="flex justify-between items-center p-4 bg-white">
+<div id="<%= dom_id(tag) %>" class="flex justify-between items-center p-4 bg-container">
   <div class="flex w-full items-center gap-2.5">
     <%= render partial: "shared/color_avatar", locals: { name: tag.name, color: tag.color } %>
-    <p class="text-gray-900 text-sm truncate">
+    <p class="text-primary text-sm truncate">
       <%= tag.name %>
     </p>
   </div>
   <div class="justify-self-end">
-    <%= contextual_menu do %>
-      <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-        <%= contextual_menu_modal_action_item t(".edit"), edit_tag_path(tag) %>
+    <%= render DS::Menu.new do |menu| %>
+      <% menu.with_item(variant: "link", text: t(".edit"), href: edit_tag_path(tag), icon: "pencil", data: { turbo_frame: "modal" }) %>
 
-        <%= link_to new_tag_deletion_path(tag),
-                    class: "block w-full py-2 px-3 space-x-2 text-red-600 hover:bg-red-50 flex items-center rounded-lg",
-                    data: { turbo_frame: :modal } do %>
-          <%= lucide_icon "trash-2", class: "w-5 h-5" %>
-          <span><%= t(".delete") %></span>
-        <% end %>
-      </div>
+      <% if tag.transactions.any? %>
+        <% menu.with_item(
+          variant: "link",
+          text: t(".delete"),
+          href: new_tag_deletion_path(tag),
+          icon: "trash-2",
+          frame: :modal
+        ) %>
+      <% else %>
+        <% menu.with_item(
+          variant: "button",
+          text: t(".delete"),
+          href: tag_path(tag),
+          icon: "trash-2",
+          method: :delete,
+          confirm: CustomConfirm.for_resource_deletion(tag.name)
+        ) %>
+      <% end %>
     <% end %>
   </div>
 </div>
diff --git a/app/views/tags/edit.html.erb b/app/views/tags/edit.html.erb
index 75ad4a0f..7a45c5b7 100644
--- a/app/views/tags/edit.html.erb
+++ b/app/views/tags/edit.html.erb
@@ -1,3 +1,6 @@
-<%= modal_form_wrapper title: t(".edit") do %>
-  <%= render "form", tag: @tag %>
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".edit")) %>
+  <% dialog.with_body do %>
+    <%= render "form", tag: @tag %>
+  <% end %>
 <% end %>
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 5ba44963..8ab32898 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -1,44 +1,56 @@
-<% content_for :sidebar do %>
-  <%= render "settings/nav" %>
-<% end %>
+<header class="flex items-center justify-between">
+  <h1 class="text-primary text-xl font-medium"><%= t(".tags") %></h1>
 
-<section class="space-y-4">
-  <header class="flex items-center justify-between">
-    <h1 class="text-gray-900 text-xl font-medium"><%= t(".tags") %></h1>
+<div class="flex items-center gap-2">
+  <%= render DS::Menu.new do |menu| %>
+    <% menu.with_item(
+          variant: "button",
+          text: "Delete all",
+          href: destroy_all_tags_path,
+          method: :delete,
+          icon: "trash-2",
+          confirm: CustomConfirm.for_resource_deletion("all tags", high_severity: true)) %>
+  <% end %>
 
-    <%= link_to new_tag_path, class: "btn btn--primary flex items-center gap-1 justify-center", data: { turbo_frame: :modal } do %>
-      <%= lucide_icon "plus", class: "w-5 h-5" %>
-      <p><%= t(".new") %></p>
-    <% end %>
-  </header>
+    <%= render DS::Link.new(
+      text: t(".new"),
+      variant: "primary",
+      href: new_tag_path,
+      icon: "plus",
+      frame: :modal
+    ) %>
 
-  <div class="bg-white shadow-xs border border-alpha-black-25 rounded-xl p-4">
-    <% if @tags.any? %>
-      <div class="rounded-xl bg-gray-25 space-y-1 p-1">
-        <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-gray-500 uppercase">
-          <p><%= t(".tags") %></p>
-          <span class="text-gray-400">&middot;</span>
-          <p><%= @tags.count %></p>
-        </div>
+</div>
 
-        <div class="border border-alpha-black-25 rounded-md bg-white shadow-xs">
-          <div class="overflow-hidden rounded-md">
-            <%= render partial: @tags, spacer_template: "tags/ruler" %>
-          </div>
+</header>
+
+<div class="bg-container rounded-xl shadow-border-xs p-4">
+  <% if @tags.any? %>
+    <div class="rounded-xl bg-container-inset space-y-1 p-1">
+      <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-secondary uppercase">
+        <p><%= t(".tags") %></p>
+        <span class="text-subdued">&middot;</span>
+        <p><%= @tags.count %></p>
+      </div>
+
+      <div class="bg-container rounded-lg shadow-border-xs">
+        <div class="overflow-hidden rounded-lg">
+          <%= render partial: @tags, spacer_template: "shared/ruler" %>
         </div>
       </div>
-    <% else %>
-      <div class="flex justify-center items-center py-20">
-        <div class="text-center flex flex-col items-center max-w-[300px]">
-          <p class="text-gray-900 mb-1 font-medium text-sm"><%= t(".empty") %></p>
-          <%= link_to new_tag_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>
-            <%= lucide_icon("plus", class: "w-5 h-5") %>
-            <span><%= t(".new") %></span>
-          <% end %>
-        </div>
-      </div>
-    <% end %>
-  </div>
+    </div>
+  <% else %>
+    <div class="flex justify-center items-center py-20">
+      <div class="text-center flex flex-col items-center max-w-[300px]">
+        <p class="text-primary mb-1 font-medium text-sm"><%= t(".empty") %></p>
 
-  <%= settings_nav_footer %>
-</section>
+        <%= render DS::Link.new(
+          text: t(".new"),
+          icon: "plus",
+          href: new_tag_path,
+          frame: :modal
+        ) %>
+      </div>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/tags/new.html.erb b/app/views/tags/new.html.erb
index ad97c79d..273cc26d 100644
--- a/app/views/tags/new.html.erb
+++ b/app/views/tags/new.html.erb
@@ -1,3 +1,6 @@
-<%= modal_form_wrapper title: t(".new") do %>
-  <%= render "form", tag: @tag %>
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".new")) %>
+  <% dialog.with_body do %>
+    <%= render "form", tag: @tag %>
+  <% end %>
 <% end %>
diff --git a/app/views/trades/_form.html.erb b/app/views/trades/_form.html.erb
new file mode 100644
index 00000000..57e22907
--- /dev/null
+++ b/app/views/trades/_form.html.erb
@@ -0,0 +1,59 @@
+<%# locals: (model:, account:) %>
+
+<% type = params[:type] || "buy" %>
+
+<%= styled_form_with url: trades_path(account_id: account&.id), scope: :model, data: { controller: "trade-form" } do |form| %>
+  <div class="space-y-4">
+    <% if model.errors.any? %>
+      <%= render "shared/form_errors", model: model %>
+    <% end %>
+
+    <div class="space-y-2">
+      <%= form.select :type, [
+          ["Buy", "buy"],
+          ["Sell", "sell"],
+          ["Deposit", "deposit"],
+          ["Withdrawal", "withdrawal"],
+          ["Interest", "interest"]
+      ],
+      { label: t(".type"), selected: type },
+      { data: {
+          action: "trade-form#changeType",
+          trade_form_url_param: new_trade_path(account_id: account&.id),
+          trade_form_key_param: "type",
+        }} %>
+
+      <% if %w[buy sell].include?(type) %>
+        <% if Security.provider.present? %>
+          <div class="form-field combobox">
+            <%= form.combobox :ticker,
+                            securities_path(country_code: Current.family.country),
+                            name_when_new: "entry[manual_ticker]",
+                            label: t(".holding"),
+                            placeholder: t(".ticker_placeholder"),
+                            required: true %>
+          </div>
+        <% else %>
+          <%= form.text_field :manual_ticker, label: "Ticker symbol", placeholder: "AAPL", required: true %>
+        <% end %>
+      <% end %>
+
+      <%= form.date_field :date, label: true, value: model.date || Date.current, required: true %>
+
+      <% unless %w[buy sell].include?(type) %>
+        <%= form.money_field :amount, label: t(".amount"), value: model.amount, required: true %>
+      <% end %>
+
+      <% if %w[deposit withdrawal].include?(type) %>
+        <%= form.collection_select :transfer_account_id, Current.family.accounts.visible.alphabetically, :id, :name, { prompt: t(".account_prompt"), label: t(".account") } %>
+      <% end %>
+
+      <% if %w[buy sell].include?(type) %>
+        <%= form.number_field :qty, label: t(".qty"), placeholder: "10", min: 0.000000000000000001, step: "any", required: true %>
+        <%= form.money_field :price, label: t(".price"), required: true %>
+      <% end %>
+    </div>
+
+    <%= form.submit t(".submit") %>
+  </div>
+<% end %>
diff --git a/app/views/trades/_header.html.erb b/app/views/trades/_header.html.erb
new file mode 100644
index 00000000..64be85a3
--- /dev/null
+++ b/app/views/trades/_header.html.erb
@@ -0,0 +1,74 @@
+<%# locals: (entry:) %>
+
+<div id="<%= dom_id(entry, :header) %>">
+  <%= tag.header class: "mb-4 space-y-1" do %>
+    <span class="text-secondary text-sm">
+      <%= entry.amount.negative? ? t(".sell") : t(".buy") %>
+    </span>
+
+    <div class="flex items-center gap-4">
+      <h3 class="font-medium">
+        <span class="text-2xl">
+          <%= format_money entry.amount_money %>
+        </span>
+
+        <span class="text-lg text-secondary">
+          <%= entry.currency %>
+        </span>
+      </h3>
+
+      <% if entry.linked? %>
+        <span title="Linked with Plaid">
+          <%= icon("refresh-ccw", size: "sm") %>
+        </span>
+      <% end %>
+    </div>
+
+    <span class="text-sm text-secondary">
+      <%= I18n.l(entry.date, format: :long) %>
+    </span>
+  <% end %>
+
+  <% trade = entry.trade %>
+
+  <div class="mb-2">
+    <%= render DS::Disclosure.new(title: t(".overview"), open: true) do %>
+      <div class="pb-4">
+        <dl class="space-y-3 px-3 py-2">
+          <div class="flex items-center justify-between text-sm">
+            <dt class="text-secondary"><%= t(".symbol_label") %></dt>
+            <dd class="text-primary"><%= trade.security.ticker %></dd>
+          </div>
+
+          <% if trade.qty.positive? %>
+            <div class="flex items-center justify-between text-sm">
+              <dt class="text-secondary"><%= t(".purchase_qty_label") %></dt>
+              <dd class="text-primary"><%= trade.qty.abs %></dd>
+            </div>
+
+            <div class="flex items-center justify-between text-sm">
+              <dt class="text-secondary"><%= t(".purchase_price_label") %></dt>
+              <dd class="text-primary"><%= format_money trade.price_money %></dd>
+            </div>
+          <% end %>
+
+          <% if trade.security.current_price.present? %>
+            <div class="flex items-center justify-between text-sm">
+              <dt class="text-secondary"><%= t(".current_market_price_label") %></dt>
+              <dd class="text-primary"><%= format_money trade.security.current_price %></dd>
+            </div>
+          <% end %>
+
+          <% if trade.qty.positive? && trade.unrealized_gain_loss.present? %>
+            <div class="flex items-center justify-between text-sm">
+              <dt class="text-secondary"><%= t(".total_return_label") %></dt>
+              <dd style="color: <%= trade.unrealized_gain_loss.color %>;">
+                <%= render "shared/trend_change", trend: trade.unrealized_gain_loss %>
+              </dd>
+            </div>
+          <% end %>
+        </dl>
+      </div>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/trades/_trade.html.erb b/app/views/trades/_trade.html.erb
new file mode 100644
index 00000000..02245edf
--- /dev/null
+++ b/app/views/trades/_trade.html.erb
@@ -0,0 +1,43 @@
+<%# locals: (entry:, balance_trend: nil, **) %>
+
+<% trade = entry.entryable %>
+
+<%= turbo_frame_tag dom_id(entry) do %>
+  <%= turbo_frame_tag dom_id(trade) do %>
+    <div class="grid grid-cols-12 items-center <%= entry.excluded ? "text-gray-400 bg-gray-25" : "text-primary" %> text-sm font-medium p-4">
+      <div class="col-span-8 flex items-center gap-4">
+        <%= check_box_tag dom_id(entry, "selection"),
+                        class: "checkbox checkbox--light",
+                        data: { id: entry.id, "bulk-select-target": "row", action: "bulk-select#toggleRowSelection" } %>
+
+        <div class="max-w-full">
+          <%= tag.div class: ["flex items-center gap-2"] do %>
+            <%= render DS::FilledIcon.new(
+              variant: :text,
+              text: entry.name,
+              size: "sm",
+              rounded: true
+            ) %>
+
+            <div class="truncate">
+              <%= link_to entry.name,
+                        entry_path(entry),
+                        data: { turbo_frame: "drawer", turbo_prefetch: false },
+                        class: "hover:underline" %>
+            </div>
+          <% end %>
+        </div>
+      </div>
+
+      <div class="col-span-2 flex items-center">
+        <%= render "categories/badge", category: trade_category %>
+      </div>
+
+      <div class="col-span-2 justify-self-end font-medium text-sm">
+        <%= content_tag :p,
+                    format_money(-entry.amount_money),
+                    class: ["text-green-600": entry.amount.negative?] %>
+      </div>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/trades/new.html.erb b/app/views/trades/new.html.erb
new file mode 100644
index 00000000..88cfdc40
--- /dev/null
+++ b/app/views/trades/new.html.erb
@@ -0,0 +1,6 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".title")) %>
+  <% dialog.with_body do %>
+    <%= render "trades/form", model: @model, account: @account %>
+  <% end %>
+<% end %>
diff --git a/app/views/trades/show.html.erb b/app/views/trades/show.html.erb
new file mode 100644
index 00000000..c80b379d
--- /dev/null
+++ b/app/views/trades/show.html.erb
@@ -0,0 +1,98 @@
+<%= render DS::Dialog.new(variant: "drawer") do |dialog| %>
+  <% dialog.with_header do %>
+    <%= render "trades/header", entry: @entry %>
+  <% end %>
+
+  <% trade = @entry.trade %>
+
+  <% dialog.with_body do %>
+    <% dialog.with_section(title: t(".details"), open: true) do %>
+      <div class="pb-4">
+        <%= styled_form_with model: @entry,
+              url: trade_path(@entry),
+              class: "space-y-2",
+              data: { controller: "auto-submit-form" } do |f| %>
+          <%= f.date_field :date,
+                label: t(".date_label"),
+                max: Date.current,
+                disabled: @entry.linked?,
+                "data-auto-submit-form-target": "auto" %>
+
+          <div class="flex items-center gap-2">
+            <%= f.select :nature,
+                          [["Buy", "outflow"], ["Sell", "inflow"]],
+                          { container_class: "w-1/3", label: "Type", selected: @entry.amount.negative? ? "inflow" : "outflow" },
+                          { data: { "auto-submit-form-target": "auto" }, disabled: @entry.linked? } %>
+
+            <%= f.fields_for :entryable do |ef| %>
+              <%= ef.number_field :qty,
+                  label: t(".quantity_label"),
+                  step: "any",
+                  value: trade.qty.abs,
+                  "data-auto-submit-form-target": "auto",
+                  disabled: @entry.linked? %>
+            <% end %>
+          </div>
+
+          <%= f.fields_for :entryable do |ef| %>
+            <%= ef.money_field :price,
+                  label: t(".cost_per_share_label"),
+                  disable_currency: true,
+                  auto_submit: true,
+                  min: 0,
+                  disabled: @entry.linked? %>
+          <% end %>
+        <% end %>
+      </div>
+    <% end %>
+
+    <% dialog.with_section(title: t(".additional")) do %>
+      <div class="pb-4">
+        <%= styled_form_with model: @entry,
+              url: trade_path(@entry),
+              class: "space-y-2",
+              data: { controller: "auto-submit-form" } do |f| %>
+          <%= f.text_area :notes,
+                label: t(".note_label"),
+                placeholder: t(".note_placeholder"),
+                rows: 5,
+                "data-auto-submit-form-target": "auto" %>
+        <% end %>
+      </div>
+    <% end %>
+
+    <% dialog.with_section(title: t(".settings")) do %>
+      <div class="pb-4">
+        <!-- Exclude Trade Form -->
+        <%= styled_form_with model: @entry,
+              url: trade_path(@entry),
+              class: "p-3",
+              data: { controller: "auto-submit-form" } do |f| %>
+          <div class="flex cursor-pointer items-center gap-2 justify-between">
+            <div class="text-sm space-y-1">
+              <h4 class="text-primary"><%= t(".exclude_title") %></h4>
+              <p class="text-secondary"><%= t(".exclude_subtitle") %></p>
+            </div>
+
+            <%= f.toggle :excluded, { data: { auto_submit_form_target: "auto" } } %>
+          </div>
+        <% end %>
+
+        <!-- Delete Trade Form -->
+        <div class="flex items-center justify-between gap-2 p-3">
+          <div class="text-sm space-y-1">
+            <h4 class="text-primary"><%= t(".delete_title") %></h4>
+            <p class="text-secondary"><%= t(".delete_subtitle") %></p>
+          </div>
+
+          <%= button_to t(".delete"),
+                entry_path(@entry),
+                method: :delete,
+                class:  "rounded-lg px-3 py-2 text-red-500 text-sm
+                         font-medium border border-secondary",
+                data:   { turbo_confirm: true } %>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/transactions/_form.html.erb b/app/views/transactions/_form.html.erb
index 050ad297..46fd4ac1 100644
--- a/app/views/transactions/_form.html.erb
+++ b/app/views/transactions/_form.html.erb
@@ -1,26 +1,52 @@
-<%= styled_form_with model: @entry, url: transactions_path, class: "space-y-4", data: { turbo_frame: "_top" } do |f| %>
+<%# locals: (entry:, income_categories:, expense_categories:) %>
+
+<%= styled_form_with model: entry, url: transactions_path, class: "space-y-4" do |f| %>
+  <% if entry.errors.any? %>
+    <%= render "shared/form_errors", model: entry %>
+  <% end %>
+
   <section>
-    <fieldset class="bg-gray-50 rounded-lg p-1 grid grid-flow-col justify-stretch gap-x-2">
-      <%= radio_tab_tag form: f, name: :nature, value: :expense, label: t(".expense"), icon: "minus-circle", checked: params[:nature] == "expense" || params[:nature].nil? %>
-      <%= radio_tab_tag form: f, name: :nature, value: :income, label: t(".income"), icon: "plus-circle", checked: params[:nature] == "income" %>
-      <%= link_to new_account_transfer_path, data: { turbo_frame: :modal }, class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-gray-400 group-has-[:checked]:bg-white group-has-[:checked]:text-gray-800 group-has-[:checked]:shadow-sm" do %>
-        <%= lucide_icon "arrow-right-left", class: "w-5 h-5" %>
-        <%= tag.span t(".transfer") %>
-      <% end %>
-    </fieldset>
+    <%= render "shared/transaction_type_tabs", active_tab: params[:nature] == "inflow" ? "income" : "expense", account_id: params[:account_id] %>
+
+    <%= f.hidden_field :nature, value: params[:nature] || "outflow" %>
+    <%= f.hidden_field :entryable_type, value: "Transaction" %>
   </section>
 
   <section class="space-y-2">
     <%= f.text_field :name, label: t(".description"), placeholder: t(".description_placeholder"), required: true %>
-    <%= f.collection_select :account_id, Current.family.accounts.alphabetically, :id, :name, { prompt: t(".account_prompt"), label: t(".account") }, required: true %>
-    <%= f.money_field :amount, label: t(".amount"), required: true %>
-    <%= f.hidden_field :entryable_type, value: "Account::Transaction" %>
-    <%= f.fields_for :entryable do |ef| %>
-      <%= ef.collection_select :category_id, Current.family.categories.alphabetically, :id, :name, { prompt: t(".category_prompt"), label: t(".category") } %>
+
+    <% if @entry.account_id %>
+      <%= f.hidden_field :account_id %>
+    <% else %>
+      <%= f.collection_select :account_id, Current.family.accounts.manual.alphabetically, :id, :name, { prompt: t(".account_prompt"), label: t(".account") }, required: true, class: "form-field__input text-ellipsis" %>
     <% end %>
-    <%= f.date_field :date, label: t(".date"), required: true, min: Account::Entry.min_supported_date, max: Date.current, value: Date.current %>
+
+    <%= f.money_field :amount, label: t(".amount"), required: true %>
+    <%= f.fields_for :entryable do |ef| %>
+      <% categories = params[:nature] == "inflow" ? income_categories : expense_categories %>
+      <%= ef.collection_select :category_id, categories, :id, :name, { prompt: t(".category_prompt"), label: t(".category") } %>
+    <% end %>
+    <%= f.date_field :date, label: t(".date"), required: true, min: Entry.min_supported_date, max: Date.current, value: Date.current %>
   </section>
 
+  <%= render DS::Disclosure.new(title: t(".details")) do %>
+    <%= f.fields_for :entryable do |ef| %>
+      <%= ef.select :tag_ids,
+                    Current.family.tags.alphabetically.pluck(:name, :id),
+                    {
+                      include_blank: t(".none"),
+                      multiple: true,
+                      label:    t(".tags_label"),
+                      container_class: "h-40"
+                    } %>
+    <% end %>
+    <%= f.text_area :notes,
+                    label: t(".note_label"),
+                    placeholder: t(".note_placeholder"),
+                    rows: 5,
+                    "data-auto-submit-form-target": "auto" %>
+  <% end %>
+
   <section>
     <%= f.submit t(".submit") %>
   </section>
diff --git a/app/views/transactions/_header.html.erb b/app/views/transactions/_header.html.erb
index 3e532fad..6c7b1615 100644
--- a/app/views/transactions/_header.html.erb
+++ b/app/views/transactions/_header.html.erb
@@ -1,25 +1,29 @@
-<header class="flex justify-between items-center text-gray-900 font-medium">
-  <h1 class="text-xl">Transactions</h1>
-  <div class="flex items-center gap-5">
-    <div class="flex items-center gap-2">
-      <%= contextual_menu do %>
-        <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
-          <%= contextual_menu_modal_action_item t(".edit_categories"), categories_path, icon: "shapes", turbo_frame: :_top %>
-          <%= contextual_menu_modal_action_item t(".edit_tags"), tags_path, icon: "tags", turbo_frame: :_top %>
-          <%= contextual_menu_modal_action_item t(".edit_merchants"), merchants_path, icon: "store", turbo_frame: :_top %>
-          <%= contextual_menu_modal_action_item t(".edit_imports"), imports_path, icon: "hard-drive-upload", turbo_frame: :_top %>
-        </div>
-      <% end %>
+<%# locals: (entry:) %>
 
-      <%= link_to new_import_path, class: "btn btn--outline flex items-center gap-2", data: { turbo_frame: "modal" } do %>
-        <%= lucide_icon("download", class: "text-gray-500 w-4 h-4") %>
-        <p class="text-sm font-medium text-gray-900"><%= t(".import") %></p>
-      <% end %>
+<%= tag.header class: "mb-4 space-y-1", id: dom_id(entry, :header) do %>
+  <div class="flex items-center gap-4">
+    <h3 class="font-medium">
+      <span class="text-2xl">
+        <%= format_money -entry.amount_money %>
+      </span>
 
-      <%= link_to new_transaction_path, class: "rounded-lg bg-gray-900 text-white flex items-center gap-1 justify-center hover:bg-gray-700 px-3 py-2", data: { turbo_frame: :modal } do %>
-        <%= lucide_icon("plus", class: "w-5 h-5") %>
-        <p class="text-sm font-medium">New transaction</p>
-      <% end %>
-    </div>
+      <span class="text-lg text-secondary">
+        <%= entry.currency %>
+      </span>
+    </h3>
+
+    <% if entry.transaction.transfer? %>
+      <%= icon "arrow-left-right", class: "mt-1" %>
+    <% end %>
+
+    <% if entry.linked? %>
+      <span title="Linked with Plaid">
+        <%= icon("refresh-ccw", size: "sm") %>
+      </span>
+    <% end %>
   </div>
-</header>
+
+  <span class="text-sm text-secondary">
+    <%= I18n.l(entry.date, format: :long) %>
+  </span>
+<% end %>
diff --git a/app/views/transactions/_selection_bar.html.erb b/app/views/transactions/_selection_bar.html.erb
new file mode 100644
index 00000000..65e2ce12
--- /dev/null
+++ b/app/views/transactions/_selection_bar.html.erb
@@ -0,0 +1,23 @@
+<div class="fixed bottom-30 md:bottom-6 z-10 flex items-center justify-between rounded-xl bg-gray-900 px-4 text-sm text-white md:w-[420px] w-[90%] py-1.5">
+  <div class="flex items-center gap-2">
+    <%= check_box_tag "entry_selection", 1, true, class: "checkbox checkbox--dark", data: { action: "bulk-select#deselectAll" } %>
+
+    <p data-bulk-select-target="selectionBarText"></p>
+  </div>
+
+  <div class="flex items-center gap-1 text-secondary">
+    <%= turbo_frame_tag "bulk_transaction_edit_drawer" %>
+    <%= link_to new_transactions_bulk_update_path,
+                class: "p-1.5 group hover:bg-inverse flex items-center justify-center rounded-md",
+                title: "Edit",
+                data: { turbo_frame: "bulk_transaction_edit_drawer" } do %>
+      <%= icon "pencil-line", class: "group-hover:text-inverse" %>
+    <% end %>
+
+    <%= form_with url: transactions_bulk_deletion_path, data: { turbo_confirm: true, turbo_frame: "_top" } do %>
+      <button type="button" data-bulk-select-scope-param="bulk_delete" data-action="bulk-select#submitBulkRequest" class="p-1.5 group hover:bg-inverse flex items-center justify-center rounded-md" title="Delete">
+        <%= icon "trash-2", class: "group-hover:text-inverse" %>
+      </button>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/transactions/_summary.html.erb b/app/views/transactions/_summary.html.erb
index f31eff5e..818283f2 100644
--- a/app/views/transactions/_summary.html.erb
+++ b/app/views/transactions/_summary.html.erb
@@ -1,19 +1,19 @@
 <%# locals: (totals:) %>
-<div class="grid grid-cols-3 bg-white rounded-xl border border-alpha-black-25 shadow-xs divide-x divide-alpha-black-100">
+<div class="grid grid-cols-1 md:grid-cols-3 bg-container rounded-xl shadow-border-xs md:divide-x divide-y md:divide-y-0 divide-alpha-black-100 theme-dark:divide-alpha-white-200">
   <div class="p-4 space-y-2">
-    <p class="text-sm text-gray-500">Total transactions</p>
-    <p class="text-gray-900 font-medium text-xl" id="total-transactions"><%= totals[:count] %></p>
+    <p class="text-sm text-secondary">Total transactions</p>
+    <p class="text-primary font-medium text-xl" id="total-transactions"><%= totals.count.round(0) %></p>
   </div>
   <div class="p-4 space-y-2">
-    <p class="text-sm text-gray-500">Income</p>
-    <p class="text-gray-900 font-medium text-xl" id="total-income">
-      <%= format_money totals[:income] %>
+    <p class="text-sm text-secondary">Income</p>
+    <p class="text-primary font-medium text-xl" id="total-income">
+      <%= totals.income_money.format %>
     </p>
   </div>
   <div class="p-4 space-y-2">
-    <p class="text-sm text-gray-500">Expenses</p>
-    <p class="text-gray-900 font-medium text-xl" id="total-expense">
-      <%= format_money totals[:expense] %>
+    <p class="text-sm text-secondary">Expenses</p>
+    <p class="text-primary font-medium text-xl" id="total-expense">
+      <%= totals.expense_money.format %>
     </p>
   </div>
 </div>
diff --git a/app/views/transactions/_transaction.html.erb b/app/views/transactions/_transaction.html.erb
new file mode 100644
index 00000000..bf0e3331
--- /dev/null
+++ b/app/views/transactions/_transaction.html.erb
@@ -0,0 +1,103 @@
+<%# locals: (entry:, balance_trend: nil, view_ctx: "global") %>
+
+<% transaction = entry.entryable %>
+
+<%= turbo_frame_tag dom_id(entry) do %>
+  <%= turbo_frame_tag dom_id(transaction) do %>
+    <div class="grid grid-cols-12 items-center text-primary text-sm font-medium p-4 lg:p-4 <%= entry.excluded ? "opacity-50 text-gray-400" : "" %>">
+
+      <div class="pr-4 lg:pr-10 flex items-center gap-3 lg:gap-4 col-span-8">
+        <%= check_box_tag dom_id(entry, "selection"),
+            disabled: transaction.transfer.present?,
+            class: "checkbox checkbox--light",
+            data: {
+              id: entry.id,
+              "bulk-select-target": "row",
+              action: "bulk-select#toggleRowSelection"
+            } %>
+
+        <div class="max-w-full">
+          <%= content_tag :div, class: ["flex items-center gap-2"] do %>
+            <% if transaction.merchant&.logo_url.present? %>
+              <%= image_tag transaction.merchant.logo_url,
+                  class: "w-6 h-6 rounded-full",
+                  loading: "lazy" %>
+            <% else %>
+              <%= render DS::FilledIcon.new(
+                variant: :text,
+                text: entry.name,
+                size: "sm",
+                rounded: true
+              ) %>
+            <% end %>
+
+            <div class="truncate">
+              <div class="space-y-0.5">
+                <div class="flex items-center gap-1 min-w-0">
+                  <div class="truncate flex-shrink">
+                    <% if transaction.transfer? %>
+                      <%= link_to(
+                            entry.name,
+                            transaction.transfer.present? ? transfer_path(transaction.transfer) : entry_path(entry),
+                            data: {
+                              turbo_frame: "drawer",
+                              turbo_prefetch: false
+                            },
+                            class: "hover:underline"
+                          ) %>
+                    <% else %>
+                      <%= link_to(
+                            entry.name,
+                            entry_path(entry),
+                            data: {
+                              turbo_frame: "drawer",
+                              turbo_prefetch: false
+                            },
+                            class: "hover:underline"
+                          ) %>
+                    <% end %>
+                  </div>
+
+                  <div class="flex items-center gap-1 flex-shrink-0">
+                    <% if transaction.one_time? %>
+                      <span class="text-orange-500" title="One-time <%= entry.amount.negative? ? "income" : "expense" %> (excluded from averages)">
+                        <%= icon "asterisk", size: "sm", color: "current" %>
+                      </span>
+                    <% end %>
+
+                    <% if transaction.transfer.present? %>
+                      <%= render "transactions/transfer_match", transaction: transaction %>
+                    <% end %>
+                  </div>
+                </div>
+
+                <div class="text-secondary text-xs font-normal hidden lg:block">
+                  <% if transaction.transfer? %>
+                    <span class="text-secondary">
+                      <%= transaction.loan_payment? ? "Loan Payment" : "Transfer" %> • <%= entry.account.name %>
+                    </span>
+                  <% else %>
+                    <%= link_to entry.account.name,
+                        account_path(entry.account, tab: "transactions"),
+                        data: { turbo_frame: "_top" },
+                        class: "hover:underline" %>
+                  <% end %>
+                </div>
+              </div>
+            </div>
+          <% end %>
+        </div>
+      </div>
+
+      <div class="hidden lg:flex items-center gap-1 col-span-2">
+        <%= render "transactions/transaction_category", transaction: transaction %>
+      </div>
+
+      <div class="col-span-2 ml-auto text-right">
+        <%= content_tag :p,
+            transaction.transfer? && view_ctx == "global" ? "+/- #{format_money(entry.amount_money.abs)}" : format_money(-entry.amount_money),
+            class: ["text-green-600": entry.amount.negative?] %>
+      </div>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/transactions/_transaction_category.html.erb b/app/views/transactions/_transaction_category.html.erb
new file mode 100644
index 00000000..933a80fe
--- /dev/null
+++ b/app/views/transactions/_transaction_category.html.erb
@@ -0,0 +1,9 @@
+<%# locals: (transaction:) %>
+
+<div id="<%= dom_id(transaction, "category_menu") %>">
+  <% if transaction.transfer&.categorizable? || transaction.transfer.nil? %>
+    <%= render "categories/menu", transaction: transaction %>
+  <% else %>
+    <%= render "categories/badge", category: transaction.transfer&.payment? ? payment_category :  transfer_category %>
+  <% end %>
+</div>
diff --git a/app/views/transactions/_transfer_match.html.erb b/app/views/transactions/_transfer_match.html.erb
new file mode 100644
index 00000000..1b3a6df7
--- /dev/null
+++ b/app/views/transactions/_transfer_match.html.erb
@@ -0,0 +1,28 @@
+<%# locals: (transaction:) %>
+
+<div id="<%= dom_id(transaction, "transfer_match") %>" class="flex items-center gap-1">
+  <% if transaction.transfer.confirmed? %>
+    <span title="<%= transaction.transfer.payment? ? "Payment" : "Transfer" %> is confirmed">
+      <%= icon "link-2", size: "sm", class: "text-secondary" %>
+    </span>
+  <% elsif transaction.transfer.pending? %>
+    <span class="inline-flex items-center rounded-full bg-surface-inset px-2 py-0.5 text-xs font-medium text-secondary">
+      Auto-matched
+    </span>
+
+    <%= button_to transfer_path(transaction.transfer, transfer: { status: "confirmed" }),
+                    method: :patch,
+                    class: "text-secondary flex items-center justify-center cursor-pointer",
+                    title: "Confirm match" do %>
+      <%= icon "check", size: "sm", class: "text-secondary hover:text-primary" %>
+    <% end %>
+
+    <%= button_to transfer_path(transaction.transfer, transfer: { status: "rejected" }),
+                    method: :patch,
+                    data: { turbo: false },
+                    class: "text-secondary hover:text-primary flex items-center justify-center cursor-pointer",
+                    title: "Reject match" do %>
+      <%= icon "x", size: "sm", class: "text-subdued hover:text-primary" %>
+    <% end %>
+  <% end %>
+</div>
diff --git a/app/views/transactions/bulk_edit.html.erb b/app/views/transactions/bulk_edit.html.erb
deleted file mode 100644
index dc4ec2a1..00000000
--- a/app/views/transactions/bulk_edit.html.erb
+++ /dev/null
@@ -1,62 +0,0 @@
-<%= turbo_frame_tag "bulk_transaction_edit_drawer" do %>
-  <dialog data-controller="modal"
-          data-action="click->modal#clickOutside"
-          class="bg-white border border-alpha-black-25 rounded-2xl max-h-[calc(100vh-32px)] max-w-[480px] w-full shadow-xs h-full mt-4 mr-4">
-    <%= styled_form_with url: bulk_update_transactions_path, scope: "bulk_update", class: "h-full", data: { turbo_frame: "_top" } do |form| %>
-      <div class="flex h-full flex-col justify-between p-4">
-        <div>
-          <div class="flex h-9 items-center justify-end">
-            <div data-action="click->modal#close" class="cursor-pointer">
-              <%= lucide_icon("x", class: "w-5 h-5 shrink-0") %>
-            </div>
-          </div>
-
-          <div class="flex flex-col overflow-scroll">
-            <div>
-              <header class="mb-4 space-y-1">
-                <h3 class="text-2xl font-medium" data-bulk-select-target="bulkEditDrawerTitle">
-                  Edit transactions
-                </h3>
-              </header>
-
-              <div class="space-y-2">
-                <details class="group space-y-2" open>
-                  <summary class="flex list-none items-center justify-between rounded-xl px-3 py-2 text-xs font-medium uppercase text-gray-500 bg-gray-25 focus-visible:outline-none">
-                    <h4><%= t(".overview") %></h4>
-                    <%= lucide_icon "chevron-down", class: "group-open:transform group-open:rotate-180 text-gray-500 w-5" %>
-                  </summary>
-
-                  <div class="pb-6 space-y-2">
-                    <%= form.date_field :date, label: t(".date_label"), max: Date.current %>
-                  </div>
-                </details>
-
-                <details class="group space-y-2" open>
-                  <summary class="flex list-none items-center justify-between rounded-xl px-3 py-2 text-xs font-medium uppercase text-gray-500 bg-gray-25 focus-visible:outline-none">
-                    <h4><%= t(".details") %></h4>
-                    <%= lucide_icon "chevron-down", class: "group-open:transform group-open:rotate-180 text-gray-500 w-5" %>
-                  </summary>
-
-                  <div class="space-y-2">
-                    <%= form.collection_select :category_id, Current.family.categories.alphabetically, :id, :name, { prompt: t(".category_placeholder"), label: t(".category_label"), class: "text-gray-400" } %>
-                    <%= form.collection_select :merchant_id, Current.family.merchants.alphabetically, :id, :name, { prompt: t(".merchant_placeholder"), label: t(".merchant_label"), class: "text-gray-400" } %>
-                    <%= form.text_area :notes, label: t(".note_label"), placeholder: t(".note_placeholder"), rows: 5 %>
-                  </div>
-                </details>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div class="flex justify-end items-center gap-2">
-          <%= link_to t(".cancel"), transactions_path, class: "text-sm font-medium text-gray-900 px-3 py-2" %>
-
-          <%= tag.button t(".save"),
-                         type: "button",
-                         data: { "bulk-select-scope-param": "bulk_update", action: "bulk-select#submitBulkRequest" },
-                         class: "px-3 py-2 bg-gray-900 text-white text-sm font-medium rounded-lg" %>
-        </div>
-      </div>
-    <% end %>
-  </dialog>
-<% end %>
diff --git a/app/views/transactions/bulk_updates/new.html.erb b/app/views/transactions/bulk_updates/new.html.erb
new file mode 100644
index 00000000..08c112ab
--- /dev/null
+++ b/app/views/transactions/bulk_updates/new.html.erb
@@ -0,0 +1,29 @@
+<%= render DS::Dialog.new(variant: "drawer", frame: "bulk_transaction_edit_drawer") do |dialog| %>
+  <% dialog.with_header(title: "Edit transactions", data: { bulk_select_target: "bulkEditDrawerHeader" }) %>
+
+  <% dialog.with_body do %>
+    <%= styled_form_with url: transactions_bulk_update_path, scope: "bulk_update", class: "h-full flex flex-col justify-between gap-4", data: { turbo_frame: "_top" } do |form| %>
+      <div class="space-y-4">
+        <%= render DS::Disclosure.new(title: "Overview", open: true) do %>
+          <div class="pb-6 space-y-2">
+            <%= form.date_field :date, label: "Date", max: Date.current %>
+          </div>
+        <% end %>
+
+        <%= render DS::Disclosure.new(title: "Transactions", open: true) do %>
+          <div class="space-y-2">
+            <%= form.collection_select :category_id, Current.family.categories.alphabetically, :id, :name, { prompt: "Select a category", label: "Category", class: "text-subdued" } %>
+            <%= form.collection_select :merchant_id, Current.family.merchants.alphabetically, :id, :name, { prompt: "Select a merchant", label: "Merchant", class: "text-subdued" } %>
+            <%= form.select :tag_ids, Current.family.tags.alphabetically.pluck(:name, :id), { include_blank: "None", multiple: true, label: "Tags", container_class: "h-40" } %>
+            <%= form.text_area :notes, label: "Notes", placeholder: "Enter a note that will be applied to selected transactions", rows: 5 %>
+          </div>
+        <% end %>
+      </div>
+
+      <div class="flex justify-end gap-2 mt-auto">
+        <%= render DS::Button.new(text: "Cancel", variant: "ghost", data: { action: "click->dialog#close" }) %>
+        <%= render DS::Button.new(text: "Save", data: { bulk_select_scope_param: "bulk_update", action: "bulk-select#submitBulkRequest" }) %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/transactions/index.html.erb b/app/views/transactions/index.html.erb
index 8626da49..8fa5860c 100644
--- a/app/views/transactions/index.html.erb
+++ b/app/views/transactions/index.html.erb
@@ -1,44 +1,96 @@
-<div class="space-y-4 h-full flex flex-col overflow-y-auto">
-  <%= render "header" %>
+<div class="space-y-4 pb-20 flex flex-col">
+  <header class="flex justify-between items-center text-primary font-medium">
+    <h1 class="text-xl">Transactions</h1>
+    <div class="flex items-center gap-5">
+      <div class="flex items-center gap-2">
+        <%= render DS::Menu.new do |menu| %>
+          <% menu.with_item(variant: "link", text: "New rule", href: new_rule_path(resource_type: "transaction"), icon: "plus", data: { turbo_frame: :modal }) %>
+          <% menu.with_item(variant: "link", text: "Edit rules", href: rules_path, icon: "git-branch", data: { turbo_frame: :_top }) %>
+          <% menu.with_item(variant: "link", text: "Edit categories", href: categories_path, icon: "shapes", data: { turbo_frame: :_top }) %>
+          <% menu.with_item(variant: "link", text: "Edit tags", href: tags_path, icon: "tags", data: { turbo_frame: :_top }) %>
+          <% menu.with_item(variant: "link", text: "Edit merchants", href: family_merchants_path, icon: "store", data: { turbo_frame: :_top }) %>
+          <% menu.with_item(variant: "link", text: "Edit imports", href: imports_path, icon: "hard-drive-upload", data: { turbo_frame: :_top }) %>
+          <% menu.with_item(variant: "link", text: "Import", href: new_import_path, icon: "download", data: { turbo_frame: "modal", class_name: "md:!hidden" }) %>
+        <% end %>
 
-  <%= render "summary", totals: @totals %>
+        <div class="hidden md:flex">
+          <%= render DS::Link.new(
+            text: t(".import"),
+            icon: "download",
+            variant: "outline",
+            href: new_import_path,
+            frame: :modal,
+          ) %>
+        </div>
+
+        <%= render DS::Link.new(
+            text: "New transaction",
+            icon: "plus",
+            variant: "primary",
+            href: new_transaction_path,
+            frame: :modal,
+            class: "hidden md:inline-flex"
+          ) %>
+
+        <%= render DS::Link.new(
+            icon: "plus",
+            variant: "icon-inverse",
+            href: new_transaction_path,
+            frame: :modal,
+            class: "rounded-full md:hidden"
+          ) %>
+      </div>
+    </div>
+  </header>
+
+  <%= render "summary", totals: @search.totals %>
 
   <div id="transactions"
        data-controller="bulk-select"
-       data-bulk-select-resource-value="<%= t(".transaction") %>"
-       class="overflow-y-auto flex flex-col bg-white rounded-xl border border-alpha-black-25 shadow-xs p-4">
+       data-bulk-select-singular-label-value="<%= t(".transaction") %>"
+       data-bulk-select-plural-label-value="<%= t(".transactions") %>"
+       class="flex flex-col bg-container rounded-xl shadow-border-xs p-4">
     <%= render "transactions/searches/search" %>
 
-    <% if @transaction_entries.present? %>
-      <div hidden id="entry-selection-bar" data-bulk-select-target="selectionBar">
-        <%= render "account/transactions/selection_bar" %>
-      </div>
+    <div id="entry-selection-bar" data-bulk-select-target="selectionBar" class="flex justify-center hidden">
+      <%= render "transactions/selection_bar" %>
+    </div>
+
+    <% if @pagy.count > 0 %>
       <div class="grow overflow-y-auto">
-        <div class="grid grid-cols-12 bg-gray-25 rounded-xl px-5 py-3 text-xs uppercase font-medium text-gray-500 items-center mb-4">
-          <div class="pl-0.5 col-span-4 flex items-center gap-4">
+        <div class="grid-cols-12 bg-container-inset rounded-xl px-5 py-3 text-xs uppercase font-medium text-secondary items-center mb-4 hidden md:grid">
+          <div class="pl-0.5 col-span-8 flex items-center gap-4">
             <%= check_box_tag "selection_entry",
-                              class: "maybe-checkbox maybe-checkbox--light",
+                              class: "checkbox checkbox--light",
                               data: { action: "bulk-select#togglePageSelection" } %>
-            <p class="col-span-4">transaction</p>
+            <p>transaction</p>
           </div>
 
-          <p class="col-span-3 pl-4">category</p>
-          <p class="col-span-3">account</p>
+          <p class="col-span-2">category</p>
           <p class="col-span-2 justify-self-end">amount</p>
         </div>
+
+        <% if @transactions.any? %>
+          <div class="md:hidden text-xs uppercase font-medium text-secondary mb-2 px-2">
+            <%= check_box_tag "selection_entry",
+                              class: "checkbox checkbox--light mr-2 ml-1",
+                              data: { action: "bulk-select#togglePageSelection" } %>
+            <span>TRANSACTION</span>
+          </div>
+        <% end %>
+
         <div class="space-y-6">
-          <%= entries_by_date(@transaction_entries) do |entries| %>
-            <%= render entries.reject { |e| e.transfer_id.present? }, selectable: true %>
-            <%= render transfer_entries(entries), selectable: false %>
+          <%= entries_by_date(@transactions.map(&:entry), totals: true) do |entries| %>
+            <%= render entries %>
           <% end %>
         </div>
       </div>
     <% else %>
-      <%= render "account/entries/empty" %>
+      <%= render "entries/empty" %>
     <% end %>
 
     <div class="pt-4">
-      <%= render "pagination", pagy: @pagy %>
+      <%= render "shared/pagination", pagy: @pagy %>
     </div>
   </div>
 </div>
diff --git a/app/views/transactions/new.html.erb b/app/views/transactions/new.html.erb
index 0079185d..ea9d2730 100644
--- a/app/views/transactions/new.html.erb
+++ b/app/views/transactions/new.html.erb
@@ -1,3 +1,6 @@
-<%= modal_form_wrapper title: t(".new_transaction") do %>
-  <%= render "form", transaction: @transaction, entry: @entry %>
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: "New transaction") %>
+  <% dialog.with_body do %>
+    <%= render "form", entry: @entry, income_categories: @income_categories, expense_categories: @expense_categories %>
+  <% end %>
 <% end %>
diff --git a/app/views/transactions/rules.html.erb b/app/views/transactions/rules.html.erb
deleted file mode 100644
index 62222550..00000000
--- a/app/views/transactions/rules.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% content_for :sidebar do %>
-  <%= render "settings/nav" %>
-<% end %>
-
-<div class="space-y-4">
-  <h1 class="text-gray-900 text-xl font-medium mb-4">Rules</h1>
-  <div class="bg-white shadow-xs border border-alpha-black-25 rounded-xl p-4">
-    <div class="flex justify-center items-center py-20">
-      <p class="text-gray-500">Transaction rules coming soon...</p>
-    </div>
-  </div>
-  <div class="flex justify-between gap-4">
-    <%= previous_setting("Merchants", merchants_path) %>
-    <%= next_setting("Imports", imports_path) %>
-  </div>
-</div>
diff --git a/app/views/transactions/searches/_form.html.erb b/app/views/transactions/searches/_form.html.erb
index 84f628b3..d11fe5cf 100644
--- a/app/views/transactions/searches/_form.html.erb
+++ b/app/views/transactions/searches/_form.html.erb
@@ -3,24 +3,32 @@
               scope: :q,
               method: :get,
               data: { controller: "auto-submit-form" } do |form| %>
+  <%= hidden_field_tag :per_page, params[:per_page] %>
+
   <div class="flex gap-2 mb-4">
     <div class="grow">
-      <div class="flex items-center px-3 py-2 gap-2 border border-gray-200 rounded-lg focus-within:ring-gray-100 focus-within:border-gray-900">
-        <%= lucide_icon("search", class: "w-5 h-5 text-gray-500") %>
+      <div class="flex items-center px-3 py-2 gap-2 border border-secondary rounded-lg focus-within:ring-secondary focus-within:border-secondary">
+        <%= icon("search") %>
         <%= form.text_field :search,
-                            placeholder: "Search transactions by name",
+                            placeholder: "Search transactions ...",
                             value: @q[:search],
-                            class: "form-field__input placeholder:text-sm placeholder:text-gray-500",
+                            class: "form-field__input placeholder:text-sm placeholder:text-secondary",
                             "data-auto-submit-form-target": "auto" %>
       </div>
     </div>
-    <div data-controller="menu" class="relative">
-      <button id="transaction-filters-button" data-menu-target="button" type="button" class="btn btn--outline flex items-center gap-2">
-        <%= lucide_icon("list-filter", class: "w-5 h-5 text-gray-500") %>
-        <p class="text-sm font-medium text-gray-900">Filter</p>
-      </button>
 
-      <%= render "transactions/searches/menu", form: form %>
-    </div>
+    <%= render DS::Menu.new(variant: "button", no_padding: true) do |menu| %>
+      <% menu.with_button(
+        id: "transaction-filters-button",
+        type: "button",
+        text: "Filter",
+        variant: "outline",
+        icon: "list-filter"
+      ) %>
+
+      <% menu.with_custom_content do %>
+        <%= render "transactions/searches/menu", form: form %>
+      <% end %>
+    <% end %>
   </div>
 <% end %>
diff --git a/app/views/transactions/searches/_menu.html.erb b/app/views/transactions/searches/_menu.html.erb
index a42840ef..0f2e9b09 100644
--- a/app/views/transactions/searches/_menu.html.erb
+++ b/app/views/transactions/searches/_menu.html.erb
@@ -1,48 +1,46 @@
 <%# locals: (form:) %>
 
-<div
-  id="transaction-filters-menu"
-  data-menu-target="content"
-  data-controller="tabs"
-  data-tabs-active-class="bg-gray-25 text-gray-900"
-  data-tabs-default-tab-value="<%= get_default_transaction_search_filter[:key] %>"
-  class="hidden absolute flex z-10 h-80 w-[540px] top-12 right-0 border border-alpha-black-100 bg-white rounded-lg shadow-xs">
-  <div class="flex w-44 flex-col items-start p-3 text-sm font-medium text-gray-500 border-r border-r-alpha-black-100">
-    <% transaction_search_filters.each do |filter| %>
-      <button
-        class="flex text-gray-500 hover:bg-gray-25 items-center gap-2 px-3 rounded-md py-2 w-full"
-        type="button"
-        data-id="<%= filter[:key] %>"
-        data-tabs-target="btn"
-        data-action="tabs#select">
-        <%= lucide_icon(filter[:icon], class: "w-5 h-5") %>
-        <span class="text-sm font-medium"><%= t(".#{filter[:key]}") %></span>
-      </button>
-    <% end %>
-  </div>
-
-  <div class="flex flex-col grow">
-    <div class="grow p-3 border-b border-b-alpha-black-100 overflow-y-auto">
+<%= render DS::Tabs.new(
+  variant: :unstyled,
+  active_tab: get_default_transaction_search_filter[:key],
+  active_btn_classes: "bg-surface text-primary",
+  inactive_btn_classes: "text-secondary hover:bg-container-inset"
+) do |tabs| %>
+  <div id="transaction-filters-menu" class="flex flex-col md:flex-row h-[50vh] lg:max-h-auto z-10 md:h-80 w-full md:w-[540px] top-12 right-0 overflow-hidden">
+    <%= tabs.with_nav(classes: "shrink-0 flex w-full md:w-44 flex-row md:flex-col items-start p-3 text-sm font-medium text-secondary border-b md:border-b-0 md:border-r border-secondary overflow-x-auto md:overflow-x-visible") do |nav| %>
       <% transaction_search_filters.each do |filter| %>
-        <div id="<%= filter[:key] %>" data-tabs-target="tab">
-          <%= render partial: get_transaction_search_filter_partial_path(filter), locals: { form: form } %>
-        </div>
+        <%= nav.with_btn(id: filter[:key], label: filter[:label], classes: "w-full px-3 py-2 flex gap-2 items-center rounded-md") do %>
+          <%= icon(filter[:icon]) %>
+          <%= tag.span(filter[:label], class: "text-sm font-medium") %>
+        <% end %>
       <% end %>
-    </div>
+    <% end %>
 
-    <div class="flex justify-between items-center gap-2 bg-white p-3">
-      <div>
-        <% if @q.present? %>
-          <%= link_to t(".clear_filters"), transactions_path, class: "btn btn--ghost" %>
+    <div class="flex flex-col grow overflow-y-auto">
+      <div class="grow p-3 border-b border-secondary overflow-y-auto">
+        <% transaction_search_filters.each do |filter| %>
+          <%= tabs.with_panel(tab_id: filter[:key]) do %>
+            <%= render partial: get_transaction_search_filter_partial_path(filter), locals: { form: form } %>
+          <% end %>
         <% end %>
       </div>
 
-      <div>
-        <%= button_tag type: "reset", data: { action: "menu#close" }, class: "py-2 px-3 bg-gray-50 rounded-lg text-sm text-gray-900 font-medium" do %>
-          <%= t(".cancel") %>
-        <% end %>
-        <%= form.submit t(".apply"), name: nil, class: "py-2 px-3 bg-gray-900 hover:bg-gray-700 rounded-lg text-sm text-white font-medium cursor-pointer" %>
+      <div class="flex justify-between items-center gap-2 bg-container p-3 shrink-0">
+        <div>
+          <% if @q.present? %>
+            <%= render DS::Link.new(
+            text: t(".clear_filters"),
+            variant: "ghost",
+            href: transactions_path(clear_filters: true),
+          ) %>
+          <% end %>
+        </div>
+
+        <div>
+          <%= render DS::Button.new(text: t(".cancel"), type: "button", variant: "ghost", data: { action: "DS--menu#close" }) %>
+          <%= render DS::Button.new(text: t(".apply")) %>
+        </div>
       </div>
     </div>
   </div>
-</div>
+<% end %>
diff --git a/app/views/transactions/searches/filters/_account_filter.html.erb b/app/views/transactions/searches/filters/_account_filter.html.erb
index 0c6a4669..8182dedc 100644
--- a/app/views/transactions/searches/filters/_account_filter.html.erb
+++ b/app/views/transactions/searches/filters/_account_filter.html.erb
@@ -1,8 +1,8 @@
 <%# locals: (form:) %>
 <div data-controller="list-filter">
   <div class="relative">
-    <input type="search" autocomplete="off" placeholder="Filter accounts" data-list-filter-target="input" data-action="input->list-filter#filter" class="block w-full border border-gray-200 rounded-md py-2 pl-10 pr-3 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm">
-    <%= lucide_icon("search", class: "w-5 h-5 text-gray-500 absolute inset-y-0 left-2 top-1/2 transform -translate-y-1/2") %>
+    <input type="search" autocomplete="off" placeholder="Filter accounts" data-list-filter-target="input" data-action="input->list-filter#filter" class="block w-full border border-secondary rounded-md py-2 pl-10 pr-3 bg-container focus:ring-gray-500 sm:text-sm">
+    <%= icon("search", class: "absolute inset-y-0 left-2 top-1/2 transform -translate-y-1/2") %>
   </div>
   <div class="my-2" id="list" data-list-filter-target="list">
     <% Current.family.accounts.alphabetically.each do |account| %>
@@ -11,11 +11,11 @@
                            {
                              multiple: true,
                              checked: @q[:accounts]&.include?(account.name),
-                             class: "maybe-checkbox maybe-checkbox--light"
+                             class: "checkbox checkbox--light"
                            },
                            account.name,
                            nil %>
-        <%= form.label :accounts, account.name, value: account.name, class: "text-sm text-gray-900" %>
+        <%= form.label :accounts, account.name, value: account.name, class: "text-sm text-primary" %>
       </div>
     <% end %>
   </div>
diff --git a/app/views/transactions/searches/filters/_badge.html.erb b/app/views/transactions/searches/filters/_badge.html.erb
index f0ec8b1a..e71bf9ee 100644
--- a/app/views/transactions/searches/filters/_badge.html.erb
+++ b/app/views/transactions/searches/filters/_badge.html.erb
@@ -1,8 +1,8 @@
 <%# locals: (param_key:, param_value:) %>
-<li class="flex items-center gap-1 text-sm border border-alpha-black-200 rounded-3xl p-1.5">
+<li class="flex items-center gap-1 text-sm border border-secondary rounded-3xl p-1.5">
   <% if param_key == "start_date" || param_key == "end_date" %>
     <div class="flex items-center gap-2">
-      <%= lucide_icon "calendar", class: "w-5 h-5 text-gray-500" %>
+      <%= icon "calendar" %>
       <p>
         <% if param_key == "start_date" %>
           <%= t(".on_or_after", date: param_value) %>
@@ -13,7 +13,7 @@
     </div>
   <% elsif param_key == "search" %>
     <div class="flex items-center gap-2">
-      <%= lucide_icon "text", class: "w-5 h-5 text-gray-500" %>
+      <%= icon "text" %>
       <p><%= "\"#{param_value}\"".truncate(20) %></p>
     </div>
   <% elsif param_key == "accounts" %>
@@ -23,7 +23,7 @@
     </div>
   <% elsif param_key == "amount" %>
     <div class="flex items-center gap-2">
-      <%= lucide_icon "hash", class: "w-5 h-5 text-gray-500" %>
+      <%= icon "hash" %>
       <p><%= param_value %></p>
     </div>
   <% elsif param_key == "types" %>
@@ -41,7 +41,10 @@
     </div>
   <% end %>
 
-  <%= link_to transactions_path_without_param(param_key, param_value), data: { id: "clear-param-btn", turbo: false }, class: "flex items-center" do %>
-    <%= lucide_icon "x", class: "w-4 h-4 text-gray-500" %>
+  <%= button_to clear_filter_transactions_path(param_key: param_key, param_value: param_value, **request.query_parameters),
+        method: :delete,
+        data: { turbo: false },
+        class: "flex items-center cursor-pointer" do %>
+    <%= icon "x", size: "sm", class: "hover:text-primary" %>
   <% end %>
 </li>
diff --git a/app/views/transactions/searches/filters/_category_filter.html.erb b/app/views/transactions/searches/filters/_category_filter.html.erb
index 5f399126..6b848ed9 100644
--- a/app/views/transactions/searches/filters/_category_filter.html.erb
+++ b/app/views/transactions/searches/filters/_category_filter.html.erb
@@ -1,21 +1,21 @@
 <%# locals: (form:) %>
 <div data-controller="list-filter">
   <div class="relative">
-    <input type="search" autocomplete="off" placeholder="Filter category" data-list-filter-target="input" data-action="input->list-filter#filter" class="block w-full border border-gray-200 rounded-md py-2 pl-10 pr-3 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm">
-    <%= lucide_icon("search", class: "w-5 h-5 text-gray-500 absolute inset-y-0 left-2 top-1/2 transform -translate-y-1/2") %>
+    <input type="search" autocomplete="off" placeholder="Filter category" data-list-filter-target="input" data-action="input->list-filter#filter" class="block w-full bg-container border border-secondary rounded-md py-2 pl-10 pr-3 focus:ring-gray-500 sm:text-sm">
+    <%= icon("search", class: "absolute inset-y-0 left-2 top-1/2 transform -translate-y-1/2") %>
   </div>
   <div class="my-2" id="list" data-list-filter-target="list">
-    <% Current.family.categories.alphabetically.each do |category| %>
+    <% family_categories.each do |category| %>
       <div class="filterable-item flex items-center gap-2 p-2" data-filter-name="<%= category.name %>">
         <%= form.check_box :categories,
                            {
                              multiple: true,
                              checked: @q[:categories]&.include?(category.name),
-                             class: "maybe-checkbox maybe-checkbox--light"
+                             class: "checkbox checkbox--light"
                            },
                            category.name,
                            nil %>
-        <%= form.label :categories, category.name, value: category.name, class: "text-sm text-gray-900 cursor-pointer" do %>
+        <%= form.label :categories, category.name, value: category.name, class: "text-sm text-primary cursor-pointer" do %>
           <%= render partial: "categories/badge", locals: { category: category } %>
         <% end %>
       </div>
diff --git a/app/views/transactions/searches/filters/_date_filter.html.erb b/app/views/transactions/searches/filters/_date_filter.html.erb
index a77b4934..63449f9b 100644
--- a/app/views/transactions/searches/filters/_date_filter.html.erb
+++ b/app/views/transactions/searches/filters/_date_filter.html.erb
@@ -3,9 +3,9 @@
   <%= form.date_field :start_date,
                       placeholder: "Start date",
                       value: @q[:start_date],
-                      class: "block w-full border border-gray-200 rounded-md py-2 pl-3 pr-3 focus:border-gray-500 focus:ring-gray-500 sm:text-sm" %>
+                      class: "block w-full border border-secondary rounded-md bg-container py-2 pl-3 pr-3  focus:ring-gray-500 sm:text-sm" %>
   <%= form.date_field :end_date,
                       placeholder: "End date",
                       value: @q[:end_date],
-                      class: "block w-full border border-gray-200 rounded-md py-2 pl-3 pr-3 focus:border-gray-500 focus:ring-gray-500 sm:text-sm mt-2" %>
+                      class: "block w-full border border-secondary rounded-md bg-container py-2 pl-3 pr-3  focus:ring-gray-500 sm:text-sm mt-2" %>
 </div>
diff --git a/app/views/transactions/searches/filters/_merchant_filter.html.erb b/app/views/transactions/searches/filters/_merchant_filter.html.erb
index 33cfe068..c7df8c0b 100644
--- a/app/views/transactions/searches/filters/_merchant_filter.html.erb
+++ b/app/views/transactions/searches/filters/_merchant_filter.html.erb
@@ -1,22 +1,29 @@
 <%# locals: (form:) %>
 <div data-controller="list-filter">
   <div class="relative">
-    <input type="search" autocomplete="off" placeholder="Filter merchants" data-list-filter-target="input" data-action="input->list-filter#filter" class="block w-full border border-gray-200 rounded-md py-2 pl-10 pr-3 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm">
-    <%= lucide_icon("search", class: "w-5 h-5 text-gray-500 absolute inset-y-0 left-2 top-1/2 transform -translate-y-1/2") %>
+    <input type="search" autocomplete="off" placeholder="Filter merchants" data-list-filter-target="input" data-action="input->list-filter#filter" class="block w-full bg-container border border-secondary rounded-md py-2 pl-10 pr-3 focus:ring-gray-500 sm:text-sm">
+    <%= icon("search", class: "absolute inset-y-0 left-2 top-1/2 transform -translate-y-1/2") %>
   </div>
   <div class="my-2" id="list" data-list-filter-target="list">
-    <% Current.family.merchants.alphabetically.each do |merchant| %>
+    <% Current.family.assigned_merchants.alphabetically.each do |merchant| %>
       <div class="filterable-item flex items-center gap-2 p-2" data-filter-name="<%= merchant.name %>">
         <%= form.check_box :merchants,
                            {
                              multiple: true,
                              checked: @q[:merchants]&.include?(merchant.name),
-                             class: "maybe-checkbox maybe-checkbox--light"
+                             class: "checkbox checkbox--light"
                            },
                            merchant.name,
                            nil %>
-        <%= form.label :merchants, value: merchant.name, class: "text-sm text-gray-900 flex items-center gap-2" do %>
-          <%= circle_logo(merchant.name, hex: merchant.color, size: "sm") %>
+        <%= form.label :merchants, value: merchant.name, class: "text-sm text-primary flex items-center gap-2" do %>
+          <%= render DS::FilledIcon.new(
+            variant: :text,
+            hex_color: merchant.color,
+            text: merchant.name,
+            size: "sm",
+            rounded: true
+          ) %>
+
           <%= merchant.name %>
         <% end %>
       </div>
diff --git a/app/views/transactions/searches/filters/_tag_filter.html.erb b/app/views/transactions/searches/filters/_tag_filter.html.erb
index af86283a..76b19811 100644
--- a/app/views/transactions/searches/filters/_tag_filter.html.erb
+++ b/app/views/transactions/searches/filters/_tag_filter.html.erb
@@ -1,8 +1,8 @@
 <%# locals: (form:) %>
 <div data-controller="list-filter">
   <div class="relative">
-    <input type="search" autocomplete="off" placeholder="Filter tags" data-list-filter-target="input" data-action="input->list-filter#filter" class="block w-full border border-gray-200 rounded-md py-2 pl-10 pr-3 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm">
-    <%= lucide_icon("search", class: "w-5 h-5 text-gray-500 absolute inset-y-0 left-2 top-1/2 transform -translate-y-1/2") %>
+    <input type="search" autocomplete="off" placeholder="Filter tags" data-list-filter-target="input" data-action="input->list-filter#filter" class="block w-full bg-container border border-secondary rounded-md py-2 pl-10 pr-3 focus:ring-gray-500 sm:text-sm">
+    <%= icon("search", class: "absolute inset-y-0 left-2 top-1/2 transform -translate-y-1/2") %>
   </div>
   <div class="my-2" id="list" data-list-filter-target="list">
     <% Current.family.tags.alphabetically.each do |tag| %>
@@ -11,12 +11,19 @@
                            {
                              multiple: true,
                              checked: @q[:tags]&.include?(tag.name),
-                             class: "maybe-checkbox maybe-checkbox--light"
+                             class: "checkbox checkbox--light"
                            },
                            tag.name,
                            nil %>
-        <%= form.label :tags, value: tag.name, class: "text-sm text-gray-900 flex items-center gap-2" do %>
-          <%= circle_logo(tag.name, hex: tag.color || Tag::UNCATEGORIZED_COLOR, size: "sm") %>
+        <%= form.label :tags, value: tag.name, class: "text-sm text-primary flex items-center gap-2" do %>
+          <%= render DS::FilledIcon.new(
+            variant: :text,
+            hex_color: tag.color || Tag::UNCATEGORIZED_COLOR,
+            text: tag.name,
+            size: "sm",
+            rounded: true
+          ) %>
+
           <%= tag.name %>
         <% end %>
       </div>
diff --git a/app/views/transactions/searches/filters/_type_filter.html.erb b/app/views/transactions/searches/filters/_type_filter.html.erb
index 5effc7e9..78288b2d 100644
--- a/app/views/transactions/searches/filters/_type_filter.html.erb
+++ b/app/views/transactions/searches/filters/_type_filter.html.erb
@@ -6,32 +6,32 @@
                            {
                              multiple: true,
                              checked: @q[:types]&.include?("income"),
-                             class: "maybe-checkbox maybe-checkbox--light"
+                             class: "checkbox checkbox--light"
                            },
                            "income",
                            nil %>
-    <%= form.label :types, t(".income"), value: "income", class: "text-sm text-gray-900" %>
+    <%= form.label :types, t(".income"), value: "income", class: "text-sm text-primary" %>
   </div>
   <div class="flex items-center gap-3" data-filter-name="expense">
     <%= form.check_box :types,
                            {
                              multiple: true,
                              checked: @q[:types]&.include?("expense"),
-                             class: "maybe-checkbox maybe-checkbox--light"
+                             class: "checkbox checkbox--light"
                            },
                            "expense",
                            nil %>
-    <%= form.label :types, t(".expense"), value: "expense", class: "text-sm text-gray-900" %>
+    <%= form.label :types, t(".expense"), value: "expense", class: "text-sm text-primary" %>
   </div>
   <div class="flex items-center gap-3" data-filter-name="transfer">
     <%= form.check_box :types,
                            {
                              multiple: true,
                              checked: @q[:types]&.include?("transfer"),
-                             class: "maybe-checkbox maybe-checkbox--light"
+                             class: "checkbox checkbox--light"
                            },
                            "transfer",
                            nil %>
-    <%= form.label :types, t(".transfer"), value: "transfer", class: "text-sm text-gray-900" %>
+    <%= form.label :types, t(".transfer"), value: "transfer", class: "text-sm text-primary" %>
   </div>
 </div>
diff --git a/app/views/transactions/show.html.erb b/app/views/transactions/show.html.erb
new file mode 100644
index 00000000..4111cd43
--- /dev/null
+++ b/app/views/transactions/show.html.erb
@@ -0,0 +1,172 @@
+<%= render DS::Dialog.new(variant: "drawer") do |dialog| %>
+  <% dialog.with_header do %>
+    <%= render "transactions/header", entry: @entry %>
+  <% end %>
+
+  <% dialog.with_body do %>
+    <% dialog.with_section(title: t(".overview"), open: true) do %>
+      <div class="pb-4">
+        <%= styled_form_with model: @entry,
+              url: transaction_path(@entry),
+              class: "space-y-2",
+              data: { controller: "auto-submit-form" } do |f| %>
+
+          <%= f.text_field :name,
+                label: t(".name_label"),
+                "data-auto-submit-form-target": "auto" %>
+
+          <%= f.date_field :date,
+                label: t(".date_label"),
+                max: Date.current,
+                disabled: @entry.linked?,
+                "data-auto-submit-form-target": "auto" %>
+
+          <% unless @entry.transaction.transfer? %>
+            <div class="flex items-center gap-2">
+              <%= f.select :nature,
+                    [["Expense", "outflow"], ["Income", "inflow"]],
+                    { container_class: "w-1/3", label: t(".nature"), selected: @entry.amount.negative? ? "inflow" : "outflow" },
+                    { data: { "auto-submit-form-target": "auto" }, disabled: @entry.linked? } %>
+
+              <%= f.money_field :amount, label: t(".amount"),
+                    container_class: "w-2/3",
+                    auto_submit: true,
+                    min: 0,
+                    value: @entry.amount.abs,
+                    disabled: @entry.linked?,
+                    disable_currency: @entry.linked? %>
+            </div>
+
+            <%= f.fields_for :entryable do |ef| %>
+              <%= ef.collection_select :category_id,
+                      Current.family.categories.alphabetically,
+                    :id, :name,
+                    { label: t(".category_label"),
+                      class: "text-subdued", include_blank: t(".uncategorized") },
+                    "data-auto-submit-form-target": "auto" %>
+            <% end %>
+          <% end %>
+
+        <% end %>
+      </div>
+    <% end %>
+
+    <% dialog.with_section(title: t(".details")) do %>
+      <div class="pb-4">
+        <%= styled_form_with model: @entry,
+              url: transaction_path(@entry),
+              class: "space-y-2",
+              data: { controller: "auto-submit-form" } do |f| %>
+          <% unless @entry.transaction.transfer? %>
+            <%= f.select :account,
+                options_for_select(
+                  Current.family.accounts.alphabetically.pluck(:name, :id),
+                  @entry.account_id
+                ),
+                { label: t(".account_label") },
+                { disabled: true } %>
+
+            <%= f.fields_for :entryable do |ef| %>
+
+              <%= ef.collection_select :merchant_id,
+                    [@entry.transaction.merchant, *Current.family.merchants.alphabetically].compact,
+                    :id, :name,
+                    { include_blank: t(".none"),
+                      label: t(".merchant_label"),
+                      class: "text-subdued" },
+                    "data-auto-submit-form-target": "auto" %>
+
+              <%= ef.select :tag_ids,
+                    Current.family.tags.alphabetically.pluck(:name, :id),
+                    {
+                      include_blank: t(".none"),
+                      multiple: true,
+                      label:    t(".tags_label"),
+                      container_class: "h-40"
+                    },
+                    { "data-auto-submit-form-target": "auto" } %>
+            <% end %>
+          <% end %>
+
+          <%= f.text_area :notes,
+                  label: t(".note_label"),
+                  placeholder: t(".note_placeholder"),
+                  rows: 5,
+                  "data-auto-submit-form-target": "auto" %>
+
+        <% end %>
+      </div>
+    <% end %>
+
+    <% dialog.with_section(title: t(".settings")) do %>
+      <div class="pb-4">
+        <%= styled_form_with model: @entry,
+              url: transaction_path(@entry),
+              class: "p-3",
+              data: { controller: "auto-submit-form" } do |f| %>
+          <div class="flex cursor-pointer items-center gap-4 justify-between">
+            <div class="text-sm space-y-1">
+              <h4 class="text-primary">Exclude</h4>
+              <p class="text-secondary">Excluded transactions will be removed from budgeting calculations and reports.</p>
+            </div>
+
+            <%= f.toggle :excluded, { data: { auto_submit_form_target: "auto" } } %>
+          </div>
+        <% end %>
+      </div>
+
+      <div class="pb-4">
+        <%= styled_form_with model: @entry,
+              url: transaction_path(@entry),
+              class: "p-3",
+              data: { controller: "auto-submit-form" } do |f| %>
+          <%= f.fields_for :entryable do |ef| %>
+            <div class="flex cursor-pointer items-center gap-4 justify-between">
+              <div class="text-sm space-y-1">
+                <h4 class="text-primary">One-time <%= @entry.amount.negative? ? "Income" : "Expense" %></h4>
+                <p class="text-secondary">One-time transactions will be excluded from certain budgeting calculations and reports to help you see what's really important.</p>
+              </div>
+
+              <%= ef.toggle :kind, {
+                    checked: @entry.transaction.one_time?,
+                    data: { auto_submit_form_target: "auto" }
+                  }, "one_time", "standard" %>
+            </div>
+          <% end %>
+        <% end %>
+
+        <div class="flex items-center justify-between gap-4 p-3">
+          <div class="text-sm space-y-1">
+            <h4 class="text-primary">Transfer or Debt Payment?</h4>
+            <p class="text-secondary">Transfers and payments are special types of transactions that indicate money movement between 2 accounts.</p>
+          </div>
+
+          <%= render DS::Link.new(
+            text: "Open matcher",
+            icon: "arrow-left-right",
+            variant: "outline",
+            href: new_transaction_transfer_match_path(@entry),
+            frame: :modal
+          ) %>
+        </div>
+
+        <!-- Delete Transaction Form -->
+        <div class="flex items-center justify-between gap-2 p-3">
+          <div class="text-sm space-y-1">
+            <h4 class="text-primary"><%= t(".delete_title") %></h4>
+            <p class="text-secondary"><%= t(".delete_subtitle") %></p>
+          </div>
+
+          <%= render DS::Button.new(
+            text: t(".delete"),
+            variant: "outline-destructive",
+            href: entry_path(@entry),
+            method: :delete,
+            confirm: CustomConfirm.for_resource_deletion("transaction"),
+            frame: "_top"
+          ) %>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/transfer_matches/_matching_fields.html.erb b/app/views/transfer_matches/_matching_fields.html.erb
new file mode 100644
index 00000000..0c5583bd
--- /dev/null
+++ b/app/views/transfer_matches/_matching_fields.html.erb
@@ -0,0 +1,44 @@
+<%# locals: (form:, entry:, candidates:, accounts:) %>
+
+<% if candidates.any? %>
+  <div data-controller="transfer-match" class="space-y-2">
+    <p class="text-sm text-secondary">
+      Select a method for matching your transactions.
+    </p>
+
+    <%= form.select :method,
+              [
+                ["Match existing transaction (recommended)", "existing"],
+                ["Create new transaction", "new"]
+              ],
+              { selected: "existing", label: "Matching method" },
+              data: { action: "change->transfer-match#update" } %>
+
+    <div data-transfer-match-target="existingSelect">
+      <%= form.select :matched_entry_id,
+                candidates.map { |entry|
+                  [entry_name_detailed(entry), entry.id]
+                },
+                { label: "Matching transaction" } %>
+    </div>
+
+    <div data-transfer-match-target="newSelect" class="hidden">
+      <%= form.select :target_account_id,
+                accounts.map { |account| [account.name, account.id] },
+                { label: "Target account" } %>
+    </div>
+  </div>
+<% else %>
+  <p class="text-sm text-secondary">
+    We couldn't find any transactions to match from your other accounts.
+    Please select an account and we will create a new inflow transaction for you.
+  </p>
+
+  <%= form.hidden_field :method, value: "new" %>
+
+  <div>
+    <%= form.select :target_account_id,
+                accounts.map { |account| [account.name, account.id] },
+                { label: "Target account" } %>
+  </div>
+<% end %>
diff --git a/app/views/transfer_matches/new.html.erb b/app/views/transfer_matches/new.html.erb
new file mode 100644
index 00000000..8a84b982
--- /dev/null
+++ b/app/views/transfer_matches/new.html.erb
@@ -0,0 +1,63 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: "Match transfer or payment") %>
+  <% dialog.with_body do %>
+    <%= styled_form_with(
+          url: transaction_transfer_match_path(@entry),
+          scope: :transfer_match,
+          class: "space-y-8",
+          data: { turbo_frame: :_top }
+        ) do |f| %>
+      <section class="space-y-4">
+        <div class="space-y-2">
+          <h2 class="text-sm font-medium text-gray-700">
+            <%= @entry.amount.positive? ? "From account: #{@entry.account.name}" : "From account" %>
+          </h2>
+
+          <% if @entry.amount.positive? %>
+            <%= f.select(
+                  :entry_id,
+                  [[entry_name_detailed(@entry), @entry.id]],
+                  {
+                    label: "Outflow transaction",
+                    selected: @entry.id,
+                  },
+                  disabled: true
+                ) %>
+          <% else %>
+            <%= render "transfer_matches/matching_fields",
+                        form: f, entry: @entry, candidates: @transfer_match_candidates.map { |pm| pm.outflow_transaction.entry }, accounts: @accounts %>
+          <% end %>
+        </div>
+      </section>
+
+      <div class="flex justify-center py-2">
+        <%= icon "arrow-down" %>
+      </div>
+
+      <section class="space-y-4">
+        <div class="space-y-2">
+          <h2 class="text-sm font-medium text-gray-700">
+            <%= @entry.amount.negative? ? "To account: #{@entry.account.name}" : "To account" %>
+          </h2>
+
+          <% if @entry.amount.negative? %>
+            <%= f.select(
+                  :entry_id,
+                  [[entry_name_detailed(@entry), @entry.id]],
+                  {
+                    label: "Inflow transaction",
+                    selected: @entry.id,
+                  },
+                  disabled: true
+                ) %>
+          <% else %>
+            <%= render "transfer_matches/matching_fields",
+                        form: f, entry: @entry, candidates: @transfer_match_candidates.map { |pm| pm.inflow_transaction.entry }, accounts: @accounts %>
+          <% end %>
+        </div>
+      </section>
+
+      <%= f.submit "Create transfer match" %>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/transfers/_account_links.html.erb b/app/views/transfers/_account_links.html.erb
new file mode 100644
index 00000000..738416c6
--- /dev/null
+++ b/app/views/transfers/_account_links.html.erb
@@ -0,0 +1,25 @@
+<%# locals: (transfer:, is_inflow: false) %>
+<div class="flex items-center gap-1">
+  <% first_account, second_account = is_inflow ? [transfer.to_account, transfer.from_account] : [transfer.from_account, transfer.to_account] %>
+
+  <%# Check if first_account exists before creating link %>
+  <% if first_account %>
+    <%= link_to first_account.name, account_path(first_account, tab: "activity"), class: "hover:underline", data: { turbo_frame: "_top" } %>
+  <% else %>
+    <span class="text-warning text-xs italic" title="Transfer ID: <%= transfer.id %>">
+      Data Error: Missing account
+    </span>
+  <% end %>
+
+  <%# Use icon helper per conventions %>
+  <%= icon(is_inflow ? "arrow-left" : "arrow-right", size: "sm") %>
+
+  <%# Check if second_account exists before creating link %>
+  <% if second_account %>
+    <%= link_to second_account.name, account_path(second_account, tab: "activity"), class: "hover:underline", data: { turbo_frame: "_top" } %>
+  <% else %>
+    <span class="text-warning text-xs italic" title="Transfer ID: <%= transfer.id %>">
+      Data Error: Missing account
+    </span>
+  <% end %>
+</div>
diff --git a/app/views/transfers/_form.html.erb b/app/views/transfers/_form.html.erb
new file mode 100644
index 00000000..d584cb7c
--- /dev/null
+++ b/app/views/transfers/_form.html.erb
@@ -0,0 +1,23 @@
+<%= styled_form_with model: transfer, class: "space-y-4", data: { turbo_frame: "_top", controller: "transfer-form" } do |f| %>
+  <% if transfer.errors.present? %>
+    <div class="text-destructive flex items-center gap-2">
+      <%= icon "circle-alert", size: "sm" %>
+      <p class="text-sm"><%= @transfer.errors.full_messages.to_sentence %></p>
+    </div>
+  <% end %>
+
+  <section>
+    <%= render "shared/transaction_type_tabs", active_tab: "transfer" %>
+  </section>
+
+  <section class="space-y-2">
+    <%= f.collection_select :from_account_id, Current.family.accounts.manual.alphabetically, :id, :name, { prompt: t(".select_account"), label: t(".from") }, required: true %>
+    <%= f.collection_select :to_account_id, Current.family.accounts.manual.alphabetically, :id, :name, { prompt: t(".select_account"), label: t(".to") }, required: true %>
+    <%= f.number_field :amount, label: t(".amount"), required: true, min: 0, placeholder: "100", step: 0.00000001 %>
+    <%= f.date_field :date, value: transfer.inflow_transaction&.entry&.date || Date.current, label: t(".date"), required: true, max: Date.current %>
+  </section>
+
+  <section>
+    <%= f.submit t(".submit") %>
+  </section>
+<% end %>
diff --git a/app/views/transfers/new.html.erb b/app/views/transfers/new.html.erb
new file mode 100644
index 00000000..db8b7d76
--- /dev/null
+++ b/app/views/transfers/new.html.erb
@@ -0,0 +1,6 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".title")) %>
+  <% dialog.with_body do %>
+    <%= render "form", transfer: @transfer %>
+  <% end %>
+<% end %>
diff --git a/app/views/transfers/show.html.erb b/app/views/transfers/show.html.erb
new file mode 100644
index 00000000..83e766b7
--- /dev/null
+++ b/app/views/transfers/show.html.erb
@@ -0,0 +1,104 @@
+<%= render DS::Dialog.new(variant: "drawer") do |dialog| %>
+  <% dialog.with_header do %>
+    <div class="space-y-1">
+      <div class="flex items-center gap-4">
+        <h3 class="font-medium">
+          <span class="text-2xl">
+            <%= format_money @transfer.amount_abs %>
+          </span>
+
+          <span class="text-lg text-secondary">
+            <%= @transfer.amount_abs.currency.iso_code %>
+          </span>
+        </h3>
+
+        <%= icon "arrow-left-right", size: "sm" %>
+      </div>
+
+      <span class="text-sm text-secondary">
+        <%= @transfer.name %>
+      </span>
+    </div>
+  <% end %>
+
+  <% dialog.with_body do %>
+    <% dialog.with_section(title: t(".overview"), open: true) do %>
+      <div class="pb-4 px-3 pt-2 text-sm space-y-3 text-primary">
+        <div class="space-y-3">
+          <dl class="flex items-center gap-2 justify-between">
+            <dt class="text-secondary">From</dt>
+            <dd class="flex items-center gap-2 font-medium">
+              <%= render "accounts/logo", account: @transfer.from_account, size: "sm" %>
+              <%= link_to @transfer.from_account.name, account_path(@transfer.from_account), data: { turbo_frame: "_top" } %>
+            </dd>
+          </dl>
+
+          <dl class="flex items-center gap-2 justify-between">
+            <dt class="text-secondary">Date</dt>
+            <dd class="font-medium"><%= l(@transfer.outflow_transaction.entry.date, format: :long) %></dd>
+          </dl>
+
+          <dl class="flex items-center gap-2 justify-between">
+            <dt class="text-secondary">Amount</dt>
+            <dd class="font-medium text-red-500"><%= format_money @transfer.outflow_transaction.entry.amount_money * -1 %></dd>
+          </dl>
+        </div>
+
+        <%= render "shared/ruler", classes: "my-2" %>
+
+        <div class="space-y-3">
+          <dl class="flex items-center gap-2 justify-between">
+            <dt class="text-secondary">To</dt>
+            <dd class="flex items-center gap-2 font-medium">
+              <%= render "accounts/logo", account: @transfer.to_account, size: "sm" %>
+              <%= link_to @transfer.to_account.name, account_path(@transfer.to_account), data: { turbo_frame: "_top" } %>
+            </dd>
+          </dl>
+
+          <dl class="flex items-center gap-2 justify-between">
+            <dt class="text-secondary">Date</dt>
+            <dd class="font-medium"><%= l(@transfer.inflow_transaction.entry.date, format: :long) %></dd>
+          </dl>
+
+          <dl class="flex items-center gap-2 justify-between">
+            <dt class="text-secondary">Amount</dt>
+            <dd class="font-medium text-green-500">+<%= format_money @transfer.inflow_transaction.entry.amount_money * -1 %></dd>
+          </dl>
+        </div>
+      </div>
+    <% end %>
+
+    <% dialog.with_section(title: t(".details")) do %>
+      <%= styled_form_with model: @transfer,
+              data: { controller: "auto-submit-form" }, class: "space-y-2" do |f| %>
+        <% if @transfer.categorizable? %>
+          <%= f.collection_select :category_id, @categories.alphabetically, :id, :name, { label: "Category", include_blank: "Uncategorized", selected: @transfer.outflow_transaction.category&.id }, "data-auto-submit-form-target": "auto" %>
+        <% end %>
+
+        <%= f.text_area :notes,
+                  label: t(".note_label"),
+                  placeholder: t(".note_placeholder"),
+                  rows: 5,
+                  "data-auto-submit-form-target": "auto" %>
+      <% end %>
+    <% end %>
+
+    <% dialog.with_section(title: t(".settings")) do %>
+      <div class="pb-4">
+        <div class="flex items-center justify-between gap-2 p-3">
+          <div class="text-sm space-y-1">
+            <h4 class="text-primary"><%= t(".delete_title") %></h4>
+            <p class="text-secondary"><%= t(".delete_subtitle") %></p>
+          </div>
+
+          <%= button_to t(".delete"),
+                transfer_path(@transfer),
+                method: :delete,
+                class:  "rounded-lg px-3 py-2 whitespace-nowrap text-red-500 text-sm
+                          font-medium border border-secondary",
+                data:   { turbo_confirm: true, turbo_frame: "_top" } %>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/transfers/update.turbo_stream.erb b/app/views/transfers/update.turbo_stream.erb
new file mode 100644
index 00000000..82a503d0
--- /dev/null
+++ b/app/views/transfers/update.turbo_stream.erb
@@ -0,0 +1,20 @@
+<% unless @transfer.destroyed? %>
+  <%= turbo_stream.replace @transfer.inflow_transaction.entry %>
+  <%= turbo_stream.replace @transfer.outflow_transaction.entry %>
+
+  <%= turbo_stream.replace dom_id(@transfer.inflow_transaction, "category_menu"),
+                          partial: "transactions/transaction_category",
+                          locals: { transaction: @transfer.inflow_transaction } %>
+
+  <%= turbo_stream.replace dom_id(@transfer.outflow_transaction, "category_menu"),
+                          partial: "transactions/transaction_category",
+                          locals: { transaction: @transfer.outflow_transaction } %>
+
+  <%= turbo_stream.replace dom_id(@transfer.inflow_transaction, "transfer_match"),
+                          partial: "transactions/transfer_match",
+                          locals: { transaction: @transfer.inflow_transaction } %>
+
+  <%= turbo_stream.replace dom_id(@transfer.outflow_transaction, "transfer_match"),
+                          partial: "transactions/transfer_match",
+                          locals: { transaction: @transfer.outflow_transaction } %>
+<% end %>
diff --git a/app/views/user_messages/_user_message.html.erb b/app/views/user_messages/_user_message.html.erb
new file mode 100644
index 00000000..0b7ac62e
--- /dev/null
+++ b/app/views/user_messages/_user_message.html.erb
@@ -0,0 +1,5 @@
+<%# locals: (user_message:) %>
+
+<div id="<%= dom_id(user_message) %>" class="bg-surface-inset px-3 py-2 rounded-lg max-w-[85%] w-fit ml-auto mb-6">
+  <div class="prose prose--ai-chat"><%= markdown(user_message.content) %></div>
+</div>
diff --git a/app/views/users/_user_menu.html.erb b/app/views/users/_user_menu.html.erb
new file mode 100644
index 00000000..fcc2d688
--- /dev/null
+++ b/app/views/users/_user_menu.html.erb
@@ -0,0 +1,47 @@
+<%# locals: (user:, placement: "right-start", offset: 16) %>
+
+<div data-testid="user-menu">
+  <%= render DS::Menu.new(variant: "avatar", avatar_url: user.profile_image&.variant(:small)&.url, initials: user.initials, placement: placement, offset: offset) do |menu| %>
+    <%= menu.with_header do %>
+      <div class="px-4 py-3 flex items-center gap-3">
+        <div class="w-9 h-9 shrink-0">
+          <%= render "settings/user_avatar", avatar_url: user.profile_image&.variant(:small)&.url, initials: user.initials, lazy: true %>
+        </div>
+
+        <div class="overflow-hidden text-ellipsis text-sm">
+          <p class="font-medium"><%= user.display_name %></p>
+          <% if user.display_name != user.email %>
+            <p class="text-secondary"><%= user.email %></p>
+          <% end %>
+        </div>
+      </div>
+
+      <% if self_hosted? %>
+        <div class="px-4 py-3 border-t border-tertiary">
+          <p class="text-sm">
+            <span class="font-medium text-primary">Version:</span>
+            <%= link_to Maybe.version.to_release_tag, "https://github.com/maybe-finance/maybe/releases/tag/#{Maybe.version.to_release_tag}", target: "_blank", class: "hover:underline" %>
+
+            <% if Maybe.commit_sha.present? %>
+              (<%= link_to Maybe.commit_sha.first(7), "https://github.com/maybe-finance/maybe/commit/#{Maybe.commit_sha}", target: "_blank", class: "hover:underline" %>)
+            <% end %>
+          </p>
+        </div>
+      <% end %>
+    <% end %>
+
+    <% menu.with_item(variant: "link", text: "Settings", icon: "settings", href: settings_profile_path(return_to: request.fullpath)) %>
+    <% menu.with_item(variant: "link", text: "Changelog", icon: "box", href: changelog_path) %>
+
+    <% if self_hosted? %>
+      <% menu.with_item(variant: "link", text: "Feedback", icon: "megaphone", href: feedback_path) %>
+      <% menu.with_item(variant: "link", text: "Contact", icon: "message-square-more", href: "https://link.maybe.co/discord") %>
+    <% else %>
+      <% menu.with_item(variant: "button", text: "Contact", icon: "message-square-more", data: { action: "intercom#show" }) %>
+    <% end %>
+
+    <% menu.with_item(variant: "divider") %>
+
+    <% menu.with_item(variant: "button", text: "Log out", icon: "log-out", href: session_path(Current.session), method: :delete) %>
+  <% end %>
+</div>
diff --git a/app/views/valuations/_confirmation_contents.html.erb b/app/views/valuations/_confirmation_contents.html.erb
new file mode 100644
index 00000000..d8fdf032
--- /dev/null
+++ b/app/views/valuations/_confirmation_contents.html.erb
@@ -0,0 +1,51 @@
+<%# locals: (account:, entry:, reconciliation_dry_run:, is_update:, action_verb:) %>
+
+<div class="space-y-4 text-sm text-secondary">
+  <% if account.investment? %>
+    <% brokerage_cash = reconciliation_dry_run.new_cash_balance || 0 %>
+    <% holdings_value = reconciliation_dry_run.new_balance - brokerage_cash %>
+
+    <p>This will <%= action_verb %> the account value on <span class="font-medium text-primary"><%= entry.date.strftime("%B %d, %Y") %></span> to:</p>
+
+    <div class="bg-container rounded-lg p-4 space-y-2 border border-primary">
+      <div class="flex justify-between">
+        <span>Total account value</span>
+        <span class="font-medium text-primary"><%= Money.new(reconciliation_dry_run.new_balance, account.currency).format %></span>
+      </div>
+      <div class="flex justify-between text-xs">
+        <span>Holdings value</span>
+        <span><%= Money.new(holdings_value, account.currency).format %></span>
+      </div>
+      <div class="flex justify-between text-xs">
+        <span>Brokerage cash</span>
+        <span class="<%= brokerage_cash.negative? ? "text-red-500" : "text-green-500" %>"><%= Money.new(brokerage_cash, account.currency).format %></span>
+      </div>
+    </div>
+  <% else %>
+    <p><%= action_verb.capitalize %>
+      <% if account.depository? %>
+        account balance
+      <% elsif account.credit_card? %>
+        credit card balance
+      <% elsif account.loan? %>
+        loan balance
+      <% elsif account.property? %>
+        property value
+      <% elsif account.vehicle? %>
+        vehicle value
+      <% elsif account.crypto? %>
+        crypto balance
+      <% elsif account.other_asset? %>
+        asset value
+      <% elsif account.other_liability? %>
+        liability balance
+      <% else %>
+        balance
+      <% end %>
+      on <span class="font-medium text-primary"><%= entry.date.strftime("%B %d, %Y") %></span> to
+      <span class="font-medium text-primary"><%= entry.amount_money.format %></span>.
+    </p>
+  <% end %>
+
+  <p>All future transactions and balances will be recalculated based on this <%= is_update ? "change" : "update" %>.</p>
+</div>
diff --git a/app/views/valuations/_header.html.erb b/app/views/valuations/_header.html.erb
new file mode 100644
index 00000000..ce7f138f
--- /dev/null
+++ b/app/views/valuations/_header.html.erb
@@ -0,0 +1,19 @@
+<%# locals: (entry:) %>
+
+<%= tag.header class: "mb-4 space-y-1", id: dom_id(entry, :header) do %>
+  <span class="text-secondary text-sm">
+    <%= entry.name %>
+  </span>
+
+  <div class="flex items-center gap-4">
+    <h3 class="font-medium">
+      <span class="text-2xl">
+        <%= format_money entry.amount_money %>
+      </span>
+    </h3>
+  </div>
+
+  <span class="text-sm text-secondary">
+    <%= I18n.l(entry.date, format: :long) %>
+  </span>
+<% end %>
diff --git a/app/views/valuations/_valuation.html.erb b/app/views/valuations/_valuation.html.erb
new file mode 100644
index 00000000..9bb41ce1
--- /dev/null
+++ b/app/views/valuations/_valuation.html.erb
@@ -0,0 +1,33 @@
+<%# locals: (entry:, **) %>
+
+<% valuation = entry.entryable %>
+
+<% color = valuation.opening_anchor? ? "#D444F1" : "var(--color-gray)" %>
+<% icon = valuation.opening_anchor? ? "plus" : "minus" %>
+
+<%= turbo_frame_tag dom_id(entry) do %>
+  <%= turbo_frame_tag dom_id(valuation) do %>
+    <div class="p-4 grid grid-cols-12 items-center text-primary text-sm font-medium">
+      <div class="col-span-8 flex items-center gap-4">
+        <%= check_box_tag dom_id(entry, "selection"),
+                        class: "checkbox checkbox--light",
+                        data: { id: entry.id, "bulk-select-target": "row", action: "bulk-select#toggleRowSelection" } %>
+
+        <div class="flex items-center gap-3">
+          <%= render DS::FilledIcon.new(icon: icon, size: "sm", hex_color: color, rounded: true) %>
+
+          <div class="truncate text-primary">
+            <%= link_to entry.name,
+                        entry_path(entry),
+                        data: { turbo_frame: "drawer", turbo_prefetch: false },
+                        class: "hover:underline" %>
+          </div>
+        </div>
+      </div>
+
+      <div class="col-span-4 justify-self-end">
+        <%= tag.p format_money(entry.amount_money), class: "font-bold text-sm text-primary" %>
+      </div>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/valuations/confirm_create.html.erb b/app/views/valuations/confirm_create.html.erb
new file mode 100644
index 00000000..906c957d
--- /dev/null
+++ b/app/views/valuations/confirm_create.html.erb
@@ -0,0 +1,19 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: "Confirm new balance") %>
+  <% dialog.with_body do %>
+    <%= styled_form_with model: @entry, url: valuations_path, class: "space-y-4" do |form| %>
+      <%= form.hidden_field :account_id %>
+      <%= form.hidden_field :date %>
+      <%= form.hidden_field :amount %>
+
+      <%= render "confirmation_contents",
+          reconciliation_dry_run: @reconciliation_dry_run,
+          account: @account,
+          entry: @entry,
+          action_verb: "set",
+          is_update: false %>
+
+      <%= form.submit "Confirm" %>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/valuations/confirm_update.html.erb b/app/views/valuations/confirm_update.html.erb
new file mode 100644
index 00000000..720f7bd5
--- /dev/null
+++ b/app/views/valuations/confirm_update.html.erb
@@ -0,0 +1,18 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: "Update balance") %>
+  <% dialog.with_body do %>
+    <%= styled_form_with model: @entry, url: valuation_path(@entry), method: :patch, class: "space-y-4", data: { turbo_frame: :_top } do |form| %>
+      <%= form.hidden_field :date %>
+      <%= form.hidden_field :amount %>
+
+      <%= render "confirmation_contents",
+          reconciliation_dry_run: @reconciliation_dry_run,
+          account: @account,
+          entry: @entry,
+          action_verb: "update",
+          is_update: true %>
+
+      <%= form.submit "Update" %>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/account/valuations/index.html.erb b/app/views/valuations/index.html.erb
similarity index 55%
rename from app/views/account/valuations/index.html.erb
rename to app/views/valuations/index.html.erb
index 41b7ada8..427714e3 100644
--- a/app/views/account/valuations/index.html.erb
+++ b/app/views/valuations/index.html.erb
@@ -1,33 +1,35 @@
 <%= turbo_frame_tag dom_id(@account, "valuations") do %>
-  <div class="bg-white space-y-4 p-5 border border-alpha-black-25 rounded-xl shadow-xs">
+  <div class="bg-container space-y-4 p-5 shadow-border-xs rounded-xl">
     <div class="flex items-center justify-between">
       <%= tag.h2 t(".valuations"), class: "font-medium text-lg" %>
-      <%= link_to new_account_valuation_path(@account),
-                  data:  { turbo_frame: dom_id(@account.entries.account_valuations.new) },
-                  class: "flex gap-1 font-medium items-center bg-gray-50 text-gray-900 p-2 rounded-lg" do %>
-        <%= lucide_icon("plus", class: "w-5 h-5 text-gray-900") %>
+      <%= link_to new_valuation_path(@account),
+                  data:  { turbo_frame: dom_id(@account.entries.valuations.new) },
+                  class: "flex gap-1 font-medium items-center bg-gray-50 text-primary p-2 rounded-lg" do %>
+        <span class="text-primary">
+          <%= icon("plus", color: "current") %>
+        </span>
         <%= tag.span t(".new_entry"), class: "text-sm" %>
       <% end %>
     </div>
 
-    <div class="rounded-xl bg-gray-25 p-1">
-      <div class="grid grid-cols-10 items-center uppercase text-xs font-medium text-gray-500 px-4 py-2">
+    <div class="rounded-xl bg-container-inset p-1">
+      <div class="grid grid-cols-10 items-center uppercase text-xs font-medium text-secondary px-4 py-2">
         <%= tag.p t(".date"), class: "col-span-5" %>
         <%= tag.p t(".value"), class: "col-span-2 justify-self-end" %>
         <%= tag.p t(".change"), class: "col-span-2 justify-self-end" %>
         <%= tag.div class: "col-span-1" %>
       </div>
 
-      <div class="rounded-lg bg-white border-alpha-black-25 shadow-xs">
-        <%= turbo_frame_tag dom_id(@account.entries.account_valuations.new) %>
+      <div class="rounded-lg bg-container shadow-border-xs">
+        <%= turbo_frame_tag dom_id(@account.entries.valuations.new) %>
 
         <% if @entries.any? %>
-          <%= render partial: "account/valuations/valuation",
+          <%= render partial: "valuations/valuation",
                      collection:      @entries,
                      as:              :entry,
-                     spacer_template: "account/entries/ruler" %>
+                     spacer_template: "shared/ruler" %>
         <% else %>
-          <p class="text-gray-500 text-sm p-4"><%= t(".no_valuations") %></p>
+          <p class="text-secondary text-sm p-4"><%= t(".no_valuations") %></p>
         <% end %>
       </div>
     </div>
diff --git a/app/views/valuations/new.html.erb b/app/views/valuations/new.html.erb
new file mode 100644
index 00000000..cf805d67
--- /dev/null
+++ b/app/views/valuations/new.html.erb
@@ -0,0 +1,19 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".title")) %>
+  <% dialog.with_body do %>
+    <%= styled_form_with model: @entry, url: confirm_create_valuations_path, class: "space-y-4" do |form| %>
+      <%= form.hidden_field :account_id %>
+
+      <% if @error_message.present? %>
+        <%= render DS::Alert.new(message: @error_message, variant: :error) %>
+      <% end %>
+
+      <div class="space-y-3">
+        <%= form.date_field :date, label: true, required: true, value: Date.current, min: Entry.min_supported_date, max: Date.current %>
+        <%= form.money_field :amount, label: t(".amount"), required: true, disable_currency: true %>
+      </div>
+
+      <%= form.submit t(".submit") %>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/valuations/show.html.erb b/app/views/valuations/show.html.erb
new file mode 100644
index 00000000..089d98a4
--- /dev/null
+++ b/app/views/valuations/show.html.erb
@@ -0,0 +1,75 @@
+<% entry, account = @entry, @entry.account %>
+
+<%= render DS::Dialog.new(variant: "drawer") do |dialog| %>
+  <% dialog.with_header do %>
+    <%= render "valuations/header", entry: @entry %>
+  <% end %>
+
+  <% dialog.with_body do %>
+    <% if @error_message.present? %>
+      <div class="mb-4">
+        <%= render DS::Alert.new(message: @error_message, variant: :error) %>
+      </div>
+    <% end %>
+
+    <% dialog.with_section(title: t(".overview"), open: true) do %>
+      <div class="pb-4">
+        <%= styled_form_with model: entry,
+              url: confirm_update_valuation_path(entry),
+              method: :post,
+              data: { turbo_frame: :modal },
+              class: "space-y-4" do |f| %>
+          <%= f.date_field :date,
+                label: t(".date_label"),
+                max: Date.current %>
+
+          <%= f.money_field :amount,
+                label: "Account value on date",
+                disable_currency: true %>
+
+          <div class="flex justify-end">
+            <%= render DS::Button.new(
+              text: "Update value",
+              variant: :primary,
+              type: "submit"
+            ) %>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+
+    <% dialog.with_section(title: t(".details")) do %>
+      <div class="pb-4">
+        <%= styled_form_with model: entry,
+              url: valuation_path(entry),
+              method: :patch,
+              class: "space-y-2",
+              data: { controller: "auto-submit-form", auto_submit_form_trigger_event_value: "blur" } do |f| %>
+          <%= f.text_area :notes,
+                label: t(".note_label"),
+                placeholder: t(".note_placeholder"),
+                rows: 5,
+                "data-auto-submit-form-target": "auto" %>
+        <% end %>
+      </div>
+    <% end %>
+
+    <% dialog.with_section(title: t(".settings")) do %>
+      <div class="pb-4">
+        <!-- Delete Valuation Form -->
+        <div class="flex items-center justify-between gap-2 p-3">
+          <div class="text-sm space-y-1">
+            <h4 class="text-primary"><%= t(".delete_title") %></h4>
+            <p class="text-secondary"><%= t(".delete_subtitle") %></p>
+          </div>
+
+          <%= button_to t(".delete"),
+                entry_path(entry),
+                method: :delete,
+                class: "rounded-lg px-3 py-2 text-red-500 text-sm font-medium border border-secondary",
+                data: { turbo_confirm: CustomConfirm.for_resource_deletion("value update").to_data_attribute, turbo_frame: "_top" } %>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/vehicles/_form.html.erb b/app/views/vehicles/_form.html.erb
new file mode 100644
index 00000000..a77d88b7
--- /dev/null
+++ b/app/views/vehicles/_form.html.erb
@@ -0,0 +1,33 @@
+<%# locals: (account:, url:) %>
+
+<%= render "accounts/form", account: account, url: url do |form| %>
+  <%= render "shared/ruler", classes: "my-4" %>
+
+  <div class="space-y-2">
+    <%= form.fields_for :accountable do |vehicle_form| %>
+      <div class="flex items-center gap-2">
+        <%= vehicle_form.text_field :make,
+                                  label: t("vehicles.form.make"),
+                                  placeholder: t("vehicles.form.make_placeholder") %>
+        <%= vehicle_form.text_field :model,
+                                  label: t("vehicles.form.model"),
+                                  placeholder: t("vehicles.form.model_placeholder") %>
+      </div>
+
+      <div class="flex items-center gap-2">
+        <%= vehicle_form.number_field :year,
+                                    label: t("vehicles.form.year"),
+                                    placeholder: t("vehicles.form.year_placeholder"),
+                                    min: 1900,
+                                    max: Time.current.year + 1 %>
+        <%= vehicle_form.number_field :mileage_value,
+                                    label: t("vehicles.form.mileage"),
+                                    placeholder: t("vehicles.form.mileage_placeholder"),
+                                    min: 0 %>
+        <%= vehicle_form.select :mileage_unit,
+                              [["Miles", "mi"], ["Kilometers", "km"]],
+                              { label: t("vehicles.form.mileage_unit") } %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/vehicles/edit.html.erb b/app/views/vehicles/edit.html.erb
new file mode 100644
index 00000000..87308377
--- /dev/null
+++ b/app/views/vehicles/edit.html.erb
@@ -0,0 +1,6 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".edit", account: @account.name)) %>
+  <% dialog.with_body do %>
+    <%= render "form", account: @account, url: vehicle_path(@account) %>
+  <% end %>
+<% end %>
diff --git a/app/views/vehicles/new.html.erb b/app/views/vehicles/new.html.erb
new file mode 100644
index 00000000..2f09bcf4
--- /dev/null
+++ b/app/views/vehicles/new.html.erb
@@ -0,0 +1,6 @@
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".title")) %>
+  <% dialog.with_body do %>
+    <%= render "vehicles/form", account: @account, url: vehicles_path(return_to: params[:return_to]) %>
+  <% end %>
+<% end %>
diff --git a/app/views/accounts/accountables/vehicle/_overview.html.erb b/app/views/vehicles/tabs/_overview.html.erb
similarity index 83%
rename from app/views/accounts/accountables/vehicle/_overview.html.erb
rename to app/views/vehicles/tabs/_overview.html.erb
index 2455c67b..b71793bb 100644
--- a/app/views/accounts/accountables/vehicle/_overview.html.erb
+++ b/app/views/vehicles/tabs/_overview.html.erb
@@ -31,3 +31,12 @@
     </div>
   <% end %>
 </div>
+
+<div class="flex justify-center py-8">
+  <%= render DS::Link.new(
+    text: "Edit account details",
+    variant: "ghost",
+    href: edit_vehicle_path(account),
+    frame: :modal
+  ) %>
+</div>
diff --git a/bin/dev b/bin/dev
index ad72c7d5..6b73c3e9 100755
--- a/bin/dev
+++ b/bin/dev
@@ -3,6 +3,12 @@
 if ! gem list foreman -i --silent; then
   echo "Installing foreman..."
   gem install foreman
+  
+  # Add rehash for rbenv users
+  if command -v rbenv > /dev/null; then
+    echo "Running rbenv rehash..."
+    rbenv rehash
+  fi
 fi
 
 # Default to port 3000 if not specified
@@ -13,4 +19,4 @@ export PORT="${PORT:-3000}"
 export RUBY_DEBUG_OPEN="true"
 export RUBY_DEBUG_LAZY="true"
 
-exec foreman start -f Procfile.dev "$@"
+exec bundle exec foreman start -f Procfile.dev "$@"
diff --git a/bin/erblint b/bin/erblint
deleted file mode 100755
index 63d662cf..00000000
--- a/bin/erblint
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'erblint' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
-
-bundle_binstub = File.expand_path("bundle", __dir__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("erb_lint", "erblint")
diff --git a/bin/render-build.sh b/bin/render-build.sh
index 5f260f64..a4c2a21c 100755
--- a/bin/render-build.sh
+++ b/bin/render-build.sh
@@ -1,25 +1,13 @@
 #!/usr/bin/env bash
-# exit on error
 set -o errexit
 
 echo "Installing gems..."
 bundle install
 
-echo "Precompiling assets..."
-./bin/rails assets:precompile
-./bin/rails assets:clean
+echo "Clobbering old assets..."
+bundle exec rails assets:clobber
 
-echo "Build complete"
+echo "Precompiling assets for production..."
+bundle exec rails assets:precompile
 
-# Self Hosters:
-#
-# By default, one-click deploys are free-tier instances (to avoid unexpected charges)
-# Render does NOT allow free-tier instances to use the `preDeployCommand` feature, so 
-# database migrations must be run in the build step.
-#
-# If you're on a paid Render plan, you can remove the `RUN_DB_MIGRATIONS_IN_BUILD_STEP` (or set to `false`)
-if [ "$RUN_DB_MIGRATIONS_IN_BUILD_STEP" = "true" ]; then
-  echo "Initiating database migrations for the free tier..."
-  bundle exec rails db:migrate
-  echo "Database migrations completed. Reminder: If you've moved to a Render paid plan, you can remove the RUN_DB_MIGRATIONS_IN_BUILD_STEP environment variable to utilize the `preDeployCommand` feature for migrations."
-fi
+echo "✅ Build complete"
\ No newline at end of file
diff --git a/bin/update_structure.sh b/bin/update_structure.sh
new file mode 100755
index 00000000..1243067e
--- /dev/null
+++ b/bin/update_structure.sh
@@ -0,0 +1,142 @@
+#!/bin/bash
+# save to .scripts/update_structure.sh
+# best way to use is with tree: `brew install tree`
+
+# Create the output file with header
+echo "---" > .cursor/rules/structure.mdc
+echo "description: Project structure" >> .cursor/rules/structure.mdc
+echo "globs: *" >> .cursor/rules/structure.mdc
+echo "alwaysApply: true" >> .cursor/structure/structure.mdc
+echo "---" >> .cursor/rules/structure.mdc
+echo "" >> .cursor/rules/structure.mdc
+echo "# Project Structure" > .cursor/rules/structure.mdc
+echo "" >> .cursor/rules/structure.mdc
+echo "\`\`\`" >> .cursor/rules/structure.mdc
+
+# Check if tree command is available
+if command -v tree &> /dev/null; then
+  # Use tree command for better visualization
+  git ls-files --others --exclude-standard --cached | tree --fromfile -a >> .cursor/rules/structure.mdc
+  echo "Using tree command for structure visualization."
+else
+  # Fallback to the alternative approach if tree is not available
+  echo "Tree command not found. Using fallback approach."
+
+  # Get all files from git (respecting .gitignore)
+  git ls-files --others --exclude-standard --cached | sort > /tmp/files_list.txt
+
+  # Create a simple tree structure
+  echo "." > /tmp/tree_items.txt
+
+  # Process each file to build the tree
+  while read -r file; do
+    # Skip directories
+    if [[ -d "$file" ]]; then continue; fi
+
+    # Add the file to the tree
+    echo "$file" >> /tmp/tree_items.txt
+
+    # Add all parent directories
+    dir="$file"
+    while [[ "$dir" != "." ]]; do
+      dir=$(dirname "$dir")
+      echo "$dir" >> /tmp/tree_items.txt
+    done
+  done < /tmp/files_list.txt
+
+  # Sort and remove duplicates
+  sort -u /tmp/tree_items.txt > /tmp/tree_sorted.txt
+  mv /tmp/tree_sorted.txt /tmp/tree_items.txt
+
+  # Simple tree drawing approach
+  prev_dirs=()
+
+  while read -r item; do
+    # Skip the root
+    if [[ "$item" == "." ]]; then
+      continue
+    fi
+
+    # Determine if it's a file or directory
+    if [[ -f "$item" ]]; then
+      is_dir=0
+      name=$(basename "$item")
+    else
+      is_dir=1
+      name="$(basename "$item")/"
+    fi
+
+    # Split path into components
+    IFS='/' read -ra path_parts <<< "$item"
+
+    # Calculate depth (number of path components minus 1)
+    depth=$((${#path_parts[@]} - 1))
+
+    # Find common prefix with previous path
+    common=0
+    if [[ ${#prev_dirs[@]} -gt 0 ]]; then
+      for ((i=0; i<depth && i<${#prev_dirs[@]}; i++)); do
+        if [[ "${path_parts[$i]}" == "${prev_dirs[$i]}" ]]; then
+          ((common++))
+        else
+          break
+        fi
+      done
+    fi
+
+    # Build the prefix
+    prefix=""
+    for ((i=0; i<depth; i++)); do
+      if [[ $i -lt $common ]]; then
+        # Check if this component has more siblings
+        has_more=0
+        for next in $(grep "^$(dirname "$item")/" /tmp/tree_items.txt); do
+          if [[ "$next" > "$item" ]]; then
+            has_more=1
+            break
+          fi
+        done
+
+        if [[ $has_more -eq 1 ]]; then
+          prefix="${prefix}│   "
+        else
+          prefix="${prefix}    "
+        fi
+      else
+        prefix="${prefix}    "
+      fi
+    done
+
+    # Determine if this is the last item in its directory
+    is_last=1
+    dir=$(dirname "$item")
+    for next in $(grep "^$dir/" /tmp/tree_items.txt); do
+      if [[ "$next" > "$item" ]]; then
+        is_last=0
+        break
+      fi
+    done
+
+    # Choose the connector
+    if [[ $is_last -eq 1 ]]; then
+      connector="└── "
+    else
+      connector="├── "
+    fi
+
+    # Output the item
+    echo "${prefix}${connector}${name}" >> .cursor/rules/structure.mdc
+
+    # Save current path for next iteration
+    prev_dirs=("${path_parts[@]}")
+
+  done < /tmp/tree_items.txt
+
+  # Clean up
+  rm -f /tmp/files_list.txt /tmp/tree_items.txt
+fi
+
+# Close the code block
+echo "\`\`\`" >> .cursor/rules/structure.mdc
+
+echo "Project structure has been updated in .cursor/rules/structure.mdc"
\ No newline at end of file
diff --git a/biome.json b/biome.json
new file mode 100644
index 00000000..568b6d96
--- /dev/null
+++ b/biome.json
@@ -0,0 +1,34 @@
+{
+  "$schema": "https://biomejs.dev/schemas/1.9.3/schema.json",
+  "vcs": {
+    "enabled": false,
+    "clientKind": "git",
+    "useIgnoreFile": true
+  },
+  "files": {
+    "ignoreUnknown": false,
+    "ignore": [],
+    "include": ["./app/javascript/**/*.js"]
+  },
+  "formatter": {
+    "enabled": true,
+    "useEditorconfig": true
+  },
+  "organizeImports": {
+    "enabled": true
+  },
+  "linter": {
+    "enabled": true,
+    "rules": {
+      "recommended": true,
+      "complexity": {
+        "noForEach": "off"
+      }
+    }
+  },
+  "javascript": {
+    "formatter": {
+      "quoteStyle": "double"
+    }
+  }
+}
diff --git a/compose.example.yml b/compose.example.yml
new file mode 100644
index 00000000..7a7aea65
--- /dev/null
+++ b/compose.example.yml
@@ -0,0 +1,112 @@
+# ===========================================================================
+# Example Docker Compose file
+# ===========================================================================
+#
+# Purpose:
+# --------
+#
+# This file is an example Docker Compose configuration for self hosting
+# Maybe on your local machine or on a cloud VPS.
+#
+# The configuration below is a "standard" setup that works out of the box,
+# but if you're running this outside of a local network, it is recommended
+# to set the environment variables for extra security.
+#
+# Setup:
+# ------
+#
+# To run this, you should read the setup guide:
+#
+# https://github.com/maybe-finance/maybe/blob/main/docs/hosting/docker.md
+#
+# Troubleshooting:
+# ----------------
+#
+# If you run into problems, you should open a Discussion here:
+#
+# https://github.com/maybe-finance/maybe/discussions/categories/general
+#
+
+x-db-env: &db_env
+  POSTGRES_USER: ${POSTGRES_USER:-maybe_user}
+  POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-maybe_password}
+  POSTGRES_DB: ${POSTGRES_DB:-maybe_production}
+
+x-rails-env: &rails_env
+  <<: *db_env
+  SECRET_KEY_BASE: ${SECRET_KEY_BASE:-a7523c3d0ae56415046ad8abae168d71074a79534a7062258f8d1d51ac2f76d3c3bc86d86b6b0b307df30d9a6a90a2066a3fa9e67c5e6f374dbd7dd4e0778e13}
+  SELF_HOSTED: "true"
+  RAILS_FORCE_SSL: "false"
+  RAILS_ASSUME_SSL: "false"
+  DB_HOST: db
+  DB_PORT: 5432
+  REDIS_URL: redis://redis:6379/1
+# NOTE: enabling OpenAI will incur costs when you use AI-related features in the app (chat, rules).  Make sure you have set appropriate spend limits on your account before adding this.
+  OPENAI_ACCESS_TOKEN: ${OPENAI_ACCESS_TOKEN}
+
+services:
+  web:
+    image: ghcr.io/maybe-finance/maybe:latest
+    volumes:
+      - app-storage:/rails/storage
+    ports:
+      - 3000:3000
+    restart: unless-stopped
+    environment:
+      <<: *rails_env
+    depends_on:
+      db:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    networks:
+      - maybe_net
+
+  worker:
+    image: ghcr.io/maybe-finance/maybe:latest
+    command: bundle exec sidekiq
+    restart: unless-stopped
+    depends_on:
+      redis:
+        condition: service_healthy
+    environment:
+      <<: *rails_env
+    networks:
+      - maybe_net
+
+  db:
+    image: postgres:16
+    restart: unless-stopped
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    environment:
+      <<: *db_env
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    networks:
+      - maybe_net
+
+  redis:
+    image: redis:latest
+    restart: unless-stopped
+    volumes:
+      - redis-data:/data
+    healthcheck:
+      test: [ "CMD", "redis-cli", "ping" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    networks:
+      - maybe_net
+
+volumes:
+  app-storage:
+  postgres-data:
+  redis-data:
+
+networks:
+  maybe_net:
+    driver: bridge
diff --git a/config/application.rb b/config/application.rb
index 3615cb76..134feb5a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -24,11 +24,22 @@ module Maybe
     # config.time_zone = "Central Time (US & Canada)"
     # config.eager_load_paths << Rails.root.join("extras")
 
-    config.active_job.queue_adapter = :good_job
-
     # TODO: This is here for incremental adoption of localization.  This can be removed when all translations are implemented.
     config.i18n.fallbacks = true
 
     config.app_mode = (ENV["SELF_HOSTED"] == "true" || ENV["SELF_HOSTING_ENABLED"] == "true" ? "self_hosted" : "managed").inquiry
+
+    # Self hosters can optionally set their own encryption keys if they want to use ActiveRecord encryption.
+    if Rails.application.credentials.active_record_encryption.present?
+      config.active_record.encryption = Rails.application.credentials.active_record_encryption
+    end
+
+    config.view_component.preview_controller = "LookbooksController"
+    config.lookbook.preview_display_options = {
+      theme: [ "light", "dark" ] # available in view as params[:theme]
+    }
+
+    # Enable Rack::Attack middleware for API rate limiting
+    config.middleware.use Rack::Attack
   end
 end
diff --git a/config/brakeman.ignore b/config/brakeman.ignore
index 71a47b67..5ca90443 100644
--- a/config/brakeman.ignore
+++ b/config/brakeman.ignore
@@ -1,95 +1,74 @@
 {
   "ignored_warnings": [
     {
-      "warning_type": "Dynamic Render Path",
-      "warning_code": 15,
-      "fingerprint": "03a2010b605b8bdb7d4e1566720904d69ef2fbf8e7bc35735b84e161b475215e",
-      "check_name": "Render",
-      "message": "Render path contains parameter value",
-      "file": "app/controllers/issues_controller.rb",
-      "line": 5,
-      "link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
-      "code": "render(template => \"#{Current.family.issues.find(params[:id]).class.name.underscore.pluralize}/show\", { :layout => \"issues\" })",
+      "warning_type": "Mass Assignment",
+      "warning_code": 105,
+      "fingerprint": "85e2c11853dd6c69b1953a6ec3ad661cd0ce3df55e4e5beff92365b6ed601171",
+      "check_name": "PermitAttributes",
+      "message": "Potentially dangerous key allowed for mass assignment",
+      "file": "app/controllers/api/v1/transactions_controller.rb",
+      "line": 255,
+      "link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
+      "code": "params.require(:transaction).permit(:account_id, :date, :amount, :name, :description, :notes, :currency, :category_id, :merchant_id, :nature, :tag_ids => ([]))",
       "render_path": null,
       "location": {
         "type": "method",
-        "class": "IssuesController",
-        "method": "show"
+        "class": "Api::V1::TransactionsController",
+        "method": "transaction_params"
       },
-      "user_input": "params[:id]",
-      "confidence": "Weak",
-      "cwe_id": [
-        22
-      ],
-      "note": ""
-    },
-    {
-      "warning_type": "Cross-Site Scripting",
-      "warning_code": 2,
-      "fingerprint": "b1f821a5c03b8aa348fb21b9297081a3bf9e954244290e7e511c67213d35f3dc",
-      "check_name": "CrossSiteScripting",
-      "message": "Unescaped model attribute",
-      "file": "app/views/pages/changelog.html.erb",
-      "line": 22,
-      "link": "https://brakemanscanner.org/docs/warning_types/cross_site_scripting",
-      "code": "Provider::Github.new.fetch_latest_release_notes[:body]",
-      "render_path": [
-        {
-          "type": "controller",
-          "class": "PagesController",
-          "method": "changelog",
-          "line": 35,
-          "file": "app/controllers/pages_controller.rb",
-          "rendered": {
-            "name": "pages/changelog",
-            "file": "app/views/pages/changelog.html.erb"
-          }
-        }
-      ],
-      "location": {
-        "type": "template",
-        "template": "pages/changelog"
-      },
-      "user_input": null,
+      "user_input": ":account_id",
       "confidence": "High",
       "cwe_id": [
-        79
+        915
+      ],
+      "note": "account_id is properly validated in create action - line 79 ensures account belongs to user's family: family.accounts.find(transaction_params[:account_id])"
+    },
+    {
+      "warning_type": "Mass Assignment",
+      "warning_code": 105,
+      "fingerprint": "aaccd8db0be34afdc88e5af08d91ae2e8b7765dfea2f3fc6e1c37db0adc7b991",
+      "check_name": "PermitAttributes",
+      "message": "Potentially dangerous key allowed for mass assignment",
+      "file": "app/controllers/invitations_controller.rb",
+      "line": 58,
+      "link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
+      "code": "params.require(:invitation).permit(:email, :role)",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "InvitationsController",
+        "method": "invitation_params"
+      },
+      "user_input": ":role",
+      "confidence": "Medium",
+      "cwe_id": [
+        915
       ],
       "note": ""
     },
     {
-      "warning_type": "Dynamic Render Path",
-      "warning_code": 15,
-      "fingerprint": "b7a59d6dd91f4d30873b271659636c7975e25b47f436b4f03900a08809af2e92",
-      "check_name": "Render",
-      "message": "Render path contains parameter value",
-      "file": "app/views/accounts/show.html.erb",
-      "line": 105,
-      "link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
-      "code": "render(action => selected_account_tab(Current.family.accounts.find(params[:id]))[:partial_path], { :account => Current.family.accounts.find(params[:id]) })",
-      "render_path": [
-        {
-          "type": "controller",
-          "class": "AccountsController",
-          "method": "show",
-          "line": 38,
-          "file": "app/controllers/accounts_controller.rb",
-          "rendered": {
-            "name": "accounts/show",
-            "file": "app/views/accounts/show.html.erb"
-          }
-        }
-      ],
+      "warning_type": "Dangerous Eval",
+      "warning_code": 13,
+      "fingerprint": "c154514a0f86341473e4abf35e77721495b326c7855e4967d284b4942371819c",
+      "check_name": "Evaluation",
+      "message": "Dynamic string evaluated as code",
+      "file": "app/helpers/styled_form_builder.rb",
+      "line": 5,
+      "link": "https://brakemanscanner.org/docs/warning_types/dangerous_eval/",
+      "code": "class_eval(\"      def #{selector}(method, options = {})\\n        form_options = options.slice(:label, :label_tooltip, :inline, :container_class, :required)\\n        html_options = options.except(:label, :label_tooltip, :inline, :container_class)\\n\\n        build_field(method, form_options, html_options) do |merged_options|\\n          super(method, merged_options)\\n        end\\n      end\\n\", \"app/helpers/styled_form_builder.rb\", (5 + 1))",
+      "render_path": null,
       "location": {
-        "type": "template",
-        "template": "accounts/show"
+        "type": "method",
+        "class": "StyledFormBuilder",
+        "method": null
       },
-      "user_input": "params[:id]",
+      "user_input": null,
       "confidence": "Weak",
       "cwe_id": [
-        22
+        913,
+        95
       ],
-      "note": ""
+      "note": "Uses similar pattern to Rails internal form builder"
     },
     {
       "warning_type": "Dynamic Render Path",
@@ -98,7 +77,7 @@
       "check_name": "Render",
       "message": "Render path contains parameter value",
       "file": "app/views/import/configurations/show.html.erb",
-      "line": 13,
+      "line": 34,
       "link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
       "code": "render(partial => permitted_import_configuration_path(Current.family.imports.find(params[:import_id])), { :locals => ({ :import => Current.family.imports.find(params[:import_id]) }) })",
       "render_path": [
@@ -126,6 +105,5 @@
       "note": ""
     }
   ],
-  "updated": "2024-09-28 13:27:09 -0400",
-  "brakeman_version": "6.2.1"
+  "brakeman_version": "7.0.2"
 }
diff --git a/config/cable.yml b/config/cable.yml
index cc73650e..3474a21a 100644
--- a/config/cable.yml
+++ b/config/cable.yml
@@ -1,8 +1,10 @@
 development:
-  adapter: postgresql
+  adapter: async
 
 test:
   adapter: test
 
 production:
-  adapter: postgresql
+  adapter: redis
+  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
+  channel_prefix: maybe_production
diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc
index 024d5e68..06708655 100644
--- a/config/credentials.yml.enc
+++ b/config/credentials.yml.enc
@@ -1 +1 @@
-KRWOjsn+8XsQvywXPDphgdRfbxouM6sML006oZNoiXQE3QMj/B7ee53nsT40Pgt37yyu6Adn84SZTkOs0sbOtHlEKQOr8fagJ96bZsQiIqtWA3JIDrHSVygssRIYVD8LyB1ezS+Oa4rZh4NsGJGQdyxlyUVmdFpqT6s18ptFnraDJuf54pkPyl5zAxtIVufXWO2wbyXryE2XEoYfHNmuPO3rtvXOQS9gEYe5yxh1EqgTG32UKnwxCNXBCksgrzuy9qebVTiBRun1L2S7diRw94dZ1mgkIweDAJCwO5wBtgfqo8DWBPunKbqJ5gwRJTvELDXXCWcnPjCUGPSPPBw4clUXNbjkxMltFlC5EReiTb7fi2rRGM64cRZlgReh8RVy6pyiKM2tHUI3Tmdk4q7nwTBCy6ot--ZUWi92DcBx1HlcZg--SVhHEO5AJCLD9LlhuXA+kA==
\ No newline at end of file
+Be5nAlhacgJFHZJBgO8noswyX/VOrmkMem7wS3YQhoogzG0MCSVxCAVMbFyYFYUwqZrSPkAqUTpgH5OJJ1FB1gZfL9IYYWnEdTzMxM7IvhdDwYllYcM6smbvZEbOiqxLs9VdfC/qFS+1iFtsezBaqxfGdANJsJt3TxoRWl/ZbQ4Od1s0BNkMis1CDZt5RMEQlTz813cE5sXBlxhqEr9/2CaktwPIe5S/Oxrwo8vPFBvrNdox8BysiK9WDik8jJFSVwPSCvg43/MaIJUT0cOILdSxqrATXV143/h6ghNYtrJgoUNFT7wuu0FTU/ovTgtTqQEKG+7PDO1WLFn606bVknjPwfNMGBa9hX3LbRErDDIXNq69um9fPZ8Yq5f9jP++dPbAqbWBEg+JYsZmDgzr7LmtXVzQgAcuMkHaBbL8uxod8S1B6qhXhLNc8Dd1oeHVu0kcLFO2zaqdYRFNEY30JSjjXlG3GExXQE6aEluXvdF2gj9Hjhp7tEXZEJbIx+ZFy+6Xbrd1E2BE8AZUbalExAfudkPSYlAZ+z3fWc2RlNIuBzTYDOWH9Ai8mqsdyGNVEyizXQ==--j/6QtlLtP4mYXIFw--c+AKfDPo9stantWni+u+4Q==
\ No newline at end of file
diff --git a/config/currencies.yml b/config/currencies.yml
index 97f10d42..331ad457 100644
--- a/config/currencies.yml
+++ b/config/currencies.yml
@@ -866,20 +866,6 @@ zmw:
   delimiter: ","
   default_format: "%u%n"
   default_precision: 2
-bch:
-  name: Bitcoin Cash
-  priority: 100
-  iso_code: BCH
-  iso_numeric: ""
-  html_code: "&#x20bf;"
-  symbol: "₿"
-  minor_unit: Satoshi
-  minor_unit_conversion: 100000000
-  smallest_denomination: 1
-  separator: "."
-  delimiter: ","
-  default_format: "%n %u"
-  default_precision: 8
 btc:
   name: Bitcoin
   priority: 100
@@ -1655,8 +1641,8 @@ amd:
   priority: 100
   iso_code: AMD
   iso_numeric: "051"
-  html_code: ""
-  symbol: դր.
+  html_code: "&#1423;"
+  symbol: ֏
   minor_unit: Luma
   minor_unit_conversion: 100
   smallest_denomination: 10
diff --git a/config/database.yml b/config/database.yml
index 221e19e8..d3a412be 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,7 +1,7 @@
 default: &default
   adapter: postgresql
   encoding: unicode
-  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 3 } %>
   host: <%= ENV.fetch("DB_HOST") { "127.0.0.1" } %>
   port: <%= ENV.fetch("DB_PORT") { "5432" } %>
   user: <%= ENV.fetch("POSTGRES_USER") { nil } %>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 2f4f659c..553da47e 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -35,6 +35,12 @@ Rails.application.configure do
 
   # Store uploaded files on the local file system (see config/storage.yml for options).
   config.active_storage.service = ENV.fetch("ACTIVE_STORAGE_SERVICE", "local").to_sym
+  config.after_initialize do
+    ActiveStorage::Current.url_options = { host: "localhost", port: 3000 }
+  end
+
+  # Set Active Storage URL expiration time to 7 days
+  config.active_storage.urls_expire_in = 7.days
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
@@ -58,10 +64,8 @@ Rails.application.configure do
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
-  # Highlight code that triggered database queries in logs.
+  config.assets.quiet = true
   config.active_record.verbose_query_logs = true
-
-  # Highlight code that enqueued background job in logs.
   config.active_job.verbose_enqueue_logs = true
 
   # Raises error for missing translations.
diff --git a/config/environments/production.rb b/config/environments/production.rb
index ea7cd99d..671b5239 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -33,6 +33,9 @@ Rails.application.configure do
   # Store uploaded files on the local file system (see config/storage.yml for options).
   config.active_storage.service = ENV.fetch("ACTIVE_STORAGE_SERVICE", "local").to_sym
 
+  # Set Active Storage URL expiration time to 7 days
+  config.active_storage.urls_expire_in = 7.days
+
   # Mount Action Cable outside main process or domain.
   # config.action_cable.mount_path = nil
   # config.action_cable.url = "wss://example.com/cable"
@@ -45,10 +48,18 @@ Rails.application.configure do
   # Can be used together with config.force_ssl for Strict-Transport-Security and secure cookies.
   config.assume_ssl = ActiveModel::Type::Boolean.new.cast(ENV.fetch("RAILS_ASSUME_SSL", true))
 
-  # Log to STDOUT by default
-  config.logger = ActiveSupport::Logger.new(STDOUT)
-    .tap  { |logger| logger.formatter = ::Logger::Formatter.new }
-    .then { |logger| ActiveSupport::TaggedLogging.new(logger) }
+  # Log to Logtail if API key is present, otherwise log to STDOUT
+  base_logger = if ENV["LOGTAIL_API_KEY"].present? && ENV["LOGTAIL_INGESTING_HOST"].present?
+    Logtail::Logger.create_default_logger(
+      ENV["LOGTAIL_API_KEY"],
+      ingesting_host: ENV["LOGTAIL_INGESTING_HOST"]
+    )
+  else
+    ActiveSupport::Logger.new(STDOUT)
+      .tap { |logger| logger.formatter = ::Logger::Formatter.new }
+  end
+
+  config.logger = ActiveSupport::TaggedLogging.new(base_logger)
 
   # Prepend all log lines with the following tags.
   config.log_tags = [ :request_id ]
@@ -58,11 +69,12 @@ Rails.application.configure do
   # want to log everything, set the level to "debug".
   config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")
 
-  # Use a different cache store in production.
-  # config.cache_store = :mem_cache_store
+  if ENV["CACHE_REDIS_URL"].present?
+    config.cache_store = :redis_cache_store, { url: ENV["CACHE_REDIS_URL"] }
+  end
 
   config.action_mailer.perform_caching = false
-
+  config.action_mailer.deliver_later_queue_name = :high_priority
   config.action_mailer.default_url_options = { host: ENV["APP_DOMAIN"] }
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.smtp_settings = {
@@ -94,4 +106,7 @@ Rails.application.configure do
   # ]
   # Skip DNS rebinding protection for the default health check endpoint.
   # config.host_authorization = { exclude: ->(request) { request.path == "/up" } }
+
+  # set REDIS_URL for Sidekiq to use Redis
+  config.active_job.queue_adapter = :sidekiq
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index c9918cbc..23bd03f3 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -18,10 +18,14 @@ Rails.application.configure do
   config.eager_load = ENV["CI"].present?
 
   # Configure public file server for tests with Cache-Control for performance.
+  config.public_file_server.enabled = true
   config.public_file_server.headers = {
     "Cache-Control" => "public, max-age=#{1.hour.to_i}"
   }
 
+  # Set default sender email for tests
+  ENV["EMAIL_SENDER"] = "hello@maybefinance.com"
+
   # Show full error reports and disable caching.
   config.consider_all_requests_local = true
   config.action_controller.perform_caching = false
@@ -63,5 +67,12 @@ Rails.application.configure do
   # Raise error when a before_action's only/except options reference missing actions
   config.action_controller.raise_on_missing_callback_actions = true
 
+  config.active_record.encryption.primary_key = "test"
+  config.active_record.encryption.deterministic_key = "test"
+  config.active_record.encryption.key_derivation_salt = "test"
+  config.active_record.encryption.encrypt_fixtures = true
+
   config.autoload_paths += %w[test/support]
+
+  config.action_mailer.default_url_options = { host: "example.com" }
 end
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index f7627158..bf7d512b 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -12,6 +12,7 @@ search:
     - app/
   relative_roots:
     - app/controllers
+    - app/controllers/concerns
     - app/helpers
     - app/mailers
     - app/presenters
@@ -40,4 +41,5 @@ ignore_unused:
   - 'number.*'
   - 'errors.*'
   - 'helpers.*'
-  - 'support.*'
\ No newline at end of file
+  - 'support.*'
+  - '{credit_cards,cryptos,depositories,other_assets,other_liabilities,loans,vehicles,properties,investments}.{create,update,destroy}.success'
\ No newline at end of file
diff --git a/config/importmap.rb b/config/importmap.rb
index 96aaed73..5f1d8087 100644
--- a/config/importmap.rb
+++ b/config/importmap.rb
@@ -5,15 +5,14 @@ pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true
 pin "@hotwired/stimulus", to: "stimulus.min.js"
 pin "@hotwired/stimulus-loading", to: "stimulus-loading.js"
 pin_all_from "app/javascript/controllers", under: "controllers"
+pin_all_from "app/components", under: "controllers", to: ""
 pin_all_from "app/javascript/services", under: "services", to: "services"
-pin "@github/hotkey", to: "@github--hotkey.js" # @3.1.0
-
-# Custom namespace for local files
-pin "@maybe/tailwindcolors", to: "tailwindColors.js"
+pin "@github/hotkey", to: "@github--hotkey.js" # @3.1.1
+pin "@simonwep/pickr", to: "@simonwep--pickr.js" # @1.9.1
 
 # D3 packages
-pin "d3" # @7.8.5
-pin "d3-array" # @3.2.4
+pin "d3" # @7.9.0
+pin "d3-array", to: "shims/d3-array-default.js"
 pin "d3-axis" # @3.0.0
 pin "d3-brush" # @3.0.0
 pin "d3-chord" # @3.0.1
@@ -27,7 +26,7 @@ pin "d3-ease" # @3.0.1
 pin "d3-fetch" # @3.0.1
 pin "d3-force" # @3.0.0
 pin "d3-format" # @3.1.0
-pin "d3-geo" # @3.1.0
+pin "d3-geo" # @3.1.1
 pin "d3-hierarchy" # @3.1.2
 pin "d3-interpolate" # @3.0.1
 pin "d3-path" # @3.1.0
@@ -35,9 +34,9 @@ pin "d3-polygon" # @3.0.1
 pin "d3-quadtree" # @3.0.1
 pin "d3-random" # @3.0.1
 pin "d3-scale" # @4.0.2
-pin "d3-scale-chromatic" # @3.0.0
+pin "d3-scale-chromatic" # @3.1.0
 pin "d3-selection" # @3.0.0
-pin "d3-shape" # @3.2.0
+pin "d3-shape", to: "shims/d3-shape-default.js"
 pin "d3-time" # @3.1.0
 pin "d3-time-format" # @4.1.0
 pin "d3-timer" # @3.0.1
@@ -46,7 +45,10 @@ pin "d3-zoom" # @3.0.0
 pin "delaunator" # @5.0.1
 pin "internmap" # @2.0.3
 pin "robust-predicates" # @3.0.2
-pin "@floating-ui/dom", to: "@floating-ui--dom.js" # @1.6.9
-pin "@floating-ui/core", to: "@floating-ui--core.js" # @1.6.6
-pin "@floating-ui/utils", to: "@floating-ui--utils.js" # @0.2.6
-pin "@floating-ui/utils/dom", to: "@floating-ui--utils--dom.js" # @0.2.6
+pin "@floating-ui/dom", to: "@floating-ui--dom.js" # @1.7.0
+pin "@floating-ui/core", to: "@floating-ui--core.js" # @1.7.0
+pin "@floating-ui/utils", to: "@floating-ui--utils.js" # @0.2.9
+pin "@floating-ui/utils/dom", to: "@floating-ui--utils--dom.js" # @0.2.9
+pin "d3-sankey" # @0.12.3
+pin "d3-array-src", to: "d3-array.js"
+pin "d3-shape-src", to: "d3-shape.js"
diff --git a/config/initializers/active_record_encryption.rb b/config/initializers/active_record_encryption.rb
new file mode 100644
index 00000000..30d77153
--- /dev/null
+++ b/config/initializers/active_record_encryption.rb
@@ -0,0 +1,25 @@
+# Auto-generate Active Record encryption keys for self-hosted instances
+# This ensures encryption works out of the box without manual setup
+if Rails.application.config.app_mode.self_hosted? && !Rails.application.credentials.active_record_encryption.present?
+  # Check if keys are provided via environment variables
+  primary_key = ENV["ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY"]
+  deterministic_key = ENV["ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY"]
+  key_derivation_salt = ENV["ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT"]
+
+  # If any key is missing, generate all of them based on SECRET_KEY_BASE
+  if primary_key.blank? || deterministic_key.blank? || key_derivation_salt.blank?
+    # Use SECRET_KEY_BASE as the seed for deterministic key generation
+    # This ensures keys are consistent across container restarts
+    secret_base = Rails.application.secret_key_base
+
+    # Generate deterministic keys from the secret base
+    primary_key = Digest::SHA256.hexdigest("#{secret_base}:primary_key")[0..63]
+    deterministic_key = Digest::SHA256.hexdigest("#{secret_base}:deterministic_key")[0..63]
+    key_derivation_salt = Digest::SHA256.hexdigest("#{secret_base}:key_derivation_salt")[0..63]
+  end
+
+  # Configure Active Record encryption
+  Rails.application.config.active_record.encryption.primary_key = primary_key
+  Rails.application.config.active_record.encryption.deterministic_key = deterministic_key
+  Rails.application.config.active_record.encryption.key_derivation_salt = key_derivation_salt
+end
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 48732442..d06e93b0 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -4,4 +4,5 @@
 Rails.application.config.assets.version = "1.0"
 
 # Add additional assets to the asset load path.
-# Rails.application.config.assets.paths << Emoji.images_path
+Rails.application.config.assets.paths << "app/components"
+Rails.application.config.importmap.cache_sweepers << Rails.root.join("app/components")
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
new file mode 100644
index 00000000..ee13a9a6
--- /dev/null
+++ b/config/initializers/doorkeeper.rb
@@ -0,0 +1,546 @@
+# frozen_string_literal: true
+
+Doorkeeper.configure do
+  # Change the ORM that doorkeeper will use (requires ORM extensions installed).
+  # Check the list of supported ORMs here: https://github.com/doorkeeper-gem/doorkeeper#orms
+  orm :active_record
+
+  # This block will be called to check whether the resource owner is authenticated or not.
+  resource_owner_authenticator do
+    # Manually replicate the app's session-based authentication logic, since
+    # Doorkeeper controllers don't include our Authentication concern.
+    if (session_id = cookies.signed[:session_token]).present?
+      if (session_record = Session.find_by(id: session_id))
+        # Set Current.session so downstream code expecting it behaves normally.
+        Current.session = session_record
+        # Return the authenticated user object as the resource owner.
+        session_record.user
+      else
+        redirect_to new_session_url
+      end
+    else
+      redirect_to new_session_url
+    end
+  end
+
+  # If you didn't skip applications controller from Doorkeeper routes in your application routes.rb
+  # file then you need to declare this block in order to restrict access to the web interface for
+  # adding oauth authorized applications. In other case it will return 403 Forbidden response
+  # every time somebody will try to access the admin web interface.
+  #
+  admin_authenticator do
+    if (session_id = cookies.signed[:session_token]).present?
+      if (session_record = Session.find_by(id: session_id))
+        Current.session = session_record
+        head :forbidden unless session_record.user&.super_admin?
+      else
+        redirect_to new_session_url
+      end
+    else
+      redirect_to new_session_url
+    end
+  end
+
+  # You can use your own model classes if you need to extend (or even override) default
+  # Doorkeeper models such as `Application`, `AccessToken` and `AccessGrant.
+  #
+  # By default Doorkeeper ActiveRecord ORM uses its own classes:
+  #
+  # access_token_class "Doorkeeper::AccessToken"
+  # access_grant_class "Doorkeeper::AccessGrant"
+  # application_class "Doorkeeper::Application"
+  #
+  # Don't forget to include Doorkeeper ORM mixins into your custom models:
+  #
+  #   *  ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessToken - for access token
+  #   *  ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessGrant - for access grant
+  #   *  ::Doorkeeper::Orm::ActiveRecord::Mixins::Application - for application (OAuth2 clients)
+  #
+  # For example:
+  #
+  # access_token_class "MyAccessToken"
+  #
+  # class MyAccessToken < ApplicationRecord
+  #   include ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessToken
+  #
+  #   self.table_name = "hey_i_wanna_my_name"
+  #
+  #   def destroy_me!
+  #     destroy
+  #   end
+  # end
+
+  # Enables polymorphic Resource Owner association for Access Tokens and Access Grants.
+  # By default this option is disabled.
+  #
+  # Make sure you properly setup you database and have all the required columns (run
+  # `bundle exec rails generate doorkeeper:enable_polymorphic_resource_owner` and execute Rails
+  # migrations).
+  #
+  # If this option enabled, Doorkeeper will store not only Resource Owner primary key
+  # value, but also it's type (class name). See "Polymorphic Associations" section of
+  # Rails guides: https://guides.rubyonrails.org/association_basics.html#polymorphic-associations
+  #
+  # [NOTE] If you apply this option on already existing project don't forget to manually
+  # update `resource_owner_type` column in the database and fix migration template as it will
+  # set NOT NULL constraint for Access Grants table.
+  #
+  # use_polymorphic_resource_owner
+
+  # If you are planning to use Doorkeeper in Rails 5 API-only application, then you might
+  # want to use API mode that will skip all the views management and change the way how
+  # Doorkeeper responds to a requests.
+  #
+  # api_only
+
+  # Enforce token request content type to application/x-www-form-urlencoded.
+  # It is not enabled by default to not break prior versions of the gem.
+  #
+  # enforce_content_type
+
+  # Authorization Code expiration time (default: 10 minutes).
+  #
+  # authorization_code_expires_in 10.minutes
+
+  # Access token expiration time (default: 2 hours).
+  # If you set this to `nil` Doorkeeper will not expire the token and omit expires_in in response.
+  # It is RECOMMENDED to set expiration time explicitly.
+  # Prefer access_token_expires_in 100.years or similar,
+  # which would be functionally equivalent and avoid the risk of unexpected behavior by callers.
+  #
+  access_token_expires_in 1.year
+
+  # Assign custom TTL for access tokens. Will be used instead of access_token_expires_in
+  # option if defined. In case the block returns `nil` value Doorkeeper fallbacks to
+  # +access_token_expires_in+ configuration option value. If you really need to issue a
+  # non-expiring access token (which is not recommended) then you need to return
+  # Float::INFINITY from this block.
+  #
+  # `context` has the following properties available:
+  #
+  #   * `client` - the OAuth client application (see Doorkeeper::OAuth::Client)
+  #   * `grant_type` - the grant type of the request (see Doorkeeper::OAuth)
+  #   * `scopes` - the requested scopes (see Doorkeeper::OAuth::Scopes)
+  #   * `resource_owner` - authorized resource owner instance (if present)
+  #
+  # custom_access_token_expires_in do |context|
+  #   context.client.additional_settings.implicit_oauth_expiration
+  # end
+
+  # Use a custom class for generating the access token.
+  # See https://doorkeeper.gitbook.io/guides/configuration/other-configurations#custom-access-token-generator
+  #
+  # access_token_generator '::Doorkeeper::JWT'
+
+  # The controller +Doorkeeper::ApplicationController+ inherits from.
+  # Defaults to +ActionController::Base+ unless +api_only+ is set, which changes the default to
+  # +ActionController::API+. The return value of this option must be a stringified class name.
+  # See https://doorkeeper.gitbook.io/guides/configuration/other-configurations#custom-controllers
+  #
+  # base_controller 'ApplicationController'
+
+  # Reuse access token for the same resource owner within an application (disabled by default).
+  #
+  # This option protects your application from creating new tokens before old **valid** one becomes
+  # expired so your database doesn't bloat. Keep in mind that when this option is enabled Doorkeeper
+  # doesn't update existing token expiration time, it will create a new token instead if no active matching
+  # token found for the application, resources owner and/or set of scopes.
+  # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/383
+  #
+  # You can not enable this option together with +hash_token_secrets+.
+  #
+  # reuse_access_token
+
+  # In case you enabled `reuse_access_token` option Doorkeeper will try to find matching
+  # token using `matching_token_for` Access Token API that searches for valid records
+  # in batches in order not to pollute the memory with all the database records. By default
+  # Doorkeeper uses batch size of 10 000 records. You can increase or decrease this value
+  # depending on your needs and server capabilities.
+  #
+  # token_lookup_batch_size 10_000
+
+  # Set a limit for token_reuse if using reuse_access_token option
+  #
+  # This option limits token_reusability to some extent.
+  # If not set then access_token will be reused unless it expires.
+  # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/1189
+  #
+  # This option should be a percentage(i.e. (0,100])
+  #
+  # token_reuse_limit 100
+
+  # Only allow one valid access token obtained via client credentials
+  # per client. If a new access token is obtained before the old one
+  # expired, the old one gets revoked (disabled by default)
+  #
+  # When enabling this option, make sure that you do not expect multiple processes
+  # using the same credentials at the same time (e.g. web servers spanning
+  # multiple machines and/or processes).
+  #
+  # revoke_previous_client_credentials_token
+
+  # Only allow one valid access token obtained via authorization code
+  # per client. If a new access token is obtained before the old one
+  # expired, the old one gets revoked (disabled by default)
+  #
+  # revoke_previous_authorization_code_token
+
+  # Require non-confidential clients to use PKCE when using an authorization code
+  # to obtain an access_token (disabled by default)
+  #
+  force_pkce
+
+  # Hash access and refresh tokens before persisting them.
+  # This will disable the possibility to use +reuse_access_token+
+  # since plain values can no longer be retrieved.
+  #
+  # Note: If you are already a user of doorkeeper and have existing tokens
+  # in your installation, they will be invalid without adding 'fallback: :plain'.
+  #
+  # For test environment, allow fallback to plain tokens to make testing easier
+  if Rails.env.test?
+    hash_token_secrets fallback: :plain
+  else
+    hash_token_secrets
+  end
+  # By default, token secrets will be hashed using the
+  # +Doorkeeper::Hashing::SHA256+ strategy.
+  #
+  # If you wish to use another hashing implementation, you can override
+  # this strategy as follows:
+  #
+  # hash_token_secrets using: '::Doorkeeper::Hashing::MyCustomHashImpl'
+  #
+  # Keep in mind that changing the hashing function will invalidate all existing
+  # secrets, if there are any.
+
+  # Hash application secrets before persisting them.
+  #
+  hash_application_secrets
+  #
+  # By default, applications will be hashed
+  # with the +Doorkeeper::SecretStoring::SHA256+ strategy.
+  #
+  # If you wish to use bcrypt for application secret hashing, uncomment
+  # this line instead:
+  #
+  # hash_application_secrets using: '::Doorkeeper::SecretStoring::BCrypt'
+
+  # When the above option is enabled, and a hashed token or secret is not found,
+  # you can allow to fall back to another strategy. For users upgrading
+  # doorkeeper and wishing to enable hashing, you will probably want to enable
+  # the fallback to plain tokens.
+  #
+  # This will ensure that old access tokens and secrets
+  # will remain valid even if the hashing above is enabled.
+  #
+  # This can be done by adding 'fallback: plain', e.g. :
+  #
+  # hash_application_secrets using: '::Doorkeeper::SecretStoring::BCrypt', fallback: :plain
+
+  # Issue access tokens with refresh token (disabled by default), you may also
+  # pass a block which accepts `context` to customize when to give a refresh
+  # token or not. Similar to +custom_access_token_expires_in+, `context` has
+  # the following properties:
+  #
+  # `client` - the OAuth client application (see Doorkeeper::OAuth::Client)
+  # `grant_type` - the grant type of the request (see Doorkeeper::OAuth)
+  # `scopes` - the requested scopes (see Doorkeeper::OAuth::Scopes)
+  #
+  use_refresh_token
+
+  # Provide support for an owner to be assigned to each registered application (disabled by default)
+  # Optional parameter confirmation: true (default: false) if you want to enforce ownership of
+  # a registered application
+  # NOTE: you must also run the rails g doorkeeper:application_owner generator
+  # to provide the necessary support
+  #
+  enable_application_owner confirmation: false
+
+  # Define access token scopes for your provider
+  # For more information go to
+  # https://doorkeeper.gitbook.io/guides/ruby-on-rails/scopes
+  #
+  default_scopes  :read
+  optional_scopes :read_write
+
+  # Allows to restrict only certain scopes for grant_type.
+  # By default, all the scopes will be available for all the grant types.
+  #
+  # Keys to this hash should be the name of grant_type and
+  # values should be the array of scopes for that grant type.
+  # Note: scopes should be from configured_scopes (i.e. default or optional)
+  #
+  # scopes_by_grant_type password: [:write], client_credentials: [:update]
+
+  # Forbids creating/updating applications with arbitrary scopes that are
+  # not in configuration, i.e. +default_scopes+ or +optional_scopes+.
+  # (disabled by default)
+  #
+  # enforce_configured_scopes
+
+  # Change the way client credentials are retrieved from the request object.
+  # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then
+  # falls back to the `:client_id` and `:client_secret` params from the `params` object.
+  # Check out https://github.com/doorkeeper-gem/doorkeeper/wiki/Changing-how-clients-are-authenticated
+  # for more information on customization
+  #
+  # client_credentials :from_basic, :from_params
+
+  # Change the way access token is authenticated from the request object.
+  # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then
+  # falls back to the `:access_token` or `:bearer_token` params from the `params` object.
+  # Check out https://github.com/doorkeeper-gem/doorkeeper/wiki/Changing-how-clients-are-authenticated
+  # for more information on customization
+  #
+  # access_token_methods :from_bearer_authorization, :from_access_token_param, :from_bearer_param
+
+  # Forces the usage of the HTTPS protocol in non-native redirect uris (enabled
+  # by default in non-development environments). OAuth2 delegates security in
+  # communication to the HTTPS protocol so it is wise to keep this enabled.
+  #
+  # Callable objects such as proc, lambda, block or any object that responds to
+  # #call can be used in order to allow conditional checks (to allow non-SSL
+  # redirects to localhost for example).
+  #
+  # Allow custom URL schemes for mobile apps
+  force_ssl_in_redirect_uri false
+
+  # Specify what redirect URI's you want to block during Application creation.
+  # Any redirect URI is allowed by default.
+  #
+  # You can use this option in order to forbid URI's with 'javascript' scheme
+  # for example.
+  #
+  # Block javascript URIs but allow custom schemes
+  forbid_redirect_uri { |uri| uri.scheme.to_s.downcase == "javascript" }
+
+  # Allows to set blank redirect URIs for Applications in case Doorkeeper configured
+  # to use URI-less OAuth grant flows like Client Credentials or Resource Owner
+  # Password Credentials. The option is on by default and checks configured grant
+  # types, but you **need** to manually drop `NOT NULL` constraint from `redirect_uri`
+  # column for `oauth_applications` database table.
+  #
+  # You can completely disable this feature with:
+  #
+  # allow_blank_redirect_uri false
+  #
+  # Or you can define your custom check:
+  #
+  # allow_blank_redirect_uri do |grant_flows, client|
+  #   client.superapp?
+  # end
+
+  # Specify how authorization errors should be handled.
+  # By default, doorkeeper renders json errors when access token
+  # is invalid, expired, revoked or has invalid scopes.
+  #
+  # If you want to render error response yourself (i.e. rescue exceptions),
+  # set +handle_auth_errors+ to `:raise` and rescue Doorkeeper::Errors::InvalidToken
+  # or following specific errors:
+  #
+  #   Doorkeeper::Errors::TokenForbidden, Doorkeeper::Errors::TokenExpired,
+  #   Doorkeeper::Errors::TokenRevoked, Doorkeeper::Errors::TokenUnknown
+  #
+  # handle_auth_errors :raise
+  #
+  # If you want to redirect back to the client application in accordance with
+  # https://datatracker.ietf.org/doc/html/rfc6749#section-4.1.2.1, you can set
+  # +handle_auth_errors+ to :redirect
+  #
+  # handle_auth_errors :redirect
+
+  # Customize token introspection response.
+  # Allows to add your own fields to default one that are required by the OAuth spec
+  # for the introspection response. It could be `sub`, `aud` and so on.
+  # This configuration option can be a proc, lambda or any Ruby object responds
+  # to `.call` method and result of it's invocation must be a Hash.
+  #
+  # custom_introspection_response do |token, context|
+  #   {
+  #     "sub": "Z5O3upPC88QrAjx00dis",
+  #     "aud": "https://protected.example.net/resource",
+  #     "username": User.find(token.resource_owner_id).username
+  #   }
+  # end
+  #
+  # or
+  #
+  # custom_introspection_response CustomIntrospectionResponder
+
+  # Specify what grant flows are enabled in array of Strings. The valid
+  # strings and the flows they enable are:
+  #
+  # "authorization_code" => Authorization Code Grant Flow
+  # "implicit"           => Implicit Grant Flow
+  # "password"           => Resource Owner Password Credentials Grant Flow
+  # "client_credentials" => Client Credentials Grant Flow
+  #
+  # If not specified, Doorkeeper enables authorization_code and
+  # client_credentials.
+  #
+  # implicit and password grant flows have risks that you should understand
+  # before enabling:
+  #   https://datatracker.ietf.org/doc/html/rfc6819#section-4.4.2
+  #   https://datatracker.ietf.org/doc/html/rfc6819#section-4.4.3
+  #
+  # grant_flows %w[authorization_code client_credentials]
+
+  # Allows to customize OAuth grant flows that +each+ application support.
+  # You can configure a custom block (or use a class respond to `#call`) that must
+  # return `true` in case Application instance supports requested OAuth grant flow
+  # during the authorization request to the server. This configuration +doesn't+
+  # set flows per application, it only allows to check if application supports
+  # specific grant flow.
+  #
+  # For example you can add an additional database column to `oauth_applications` table,
+  # say `t.array :grant_flows, default: []`, and store allowed grant flows that can
+  # be used with this application there. Then when authorization requested Doorkeeper
+  # will call this block to check if specific Application (passed with client_id and/or
+  # client_secret) is allowed to perform the request for the specific grant type
+  # (authorization, password, client_credentials, etc).
+  #
+  # Example of the block:
+  #
+  #   ->(flow, client) { client.grant_flows.include?(flow) }
+  #
+  # In case this option invocation result is `false`, Doorkeeper server returns
+  # :unauthorized_client error and stops the request.
+  #
+  # @param allow_grant_flow_for_client [Proc] Block or any object respond to #call
+  # @return [Boolean] `true` if allow or `false` if forbid the request
+  #
+  # allow_grant_flow_for_client do |grant_flow, client|
+  #   # `grant_flows` is an Array column with grant
+  #   # flows that application supports
+  #
+  #   client.grant_flows.include?(grant_flow)
+  # end
+
+  # If you need arbitrary Resource Owner-Client authorization you can enable this option
+  # and implement the check your need. Config option must respond to #call and return
+  # true in case resource owner authorized for the specific application or false in other
+  # cases.
+  #
+  # By default all Resource Owners are authorized to any Client (application).
+  #
+  # authorize_resource_owner_for_client do |client, resource_owner|
+  #   resource_owner.admin? || client.owners_allowlist.include?(resource_owner)
+  # end
+
+  # Allows additional data fields to be sent while granting access to an application,
+  # and for this additional data to be included in subsequently generated access tokens.
+  # The 'authorizations/new' page will need to be overridden to include this additional data
+  # in the request params when granting access. The access grant and access token models
+  # will both need to respond to these additional data fields, and have a database column
+  # to store them in.
+  #
+  # Example:
+  # You have a multi-tenanted platform and want to be able to grant access to a specific
+  # tenant, rather than all the tenants a user has access to. You can use this config
+  # option to specify that a ':tenant_id' will be passed when authorizing. This tenant_id
+  # will be included in the access tokens. When a request is made with one of these access
+  # tokens, you can check that the requested data belongs to the specified tenant.
+  #
+  # Default value is an empty Array: []
+  # custom_access_token_attributes [:tenant_id]
+
+  # Hook into the strategies' request & response life-cycle in case your
+  # application needs advanced customization or logging:
+  #
+  # before_successful_strategy_response do |request|
+  #   puts "BEFORE HOOK FIRED! #{request}"
+  # end
+  #
+  # after_successful_strategy_response do |request, response|
+  #   puts "AFTER HOOK FIRED! #{request}, #{response}"
+  # end
+
+  # Hook into Authorization flow in order to implement Single Sign Out
+  # or add any other functionality. Inside the block you have an access
+  # to `controller` (authorizations controller instance) and `context`
+  # (Doorkeeper::OAuth::Hooks::Context instance) which provides pre auth
+  # or auth objects with issued token based on hook type (before or after).
+  #
+  # before_successful_authorization do |controller, context|
+  #   Rails.logger.info(controller.request.params.inspect)
+  #
+  #   Rails.logger.info(context.pre_auth.inspect)
+  # end
+  #
+  # after_successful_authorization do |controller, context|
+  #   controller.session[:logout_urls] <<
+  #     Doorkeeper::Application
+  #       .find_by(controller.request.params.slice(:redirect_uri))
+  #       .logout_uri
+  #
+  #   Rails.logger.info(context.auth.inspect)
+  #   Rails.logger.info(context.issued_token)
+  # end
+
+  # Under some circumstances you might want to have applications auto-approved,
+  # so that the user skips the authorization step.
+  # For example if dealing with a trusted application.
+  #
+  # skip_authorization do |resource_owner, client|
+  #   client.superapp? or resource_owner.admin?
+  # end
+
+  # Configure custom constraints for the Token Introspection request.
+  # By default this configuration option allows to introspect a token by another
+  # token of the same application, OR to introspect the token that belongs to
+  # authorized client (from authenticated client) OR when token doesn't
+  # belong to any client (public token). Otherwise requester has no access to the
+  # introspection and it will return response as stated in the RFC.
+  #
+  # Block arguments:
+  #
+  # @param token [Doorkeeper::AccessToken]
+  #   token to be introspected
+  #
+  # @param authorized_client [Doorkeeper::Application]
+  #   authorized client (if request is authorized using Basic auth with
+  #   Client Credentials for example)
+  #
+  # @param authorized_token [Doorkeeper::AccessToken]
+  #   Bearer token used to authorize the request
+  #
+  # In case the block returns `nil` or `false` introspection responses with 401 status code
+  # when using authorized token to introspect, or you'll get 200 with { "active": false } body
+  # when using authorized client to introspect as stated in the
+  # RFC 7662 section 2.2. Introspection Response.
+  #
+  # Using with caution:
+  # Keep in mind that these three parameters pass to block can be nil as following case:
+  #  `authorized_client` is nil if and only if `authorized_token` is present, and vice versa.
+  #  `token` will be nil if and only if `authorized_token` is present.
+  # So remember to use `&` or check if it is present before calling method on
+  # them to make sure you doesn't get NoMethodError exception.
+  #
+  # You can define your custom check:
+  #
+  # allow_token_introspection do |token, authorized_client, authorized_token|
+  #   if authorized_token
+  #     # customize: require `introspection` scope
+  #     authorized_token.application == token&.application ||
+  #       authorized_token.scopes.include?("introspection")
+  #   elsif token.application
+  #     # `protected_resource` is a new database boolean column, for example
+  #     authorized_client == token.application || authorized_client.protected_resource?
+  #   else
+  #     # public token (when token.application is nil, token doesn't belong to any application)
+  #     true
+  #   end
+  # end
+  #
+  # Or you can completely disable any token introspection:
+  #
+  # allow_token_introspection false
+  #
+  # If you need to block the request at all, then configure your routes.rb or web-server
+  # like nginx to forbid the request.
+
+  # WWW-Authenticate Realm (default: "Doorkeeper").
+  #
+  # realm "Doorkeeper"
+end
diff --git a/config/initializers/doorkeeper_csrf_protection.rb b/config/initializers/doorkeeper_csrf_protection.rb
new file mode 100644
index 00000000..cd8b61b6
--- /dev/null
+++ b/config/initializers/doorkeeper_csrf_protection.rb
@@ -0,0 +1,20 @@
+# Disable CSRF protection for Doorkeeper endpoints.
+#
+# OAuth requests (both the authorization endpoint hit by users and the token
+# endpoint hit by confidential/public clients) are performed by third-party
+# clients that do not have access to the Rails session, and therefore cannot
+# include the standard CSRF token. Requiring the token in these controllers
+# breaks the OAuth flow with an ActionController::InvalidAuthenticityToken
+# error. It is safe to disable CSRF verification here because Doorkeeper's
+# endpoints already implement their own security semantics defined by the
+# OAuth 2.0 specification (PKCE, client/secret checks, etc.).
+#
+# This hook runs on each application reload in development and ensures the
+# callback is applied after Doorkeeper loads its controllers.
+Rails.application.config.to_prepare do
+  # Doorkeeper::ApplicationController is the base controller for all
+  # Doorkeeper-provided controllers (AuthorizationsController, TokensController,
+  # TokenInfoController, etc.). Removing the authenticity-token filter here
+  # cascades to all of them.
+  Doorkeeper::ApplicationController.skip_forgery_protection
+end
diff --git a/config/initializers/doorkeeper_layout.rb b/config/initializers/doorkeeper_layout.rb
new file mode 100644
index 00000000..47d41a65
--- /dev/null
+++ b/config/initializers/doorkeeper_layout.rb
@@ -0,0 +1,6 @@
+# Ensure Doorkeeper controllers use the correct layout
+Rails.application.config.to_prepare do
+  Doorkeeper::AuthorizationsController.layout "doorkeeper/application"
+  Doorkeeper::AuthorizedApplicationsController.layout "doorkeeper/application"
+  Doorkeeper::ApplicationsController.layout "doorkeeper/application"
+end
diff --git a/config/initializers/good_job.rb b/config/initializers/good_job.rb
deleted file mode 100644
index 9841d0e9..00000000
--- a/config/initializers/good_job.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-Rails.application.configure do
-  config.good_job.enable_cron = true
-
-  if ENV["UPGRADES_ENABLED"] == "true"
-    config.good_job.cron = {
-      auto_upgrade: {
-        cron: "every 30 seconds",
-        class: "AutoUpgradeJob",
-        description: "Check for new versions of the app and upgrade if necessary"
-      }
-    }
-  end
-end
diff --git a/config/initializers/intercom.rb b/config/initializers/intercom.rb
index 03069487..e31c389e 100644
--- a/config/initializers/intercom.rb
+++ b/config/initializers/intercom.rb
@@ -16,7 +16,7 @@ if ENV["INTERCOM_APP_ID"].present? && ENV["INTERCOM_IDENTITY_VERIFICATION_KEY"].
     # == Enabled Environments
     # Which environments is auto inclusion of the Javascript enabled for
     #
-    config.enabled_environments = [ "development", "production" ]
+    config.enabled_environments = [ "production" ]
 
     # == Current user method/variable
     # The method/variable that contains the logged in user in your controllers.
@@ -54,7 +54,10 @@ if ENV["INTERCOM_APP_ID"].present? && ENV["INTERCOM_IDENTITY_VERIFICATION_KEY"].
     #
     config.user.custom_data = {
       family_id: Proc.new { Current.family.id },
-      name: Proc.new { Current.user.display_name if Current.user.display_name != Current.user.email }
+      name: Proc.new { Current.user.display_name if Current.user.display_name != Current.user.email },
+      "Role": Proc.new { Current.user.role },
+      "Connections": Proc.new { Current.family.accounts.count },
+      "AI Enabled": Proc.new { Current.user.ai_enabled }
     }
 
     # == Current company method/variable
@@ -82,6 +85,9 @@ if ENV["INTERCOM_APP_ID"].present? && ENV["INTERCOM_IDENTITY_VERIFICATION_KEY"].
     #   :number_of_messages => Proc.new { |app| app.messages.count },
     #   :is_interesting => :is_interesting?
     # }
+    config.company.custom_data = {
+      accounts_count: Proc.new { |family| family.accounts.count }
+    }
 
     # == Company Plan name
     # This is the name of the plan a company is currently paying (or not paying) for.
diff --git a/config/initializers/mini_profiler.rb b/config/initializers/mini_profiler.rb
new file mode 100644
index 00000000..6a79f19e
--- /dev/null
+++ b/config/initializers/mini_profiler.rb
@@ -0,0 +1,4 @@
+Rails.application.configure do
+  Rack::MiniProfiler.config.skip_paths = [ "/design-system", "/assets", "/cable", "/manifest", "/favicon.ico", "/hotwire-livereload", "/logo-pwa.png" ]
+  Rack::MiniProfiler.config.max_traces_to_show = 50
+end
diff --git a/config/initializers/plaid.rb b/config/initializers/plaid.rb
new file mode 100644
index 00000000..1925158a
--- /dev/null
+++ b/config/initializers/plaid.rb
@@ -0,0 +1,18 @@
+Rails.application.configure do
+  config.plaid = nil
+  config.plaid_eu = nil
+
+  if ENV["PLAID_CLIENT_ID"].present? && ENV["PLAID_SECRET"].present?
+    config.plaid = Plaid::Configuration.new
+    config.plaid.server_index = Plaid::Configuration::Environment[ENV["PLAID_ENV"] || "sandbox"]
+    config.plaid.api_key["PLAID-CLIENT-ID"] = ENV["PLAID_CLIENT_ID"]
+    config.plaid.api_key["PLAID-SECRET"] = ENV["PLAID_SECRET"]
+  end
+
+  if ENV["PLAID_EU_CLIENT_ID"].present? && ENV["PLAID_EU_SECRET"].present?
+    config.plaid_eu = Plaid::Configuration.new
+    config.plaid_eu.server_index = Plaid::Configuration::Environment[ENV["PLAID_ENV"] || "sandbox"]
+    config.plaid_eu.api_key["PLAID-CLIENT-ID"] = ENV["PLAID_EU_CLIENT_ID"]
+    config.plaid_eu.api_key["PLAID-SECRET"] = ENV["PLAID_EU_SECRET"]
+  end
+end
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
new file mode 100644
index 00000000..93f55288
--- /dev/null
+++ b/config/initializers/rack_attack.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+class Rack::Attack
+  # Enable Rack::Attack
+  enabled = Rails.env.production? || Rails.env.staging?
+
+  # Throttle requests to the OAuth token endpoint
+  throttle("oauth/token", limit: 10, period: 1.minute) do |request|
+    request.ip if request.path == "/oauth/token"
+  end
+
+  # Throttle API requests per access token
+  throttle("api/requests", limit: 100, period: 1.hour) do |request|
+    if request.path.start_with?("/api/")
+      # Extract access token from Authorization header
+      auth_header = request.get_header("HTTP_AUTHORIZATION")
+      if auth_header&.start_with?("Bearer ")
+        token = auth_header.split(" ").last
+        "api_token:#{Digest::SHA256.hexdigest(token)}"
+      else
+        # Fall back to IP-based limiting for unauthenticated requests
+        "api_ip:#{request.ip}"
+      end
+    end
+  end
+
+  # More permissive throttling for API requests by IP (for development/testing)
+  throttle("api/ip", limit: 200, period: 1.hour) do |request|
+    request.ip if request.path.start_with?("/api/")
+  end
+
+  # Block requests that appear to be malicious
+  blocklist("block malicious requests") do |request|
+    # Block requests with suspicious user agents
+    suspicious_user_agents = [
+      /sqlmap/i,
+      /nmap/i,
+      /nikto/i,
+      /masscan/i
+    ]
+
+    user_agent = request.user_agent
+    suspicious_user_agents.any? { |pattern| user_agent =~ pattern } if user_agent
+  end
+
+  # Configure response for throttled requests
+  self.throttled_responder = lambda do |request|
+    [
+      429, # status
+      {
+        "Content-Type" => "application/json",
+        "Retry-After" => "60"
+      },
+      [ { error: "Rate limit exceeded. Try again later." }.to_json ]
+    ]
+  end
+
+  # Configure response for blocked requests
+  self.blocklisted_responder = lambda do |request|
+    [
+      403, # status
+      { "Content-Type" => "application/json" },
+      [ { error: "Request blocked." }.to_json ]
+    ]
+  end
+end
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
index 56e6b4fc..d964a09b 100644
--- a/config/initializers/sentry.rb
+++ b/config/initializers/sentry.rb
@@ -1,17 +1,20 @@
 if ENV["SENTRY_DSN"].present?
   Sentry.init do |config|
     config.dsn = ENV["SENTRY_DSN"]
+    config.environment = ENV["RAILS_ENV"]
     config.breadcrumbs_logger = [ :active_support_logger, :http_logger ]
     config.enabled_environments = %w[production]
 
     # Set traces_sample_rate to 1.0 to capture 100%
     # of transactions for performance monitoring.
     # We recommend adjusting this value in production.
-    config.traces_sample_rate = 1.0
+    config.traces_sample_rate = 0.25
 
     # Set profiles_sample_rate to profile 100%
     # of sampled transactions.
     # We recommend adjusting this value in production.
-    config.profiles_sample_rate = 1.0
+    config.profiles_sample_rate = 0.25
+
+    config.profiler_class = Sentry::Vernier::Profiler
   end
 end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
new file mode 100644
index 00000000..70a6e476
--- /dev/null
+++ b/config/initializers/sidekiq.rb
@@ -0,0 +1,16 @@
+require "sidekiq/web"
+
+if Rails.env.production?
+  Sidekiq::Web.use(Rack::Auth::Basic) do |username, password|
+    configured_username = ::Digest::SHA256.hexdigest(ENV.fetch("SIDEKIQ_WEB_USERNAME", "maybe"))
+    configured_password = ::Digest::SHA256.hexdigest(ENV.fetch("SIDEKIQ_WEB_PASSWORD", "maybe"))
+
+    ActiveSupport::SecurityUtils.secure_compare(::Digest::SHA256.hexdigest(username), configured_username) &&
+      ActiveSupport::SecurityUtils.secure_compare(::Digest::SHA256.hexdigest(password), configured_password)
+  end
+end
+
+Sidekiq::Cron.configure do |config|
+  # 10 min "catch-up" window in case worker process is re-deploying when cron tick occurs
+  config.reschedule_grace_period = 600
+end
diff --git a/config/initializers/version.rb b/config/initializers/version.rb
index 4e14208b..134b959a 100644
--- a/config/initializers/version.rb
+++ b/config/initializers/version.rb
@@ -5,12 +5,16 @@ module Maybe
     end
 
     def commit_sha
-      `git rev-parse HEAD`.chomp
+      if Rails.env.production?
+        ENV["BUILD_COMMIT_SHA"]
+      else
+        `git rev-parse HEAD`.chomp
+      end
     end
 
     private
       def semver
-        "0.1.0"
+        "0.5.0"
       end
   end
 end
diff --git a/config/locales/defaults/et.yml b/config/locales/defaults/et.yml
index 337b5a87..6b0e17c6 100644
--- a/config/locales/defaults/et.yml
+++ b/config/locales/defaults/et.yml
@@ -13,7 +13,7 @@ et:
     - E
     - T
     - K
-    - N
+    - "N"
     - R
     - L
     abbr_month_names:
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
new file mode 100644
index 00000000..c9190526
--- /dev/null
+++ b/config/locales/doorkeeper.en.yml
@@ -0,0 +1,155 @@
+en:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: 'Name'
+        redirect_uri: 'Redirect URI'
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: 'cannot contain a fragment.'
+              invalid_uri: 'must be a valid URI.'
+              unspecified_scheme: 'must specify a scheme.'
+              relative_uri: 'must be an absolute URI.'
+              secured_uri: 'must be an HTTPS/SSL URI.'
+              forbidden_uri: 'is forbidden by the server.'
+            scopes:
+              not_match_configured: "doesn't match configured on the server."
+
+  doorkeeper:
+    applications:
+      confirmations:
+        destroy: 'Are you sure?'
+      buttons:
+        edit: 'Edit'
+        destroy: 'Destroy'
+        submit: 'Submit'
+        cancel: 'Cancel'
+        authorize: 'Authorize'
+      form:
+        error: 'Whoops! Check your form for possible errors'
+      help:
+        confidential: 'Application will be used where the client secret can be kept confidential. Native mobile apps and Single Page Apps are considered non-confidential.'
+        redirect_uri: 'Use one line per URI'
+        blank_redirect_uri: "Leave it blank if you configured your provider to use Client Credentials, Resource Owner Password Credentials or any other grant type that doesn't require redirect URI."
+        scopes: 'Separate scopes with spaces. Leave blank to use the default scopes.'
+      edit:
+        title: 'Edit application'
+      index:
+        title: 'Your applications'
+        new: 'New Application'
+        name: 'Name'
+        callback_url: 'Callback URL'
+        confidential: 'Confidential?'
+        actions: 'Actions'
+        confidentiality:
+          'yes': 'Yes'
+          'no': 'No'
+      new:
+        title: 'New Application'
+      show:
+        title: 'Application: %{name}'
+        application_id: 'UID'
+        secret: 'Secret'
+        secret_hashed: 'Secret hashed'
+        scopes: 'Scopes'
+        confidential: 'Confidential'
+        callback_urls: 'Callback urls'
+        actions: 'Actions'
+        not_defined: 'Not defined'
+
+    authorizations:
+      buttons:
+        authorize: 'Authorize'
+        deny: 'Deny'
+      error:
+        title: 'An error has occurred'
+      new:
+        title: 'Authorization required'
+        prompt: 'Authorize %{client_name} to use your account?'
+        able_to: 'This application will be able to'
+      show:
+        title: 'Authorization code'
+      form_post:
+        title: 'Submit this form'
+
+    authorized_applications:
+      confirmations:
+        revoke: 'Are you sure?'
+      buttons:
+        revoke: 'Revoke'
+      index:
+        title: 'Your authorized applications'
+        application: 'Application'
+        created_at: 'Created At'
+        date_format: '%Y-%m-%d %H:%M:%S'
+
+    pre_authorization:
+      status: 'Pre-authorization'
+
+    errors:
+      messages:
+        # Common error messages
+        invalid_request:
+          unknown: 'The request is missing a required parameter, includes an unsupported parameter value, or is otherwise malformed.'
+          missing_param: 'Missing required parameter: %{value}.'
+          request_not_authorized: 'Request need to be authorized. Required parameter for authorizing request is missing or invalid.'
+          invalid_code_challenge: 'Code challenge is required.'
+        invalid_redirect_uri: "The requested redirect uri is malformed or doesn't match client redirect URI."
+        unauthorized_client: 'The client is not authorized to perform this request using this method.'
+        access_denied: 'The resource owner or authorization server denied the request.'
+        invalid_scope: 'The requested scope is invalid, unknown, or malformed.'
+        invalid_code_challenge_method:
+          zero: 'The authorization server does not support PKCE as there are no accepted code_challenge_method values.'
+          one: 'The code_challenge_method must be %{challenge_methods}.'
+          other: 'The code_challenge_method must be one of %{challenge_methods}.'
+        server_error: 'The authorization server encountered an unexpected condition which prevented it from fulfilling the request.'
+        temporarily_unavailable: 'The authorization server is currently unable to handle the request due to a temporary overloading or maintenance of the server.'
+
+        # Configuration error messages
+        credential_flow_not_configured: 'Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured.'
+        resource_owner_authenticator_not_configured: 'Resource Owner find failed due to Doorkeeper.configure.resource_owner_authenticator being unconfigured.'
+        admin_authenticator_not_configured: 'Access to admin panel is forbidden due to Doorkeeper.configure.admin_authenticator being unconfigured.'
+
+        # Access grant errors
+        unsupported_response_type: 'The authorization server does not support this response type.'
+        unsupported_response_mode: 'The authorization server does not support this response mode.'
+
+        # Access token errors
+        invalid_client: 'Client authentication failed due to unknown client, no client authentication included, or unsupported authentication method.'
+        invalid_grant: 'The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client.'
+        unsupported_grant_type: 'The authorization grant type is not supported by the authorization server.'
+
+        invalid_token:
+          revoked: "The access token was revoked"
+          expired: "The access token expired"
+          unknown: "The access token is invalid"
+        revoke:
+          unauthorized: "You are not authorized to revoke this token"
+
+        forbidden_token:
+          missing_scope: 'Access to this resource requires scope "%{oauth_scopes}".'
+
+    flash:
+      applications:
+        create:
+          notice: 'Application created.'
+        destroy:
+          notice: 'Application deleted.'
+        update:
+          notice: 'Application updated.'
+      authorized_applications:
+        destroy:
+          notice: 'Application revoked.'
+
+    layouts:
+      admin:
+        title: 'Doorkeeper'
+        nav:
+          oauth2_provider: 'OAuth2 Provider'
+          applications: 'Applications'
+          home: 'Home'
+      application:
+        title: 'OAuth authorization required'
diff --git a/config/locales/mailers/invitation_mailer/en.yml b/config/locales/mailers/invitation_mailer/en.yml
new file mode 100644
index 00000000..19cb4bba
--- /dev/null
+++ b/config/locales/mailers/invitation_mailer/en.yml
@@ -0,0 +1,5 @@
+---
+en:
+  invitation_mailer:
+    invite_email:
+      subject: "%{inviter} has invited you to join their household on Maybe!"
diff --git a/config/locales/models/account/sync/en.yml b/config/locales/models/account/sync/en.yml
deleted file mode 100644
index 324ea42e..00000000
--- a/config/locales/models/account/sync/en.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-en:
-  account:
-    sync:
-      failed: Sync failed
diff --git a/config/locales/models/account/transfer/en.yml b/config/locales/models/account/transfer/en.yml
deleted file mode 100644
index c0fe38d5..00000000
--- a/config/locales/models/account/transfer/en.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-en:
-  account/transfer:
-    from_fallback_name: Originator
-    name: Transfer from %{from_account} to %{to_account}
-    to_fallback_name: Receiver
-  activerecord:
-    errors:
-      models:
-        account/transfer:
-          attributes:
-            entries:
-              must_be_from_different_accounts: must be from different accounts
-              must_be_marked_as_transfer: must be marked as transfer
-              must_have_an_inflow_and_outflow_that_net_to_zero: must have an inflow
-                and outflow that net to zero
-              must_have_exactly_2_entries: must have exactly 2 entries
diff --git a/config/locales/models/address/en.yml b/config/locales/models/address/en.yml
index eb0db551..f7300f3e 100644
--- a/config/locales/models/address/en.yml
+++ b/config/locales/models/address/en.yml
@@ -8,8 +8,4 @@ en:
       locality: Locality
       postal_code: Postal Code
       region: Region
-    format: |-
-      %{line1}
-      %{line2}
-      %{locality}, %{region} %{postal_code}
-      %{country}
+    format: "%{line1} %{line2}, %{locality}, %{region} %{postal_code} %{country}"
\ No newline at end of file
diff --git a/config/locales/models/account/entry/en.yml b/config/locales/models/entry/en.yml
similarity index 90%
rename from config/locales/models/account/entry/en.yml
rename to config/locales/models/entry/en.yml
index e1e0605e..18bfda25 100644
--- a/config/locales/models/account/entry/en.yml
+++ b/config/locales/models/entry/en.yml
@@ -3,7 +3,7 @@ en:
   activerecord:
     errors:
       models:
-        account/entry:
+        entry:
           attributes:
             base:
               invalid_sell_quantity: cannot sell %{sell_qty} shares of %{ticker} because
diff --git a/config/locales/models/import/en.yml b/config/locales/models/import/en.yml
index 0019291c..36a90151 100644
--- a/config/locales/models/import/en.yml
+++ b/config/locales/models/import/en.yml
@@ -1,6 +1,10 @@
 ---
 en:
   activerecord:
+    attributes:
+      import:
+        currency: Currency
+        number_format: Number Format
     errors:
       models:
         import:
diff --git a/config/locales/models/issue/en.yml b/config/locales/models/issue/en.yml
deleted file mode 100644
index 9c0938b4..00000000
--- a/config/locales/models/issue/en.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-en:
-  activerecord:
-    models:
-      issue/exchange_rate_provider_missing: Exchange rate provider missing
-      issue/exchange_rates_missing: Exchange rates missing
-      issue/missing_prices: Missing prices
-      issue/unknown: Unknown issue occurred
diff --git a/config/locales/models/transaction/en.yml b/config/locales/models/transaction/en.yml
deleted file mode 100644
index 8e71e17b..00000000
--- a/config/locales/models/transaction/en.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-en:
-  transaction:
-    default_category:
-      auto_and_transport: Auto & Transport
-      entertainment: Entertainment
-      food_and_drink: Food & Drink
-      general_services: General Services
-      home_improvement: Home Improvement
-      income: Income
-      personal_care: Personal Care
-      rent_and_utilities: Rent & Utilities
diff --git a/config/locales/models/transfer/en.yml b/config/locales/models/transfer/en.yml
new file mode 100644
index 00000000..094194f2
--- /dev/null
+++ b/config/locales/models/transfer/en.yml
@@ -0,0 +1,22 @@
+---
+en:
+  activerecord:
+    errors:
+      models:
+        transfer:
+          attributes:
+            base:
+              inflow_cannot_be_in_multiple_transfers: Inflow transaction cannot be
+                part of multiple transfers
+              must_be_from_different_accounts: Transfer must have different accounts
+              must_be_from_same_family: Transfer must be from the same family
+              must_be_within_date_range: Transfer transaction dates must be within
+                4 days of each other
+              must_have_opposite_amounts: Transfer transactions must have opposite
+                amounts
+              must_have_single_currency: Transfer must have a single currency
+              outflow_cannot_be_in_multiple_transfers: Outflow transaction cannot
+                be part of multiple transfers
+  transfer:
+    name: Transfer to %{to_account}
+    payment_name: Payment to %{to_account}
diff --git a/config/locales/models/time_series/trend/en.yml b/config/locales/models/trend/en.yml
similarity index 94%
rename from config/locales/models/time_series/trend/en.yml
rename to config/locales/models/trend/en.yml
index 5f02353f..cf57f6ed 100644
--- a/config/locales/models/time_series/trend/en.yml
+++ b/config/locales/models/trend/en.yml
@@ -3,7 +3,7 @@ en:
   activemodel:
     errors:
       models:
-        time_series/trend:
+        trend:
           attributes:
             current:
               must_be_of_the_same_type_as_previous: must be of the same type as previous
diff --git a/config/locales/models/upgrader/en.yml b/config/locales/models/upgrader/en.yml
deleted file mode 100644
index 6a655717..00000000
--- a/config/locales/models/upgrader/en.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-en:
-  upgrader:
-    deployer:
-      null_deployer:
-        success_message: 'No-op: null deployer initiated deploy successfully'
-      render:
-        deploy_log_error: 'Failed to deploy %{type} %{commit_sha} to Render: %{error_message}'
-        deploy_log_info: Deploying %{type} %{commit_sha} to Render...
-        error_message_failed_deploy: Failed to deploy to Render
-        error_message_not_set: Render deploy hook URL is not set
-        success_message: 'Triggered deployment to Render for commit: %{commit_sha}'
-        troubleshooting_url: https://render.com/docs/deploy-hooks
diff --git a/config/locales/views/account/cashes/en.yml b/config/locales/views/account/cashes/en.yml
deleted file mode 100644
index 96da5309..00000000
--- a/config/locales/views/account/cashes/en.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-en:
-  account:
-    cashes:
-      index:
-        cash: Cash
-        name: Name
-        value: Total Balance
diff --git a/config/locales/views/account/entries/en.yml b/config/locales/views/account/entries/en.yml
deleted file mode 100644
index ca0d6e8c..00000000
--- a/config/locales/views/account/entries/en.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-en:
-  account:
-    entries:
-      destroy:
-        success: Entry deleted
-      empty:
-        description: Try adding an entry, editing filters or refining your search
-        title: No entries found
-      loading:
-        loading: Loading entries...
-      update:
-        success: Entry updated
diff --git a/config/locales/views/account/holdings/en.yml b/config/locales/views/account/holdings/en.yml
deleted file mode 100644
index ad5eafac..00000000
--- a/config/locales/views/account/holdings/en.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-en:
-  account:
-    holdings:
-      holding:
-        per_share: per share
-        shares: "%{qty} shares"
-      index:
-        cost: cost
-        holdings: Holdings
-        name: name
-        needs_sync: Your account needs to sync the latest prices to calculate this
-          portfolio
-        new_holding: New transaction
-        no_holdings: No holdings to show.
-        return: total return
-        weight: weight
-      missing_price_tooltip:
-        description: This investment has missing values and we could not calculate
-          its returns or value.
-        missing_data: Missing data
-      show:
-        avg_cost_label: Average Cost
-        current_market_price_label: Current Market Price
-        delete: Delete
-        delete_subtitle: This will delete the holding and all your associated trades
-          on this account.  This action cannot be undone.
-        delete_title: Delete holding
-        history: History
-        overview: Overview
-        portfolio_weight_label: Portfolio Weight
-        settings: Settings
-        ticker_label: Ticker
-        trade_history_entry: "%{qty} shares of %{security} at %{price}"
-        trend_label: Trend
-        unknown: Unknown
diff --git a/config/locales/views/account/trades/en.yml b/config/locales/views/account/trades/en.yml
deleted file mode 100644
index 0db9db32..00000000
--- a/config/locales/views/account/trades/en.yml
+++ /dev/null
@@ -1,55 +0,0 @@
----
-en:
-  account:
-    trades:
-      create:
-        failure: Something went wrong
-        success: Transaction created successfully.
-      form:
-        account: Transfer account (optional)
-        account_prompt: Search account
-        amount: Amount
-        holding: Ticker symbol
-        price: Price per share
-        qty: Quantity
-        submit: Add transaction
-        ticker_placeholder: AAPL
-        type: Type
-      index:
-        amount: Amount
-        new: New transaction
-        no_trades: No transactions for this account yet.
-        trade: transaction
-        trades: Transactions
-        type: Type
-      new:
-        title: New transaction
-      show:
-        additional: Additional
-        cost_per_share_label: Cost per Share
-        current_market_price_label: Current Market Price
-        date_label: Date
-        delete: Delete
-        delete_subtitle: This action cannot be undone
-        delete_title: Delete Trade
-        details: Details
-        exclude_subtitle: This trade will not be included in reports and calculations
-        exclude_title: Exclude from analytics
-        note_label: Note
-        note_placeholder: Add any additional notes here...
-        overview: Overview
-        purchase_price_label: Purchase Price
-        purchase_qty_label: Purchase Quantity
-        quantity_label: Quantity
-        settings: Settings
-        symbol_label: Symbol
-        total_return_label: Unrealized gain/loss
-      trade:
-        buy: Buy
-        deposit: Deposit
-        inflow: Inflow
-        outflow: Outflow
-        sell: Sell
-        withdrawal: Withdrawal
-      update:
-        success: Trade updated successfully.
diff --git a/config/locales/views/account/transactions/en.yml b/config/locales/views/account/transactions/en.yml
deleted file mode 100644
index 561c5858..00000000
--- a/config/locales/views/account/transactions/en.yml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-en:
-  account:
-    transactions:
-      index:
-        new: New transaction
-        no_transactions: No transactions for this account yet.
-        transaction: transaction
-        transactions: Transactions
-      selection_bar:
-        mark_transfers: Mark as transfers?
-        mark_transfers_confirm: Mark as transfers
-        mark_transfers_message: By marking transactions as transfers, they will no
-          longer be included in income or spending calculations.
-      show:
-        account_label: Account
-        amount: Amount
-        category_label: Category
-        category_placeholder: Select a category
-        date_label: Date
-        delete: Delete
-        delete_subtitle: This permanently deletes the transaction, affects your historical
-          balances, and cannot be undone.
-        delete_title: Delete transaction
-        details: Details
-        exclude_subtitle: This excludes the transaction from any in-app features or
-          analytics.
-        exclude_title: Exclude transaction
-        merchant_label: Merchant
-        merchant_placeholder: Select a merchant
-        name_label: Name
-        nature: Type
-        note_label: Notes
-        note_placeholder: Enter a note
-        overview: Overview
-        settings: Settings
-        tags_label: Tags
-      transaction:
-        remove_transfer: Remove transfer
-        remove_transfer_body: This will remove the transfer from this transaction
-        remove_transfer_confirm: Confirm
-      update:
-        success: Transaction updated successfully.
diff --git a/config/locales/views/account/transfers/en.yml b/config/locales/views/account/transfers/en.yml
deleted file mode 100644
index 515d28e6..00000000
--- a/config/locales/views/account/transfers/en.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-en:
-  account:
-    transfers:
-      create:
-        success: Transfer created
-      destroy:
-        success: Transfer removed
-      form:
-        amount: Amount
-        date: Date
-        description: Description
-        description_placeholder: Transfer from Checking to Savings
-        expense: Expense
-        from: From
-        income: Income
-        select_account: Select account
-        submit: Create transfer
-        to: To
-        transfer: Transfer
-      new:
-        title: New transfer
-      transfer:
-        remove_body: This will NOT delete the underlying transactions.  It will just
-          remove the transfer.
-        remove_confirm: Confirm
-        remove_title: Remove transfer?
diff --git a/config/locales/views/account/valuations/en.yml b/config/locales/views/account/valuations/en.yml
deleted file mode 100644
index 9b8dad56..00000000
--- a/config/locales/views/account/valuations/en.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-en:
-  account:
-    valuations:
-      create:
-        success: Valuation created successfully.
-      form:
-        cancel: Cancel
-      index:
-        change: change
-        date: date
-        new_entry: New entry
-        no_valuations: No valuations for this account yet
-        valuations: Value
-        value: value
-      valuation:
-        confirm_accept: Delete entry
-        confirm_body_html: "<p>Deleting this entry will remove it from the account’s
-          history which will impact different parts of your account. This includes
-          the net worth and account graphs.</p></br><p>The only way you’ll be able
-          to add this entry back is by re-entering it manually via a new entry</p>"
-        confirm_title: Delete Entry?
-        delete_entry: Delete entry
-        edit_entry: Edit entry
-        no_change: No change
-        start_balance: Starting balance
-        value_update: Value update
diff --git a/config/locales/views/accounts/en.yml b/config/locales/views/accounts/en.yml
index cb6668ef..e384ef79 100644
--- a/config/locales/views/accounts/en.yml
+++ b/config/locales/views/accounts/en.yml
@@ -2,177 +2,65 @@
 en:
   accounts:
     account:
-      has_issues: Issue detected.
       troubleshoot: Troubleshoot
-    accountables:
-      investment:
-        prompt: Select a subtype
-        none: None
-      credit_card:
-        annual_fee: Annual fee
-        annual_fee_placeholder: '99'
-        apr: APR
-        apr_placeholder: '15.99'
-        available_credit: Available credit
-        available_credit_placeholder: '10000'
-        expiration_date: Expiration date
-        minimum_payment: Minimum payment
-        minimum_payment_placeholder: '100'
-        overview:
-          amount_owed: Amount Owed
-          annual_fee: Annual Fee
-          apr: APR
-          available_credit: Available Credit
-          expiration_date: Expiration Date
-          minimum_payment: Minimum Payment
-          unknown: Unknown
-      depository:
-        prompt: Select a subtype
-        none: None
-      loan:
-        interest_rate: Interest rate
-        interest_rate_placeholder: '5.25'
-        overview:
-          interest_rate: Interest Rate
-          monthly_payment: Monthly Payment
-          not_applicable: N/A
-          original_principal: Original Principal
-          remaining_principal: Remaining Principal
-          term: Term
-          type: Type
-          unknown: Unknown
-        rate_type: Rate type
-        term_months: Term (months)
-        term_months_placeholder: '360'
-      property:
-        additional_info: Additional info
-        area_unit: Area unit
-        area_value: Area value
-        city: City
-        country: Country
-        line1: Address line 1
-        line2: Address line 2
-        optional: optional
-        overview:
-          living_area: Living Area
-          market_value: Market Value
-          purchase_price: Purchase Price
-          trend: Trend
-          unknown: Unknown
-          year_built: Year Built
-        postal_code: Postal code
-        state: State
-        year_built: Year built
-      vehicle:
-        make: Make
-        make_placeholder: Toyota
-        mileage: Mileage
-        mileage_placeholder: '15000'
-        mileage_unit: Unit
-        model: Model
-        model_placeholder: Camry
-        overview:
-          current_price: Current Price
-          make_model: Make & Model
-          mileage: Mileage
-          purchase_price: Purchase Price
-          trend: Trend
-          unknown: Unknown
-          year: Year
-        year: Year
-        year_placeholder: '2023'
+    chart:
+      data_not_available: Data not available for the selected period
     create:
-      success: New account created successfully
+      success: "%{type} account created"
     destroy:
-      success: Account deleted successfully
-    edit:
-      edit: Edit %{account}
+      success: "%{type} account scheduled for deletion"
     empty:
       empty_message: Add an account either via connection, importing or entering manually.
       new_account: New account
       no_accounts: No accounts yet
     form:
-      institution: Financial institution
-      ungrouped: "(none)"
       balance: Current balance
       name_label: Account name
       name_placeholder: Example account name
-      start_balance: Start balance (optional)
-      start_date: Start date (optional)
-    header:
-      accounts: Accounts
-      manage: Manage accounts
-      new: New account
     index:
       accounts: Accounts
-      add_institution: Add institution
+      manual_accounts:
+        other_accounts: Other accounts
       new_account: New account
-    institution_accounts:
-      add_account_to_institution: Add new account
-      confirm_accept: Delete institution
-      confirm_body: Don't worry, none of the accounts within this institution will
-        be affected by this deletion. Accounts will be ungrouped and all historical
-        data will remain intact.
-      confirm_title: Delete financial institution?
-      delete: Delete institution
-      edit: Edit institution
-      has_issues: Issue detected, see accounts
-      new_account: Add account
-      status: Last synced %{last_synced_at} ago
-      status_never: Requires data sync
-      syncing: Syncing...
-    institutionless_accounts:
-      other_accounts: Other accounts
+      sync: Sync all
     new:
-      select_accountable_type: What would you like to add?
-      title: Add an account
+      import_accounts: Import accounts
+      method_selector:
+        connected_entry: Link account
+        connected_entry_eu: Link EU account
+        manual_entry: Enter account balance
+        title: How would you like to add it?
+      title: What would you like to add?
     show:
-      cash: Cash
-      confirm_accept: Delete "%{name}"
-      confirm_body_html: "<p>By deleting this account, you will erase its value history,
-        affecting various aspects of your overall account. This action will have a
-        direct impact on your net worth calculations and the account graphs.</p><br
-        /> <p>After deletion, there is no way you'll be able to restore the account
-        information because you'll need to add it as a new account.</p>"
-      confirm_title: Delete account?
-      edit: Edit
-      holdings: Holdings
-      import: Import transactions
-      no_change: No change
-      overview: Overview
-      sync_message_missing_rates: Since exchange rates haven't been synced, balance
-        graphs may not reflect accurate values.
-      sync_message_unknown_error: An error has occurred during the sync.
-      total_owed: Total Owed
-      total_value: Total Value
-      trades: Transactions
-      transactions: Transactions
-      value: Value
-    summary:
-      new: New
-      no_assets: No assets found
-      no_assets_description: Add an asset either via connection, importing or entering
-        manually.
-      no_liabilities: No liabilities found
-      no_liabilities_description: Add a liability either via connection, importing
-        or entering manually.
-    sync_all:
-      button_text: Sync all
-      success: Successfully queued accounts for syncing.
-    tooltip:
-      cash: Cash
-      holdings: Holdings
-      total_value_tooltip: The total value is the sum of cash balance and your holdings
-        value, minus margin loans.
+      activity:
+        amount: Amount
+        balance: Balance
+        date: Date
+        entries: entries
+        entry: entry
+        new: New
+        new_balance: New balance
+        new_transaction: New transaction
+        no_entries: No entries found
+        title: Activity
+      chart:
+        balance: Balance
+        owed: Amount owed
+      menu:
+        confirm_accept: Delete "%{name}"
+        confirm_body_html: "<p>By deleting this account, you will erase its value
+          history, affecting various aspects of your overall account. This action
+          will have a direct impact on your net worth calculations and the account
+          graphs.</p><br /> <p>After deletion, there is no way you'll be able to restore
+          the account information because you'll need to add it as a new account.</p>"
+        confirm_title: Delete account?
+        edit: Edit
+        import: Import transactions
+        manage: Manage accounts
     update:
-      success: Account updated
-  credit_cards:
-    create:
-      success: Credit card created successfully
-    update:
-      success: Credit card updated successfully
-  loans:
-    create:
-      success: Loan created successfully
-    update:
-      success: Loan updated successfully
+      success: "%{type} account updated"
+  email_confirmations:
+    new:
+      invalid_token: Invalid or expired confirmation link.
+      success_login: Your email has been confirmed. Please log in with your new email
+        address.
diff --git a/config/locales/views/application/en.yml b/config/locales/views/application/en.yml
index dfa964f6..2ecb7a04 100644
--- a/config/locales/views/application/en.yml
+++ b/config/locales/views/application/en.yml
@@ -1,8 +1,5 @@
 ---
 en:
-  application:
-    pagination:
-      rows_per_page: Rows per page
   number:
     currency:
       format:
diff --git a/config/locales/views/categories/en.yml b/config/locales/views/categories/en.yml
index 5ef738c0..9f089fb7 100644
--- a/config/locales/views/categories/en.yml
+++ b/config/locales/views/categories/en.yml
@@ -1,17 +1,24 @@
 ---
 en:
   categories:
+    bootstrap:
+      success: Default categories created successfully
     category:
       delete: Delete category
       edit: Edit category
     create:
-      success: New transaction category created successfully
+      success: Category created successfully
+    destroy:
+      success: Category deleted successfully
     edit:
       edit: Edit category
     form:
       placeholder: Category name
     index:
+      bootstrap: Use defaults (recommended)
       categories: Categories
+      categories_expenses: Expense categories
+      categories_incomes: Income categories
       empty: No categories found
       new: New category
     menu:
@@ -19,4 +26,9 @@ en:
     new:
       new_category: New category
     update:
-      success: Transaction category updated successfully
+      success: Category updated successfully
+  category:
+    dropdowns:
+      show:
+        bootstrap: Generate default categories
+        empty: No categories found
diff --git a/config/locales/views/category/dropdowns/en.yml b/config/locales/views/category/dropdowns/en.yml
index 5b9e8248..511e86a9 100644
--- a/config/locales/views/category/dropdowns/en.yml
+++ b/config/locales/views/category/dropdowns/en.yml
@@ -6,7 +6,6 @@ en:
         delete: Delete category
         edit: Edit category
       show:
-        add_new: Add new
-        clear: Clear
+        clear: Clear category
         no_categories: No categories found
         search_placeholder: Search
diff --git a/config/locales/views/credit_cards/en.yml b/config/locales/views/credit_cards/en.yml
new file mode 100644
index 00000000..f0131d21
--- /dev/null
+++ b/config/locales/views/credit_cards/en.yml
@@ -0,0 +1,25 @@
+---
+en:
+  credit_cards:
+    edit:
+      edit: Edit %{account}
+    form:
+      annual_fee: Annual fee
+      annual_fee_placeholder: '99'
+      apr: APR
+      apr_placeholder: '15.99'
+      available_credit: Available credit
+      available_credit_placeholder: '10000'
+      expiration_date: Expiration date
+      minimum_payment: Minimum payment
+      minimum_payment_placeholder: '100'
+    new:
+      title: Enter credit card details
+    overview:
+      amount_owed: Amount Owed
+      annual_fee: Annual Fee
+      apr: APR
+      available_credit: Available Credit
+      expiration_date: Expiration Date
+      minimum_payment: Minimum Payment
+      unknown: Unknown
diff --git a/config/locales/views/cryptos/en.yml b/config/locales/views/cryptos/en.yml
new file mode 100644
index 00000000..298cc9cc
--- /dev/null
+++ b/config/locales/views/cryptos/en.yml
@@ -0,0 +1,7 @@
+---
+en:
+  cryptos:
+    edit:
+      edit: Edit %{account}
+    new:
+      title: Enter account balance
diff --git a/config/locales/views/depositories/en.yml b/config/locales/views/depositories/en.yml
new file mode 100644
index 00000000..081d1467
--- /dev/null
+++ b/config/locales/views/depositories/en.yml
@@ -0,0 +1,10 @@
+---
+en:
+  depositories:
+    edit:
+      edit: Edit %{account}
+    form:
+      none: None
+      subtype_prompt: Select account type
+    new:
+      title: Enter account balance
diff --git a/config/locales/views/email_confirmation_mailer/en.yml b/config/locales/views/email_confirmation_mailer/en.yml
new file mode 100644
index 00000000..e0caba08
--- /dev/null
+++ b/config/locales/views/email_confirmation_mailer/en.yml
@@ -0,0 +1,10 @@
+---
+en:
+  email_confirmation_mailer:
+    confirmation_email:
+      body: You recently requested to change your email address. Click the button
+        below to confirm this change.
+      cta: Confirm email change
+      expiry_notice: This link will expire in %{hours} hours.
+      greeting: Hello!
+      subject: 'Maybe: Confirm your email change'
diff --git a/config/locales/views/entries/en.yml b/config/locales/views/entries/en.yml
new file mode 100644
index 00000000..4303d73f
--- /dev/null
+++ b/config/locales/views/entries/en.yml
@@ -0,0 +1,14 @@
+---
+en:
+  entries:
+    create:
+      success: Entry created
+    destroy:
+      success: Entry deleted
+    empty:
+      description: Try adding an entry, editing filters or refining your search
+      title: No entries found
+    loading:
+      loading: Loading entries...
+    update:
+      success: Entry updated
diff --git a/config/locales/views/holdings/en.yml b/config/locales/views/holdings/en.yml
new file mode 100644
index 00000000..933a8b83
--- /dev/null
+++ b/config/locales/views/holdings/en.yml
@@ -0,0 +1,37 @@
+---
+en:
+  holdings:
+    cash:
+      brokerage_cash: Brokerage cash
+    destroy:
+      success: Holding deleted
+    holding:
+      per_share: per share
+      shares: "%{qty} shares"
+    index:
+      average_cost: Average cost
+      holdings: Holdings
+      name: Name
+      new_holding: New transaction
+      no_holdings: No holdings to show.
+      return: Total return
+      weight: Weight
+    missing_price_tooltip:
+      description: This investment has missing values and we could not calculate
+        its returns or value.
+      missing_data: Missing data
+    show:
+      avg_cost_label: Average Cost
+      current_market_price_label: Current Market Price
+      delete: Delete
+      delete_subtitle: This will delete the holding and all your associated trades
+        on this account.  This action cannot be undone.
+      delete_title: Delete holding
+      history: History
+      overview: Overview
+      portfolio_weight_label: Portfolio Weight
+      settings: Settings
+      ticker_label: Ticker
+      trade_history_entry: "%{qty} shares of %{security} at %{price}"
+      total_return_label: Total Return
+      unknown: Unknown
diff --git a/config/locales/views/impersonation_sessions/en.yml b/config/locales/views/impersonation_sessions/en.yml
new file mode 100644
index 00000000..202822bf
--- /dev/null
+++ b/config/locales/views/impersonation_sessions/en.yml
@@ -0,0 +1,15 @@
+---
+en:
+  impersonation_sessions:
+    approve:
+      success: Request approved
+    complete:
+      success: Session completed
+    create:
+      success: Request sent to user. Waiting for approval.
+    join:
+      success: Joined session
+    leave:
+      success: Left session
+    reject:
+      success: Request rejected
diff --git a/config/locales/views/imports/en.yml b/config/locales/views/imports/en.yml
index 7227a9f2..97274193 100644
--- a/config/locales/views/imports/en.yml
+++ b/config/locales/views/imports/en.yml
@@ -4,12 +4,21 @@ en:
     cleans:
       show:
         description: Edit your data in the table below.  Red cells are invalid.
-        errors_notice: You have errors in your data.  Hover over the error to see details.
+        errors_notice: You have errors in your data.  Hover over the error to see
+          details.
+        errors_notice_mobile: You have errors in your data.  Tap over the error tooltip to see
+          details.
         title: Clean your data
     configurations:
+      mint_import:
+        date_format_label: Date format
       show:
         description: Select the columns that correspond to each field in your CSV.
         title: Configure your import
+      trade_import:
+        date_format_label: Date format
+      transaction_import:
+        date_format_label: Date format
     confirms:
       mappings:
         create_account: Create account
@@ -18,8 +27,8 @@ en:
         no_accounts: You don't have any accounts yet. Please create an account that
           we can use for (unassigned) rows in your CSV or go back to the Clean step
           and provide an account name we can use.
-        unassigned_account: Need to create a new account for unassigned rows?
         rows_label: Rows
+        unassigned_account: Need to create a new account for unassigned rows?
       show:
         account_mapping_description: Assign all of your imported file's accounts to
           Maybe's existing accounts.  You can also add new accounts or leave them
@@ -56,6 +65,8 @@ en:
       failed: Failed
       in_progress: In progress
       label: "%{type}: %{datetime}"
+      revert_failed: Revert failed
+      reverting: Reverting
       uploading: Processing rows
       view: View
     index:
@@ -69,7 +80,7 @@ en:
       import_mint: Import from Mint
       import_portfolio: Import investments
       import_transactions: Import transactions
-      resume: Resume latest import
+      resume: Resume %{type}
       sources: Sources
       title: New CSV Import
     ready:
diff --git a/config/locales/views/institutions/en.yml b/config/locales/views/institutions/en.yml
deleted file mode 100644
index d90aec86..00000000
--- a/config/locales/views/institutions/en.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-en:
-  institutions:
-    create:
-      success: Institution created
-    destroy:
-      success: Institution deleted
-    edit:
-      edit: Edit %{institution}
-    form:
-      name: Financial institution name
-    new:
-      new_institution: New financial institution
-    sync:
-      success: Institution sync started
-    update:
-      success: Institution updated
diff --git a/config/locales/views/investments/en.yml b/config/locales/views/investments/en.yml
new file mode 100644
index 00000000..451609e3
--- /dev/null
+++ b/config/locales/views/investments/en.yml
@@ -0,0 +1,18 @@
+---
+en:
+  investments:
+    edit:
+      edit: Edit %{account}
+    form:
+      none: None
+      subtype_prompt: Select investment type
+    new:
+      title: Enter account balance
+    show:
+      chart_title: Total value
+    value_tooltip:
+      cash: Cash
+      holdings: Holdings
+      total: Portfolio balance
+      total_value_tooltip: The total portfolio balance is the sum of brokerage cash
+        (available for trading) and the current market value of your holdings.
diff --git a/config/locales/views/invitation_mailer/en.yml b/config/locales/views/invitation_mailer/en.yml
new file mode 100644
index 00000000..404d4523
--- /dev/null
+++ b/config/locales/views/invitation_mailer/en.yml
@@ -0,0 +1,8 @@
+---
+en:
+  invitation_mailer:
+    invite_email:
+      accept_button: Accept Invitation
+      body: "%{inviter} has invited you to join the %{family} family on Maybe!"
+      expiry_notice: This invitation will expire in %{days} days
+      greeting: Welcome to Maybe!
diff --git a/config/locales/views/invitations/en.yml b/config/locales/views/invitations/en.yml
new file mode 100644
index 00000000..894b9823
--- /dev/null
+++ b/config/locales/views/invitations/en.yml
@@ -0,0 +1,19 @@
+---
+en:
+  invitations:
+    create:
+      failure: Could not send invitation
+      success: Invitation sent successfully
+    destroy:
+      failure: There was a problem removing the invitation.
+      not_authorized: You are not authorized to manage invitations.
+      success: Invitation was successfully removed.
+    new:
+      email_label: Email Address
+      email_placeholder: Enter email address
+      role_admin: Administrator
+      role_label: Role
+      role_member: Member
+      submit: Send Invitation
+      subtitle: Send an invitation to join your family account on Maybe
+      title: Invite Someone
diff --git a/config/locales/views/layout/en.yml b/config/locales/views/layout/en.yml
index 0e847ab0..b5484b6a 100644
--- a/config/locales/views/layout/en.yml
+++ b/config/locales/views/layout/en.yml
@@ -2,18 +2,12 @@
 en:
   layouts:
     auth:
-      or: or
-      privacy_policy: Privacy Policy
-      sign_in: sign in to your account
-      sign_up: create an account
-      terms_of_service: Terms of Service
+      existing_account: Already have an account?
+      no_account: New to Maybe?
+      sign_in: Sign in
+      sign_up: Create account
       your_account: Your account
-    issues:
-      action: How to fix this issue
-      description: Issue Description
-    sidebar:
-      accounts: Accounts
-      dashboard: Dashboard
-      new_account: New account
-      portfolio: Portfolio
-      transactions: Transactions
+    shared:
+      footer:
+        privacy_policy: Privacy Policy
+        terms_of_service: Terms of Service
diff --git a/config/locales/views/loans/en.yml b/config/locales/views/loans/en.yml
new file mode 100644
index 00000000..33eb76f3
--- /dev/null
+++ b/config/locales/views/loans/en.yml
@@ -0,0 +1,23 @@
+---
+en:
+  loans:
+    edit:
+      edit: Edit %{account}
+    form:
+      interest_rate: Interest rate
+      interest_rate_placeholder: '5.25'
+      initial_balance: Original loan balance
+      rate_type: Rate type
+      term_months: Term (months)
+      term_months_placeholder: '360'
+    new:
+      title: Enter loan details
+    overview:
+      interest_rate: Interest Rate
+      monthly_payment: Monthly Payment
+      not_applicable: N/A
+      original_principal: Original Principal
+      remaining_principal: Remaining Principal
+      term: Term
+      type: Type
+      unknown: Unknown
diff --git a/config/locales/views/merchants/en.yml b/config/locales/views/merchants/en.yml
index b95aa729..fab034ce 100644
--- a/config/locales/views/merchants/en.yml
+++ b/config/locales/views/merchants/en.yml
@@ -1,7 +1,8 @@
 ---
 en:
-  merchants:
+  family_merchants:
     create:
+      error: 'Error creating merchant: %{error}'
       success: New merchant created successfully
     destroy:
       success: Merchant deleted successfully
diff --git a/config/locales/views/mfa/en.yml b/config/locales/views/mfa/en.yml
new file mode 100644
index 00000000..786f5259
--- /dev/null
+++ b/config/locales/views/mfa/en.yml
@@ -0,0 +1,38 @@
+---
+en:
+  mfa:
+    backup_codes:
+      backup_codes_description: Each code can only be used once. Keep these codes
+        safe and secure.
+      backup_codes_title: Your Backup Codes
+      continue: Continue to Security Settings
+      description: Store these backup codes in a safe place - you'll need them if
+        you lose access to your authenticator app
+      page_title: Backup Codes
+      title: Save Your Backup Codes
+    create:
+      invalid_code: Invalid verification code. Please try again.
+    disable:
+      success: Two-factor authentication has been disabled
+    new:
+      code_label: Verification Code
+      code_placeholder: Enter 6-digit code
+      description: Enhance your account security by setting up two-factor authentication
+      page_title: Two-Factor Authentication Setup
+      scan_description: Use an authenticator app like Google Authenticator or 1Password
+        to scan this QR code
+      scan_title: 1. Scan QR Code
+      secret_description: If you can't scan the QR code, enter this secret key manually
+        in your authenticator app
+      secret_title: Manual Entry Code
+      title: Set Up Two-Factor Authentication
+      verify_button: Verify and Enable 2FA
+      verify_description: Enter the 6-digit code from your authenticator app
+      verify_title: 2. Enter Verification Code
+    verify:
+      description: Enter the code from your authenticator app to continue
+      page_title: Verify Two-Factor Authentication
+      title: Two-Factor Authentication
+      verify_button: Verify
+    verify_code:
+      invalid_code: Invalid authentication code. Please try again.
diff --git a/config/locales/views/onboardings/en.yml b/config/locales/views/onboardings/en.yml
new file mode 100644
index 00000000..04edfd45
--- /dev/null
+++ b/config/locales/views/onboardings/en.yml
@@ -0,0 +1,28 @@
+---
+en:
+  onboardings:
+    header:
+      sign_out: Log out
+    preferences:
+      currency: Currency
+      date_format: Date format
+      example: Example account
+      locale: Language
+      preview: Preview how data displays based on preferences.
+      submit: Complete
+      subtitle: Let's configure your preferences.
+      title: Configure your preferences
+    profile:
+      country: Country
+      first_name: First Name
+      household_name: Household Name
+      last_name: Last Name
+      profile_image: Profile Image
+      submit: Continue
+      subtitle: Let's complete your profile.
+      title: Let's set up the basics
+    show:
+      message: We’re really excited you’re here. In the next step we’ll ask you a
+        few questions to complete your profile and then get you all set up.
+      setup: Set up account
+      title: Meet Maybe
diff --git a/config/locales/views/other_assets/en.yml b/config/locales/views/other_assets/en.yml
new file mode 100644
index 00000000..be3f0f43
--- /dev/null
+++ b/config/locales/views/other_assets/en.yml
@@ -0,0 +1,7 @@
+---
+en:
+  other_assets:
+    edit:
+      edit: Edit %{account}
+    new:
+      title: Enter asset details
diff --git a/config/locales/views/other_liabilities/en.yml b/config/locales/views/other_liabilities/en.yml
new file mode 100644
index 00000000..9008481e
--- /dev/null
+++ b/config/locales/views/other_liabilities/en.yml
@@ -0,0 +1,7 @@
+---
+en:
+  other_liabilities:
+    edit:
+      edit: Edit %{account}
+    new:
+      title: Enter liability details
diff --git a/config/locales/views/pages/en.yml b/config/locales/views/pages/en.yml
index 31152abb..1ee15ca3 100644
--- a/config/locales/views/pages/en.yml
+++ b/config/locales/views/pages/en.yml
@@ -4,20 +4,11 @@ en:
     changelog:
       title: What's new
     dashboard:
-      allocation_chart:
-        assets: Assets
-        debts: Debts
-      greeting: Welcome back, %{name}
-      fallback_greeting: Welcome back, friend
-      import: Import
-      income: Income
-      investing: Investing (coming soon...)
-      net_worth: Net Worth
-      new: New account
-      no_transactions: You have no recent transactions
-      savings_rate: Savings Rate
-      spending: Spending
-      subtitle: Here's what's happening today
-      title: Dashboard
-      transactions: Recent transactions
-      view_all: View all
+      net_worth_chart:
+        data_not_available: Data not available for the selected period
+        title: Net Worth
+      no_account_empty_state:
+        new_account: New account
+        no_account_subtitle: Since no accounts have been added, there's no data to
+          display. Add your first accounts to start viewing dashboard data.
+        no_account_title: No accounts yet
diff --git a/config/locales/views/password_resets/en.yml b/config/locales/views/password_resets/en.yml
index 33fa060d..886e7da0 100644
--- a/config/locales/views/password_resets/en.yml
+++ b/config/locales/views/password_resets/en.yml
@@ -1,13 +1,10 @@
 ---
 en:
   password_resets:
-    create:
-      requested: If an account with that email exists, we have sent a link to reset
-        your password.
     edit:
-      submit: Update Password
       title: Reset password
     new:
+      requested: Please check your email for a link to reset your password.
       submit: Reset password
       title: Reset password
     update:
diff --git a/config/locales/views/plaid_items/en.yml b/config/locales/views/plaid_items/en.yml
new file mode 100644
index 00000000..e4d387cf
--- /dev/null
+++ b/config/locales/views/plaid_items/en.yml
@@ -0,0 +1,26 @@
+---
+en:
+  plaid_items:
+    create:
+      success: Account linked successfully.  Please wait for accounts to sync.
+    destroy:
+      success: Accounts scheduled for deletion.
+    plaid_item:
+      add_new: Add new connection
+      confirm_accept: Delete institution
+      confirm_body: This will permanently delete all the accounts in this group and
+        all associated data.
+      confirm_title: Delete institution?
+      connection_lost: Connection lost
+      connection_lost_description: This connection is no longer valid. You'll need
+        to delete this connection and add it again to continue syncing data.
+      delete: Delete
+      error: Error occurred while syncing data
+      no_accounts_description: We could not load any accounts from this financial
+        institution.
+      no_accounts_title: No accounts found
+      requires_update: Requires re-authentication
+      status: Last synced %{timestamp} ago
+      status_never: Requires data sync
+      syncing: Syncing...
+      update: Update connection
diff --git a/config/locales/views/properties/en.yml b/config/locales/views/properties/en.yml
index a59f2f24..289335bb 100644
--- a/config/locales/views/properties/en.yml
+++ b/config/locales/views/properties/en.yml
@@ -1,7 +1,32 @@
 ---
 en:
   properties:
-    create:
-      success: Property created successfully
-    update:
-      success: Property updated successfully
+    edit:
+      edit: Edit %{account}
+    form:
+      address_line1: Street address
+      address_line1_placeholder: 123 Main St
+      area: Living area
+      area_placeholder: '2000'
+      area_unit: Unit of measurement
+      country: Country
+      country_placeholder: US
+      locality: City
+      locality_placeholder: San Francisco
+      none: None
+      postal_code: ZIP/Postal code
+      postal_code_placeholder: '94105'
+      region: State/Province
+      region_placeholder: CA
+      subtype_prompt: Select property type
+      year_built: Year built
+      year_built_placeholder: '2000'
+    new:
+      title: Enter property details
+    overview:
+      living_area: Living Area
+      market_value: Market Value
+      purchase_price: Purchase Price
+      trend: Trend
+      unknown: Unknown
+      year_built: Year Built
diff --git a/config/locales/views/registrations/en.yml b/config/locales/views/registrations/en.yml
index b091fc3a..4c02397c 100644
--- a/config/locales/views/registrations/en.yml
+++ b/config/locales/views/registrations/en.yml
@@ -9,11 +9,17 @@ en:
         create: Continue
   registrations:
     create:
-      failure: Invalid input, please try again.
+      failure: There was a problem signing up.
       invalid_invite_code: Invalid invite code, please try again.
       success: You have signed up successfully.
     new:
-      title: Create an account
+      invitation_message: "%{inviter} has invited you to join as a %{role}"
+      join_family_title: Join %{family}
+      role_admin: administrator
+      role_member: member
+      submit: Create account
+      title: Create your account
       welcome_body: To get started, you must sign up for a new account.  You will
         then be able to configure additional settings within the app.
       welcome_title: Welcome to Self Hosted Maybe!
+      password_placeholder: Enter your password
diff --git a/config/locales/views/sessions/en.yml b/config/locales/views/sessions/en.yml
index dd9169fe..53f2a7ec 100644
--- a/config/locales/views/sessions/en.yml
+++ b/config/locales/views/sessions/en.yml
@@ -10,6 +10,6 @@ en:
       email_placeholder: you@example.com
       forgot_password: Forgot your password?
       password: Password
-      reset_password: Reset it
       submit: Log in
       title: Sign in to your account
+      password_placeholder: Enter your password
\ No newline at end of file
diff --git a/config/locales/views/settings/api_keys/en.yml b/config/locales/views/settings/api_keys/en.yml
new file mode 100644
index 00000000..b814e742
--- /dev/null
+++ b/config/locales/views/settings/api_keys/en.yml
@@ -0,0 +1,75 @@
+---
+en:
+  settings:
+    api_keys_controller:
+      success: "Your API key has been created successfully"
+      revoked_successfully: "API key has been revoked successfully"
+      revoke_failed: "Failed to revoke API key"
+      scope_descriptions:
+        read_accounts: "View Accounts"
+        read_transactions: "View Transactions"
+        read_balances: "View Balances"
+        write_transactions: "Create Transactions"
+    api_keys:
+      show:
+        title: "API Key Management"
+      no_api_key:
+        title: "Create Your API Key"
+        description: "Get programmatic access to your Maybe data with a secure API key."
+        what_you_can_do: "What you can do with the API:"
+        feature_1: "Access your account data programmatically"
+        feature_2: "Build custom integrations and applications"
+        feature_3: "Automate data retrieval and analysis"
+        security_note_title: "Security First"
+        security_note: "Your API key will have restricted permissions based on the scopes you select. You can only have one active API key at a time."
+        create_api_key: "Create API Key"
+      current_api_key:
+        title: "Your API Key"
+        description: "Your active API key is ready to use. Keep it secure and never share it publicly."
+        active: "Active"
+        key_name: "Name"
+        created_at: "Created"
+        last_used: "Last Used"
+        expires: "Expires"
+        ago: "ago"
+        never_used: "Never used"
+        never_expires: "Never expires"
+        permissions: "Permissions"
+        usage_instructions_title: "How to use your API key"
+        usage_instructions: "Include your API key in the X-Api-Key header when making requests to the Maybe API:"
+        regenerate_key: "Create New Key"
+        revoke_key: "Revoke Key"
+        revoke_confirmation: "Are you sure you want to revoke this API key? This action cannot be undone and will immediately disable all applications using this key."
+      new:
+        title: "Create API Key"
+        create_new_key: "Create New API Key"
+        description: "Configure your new API key with a descriptive name and appropriate permissions."
+        name_label: "API Key Name"
+        name_placeholder: "e.g., Production App, Analytics Dashboard"
+        name_help: "Choose a descriptive name to help you identify this key's purpose."
+        permissions_label: "Permissions"
+        permissions_help: "Select the permissions your API key needs. You can always create a new key with different permissions."
+        scope_details:
+          read_accounts: "View account information, balances, and account-level data"
+          read_transactions: "View transaction data, categories, and transaction details"
+          read_balances: "View historical balance data and account value trends"
+          write_transactions: "Create and update transaction records (coming soon)"
+        security_warning_title: "Important Security Notice"
+        security_warning: "Your API key will be shown only once after creation. Store it securely and never share it publicly. If you lose it, you'll need to create a new one."
+        create_key: "Create API Key"
+        cancel: "Cancel"
+      created:
+        title: "API Key Created"
+        success_title: "API Key Created Successfully"
+        success_description: "Your new API key is ready to use. Make sure to copy it now as you won't be able to see it again."
+        your_api_key: "Your API Key"
+        key_name: "Name"
+        permissions: "Permissions"
+        critical_warning_title: "⚠️ Critical: Save Your API Key Now"
+        critical_warning_1: "This is the only time you'll see your API key in plain text."
+        critical_warning_2: "Copy and store it securely in your password manager or application."
+        critical_warning_3: "If you lose this key, you'll need to create a new one."
+        usage_instructions_title: "Quick Start"
+        usage_instructions: "Use your API key by including it in the X-Api-Key header:"
+        copy_key: "Copy API Key"
+        continue: "Continue to API Key Settings"
\ No newline at end of file
diff --git a/config/locales/views/settings/en.yml b/config/locales/views/settings/en.yml
index 8bf5b77b..8155c49e 100644
--- a/config/locales/views/settings/en.yml
+++ b/config/locales/views/settings/en.yml
@@ -3,13 +3,74 @@ en:
   settings:
     billings:
       show:
-        manage_subscription_button: Manage subscription
         page_title: Billing
-        subscribe_button: Subscribe
-        subscription_subtitle: Manage your subscription and billing details
+        subscription_subtitle: Update your subscription and billing details
         subscription_title: Manage subscription
-    nav:
+    preferences:
+      show:
+        country: Country
+        currency: Currency
+        date_format: Date format
+        general_subtitle: Configure your preferences
+        general_title: General
+        default_period: Default Period
+        language: Language
+        page_title: Preferences
+        theme_dark: Dark
+        theme_light: Light
+        theme_subtitle: Choose a preferred theme for the app
+        theme_system: System
+        theme_title: Theme
+        timezone: Timezone
+    profiles:
+      destroy:
+        cannot_remove_self: You cannot remove yourself from the account.
+        member_removal_failed: There was a problem removing the member.
+        member_removed: Member was successfully removed.
+        not_authorized: You are not authorized to remove members.
+      show:
+        confirm_delete:
+          body: Are you sure you want to permanently delete your account? This action
+            is irreversible.
+          title: Delete account?
+        confirm_reset:
+          body: Are you sure you want to reset your account? This will delete all your accounts, categories, merchants, tags, and other data. This action cannot be undone.
+          title: Reset account?
+        confirm_remove_invitation:
+          body: Are you sure you want to remove the invitation for %{email}?
+          title: Remove Invitation
+        confirm_remove_member:
+          body: Are you sure you want to remove %{name} from your account?
+          title: Remove Member
+        danger_zone_title: Danger Zone
+        delete_account: Delete account
+        delete_account_warning: Deleting your account will permanently remove all
+          your data and cannot be undone.
+        reset_account: Reset account
+        reset_account_warning: Resetting your account will delete all your accounts, categories, merchants, tags, and other data, but keep your user account intact.
+        email: Email
+        first_name: First Name
+        household_form_input_placeholder: Enter household name
+        household_form_label: Household name
+        household_subtitle: Invite family members, partners and other inviduals.  Invitees
+          can login to your household and access your shared accounts.
+        household_title: Household
+        invitation_link: Invitation link
+        invite_member: Add member
+        last_name: Last Name
+        page_title: Account
+        pending: Pending
+        profile_subtitle: Customize how you appear on Maybe
+        profile_title: Profile
+        remove_invitation: Remove Invitation
+        remove_member: Remove Member
+        save: Save
+    securities:
+      show:
+        page_title: Security
+    settings_nav:
       accounts_label: Accounts
+      api_key_label: API Key
       billing_label: Billing
       categories_label: Categories
       feedback_label: Feedback
@@ -20,47 +81,17 @@ en:
       other_section_title: More
       preferences_label: Preferences
       profile_label: Account
+      rules_label: Rules
+      security_label: Security
       self_hosting_label: Self hosting
       tags_label: Tags
       transactions_section_title: Transactions
       whats_new_label: What's new
-    nav_link_large:
+    settings_nav_link_large:
       next: Next
       previous: Back
-    preferences:
-      show:
-        general_subtitle: Configure your preferences
-        general_title: General
-        page_title: Preferences
-        theme_dark: Dark
-        theme_light: Light
-        theme_subtitle: Choose a preferred theme for the app (coming soon...)
-        theme_system: System
-        theme_title: Theme
-      update:
-        success: Preferences updated successfully.
-    profiles:
-      destroy:
-        success: Account deleted successfully.
-      show:
-        confirm_delete:
-          body: Are you sure you want to permanently delete your account? This action
-            is irreversible.
-          title: Delete account?
-        danger_zone_title: Danger Zone
-        delete_account: Delete account
-        delete_account_warning: Deleting your account will permanently remove all
-          your data and cannot be undone.
-        household_form_input_placeholder: Enter household name
-        household_form_label: Household name
-        household_subtitle: Invite family members, partners and other inviduals.  Invitees
-          can login to your household and access your shared accounts.
-        household_title: Household
-        page_title: Account
-        profile_image_choose: Choose
-        profile_image_type: JPG, GIF or PNG. 5MB max.
-        profile_subtitle: Customize how you appear on Maybe
-        profile_title: Profile
-        save: Save
-      update:
-        success: Profile updated successfully.
+    user_avatar_field:
+      accepted_formats: JPG or PNG. 5MB max.
+      choose: Upload photo
+      choose_label: (optional)
+      change: Change photo
diff --git a/config/locales/views/settings/hostings/en.yml b/config/locales/views/settings/hostings/en.yml
index 0e4a5b2d..7377c492 100644
--- a/config/locales/views/settings/hostings/en.yml
+++ b/config/locales/views/settings/hostings/en.yml
@@ -3,20 +3,24 @@ en:
   settings:
     hostings:
       invite_code_settings:
-        description: Every new user that joins your instance if Maybe can only do
+        description: Every new user that joins your instance of Maybe can only do
           so via an invite code
+        email_confirmation_description: When enabled, users must confirm their email
+          address when changing it.
+        email_confirmation_title: Require email confirmation
         generate_tokens: Generate new code
         generated_tokens: Generated codes
-        title: Require invite code for new sign ups
-      provider_settings:
-        description: Configure settings for your hosting provider
-        render_deploy_hook_label: Render Deploy Hook URL
-        render_deploy_hook_placeholder: https://api.render.com/deploy/srv-xyz...
-        title: Provider Settings
+        title: Require invite code for signup
       show:
         general: General Settings
         invites: Invite Codes
         title: Self-Hosting
+        danger_zone: Danger Zone
+        clear_cache: Clear data cache
+        clear_cache_warning: Clearing the data cache will remove all exchange rates, security prices, account balances, and other data. This will not delete accounts, transactions, categories, or other user-owned data.
+        confirm_clear_cache:
+          title: Clear data cache?
+          body: Are you sure you want to clear the data cache? This will remove all exchange rates, security prices, account balances, and other data. This action cannot be undone.
       synth_settings:
         api_calls_used: "%{used} / %{limit} API calls used (%{percentage})"
         description: Input the API key provided by Synth
@@ -27,13 +31,6 @@ en:
       update:
         failure: Invalid setting value
         success: Settings updated
-      upgrade_settings:
-        description: Configure how your application receives updates
-        latest_commit_description: Automatically update to the latest commit (unstable)
-        latest_commit_title: Latest Commit
-        latest_release_description: Automatically update to the most recent release
-          (stable)
-        latest_release_title: Latest Release
-        manual_description: You control when to download and install updates
-        manual_title: Manual
-        title: Auto Upgrade
+      clear_cache:
+        cache_cleared: Data cache has been cleared. This may take a few moments to complete.
+      not_authorized: You are not authorized to perform this action
diff --git a/config/locales/views/settings/securities/en.yml b/config/locales/views/settings/securities/en.yml
new file mode 100644
index 00000000..af439522
--- /dev/null
+++ b/config/locales/views/settings/securities/en.yml
@@ -0,0 +1,12 @@
+---
+en:
+  settings:
+    securities:
+      show:
+        disable_mfa: Disable 2FA
+        disable_mfa_confirm: Are you sure you want to disable two-factor authentication?
+          This will make your account less secure.
+        enable_mfa: Enable 2FA
+        mfa_description: Add an extra layer of security to your account by requiring
+          a code from your authenticator app when signing in
+        mfa_title: Two-Factor Authentication
diff --git a/config/locales/views/shared/en.yml b/config/locales/views/shared/en.yml
index 89ad83bc..37e22cd3 100644
--- a/config/locales/views/shared/en.yml
+++ b/config/locales/views/shared/en.yml
@@ -8,19 +8,7 @@ en:
       title: Are you sure?
     money_field:
       label: Amount
-    no_account_empty_state:
-      new_account: New account
-      no_account_subtitle: Since no accounts have been added, there's no data to display.
-        Add your first accounts to start viewing dashboard data.
-      no_account_title: No accounts yet
-    subscribe_prompt:
-      guarantee: We're reasonable people here. If you're not happy or something doesn't
-        work, we'll gladly refund you.
-      subscribe: Upgrade your account
-      subtitle: To continue using Maybe, please subscribe!
-      title: Upgrade
-    upgrade_notification:
-      app_upgraded: The app has been upgraded to %{version}.
-      dismiss: Dismiss
-      new_version_available: A new version of Maybe is available for upgrade.
-      upgrade_now: Upgrade Now
+    syncing_notice:
+      syncing: Syncing accounts data...
+    trend_change:
+      no_change: "no change"
diff --git a/config/locales/views/subscriptions/en.yml b/config/locales/views/subscriptions/en.yml
new file mode 100644
index 00000000..72ab67a9
--- /dev/null
+++ b/config/locales/views/subscriptions/en.yml
@@ -0,0 +1,3 @@
+en:
+  subscriptions:
+    self_hosted_alert: "Maybe+ is not available in self-hosted mode."
diff --git a/config/locales/views/tags/en.yml b/config/locales/views/tags/en.yml
index 4a78e350..a1f2ba32 100644
--- a/config/locales/views/tags/en.yml
+++ b/config/locales/views/tags/en.yml
@@ -3,6 +3,9 @@ en:
   tags:
     create:
       created: Tag created
+      error: 'Error creating tag: %{error}'
+    destroy:
+      deleted: Tag deleted
     edit:
       edit: Edit tag
     form:
diff --git a/config/locales/views/trades/en.yml b/config/locales/views/trades/en.yml
new file mode 100644
index 00000000..95955865
--- /dev/null
+++ b/config/locales/views/trades/en.yml
@@ -0,0 +1,38 @@
+---
+en:
+  trades:
+    form:
+      account: Transfer account (optional)
+      account_prompt: Search account
+      amount: Amount
+      holding: Ticker symbol
+      price: Price per share
+      qty: Quantity
+      submit: Add transaction
+      ticker_placeholder: AAPL
+      type: Type
+    header:
+      buy: Buy
+      current_market_price_label: Current Market Price
+      overview: Overview
+      purchase_price_label: Purchase Price
+      purchase_qty_label: Purchase Quantity
+      sell: Sell
+      symbol_label: Symbol
+      total_return_label: Unrealized gain/loss
+    new:
+      title: New transaction
+    show:
+      additional: Additional
+      cost_per_share_label: Cost per Share
+      date_label: Date
+      delete: Delete
+      delete_subtitle: This action cannot be undone
+      delete_title: Delete Trade
+      details: Details
+      exclude_subtitle: This trade will not be included in reports and calculations
+      exclude_title: Exclude from analytics
+      note_label: Note
+      note_placeholder: Add any additional notes here...
+      quantity_label: Quantity
+      settings: Settings
diff --git a/config/locales/views/transactions/en.yml b/config/locales/views/transactions/en.yml
index 7b7189e8..0655145f 100644
--- a/config/locales/views/transactions/en.yml
+++ b/config/locales/views/transactions/en.yml
@@ -1,24 +1,6 @@
 ---
 en:
   transactions:
-    bulk_delete:
-      success: "%{count} transactions deleted"
-    bulk_edit:
-      cancel: Cancel
-      category_label: Category
-      category_placeholder: Select a category
-      date_label: Date
-      details: Details
-      merchant_label: Merchant
-      merchant_placeholder: Select a merchant
-      note_label: Notes
-      note_placeholder: Enter a note that will be applied to selected transactions
-      overview: Overview
-      save: Save
-    bulk_update:
-      success: "%{count} transactions updated"
-    create:
-      success: New transaction created successfully
     form:
       account: Account
       account_prompt: Select an Account
@@ -30,8 +12,34 @@ en:
       description_placeholder: Describe transaction
       expense: Expense
       income: Income
+      none: (none)
+      note_label: Notes
+      note_placeholder: Enter a note
       submit: Add transaction
+      tags_label: Tags
       transfer: Transfer
+    new:
+      new_transaction: New transaction
+    show:
+      account_label: Account
+      amount: Amount
+      category_label: Category
+      date_label: Date
+      delete: Delete
+      delete_subtitle: This permanently deletes the transaction, affects your historical
+        balances, and cannot be undone.
+      delete_title: Delete transaction
+      details: Details
+      merchant_label: Merchant
+      name_label: Name
+      nature: Type
+      none: "(none)"
+      note_label: Notes
+      note_placeholder: Enter a note
+      overview: Overview
+      settings: Settings
+      tags_label: Tags
+      uncategorized: "(uncategorized)"
     header:
       edit_categories: Edit categories
       edit_imports: Edit imports
@@ -40,10 +48,7 @@ en:
       import: Import
     index:
       transaction: transaction
-    mark_transfers:
-      success: Marked as transfer
-    new:
-      new_transaction: New transaction
+      transactions: transactions
     searches:
       filters:
         amount_filter:
@@ -76,5 +81,3 @@ en:
         equal_to: equal to
         greater_than: greater than
         less_than: less than
-    unmark_transfers:
-      success: Transfer removed
diff --git a/config/locales/views/transfers/en.yml b/config/locales/views/transfers/en.yml
new file mode 100644
index 00000000..669bae2d
--- /dev/null
+++ b/config/locales/views/transfers/en.yml
@@ -0,0 +1,31 @@
+---
+en:
+  transfers:
+    create:
+      success: Transfer created
+    destroy:
+      success: Transfer removed
+    form:
+      amount: Amount
+      date: Date
+      expense: Expense
+      from: From
+      income: Income
+      select_account: Select account
+      submit: Create transfer
+      to: To
+      transfer: Transfer
+    new:
+      title: New transfer
+    show:
+      delete: Remove transfer
+      delete_subtitle: This removes the transfer.  It will not delete the underlying
+        transactions.
+      delete_title: Remove transfer?
+      details: Details
+      note_label: Notes
+      note_placeholder: Add a note to this transfer
+      overview: Overview
+      settings: Settings
+    update:
+      success: Transfer updated
diff --git a/config/locales/views/upgrades/en.yml b/config/locales/views/upgrades/en.yml
deleted file mode 100644
index b6dd9708..00000000
--- a/config/locales/views/upgrades/en.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-en:
-  upgrades:
-    acknowledge:
-      upgrade_complete_dismiss: We hope you enjoy the new features!
-      upgrade_dismissed: Upgrade dismissed
-      upgrade_not_available: Upgrade not available
-      upgrade_not_found: Upgrade not found
-    deploy:
-      upgrade_not_found: Upgrade not found
diff --git a/config/locales/views/users/en.yml b/config/locales/views/users/en.yml
new file mode 100644
index 00000000..e04ebc8c
--- /dev/null
+++ b/config/locales/views/users/en.yml
@@ -0,0 +1,13 @@
+---
+en:
+  users:
+    destroy:
+      success: Your account has been deleted.
+    update:
+      email_change_failed: Failed to change email address.
+      email_change_initiated: Please check your new email address for confirmation
+        instructions.
+      success: Your profile has been updated.
+    reset:
+      success: Your account has been reset. Data will be deleted in the background in some time.
+      unauthorized: You are not authorized to perform this action
diff --git a/config/locales/views/valuations/en.yml b/config/locales/views/valuations/en.yml
new file mode 100644
index 00000000..7b4ede9d
--- /dev/null
+++ b/config/locales/views/valuations/en.yml
@@ -0,0 +1,30 @@
+---
+en:
+  valuations:
+    form:
+      amount: Amount
+      submit: Add balance update
+    header:
+      balance: Balance
+    index:
+      change: change
+      date: date
+      new_entry: New entry
+      no_valuations: No valuations for this account yet
+      valuations: Value
+      value: value
+    new:
+      title: New balance
+    show:
+      amount: Amount
+      date_label: Date
+      delete: Delete
+      delete_subtitle: This action cannot be undone
+      delete_title: Delete Entry
+      details: Details
+      name_label: Name
+      name_placeholder: Enter a name for this entry
+      note_label: Notes
+      note_placeholder: Add any additional details about this entry
+      overview: Overview
+      settings: Settings
diff --git a/config/locales/views/vehicles/en.yml b/config/locales/views/vehicles/en.yml
index 73e0b8e5..03ed5225 100644
--- a/config/locales/views/vehicles/en.yml
+++ b/config/locales/views/vehicles/en.yml
@@ -1,7 +1,25 @@
 ---
 en:
   vehicles:
-    create:
-      success: Vehicle created successfully
-    update:
-      success: Vehicle updated successfully
+    edit:
+      edit: Edit %{account}
+    form:
+      make: Make
+      make_placeholder: Toyota
+      mileage: Mileage
+      mileage_placeholder: '15000'
+      mileage_unit: Unit
+      model: Model
+      model_placeholder: Camry
+      year: Year
+      year_placeholder: '2023'
+    new:
+      title: Enter vehicle details
+    overview:
+      current_price: Current Price
+      make_model: Make & Model
+      mileage: Mileage
+      purchase_price: Purchase Price
+      trend: Trend
+      unknown: Unknown
+      year: Year
diff --git a/config/routes.rb b/config/routes.rb
index 9a84ce22..e2817432 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,44 +1,103 @@
+require "sidekiq/web"
+require "sidekiq/cron/web"
+
 Rails.application.routes.draw do
-  mount GoodJob::Engine => "jobs"
+  use_doorkeeper
+  # MFA routes
+  resource :mfa, controller: "mfa", only: [ :new, :create ] do
+    get :verify
+    post :verify, to: "mfa#verify_code"
+    delete :disable
+  end
+
+  mount Lookbook::Engine, at: "/design-system"
+
+  # Uses basic auth - see config/initializers/sidekiq.rb
+  mount Sidekiq::Web => "/sidekiq"
+
+  # AI chats
+  resources :chats do
+    resources :messages, only: :create
+
+    member do
+      post :retry
+    end
+  end
 
   get "changelog", to: "pages#changelog"
   get "feedback", to: "pages#feedback"
-  get "early-access", to: "pages#early_access"
 
-  resource :registration
+  resource :current_session, only: %i[update]
+
+  resource :registration, only: %i[new create]
   resources :sessions, only: %i[new create destroy]
-  resource :password_reset
-  resource :password
+  resource :password_reset, only: %i[new create edit update]
+  resource :password, only: %i[edit update]
+  resource :email_confirmation, only: :new
 
-  namespace :settings do
-    resource :profile, only: %i[show update destroy]
-    resource :preferences, only: %i[show update]
-    resource :hosting, only: %i[show update]
-    resource :billing, only: :show
+  resources :users, only: %i[update destroy] do
+    delete :reset, on: :member
+    patch :rule_prompt_settings, on: :member
   end
 
-  resource :subscription, only: %i[new show]
+  resource :onboarding, only: :show do
+    collection do
+      get :preferences
+      get :goals
+      get :trial
+    end
+  end
 
-  resources :tags, except: %i[show destroy] do
+  namespace :settings do
+    resource :profile, only: [ :show, :destroy ]
+    resource :preferences, only: :show
+    resource :hosting, only: %i[show update] do
+      delete :clear_cache, on: :collection
+    end
+    resource :billing, only: :show
+    resource :security, only: :show
+    resource :api_key, only: [ :show, :new, :create, :destroy ]
+  end
+
+  resource :subscription, only: %i[new show create] do
+    collection do
+      get :upgrade
+      get :success
+    end
+  end
+
+  resources :tags, except: :show do
     resources :deletions, only: %i[new create], module: :tag
+    delete :destroy_all, on: :collection
   end
 
   namespace :category do
     resource :dropdown, only: :show
   end
 
-  resources :categories do
+  resources :categories, except: :show do
     resources :deletions, only: %i[new create], module: :category
+
+    post :bootstrap, on: :collection
+    delete :destroy_all, on: :collection
   end
 
-  resources :merchants, only: %i[index new create edit update destroy]
+  resources :budgets, only: %i[index show edit update], param: :month_year do
+    get :picker, on: :collection
 
-  namespace :account do
-    resources :transfers, only: %i[new create destroy]
+    resources :budget_categories, only: %i[index show update]
   end
 
+  resources :family_merchants, only: %i[index new create edit update destroy]
+
+  resources :transfers, only: %i[new create destroy show update]
+
   resources :imports, only: %i[index new show create destroy] do
-    post :publish, on: :member
+    member do
+      post :publish
+      put :revert
+      put :apply_template
+    end
 
     resource :upload, only: %i[show update], module: :import
     resource :configuration, only: %i[show update], module: :import
@@ -49,69 +108,146 @@ Rails.application.routes.draw do
     resources :mappings, only: :update, module: :import
   end
 
-  resources :accounts do
+  resources :holdings, only: %i[index new show destroy]
+  resources :trades, only: %i[show new create update destroy]
+  resources :valuations, only: %i[show new create update destroy] do
+    post :confirm_create, on: :collection
+    post :confirm_update, on: :member
+  end
+
+  namespace :transactions do
+    resource :bulk_deletion, only: :create
+    resource :bulk_update, only: %i[new create]
+  end
+
+  resources :transactions, only: %i[index new create show update destroy] do
+    resource :transfer_match, only: %i[new create]
+    resource :category, only: :update, controller: :transaction_categories
+
     collection do
-      get :summary
-      get :list
-      post :sync_all
+      delete :clear_filter
+    end
+  end
+
+  resources :accountable_sparklines, only: :show, param: :accountable_type
+
+  direct :entry do |entry, options|
+    if entry.new_record?
+      route_for entry.entryable_name.pluralize, options
+    else
+      route_for entry.entryable_name, entry, options
+    end
+  end
+
+  resources :rules, except: :show do
+    member do
+      get :confirm
+      post :apply
     end
 
+    collection do
+      delete :destroy_all
+    end
+  end
+
+  resources :accounts, only: %i[index new show destroy], shallow: true do
     member do
       post :sync
-    end
-
-    scope module: :account do
-      resource :logo, only: :show
-
-      resources :holdings, only: %i[index new show destroy]
-      resources :cashes, only: :index
-
-      resources :transactions, only: %i[index update]
-      resources :valuations, only: %i[index new create]
-      resources :trades, only: %i[index new create update]
-
-      resources :entries, only: %i[edit update show destroy]
+      get :sparkline
+      patch :toggle_active
     end
   end
 
-  resources :properties, only: %i[create update]
-  resources :vehicles, only: %i[create update]
-  resources :credit_cards, only: %i[create update]
-  resources :loans, only: %i[create update]
+  # Convenience routes for polymorphic paths
+  # Example: account_path(Account.new(accountable: Depository.new)) => /depositories/123
+  direct :edit_account do |model, options|
+    route_for "edit_#{model.accountable_name}", model, options
+  end
 
-  resources :transactions, only: %i[index new create] do
-    collection do
-      post "bulk_delete"
-      get "bulk_edit"
-      post "bulk_update"
-      post "mark_transfers"
-      post "unmark_transfers"
+  resources :depositories, only: %i[new create edit update]
+  resources :investments, only: %i[new create edit update]
+  resources :properties, only: %i[new create edit update] do
+    member do
+      get :balances
+      patch :update_balances
+
+      get :address
+      patch :update_address
     end
   end
+  resources :vehicles, only: %i[new create edit update]
+  resources :credit_cards, only: %i[new create edit update]
+  resources :loans, only: %i[new create edit update]
+  resources :cryptos, only: %i[new create edit update]
+  resources :other_assets, only: %i[new create edit update]
+  resources :other_liabilities, only: %i[new create edit update]
+
+  resources :securities, only: :index
 
-  resources :institutions, except: %i[index show] do
-    post :sync, on: :member
-  end
   resources :invite_codes, only: %i[index create]
 
-  resources :issues, only: :show
-
-  namespace :issue do
-    resources :exchange_rate_provider_missings, only: :update
+  resources :invitations, only: [ :new, :create, :destroy ] do
+    get :accept, on: :member
   end
 
-  # For managing self-hosted upgrades and release notifications
-  resources :upgrades, only: [] do
-    member do
-      post :acknowledge
-      post :deploy
+  # API routes
+  namespace :api do
+    namespace :v1 do
+      # Authentication endpoints
+      post "auth/signup", to: "auth#signup"
+      post "auth/login", to: "auth#login"
+      post "auth/refresh", to: "auth#refresh"
+
+      # Production API endpoints
+      resources :accounts, only: [ :index ]
+      resources :transactions, only: [ :index, :show, :create, :update, :destroy ]
+      resource :usage, only: [ :show ], controller: "usage"
+
+      resources :chats, only: [ :index, :show, :create, :update, :destroy ] do
+        resources :messages, only: [ :create ] do
+          post :retry, on: :collection
+        end
+      end
+
+      # Test routes for API controller testing (only available in test environment)
+      if Rails.env.test?
+        get "test", to: "test#index"
+        get "test_not_found", to: "test#not_found"
+        get "test_family_access", to: "test#family_access"
+        get "test_scope_required", to: "test#scope_required"
+        get "test_multiple_scopes_required", to: "test#multiple_scopes_required"
+      end
     end
   end
 
+
+
   resources :currencies, only: %i[show]
 
-  # Stripe webhook endpoint
-  post "webhooks/stripe", to: "webhooks#stripe"
+  resources :impersonation_sessions, only: [ :create ] do
+    post :join, on: :collection
+    delete :leave, on: :collection
+
+    member do
+      put :approve
+      put :reject
+      put :complete
+    end
+  end
+
+  resources :plaid_items, only: %i[new edit create destroy] do
+    member do
+      post :sync
+    end
+  end
+
+  namespace :webhooks do
+    post "plaid"
+    post "plaid_eu"
+    post "stripe"
+  end
+
+  get "redis-configuration-error", to: "pages#redis_configuration_error"
 
   # Reveal health status on /up that returns 200 if the app boots with no exceptions, otherwise 500.
   # Can be used by load balancers and uptime monitors to verify that the app is live.
@@ -121,6 +257,11 @@ Rails.application.routes.draw do
   get "service-worker" => "rails/pwa#service_worker", as: :pwa_service_worker
   get "manifest" => "rails/pwa#manifest", as: :pwa_manifest
 
+  get "imports/:import_id/upload/sample_csv", to: "import/uploads#sample_csv", as: :import_upload_sample_csv
+
+  get "privacy", to: redirect("https://maybefinance.com/privacy")
+  get "terms", to: redirect("https://maybefinance.com/tos")
+
   # Defines the root path route ("/")
   root "pages#dashboard"
 end
diff --git a/config/schedule.yml b/config/schedule.yml
new file mode 100644
index 00000000..731cc49b
--- /dev/null
+++ b/config/schedule.yml
@@ -0,0 +1,20 @@
+import_market_data:
+  cron: "0 22 * * 1-5" # 5:00 PM EST / 6:00 PM EDT (NY time) Monday through Friday
+  class: "ImportMarketDataJob"
+  queue: "scheduled"
+  description: "Imports market data daily at 5:00 PM EST (1 hour after market close)"
+  args:
+    mode: "full"
+    clear_cache: false
+  
+clean_syncs:
+  cron: "0 * * * *" # every hour
+  class: "SyncCleanerJob"
+  queue: "scheduled"
+  description: "Cleans up stale syncs"
+
+run_security_health_checks:
+  cron: "0 2 * * 1-5" # 2:00 AM EST / 3:00 AM EDT (NY time) Monday through Friday
+  class: "SecurityHealthCheckJob"
+  queue: "scheduled"
+  description: "Runs security health checks to detect issues with security data"
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
new file mode 100644
index 00000000..4fce6f00
--- /dev/null
+++ b/config/sidekiq.yml
@@ -0,0 +1,7 @@
+concurrency: <%= ENV.fetch("RAILS_MAX_THREADS") { 3 } %>
+queues:
+  - [scheduled, 10] # For cron-like jobs (e.g. "daily market data sync")
+  - [high_priority, 4]
+  - [medium_priority, 2]
+  - [low_priority, 1]
+  - [default, 1]
diff --git a/config/storage.yml b/config/storage.yml
index 5b6fdc3f..c6acb48e 100644
--- a/config/storage.yml
+++ b/config/storage.yml
@@ -20,16 +20,6 @@ cloudflare:
   secret_access_key: <%= ENV['CLOUDFLARE_SECRET_ACCESS_KEY'] %>
   region: auto
   bucket: <%= ENV['CLOUDFLARE_BUCKET'] %>
-
-# Removed in #702.  Uncomment, add gems, update .env.example to enable.
-#google:
-#  service: GCS
-#  project: <%#= ENV["GCS_PROJECT"] %>
-#  credentials: <%#= Rails.root.join("gcp-storage-keyfile.json") %>
-#  bucket: <%#= ENV["GCS_BUCKET"] %>
-
-#azure:
-#  service: AzureStorage
-#  storage_account_name: <%#= ENV["AZURE_STORAGE_ACCOUNT_NAME"] %>
-#  storage_access_key: <%#= ENV["AZURE_STORAGE_ACCESS_KEY"] %>
-#  container: <%#= ENV["AZURE_STORAGE_CONTAINER"] %>
+  request_checksum_calculation: "when_required"
+  response_checksum_validation: "when_required"
+  
diff --git a/config/tailwind.config.js b/config/tailwind.config.js
deleted file mode 100644
index aa7cbf2e..00000000
--- a/config/tailwind.config.js
+++ /dev/null
@@ -1,96 +0,0 @@
-const defaultTheme = require("tailwindcss/defaultTheme");
-const colors = require("../app/javascript/tailwindColors");
-
-module.exports = {
-  content: [
-    "./public/*.html",
-    "./app/helpers/**/*.rb",
-    "./app/javascript/**/*.js",
-    "./app/views/**/*.{erb,haml,html,slim}",
-  ],
-  theme: {
-    colors,
-    boxShadow: {
-      none: "0 0 #0000",
-      inner: "inset 0 2px 4px 0 rgb(0 0 0 / 0.05)",
-      xs: "0px 1px 2px 0px rgba(11, 11, 11, 0.05)",
-      sm: "0px 1px 2px 0px rgba(11, 11, 11, 0.06), 0px 1px 3px 0px rgba(11, 11, 11, 0.10)",
-      md: "0px 2px 4px -2px rgba(11, 11, 11, 0.06), 0px 4px 8px -2px rgba(11, 11, 11, 0.10)",
-      lg: "0px 4px 6px -2px rgba(11, 11, 11, 0.03), 0px 12px 16px -4px rgba(11, 11, 11, 0.08)",
-      xl: "0px 8px 8px -4px rgba(11, 11, 11, 0.03), 0px 20px 24px -4px rgba(11, 11, 11, 0.08)",
-      "2xl": "0px 24px 48px -12px rgba(11, 11, 11, 0.12)",
-      "3xl": "0px 32px 64px -12px rgba(11, 11, 11, 0.14)",
-    },
-    borderRadius: {
-      none: "0",
-      full: "9999px",
-      xs: "2px",
-      sm: "4px",
-      md: "8px",
-      DEFAULT: "8px",
-      lg: "10px",
-      xl: "12px",
-      "2xl": "16px",
-      "3xl": "24px",
-    },
-    extend: {
-      fontFamily: {
-        display: ["Inter var", ...defaultTheme.fontFamily.sans],
-      },
-      fontSize: {
-        "2xs": ".625rem",
-      },
-      spacing: {
-        '40': '10rem',
-      },
-      keyframes: {
-        "appear-then-fade": {
-          "0%,100%": { opacity: 0 },
-          "5%,90%": { opacity: 1 },
-        },
-        "stroke-fill": {
-          to: { "stroke-dashoffset": 0 },
-        },
-      },
-      typography: (theme) => ({
-        DEFAULT: {
-          css: {
-            maxWidth: "none",
-            h2: {
-              fontSize: theme("fontSize.xl"),
-              fontWeight: theme("fontWeight.medium"),
-            },
-            h3: {
-              fontSize: theme("fontSize.lg"),
-              fontWeight: theme("fontWeight.medium"),
-            },
-            li: {
-              margin: 0,
-            },
-            details: {
-              borderRadius: "12px",
-              marginBottom: "0.875rem",
-              marginTop: "0.875rem",
-            },
-            summary: {
-              display: "flex",
-              alignItems: "center",
-              columnGap: "0.25rem",
-            },
-            video: {
-              margin: 0,
-              borderBottomLeftRadius: "12px",
-              borderBottomRightRadius: "12px",
-            },
-          },
-        },
-      }),
-    },
-  },
-  plugins: [
-    require("@tailwindcss/forms"),
-    require("@tailwindcss/aspect-ratio"),
-    require("@tailwindcss/typography"),
-    require("@tailwindcss/container-queries"),
-  ],
-};
diff --git a/db/migrate/20241009214601_add_super_admin_to_users.rb b/db/migrate/20241009214601_add_super_admin_to_users.rb
new file mode 100644
index 00000000..cc1fadb4
--- /dev/null
+++ b/db/migrate/20241009214601_add_super_admin_to_users.rb
@@ -0,0 +1,23 @@
+class AddSuperAdminToUsers < ActiveRecord::Migration[7.2]
+  def change
+    reversible do |dir|
+      dir.up do
+        change_column :users, :role, :string, default: 'member'
+
+        execute <<-SQL
+          DROP TYPE user_role;
+        SQL
+      end
+
+      dir.down do
+        execute <<-SQL
+          CREATE TYPE user_role AS ENUM ('admin', 'member');
+        SQL
+
+        change_column_default :users, :role, nil
+        change_column :users, :role, :user_role, using: 'role::user_role'
+        change_column_default :users, :role, 'member'
+      end
+    end
+  end
+end
diff --git a/db/migrate/20241017162347_create_impersonation_sessions.rb b/db/migrate/20241017162347_create_impersonation_sessions.rb
new file mode 100644
index 00000000..1e7cf38e
--- /dev/null
+++ b/db/migrate/20241017162347_create_impersonation_sessions.rb
@@ -0,0 +1,12 @@
+class CreateImpersonationSessions < ActiveRecord::Migration[7.2]
+  def change
+    create_table :impersonation_sessions, id: :uuid do |t|
+      t.references :impersonator, null: false, foreign_key: { to_table: :users }, type: :uuid
+      t.references :impersonated, null: false, foreign_key: { to_table: :users }, type: :uuid
+      t.string :status, null: false, default: 'pending'
+      t.timestamps
+    end
+
+    add_reference :sessions, :active_impersonator_session, type: :uuid, foreign_key: { to_table: :impersonation_sessions }
+  end
+end
diff --git a/db/migrate/20241017162536_create_impersonation_session_logs.rb b/db/migrate/20241017162536_create_impersonation_session_logs.rb
new file mode 100644
index 00000000..ebf68d91
--- /dev/null
+++ b/db/migrate/20241017162536_create_impersonation_session_logs.rb
@@ -0,0 +1,14 @@
+class CreateImpersonationSessionLogs < ActiveRecord::Migration[7.2]
+  def change
+    create_table :impersonation_session_logs, id: :uuid do |t|
+      t.references :impersonation_session, type: :uuid, foreign_key: true, null: false
+      t.string :controller
+      t.string :action
+      t.text :path
+      t.string :method
+      t.string :ip_address
+      t.text :user_agent
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20241017204250_add_accounts_indexes.rb b/db/migrate/20241017204250_add_accounts_indexes.rb
new file mode 100644
index 00000000..bdeb992f
--- /dev/null
+++ b/db/migrate/20241017204250_add_accounts_indexes.rb
@@ -0,0 +1,7 @@
+class AddAccountsIndexes < ActiveRecord::Migration[7.2]
+  def change
+    add_index :accounts, [ :family_id, :accountable_type ]
+    add_index :accounts, [ :accountable_id, :accountable_type ]
+    add_index :accounts, [ :family_id, :id ]
+  end
+end
diff --git a/db/migrate/20241018201653_add_account_mode.rb b/db/migrate/20241018201653_add_account_mode.rb
new file mode 100644
index 00000000..54a273d2
--- /dev/null
+++ b/db/migrate/20241018201653_add_account_mode.rb
@@ -0,0 +1,5 @@
+class AddAccountMode < ActiveRecord::Migration[7.2]
+  def change
+    add_column :accounts, :mode, :string
+  end
+end
diff --git a/db/migrate/20241022170439_create_stock_exchanges.rb b/db/migrate/20241022170439_create_stock_exchanges.rb
new file mode 100644
index 00000000..5eee20e4
--- /dev/null
+++ b/db/migrate/20241022170439_create_stock_exchanges.rb
@@ -0,0 +1,24 @@
+class CreateStockExchanges < ActiveRecord::Migration[7.2]
+  def change
+    create_table :stock_exchanges, id: :uuid do |t|
+      t.string :name, null: false
+      t.string :acronym
+      t.string :mic, null: false
+      t.string :country, null: false
+      t.string :country_code, null: false
+      t.string :city, null: false
+      t.string :website
+      t.string :timezone_name, null: false
+      t.string :timezone_abbr, null: false
+      t.string :timezone_abbr_dst
+      t.string :currency_code, null: false
+      t.string :currency_symbol, null: false
+      t.string :currency_name, null: false
+      t.timestamps
+    end
+
+    add_index :stock_exchanges, :country
+    add_index :stock_exchanges, :country_code
+    add_index :stock_exchanges, :currency_code
+  end
+end
diff --git a/db/migrate/20241022192319_fix_user_role_column_type.rb b/db/migrate/20241022192319_fix_user_role_column_type.rb
new file mode 100644
index 00000000..0a2b82fc
--- /dev/null
+++ b/db/migrate/20241022192319_fix_user_role_column_type.rb
@@ -0,0 +1,16 @@
+class FixUserRoleColumnType < ActiveRecord::Migration[7.2]
+  def change
+    # First remove any constraints/references to the enum
+    execute <<-SQL
+      ALTER TABLE users ALTER COLUMN role TYPE varchar USING role::text;
+    SQL
+
+    # Then set the default
+    change_column_default :users, :role, 'member'
+
+    # Finally drop the enum type
+    execute <<-SQL
+      DROP TYPE IF EXISTS user_role;
+    SQL
+  end
+end
diff --git a/db/migrate/20241022221544_add_onboarding_fields.rb b/db/migrate/20241022221544_add_onboarding_fields.rb
new file mode 100644
index 00000000..53119d81
--- /dev/null
+++ b/db/migrate/20241022221544_add_onboarding_fields.rb
@@ -0,0 +1,7 @@
+class AddOnboardingFields < ActiveRecord::Migration[7.2]
+  def change
+    add_column :users, :onboarded_at, :datetime
+    add_column :families, :date_format, :string, default: "%m-%d-%Y"
+    add_column :families, :country, :string, default: "US"
+  end
+end
diff --git a/db/migrate/20241023195438_add_stock_exchange_reference.rb b/db/migrate/20241023195438_add_stock_exchange_reference.rb
new file mode 100644
index 00000000..a07588b2
--- /dev/null
+++ b/db/migrate/20241023195438_add_stock_exchange_reference.rb
@@ -0,0 +1,7 @@
+class AddStockExchangeReference < ActiveRecord::Migration[7.2]
+  def change
+    add_column :securities, :country_code, :string
+    add_reference :securities, :stock_exchange, type: :uuid, foreign_key: true
+    add_index :securities, :country_code
+  end
+end
diff --git a/db/migrate/20241024142537_add_subscription_timestamp_to_session.rb b/db/migrate/20241024142537_add_subscription_timestamp_to_session.rb
new file mode 100644
index 00000000..0f9677a2
--- /dev/null
+++ b/db/migrate/20241024142537_add_subscription_timestamp_to_session.rb
@@ -0,0 +1,5 @@
+class AddSubscriptionTimestampToSession < ActiveRecord::Migration[7.2]
+  def change
+    add_column :sessions, :subscribed_at, :datetime
+  end
+end
diff --git a/db/migrate/20241025174650_add_mic_to_securities.rb b/db/migrate/20241025174650_add_mic_to_securities.rb
new file mode 100644
index 00000000..1d907141
--- /dev/null
+++ b/db/migrate/20241025174650_add_mic_to_securities.rb
@@ -0,0 +1,10 @@
+class AddMicToSecurities < ActiveRecord::Migration[7.2]
+  def change
+    add_column :securities, :exchange_mic, :string
+    add_column :securities, :exchange_acronym, :string
+
+    remove_column :securities, :stock_exchange_id, :uuid
+
+    add_index :securities, [ :ticker, :exchange_mic ], unique: true
+  end
+end
diff --git a/db/migrate/20241025182612_add_search_vector_to_securities.rb b/db/migrate/20241025182612_add_search_vector_to_securities.rb
new file mode 100644
index 00000000..67617e31
--- /dev/null
+++ b/db/migrate/20241025182612_add_search_vector_to_securities.rb
@@ -0,0 +1,6 @@
+class AddSearchVectorToSecurities < ActiveRecord::Migration[7.2]
+  def change
+    add_column :securities, :search_vector, :virtual, type: :tsvector, as: "setweight(to_tsvector('simple', coalesce(ticker, '')), 'B') || to_tsvector('simple', coalesce(name, ''))", stored: true
+    add_index :securities, :search_vector, using: :gin
+  end
+end
diff --git a/db/migrate/20241029125406_add_reference_to_security_prices.rb b/db/migrate/20241029125406_add_reference_to_security_prices.rb
new file mode 100644
index 00000000..87a7ec2c
--- /dev/null
+++ b/db/migrate/20241029125406_add_reference_to_security_prices.rb
@@ -0,0 +1,14 @@
+class AddReferenceToSecurityPrices < ActiveRecord::Migration[7.2]
+  def change
+    add_reference :security_prices, :security, foreign_key: true, type: :uuid
+
+    reversible do |dir|
+      dir.up do
+        Security::Price.find_each do |sp|
+          security = Security.find_by(ticker: sp.ticker)
+          sp.update_column(:security_id, security&.id)
+        end
+      end
+    end
+  end
+end
diff --git a/db/migrate/20241029184115_remove_prices_missing_issue.rb b/db/migrate/20241029184115_remove_prices_missing_issue.rb
new file mode 100644
index 00000000..535698c6
--- /dev/null
+++ b/db/migrate/20241029184115_remove_prices_missing_issue.rb
@@ -0,0 +1,9 @@
+class RemovePricesMissingIssue < ActiveRecord::Migration[7.2]
+  def up
+    execute "DELETE FROM issues WHERE type = 'Issue::PricesMissing'"
+  end
+
+  def down
+    # Cannot restore deleted issues since we don't have the original data
+  end
+end
diff --git a/db/migrate/20241029234028_remove_search_vector.rb b/db/migrate/20241029234028_remove_search_vector.rb
new file mode 100644
index 00000000..99d94602
--- /dev/null
+++ b/db/migrate/20241029234028_remove_search_vector.rb
@@ -0,0 +1,5 @@
+class RemoveSearchVector < ActiveRecord::Migration[7.2]
+  def change
+    remove_column :securities, :search_vector
+  end
+end
diff --git a/db/migrate/20241030121302_fix_not_null_stock_exchange_data.rb b/db/migrate/20241030121302_fix_not_null_stock_exchange_data.rb
new file mode 100644
index 00000000..9a1f1012
--- /dev/null
+++ b/db/migrate/20241030121302_fix_not_null_stock_exchange_data.rb
@@ -0,0 +1,10 @@
+class FixNotNullStockExchangeData < ActiveRecord::Migration[7.2]
+  def change
+    change_column_null :stock_exchanges, :currency_code, true
+    change_column_null :stock_exchanges, :currency_symbol, true
+    change_column_null :stock_exchanges, :currency_name, true
+    change_column_null :stock_exchanges, :city, true
+    change_column_null :stock_exchanges, :timezone_name, true
+    change_column_null :stock_exchanges, :timezone_abbr, true
+  end
+end
diff --git a/db/migrate/20241030151105_remove_account_mode.rb b/db/migrate/20241030151105_remove_account_mode.rb
new file mode 100644
index 00000000..7c01db1d
--- /dev/null
+++ b/db/migrate/20241030151105_remove_account_mode.rb
@@ -0,0 +1,5 @@
+class RemoveAccountMode < ActiveRecord::Migration[7.2]
+  def change
+    remove_column :accounts, :mode
+  end
+end
diff --git a/db/migrate/20241030222235_create_invitations.rb b/db/migrate/20241030222235_create_invitations.rb
new file mode 100644
index 00000000..7b7b2638
--- /dev/null
+++ b/db/migrate/20241030222235_create_invitations.rb
@@ -0,0 +1,18 @@
+class CreateInvitations < ActiveRecord::Migration[7.2]
+  def change
+    create_table :invitations, id: :uuid do |t|
+      t.string :email
+      t.string :role
+      t.string :token
+      t.references :family, null: false, foreign_key: true, type: :uuid
+      t.references :inviter, null: false, foreign_key: { to_table: :users }, type: :uuid
+      t.datetime :accepted_at
+      t.datetime :expires_at
+
+      t.timestamps
+    end
+
+    add_index :invitations, :token, unique: true
+    add_index :invitations, :email
+  end
+end
diff --git a/db/migrate/20241106193743_add_plaid_domain.rb b/db/migrate/20241106193743_add_plaid_domain.rb
new file mode 100644
index 00000000..582b8e9d
--- /dev/null
+++ b/db/migrate/20241106193743_add_plaid_domain.rb
@@ -0,0 +1,56 @@
+class AddPlaidDomain < ActiveRecord::Migration[7.2]
+  def change
+    create_table :plaid_items, id: :uuid do |t|
+      t.references :family, null: false, type: :uuid, foreign_key: true
+      t.string :access_token
+      t.string :plaid_id
+      t.string :name
+      t.string :next_cursor
+      t.boolean :scheduled_for_deletion, default: false
+
+      t.timestamps
+    end
+
+    create_table :plaid_accounts, id: :uuid do |t|
+      t.references :plaid_item, null: false, type: :uuid, foreign_key: true
+      t.string :plaid_id
+      t.string :plaid_type
+      t.string :plaid_subtype
+      t.decimal :current_balance, precision: 19, scale: 4
+      t.decimal :available_balance, precision: 19, scale: 4
+      t.string :currency
+      t.string :name
+      t.string :mask
+
+      t.timestamps
+    end
+
+    create_table :syncs, id: :uuid do |t|
+      t.references :syncable, polymorphic: true, null: false, type: :uuid
+      t.datetime :last_ran_at
+      t.date :start_date
+      t.string :status, default: "pending"
+      t.string :error
+      t.jsonb :data
+
+      t.timestamps
+    end
+
+    remove_column :families, :last_synced_at, :datetime
+    add_column :families, :last_auto_synced_at, :datetime
+    remove_column :accounts, :last_sync_date, :date
+    remove_reference :accounts, :institution
+    add_reference :accounts, :plaid_account, type: :uuid, foreign_key: true
+
+    add_column :account_entries, :plaid_id, :string
+    add_column :accounts, :scheduled_for_deletion, :boolean, default: false
+
+    drop_table :account_syncs do |t|
+      t.timestamps
+    end
+
+    drop_table :institutions do |t|
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20241108150422_add_unique_email_index_to_invitations.rb b/db/migrate/20241108150422_add_unique_email_index_to_invitations.rb
new file mode 100644
index 00000000..ab5bf08f
--- /dev/null
+++ b/db/migrate/20241108150422_add_unique_email_index_to_invitations.rb
@@ -0,0 +1,5 @@
+class AddUniqueEmailIndexToInvitations < ActiveRecord::Migration[7.2]
+  def change
+    add_index :invitations, [ :email, :family_id ], unique: true
+  end
+end
diff --git a/db/migrate/20241114164118_add_products_to_plaid_item.rb b/db/migrate/20241114164118_add_products_to_plaid_item.rb
new file mode 100644
index 00000000..d19f53c3
--- /dev/null
+++ b/db/migrate/20241114164118_add_products_to_plaid_item.rb
@@ -0,0 +1,10 @@
+class AddProductsToPlaidItem < ActiveRecord::Migration[7.2]
+  def change
+    add_column :plaid_items, :available_products, :string, array: true, default: []
+    add_column :plaid_items, :billed_products, :string, array: true, default: []
+
+    rename_column :families, :last_auto_synced_at, :last_synced_at
+    add_column :plaid_items, :last_synced_at, :datetime
+    add_column :accounts, :last_synced_at, :datetime
+  end
+end
diff --git a/db/migrate/20241122183828_change_loan_interest_rate_precision.rb.rb b/db/migrate/20241122183828_change_loan_interest_rate_precision.rb.rb
new file mode 100644
index 00000000..45a5d59e
--- /dev/null
+++ b/db/migrate/20241122183828_change_loan_interest_rate_precision.rb.rb
@@ -0,0 +1,5 @@
+class ChangeLoanInterestRatePrecision < ActiveRecord::Migration[7.2]
+  def change
+    change_column :loans, :interest_rate, :decimal, precision: 10, scale: 3
+  end
+end
diff --git a/db/migrate/20241126211249_add_logo_url_to_security.rb b/db/migrate/20241126211249_add_logo_url_to_security.rb
new file mode 100644
index 00000000..e265424d
--- /dev/null
+++ b/db/migrate/20241126211249_add_logo_url_to_security.rb
@@ -0,0 +1,5 @@
+class AddLogoUrlToSecurity < ActiveRecord::Migration[7.2]
+  def change
+    add_column :securities, :logo_url, :string
+  end
+end
diff --git a/db/migrate/20241204235400_add_balance_components.rb b/db/migrate/20241204235400_add_balance_components.rb
new file mode 100644
index 00000000..4b5dd206
--- /dev/null
+++ b/db/migrate/20241204235400_add_balance_components.rb
@@ -0,0 +1,6 @@
+class AddBalanceComponents < ActiveRecord::Migration[7.2]
+  def change
+    add_column :accounts, :cash_balance, :decimal, precision: 19, scale: 4, default: 0
+    add_column :account_balances, :cash_balance, :decimal, precision: 19, scale: 4, default: 0
+  end
+end
diff --git a/db/migrate/20241207002408_add_family_timezone.rb b/db/migrate/20241207002408_add_family_timezone.rb
new file mode 100644
index 00000000..b8d3fb76
--- /dev/null
+++ b/db/migrate/20241207002408_add_family_timezone.rb
@@ -0,0 +1,5 @@
+class AddFamilyTimezone < ActiveRecord::Migration[7.2]
+  def change
+    add_column :families, :timezone, :string
+  end
+end
diff --git a/db/migrate/20241212141453_add_merchant_logo.rb b/db/migrate/20241212141453_add_merchant_logo.rb
new file mode 100644
index 00000000..81bd198c
--- /dev/null
+++ b/db/migrate/20241212141453_add_merchant_logo.rb
@@ -0,0 +1,8 @@
+class AddMerchantLogo < ActiveRecord::Migration[7.2]
+  def change
+    add_column :merchants, :icon_url, :string
+    add_column :merchants, :enriched_at, :datetime
+
+    add_column :account_entries, :enriched_at, :datetime
+  end
+end
diff --git a/db/migrate/20241217141716_add_enrichment_setting.rb b/db/migrate/20241217141716_add_enrichment_setting.rb
new file mode 100644
index 00000000..8d154887
--- /dev/null
+++ b/db/migrate/20241217141716_add_enrichment_setting.rb
@@ -0,0 +1,5 @@
+class AddEnrichmentSetting < ActiveRecord::Migration[7.2]
+  def change
+    add_column :families, :data_enrichment_enabled, :boolean, default: false
+  end
+end
diff --git a/db/migrate/20241218132503_add_enriched_name_field.rb b/db/migrate/20241218132503_add_enriched_name_field.rb
new file mode 100644
index 00000000..08d837c4
--- /dev/null
+++ b/db/migrate/20241218132503_add_enriched_name_field.rb
@@ -0,0 +1,37 @@
+class AddEnrichedNameField < ActiveRecord::Migration[7.2]
+  def change
+    add_column :account_entries, :enriched_name, :string
+
+    reversible do |dir|
+      dir.up do
+        execute <<-SQL
+          UPDATE account_entries ae
+          SET name = CASE ae.entryable_type
+            WHEN 'Account::Trade' THEN
+              CASE
+                WHEN EXISTS (
+                  SELECT 1 FROM account_trades t
+                  WHERE t.id = ae.entryable_id AND t.qty < 0
+                ) THEN 'Sell trade'
+                ELSE 'Buy trade'
+              END
+            WHEN 'Account::Transaction' THEN
+              CASE
+                WHEN ae.amount > 0 THEN 'Expense'
+                ELSE 'Income'
+              END
+            WHEN 'Account::Valuation' THEN 'Balance update'
+            ELSE 'Unknown entry'
+          END
+          WHERE name IS NULL
+        SQL
+
+        change_column_null :account_entries, :name, false
+      end
+
+      dir.down do
+        change_column_null :account_entries, :name, true
+      end
+    end
+  end
+end
diff --git a/db/migrate/20241219151540_add_region_to_plaid_item.rb b/db/migrate/20241219151540_add_region_to_plaid_item.rb
new file mode 100644
index 00000000..55e96075
--- /dev/null
+++ b/db/migrate/20241219151540_add_region_to_plaid_item.rb
@@ -0,0 +1,5 @@
+class AddRegionToPlaidItem < ActiveRecord::Migration[7.2]
+  def change
+    add_column :plaid_items, :plaid_region, :string, null: false, default: "us"
+  end
+end
diff --git a/db/migrate/20241219174803_add_parent_category.rb b/db/migrate/20241219174803_add_parent_category.rb
new file mode 100644
index 00000000..85457d08
--- /dev/null
+++ b/db/migrate/20241219174803_add_parent_category.rb
@@ -0,0 +1,6 @@
+class AddParentCategory < ActiveRecord::Migration[7.2]
+  def change
+    add_column :categories, :parent_id, :uuid
+    remove_column :categories, :internal_category, :string
+  end
+end
diff --git a/db/migrate/20241227142333_add_error_trace_to_syncs.rb b/db/migrate/20241227142333_add_error_trace_to_syncs.rb
new file mode 100644
index 00000000..41c3f5bc
--- /dev/null
+++ b/db/migrate/20241227142333_add_error_trace_to_syncs.rb
@@ -0,0 +1,5 @@
+class AddErrorTraceToSyncs < ActiveRecord::Migration[7.2]
+  def change
+    add_column :syncs, :error_backtrace, :text, array: true
+  end
+end
diff --git a/db/migrate/20241231140709_reverse_transfer_relations.rb b/db/migrate/20241231140709_reverse_transfer_relations.rb
new file mode 100644
index 00000000..5dbfe795
--- /dev/null
+++ b/db/migrate/20241231140709_reverse_transfer_relations.rb
@@ -0,0 +1,75 @@
+class ReverseTransferRelations < ActiveRecord::Migration[7.2]
+  def change
+    create_table :transfers, id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+      t.references :inflow_transaction, null: false, foreign_key: { to_table: :account_transactions }, type: :uuid
+      t.references :outflow_transaction, null: false, foreign_key: { to_table: :account_transactions }, type: :uuid
+      t.string :status, null: false, default: "pending"
+      t.text :notes
+
+      t.index [ :inflow_transaction_id, :outflow_transaction_id ], unique: true
+      t.timestamps
+    end
+
+    reversible do |dir|
+      dir.up do
+        execute <<~SQL
+          INSERT INTO transfers (inflow_transaction_id, outflow_transaction_id, status, created_at, updated_at)
+          SELECT
+            CASE WHEN e1.amount <= 0 THEN e1.entryable_id ELSE e2.entryable_id END as inflow_transaction_id,
+            CASE WHEN e1.amount <= 0 THEN e2.entryable_id ELSE e1.entryable_id END as outflow_transaction_id,
+            'confirmed' as status,
+            e1.created_at,
+            e1.updated_at
+          FROM account_entries e1
+          JOIN account_entries e2 ON
+            e1.transfer_id = e2.transfer_id AND
+            e1.id != e2.id AND
+            e1.id < e2.id -- Ensures we don't duplicate transfers from both sides
+          JOIN accounts a1 ON e1.account_id = a1.id
+          JOIN accounts a2 ON e2.account_id = a2.id
+          WHERE
+            e1.entryable_type = 'Account::Transaction' AND
+            e2.entryable_type = 'Account::Transaction' AND
+            e1.transfer_id IS NOT NULL AND
+            a1.family_id = a2.family_id;
+        SQL
+      end
+
+      dir.down do
+        execute <<~SQL
+          WITH new_transfers AS (
+            INSERT INTO account_transfers (created_at, updated_at)
+            SELECT created_at, updated_at
+            FROM transfers
+            RETURNING id, created_at
+          ),
+          transfer_pairs AS (
+            SELECT
+              nt.id as transfer_id,
+              ae_in.id as inflow_entry_id,
+              ae_out.id as outflow_entry_id
+            FROM transfers t
+            JOIN new_transfers nt ON nt.created_at = t.created_at
+            JOIN account_entries ae_in ON ae_in.entryable_id = t.inflow_transaction_id
+            JOIN account_entries ae_out ON ae_out.entryable_id = t.outflow_transaction_id
+            WHERE
+              ae_in.entryable_type = 'Account::Transaction' AND
+              ae_out.entryable_type = 'Account::Transaction'
+          )
+          UPDATE account_entries ae
+          SET transfer_id = tp.transfer_id
+          FROM transfer_pairs tp
+          WHERE ae.id IN (tp.inflow_entry_id, tp.outflow_entry_id);
+        SQL
+      end
+    end
+
+    remove_foreign_key :account_entries, :account_transfers, column: :transfer_id
+    remove_column :account_entries, :transfer_id, :uuid
+    remove_column :account_entries, :marked_as_transfer, :boolean
+
+    drop_table :account_transfers, id: :uuid, default: -> { "gen_random_uuid()" } do |t|
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20250108182147_create_budgets.rb b/db/migrate/20250108182147_create_budgets.rb
new file mode 100644
index 00000000..72a0f046
--- /dev/null
+++ b/db/migrate/20250108182147_create_budgets.rb
@@ -0,0 +1,15 @@
+class CreateBudgets < ActiveRecord::Migration[7.2]
+  def change
+    create_table :budgets, id: :uuid do |t|
+      t.references :family, null: false, foreign_key: true, type: :uuid
+      t.date :start_date, null: false
+      t.date :end_date, null: false
+      t.decimal :budgeted_spending, precision: 19, scale: 4
+      t.decimal :expected_income, precision: 19, scale: 4
+      t.string :currency, null: false
+      t.timestamps
+    end
+
+    add_index :budgets, %i[family_id start_date end_date], unique: true
+  end
+end
diff --git a/db/migrate/20250108200055_create_budget_categories.rb b/db/migrate/20250108200055_create_budget_categories.rb
new file mode 100644
index 00000000..d248884f
--- /dev/null
+++ b/db/migrate/20250108200055_create_budget_categories.rb
@@ -0,0 +1,13 @@
+class CreateBudgetCategories < ActiveRecord::Migration[7.2]
+  def change
+    create_table :budget_categories, id: :uuid do |t|
+      t.references :budget, null: false, foreign_key: true, type: :uuid
+      t.references :category, null: false, foreign_key: true, type: :uuid
+      t.decimal :budgeted_spending, null: false, precision: 19, scale: 4
+      t.string :currency, null: false
+      t.timestamps
+    end
+
+    add_index :budget_categories, %i[budget_id category_id], unique: true
+  end
+end
diff --git a/db/migrate/20250110012347_category_classification.rb b/db/migrate/20250110012347_category_classification.rb
new file mode 100644
index 00000000..a204bc42
--- /dev/null
+++ b/db/migrate/20250110012347_category_classification.rb
@@ -0,0 +1,17 @@
+class CategoryClassification < ActiveRecord::Migration[7.2]
+  def change
+    add_column :categories, :classification, :string, null: false, default: "expense"
+    add_column :categories, :lucide_icon, :string
+
+    # Attempt to update existing user categories that are likely to be income
+    reversible do |dir|
+      dir.up do
+        execute <<-SQL
+          UPDATE categories
+          SET classification = 'income'
+          WHERE lower(name) in ('income', 'incomes', 'other income', 'other incomes');
+        SQL
+      end
+    end
+  end
+end
diff --git a/db/migrate/20250120210449_align_transfer_cascade_behavior.rb b/db/migrate/20250120210449_align_transfer_cascade_behavior.rb
new file mode 100644
index 00000000..06b404d3
--- /dev/null
+++ b/db/migrate/20250120210449_align_transfer_cascade_behavior.rb
@@ -0,0 +1,14 @@
+class AlignTransferCascadeBehavior < ActiveRecord::Migration[7.2]
+  def change
+    remove_foreign_key :transfers, :account_transactions, column: :inflow_transaction_id
+    remove_foreign_key :transfers, :account_transactions, column: :outflow_transaction_id
+
+    add_foreign_key :transfers, :account_transactions,
+                    column: :inflow_transaction_id,
+                    on_delete: :cascade
+
+    add_foreign_key :transfers, :account_transactions,
+                    column: :outflow_transaction_id,
+                    on_delete: :cascade
+  end
+end
diff --git a/db/migrate/20250124224316_create_rejected_transfers.rb b/db/migrate/20250124224316_create_rejected_transfers.rb
new file mode 100644
index 00000000..3055a42b
--- /dev/null
+++ b/db/migrate/20250124224316_create_rejected_transfers.rb
@@ -0,0 +1,44 @@
+class CreateRejectedTransfers < ActiveRecord::Migration[7.2]
+  def change
+    create_table :rejected_transfers, id: :uuid do |t|
+      t.references :inflow_transaction, null: false, foreign_key: { to_table: :account_transactions }, type: :uuid
+      t.references :outflow_transaction, null: false, foreign_key: { to_table: :account_transactions }, type: :uuid
+      t.timestamps
+    end
+
+    add_index :rejected_transfers, [ :inflow_transaction_id, :outflow_transaction_id ], unique: true
+
+    reversible do |dir|
+      dir.up do
+        execute <<~SQL
+          INSERT INTO rejected_transfers (inflow_transaction_id, outflow_transaction_id, created_at, updated_at)
+          SELECT
+            inflow_transaction_id,
+            outflow_transaction_id,
+            created_at,
+            updated_at
+          FROM transfers
+          WHERE status = 'rejected'
+        SQL
+
+        execute <<~SQL
+          DELETE FROM transfers
+          WHERE status = 'rejected'
+        SQL
+      end
+
+      dir.down do
+        execute <<~SQL
+          INSERT INTO transfers (inflow_transaction_id, outflow_transaction_id, status, created_at, updated_at)
+          SELECT
+            inflow_transaction_id,
+            outflow_transaction_id,
+            'rejected',
+            created_at,
+            updated_at
+          FROM rejected_transfers
+        SQL
+      end
+    end
+  end
+end
diff --git a/db/migrate/20250128203303_store_transaction_filters_in_session.rb b/db/migrate/20250128203303_store_transaction_filters_in_session.rb
new file mode 100644
index 00000000..00c7ee5c
--- /dev/null
+++ b/db/migrate/20250128203303_store_transaction_filters_in_session.rb
@@ -0,0 +1,5 @@
+class StoreTransactionFiltersInSession < ActiveRecord::Migration[7.2]
+  def change
+    add_column :sessions, :prev_transaction_page_params, :jsonb, default: {}
+  end
+end
diff --git a/db/migrate/20250130191533_add_email_confirmation_to_users.rb b/db/migrate/20250130191533_add_email_confirmation_to_users.rb
new file mode 100644
index 00000000..ac929b48
--- /dev/null
+++ b/db/migrate/20250130191533_add_email_confirmation_to_users.rb
@@ -0,0 +1,9 @@
+class AddEmailConfirmationToUsers < ActiveRecord::Migration[7.2]
+  def change
+    add_column :users, :unconfirmed_email, :string
+    add_column :users, :email_confirmation_token, :string
+    add_column :users, :email_confirmation_sent_at, :datetime
+
+    add_index :users, :email_confirmation_token, unique: true
+  end
+end
diff --git a/db/migrate/20250130214500_remove_email_confirmation_sent_at_from_users.rb b/db/migrate/20250130214500_remove_email_confirmation_sent_at_from_users.rb
new file mode 100644
index 00000000..89533213
--- /dev/null
+++ b/db/migrate/20250130214500_remove_email_confirmation_sent_at_from_users.rb
@@ -0,0 +1,5 @@
+class RemoveEmailConfirmationSentAtFromUsers < ActiveRecord::Migration[7.2]
+  def change
+    remove_column :users, :email_confirmation_sent_at, :datetime
+  end
+end
diff --git a/db/migrate/20250131171943_remove_email_confirmation_token_from_users.rb b/db/migrate/20250131171943_remove_email_confirmation_token_from_users.rb
new file mode 100644
index 00000000..db1db8b8
--- /dev/null
+++ b/db/migrate/20250131171943_remove_email_confirmation_token_from_users.rb
@@ -0,0 +1,6 @@
+class RemoveEmailConfirmationTokenFromUsers < ActiveRecord::Migration[7.2]
+  def change
+    remove_index :users, :email_confirmation_token
+    remove_column :users, :email_confirmation_token, :string
+  end
+end
diff --git a/db/migrate/20250206003115_remove_import_status_enum.rb b/db/migrate/20250206003115_remove_import_status_enum.rb
new file mode 100644
index 00000000..2ea0866d
--- /dev/null
+++ b/db/migrate/20250206003115_remove_import_status_enum.rb
@@ -0,0 +1,21 @@
+class RemoveImportStatusEnum < ActiveRecord::Migration[7.2]
+  def up
+    change_column_default :imports, :status, nil
+    change_column :imports, :status, :string
+    execute "DROP TYPE IF EXISTS import_status"
+  end
+
+  def down
+    execute <<-SQL
+      CREATE TYPE import_status AS ENUM (
+        'pending',
+        'importing',
+        'complete',
+        'failed'
+      );
+    SQL
+
+    change_column :imports, :status, :import_status, using: 'status::import_status'
+    change_column_default :imports, :status, 'pending'
+  end
+end
diff --git a/db/migrate/20250206141452_add_institution_details_to_plaid_items.rb b/db/migrate/20250206141452_add_institution_details_to_plaid_items.rb
new file mode 100644
index 00000000..77d19aae
--- /dev/null
+++ b/db/migrate/20250206141452_add_institution_details_to_plaid_items.rb
@@ -0,0 +1,7 @@
+class AddInstitutionDetailsToPlaidItems < ActiveRecord::Migration[7.2]
+  def change
+    add_column :plaid_items, :institution_url, :string
+    add_column :plaid_items, :institution_id, :string
+    add_column :plaid_items, :institution_color, :string
+  end
+end
diff --git a/db/migrate/20250206151825_add_mfa_fields_to_users.rb b/db/migrate/20250206151825_add_mfa_fields_to_users.rb
new file mode 100644
index 00000000..d906a301
--- /dev/null
+++ b/db/migrate/20250206151825_add_mfa_fields_to_users.rb
@@ -0,0 +1,9 @@
+class AddMfaFieldsToUsers < ActiveRecord::Migration[7.2]
+  def change
+    add_column :users, :otp_secret, :string
+    add_column :users, :otp_required, :boolean, default: false, null: false
+    add_column :users, :otp_backup_codes, :string, array: true, default: []
+
+    add_index :users, :otp_secret, unique: true, where: "otp_secret IS NOT NULL"
+  end
+end
diff --git a/db/migrate/20250206204404_add_constraints_to_account_holdings.rb b/db/migrate/20250206204404_add_constraints_to_account_holdings.rb
new file mode 100644
index 00000000..d745346d
--- /dev/null
+++ b/db/migrate/20250206204404_add_constraints_to_account_holdings.rb
@@ -0,0 +1,40 @@
+class AddConstraintsToAccountHoldings < ActiveRecord::Migration[7.2]
+  def up
+    # First, remove any holdings with nil values
+    execute <<-SQL
+      DELETE FROM account_holdings#{' '}
+      WHERE date IS NULL#{' '}
+         OR qty IS NULL#{' '}
+         OR price IS NULL#{' '}
+         OR amount IS NULL#{' '}
+         OR currency IS NULL;
+    SQL
+
+    # Remove any holdings where amount doesn't match qty * price
+    execute <<-SQL
+      DELETE FROM account_holdings#{' '}
+      WHERE ROUND(qty * price, 4) != ROUND(amount, 4);
+    SQL
+
+    # Remove any holdings with negative values
+    execute <<-SQL
+      DELETE FROM account_holdings#{' '}
+      WHERE qty < 0 OR price < 0 OR amount < 0;
+    SQL
+
+    # Now add NOT NULL constraints
+    change_column_null :account_holdings, :date, false
+    change_column_null :account_holdings, :qty, false
+    change_column_null :account_holdings, :price, false
+    change_column_null :account_holdings, :amount, false
+    change_column_null :account_holdings, :currency, false
+  end
+
+  def down
+    change_column_null :account_holdings, :date, true
+    change_column_null :account_holdings, :qty, true
+    change_column_null :account_holdings, :price, true
+    change_column_null :account_holdings, :amount, true
+    change_column_null :account_holdings, :currency, true
+  end
+end
diff --git a/db/migrate/20250207011850_add_exchange_operating_mic_to_securities.rb b/db/migrate/20250207011850_add_exchange_operating_mic_to_securities.rb
new file mode 100644
index 00000000..cdd424f5
--- /dev/null
+++ b/db/migrate/20250207011850_add_exchange_operating_mic_to_securities.rb
@@ -0,0 +1,6 @@
+class AddExchangeOperatingMicToSecurities < ActiveRecord::Migration[7.2]
+  def change
+    add_column :securities, :exchange_operating_mic, :string
+    add_index :securities, :exchange_operating_mic
+  end
+end
diff --git a/db/migrate/20250207014022_add_number_format_to_imports.rb b/db/migrate/20250207014022_add_number_format_to_imports.rb
new file mode 100644
index 00000000..265fbc6b
--- /dev/null
+++ b/db/migrate/20250207014022_add_number_format_to_imports.rb
@@ -0,0 +1,5 @@
+class AddNumberFormatToImports < ActiveRecord::Migration[7.2]
+  def change
+    add_column :imports, :number_format, :string
+  end
+end
diff --git a/db/migrate/20250207194638_adjust_securities_indexes.rb b/db/migrate/20250207194638_adjust_securities_indexes.rb
new file mode 100644
index 00000000..b04d8de1
--- /dev/null
+++ b/db/migrate/20250207194638_adjust_securities_indexes.rb
@@ -0,0 +1,6 @@
+class AdjustSecuritiesIndexes < ActiveRecord::Migration[7.2]
+  def change
+    remove_index :securities, name: "index_securities_on_ticker_and_exchange_mic"
+    add_index :securities, [ :ticker, :exchange_operating_mic ], unique: true
+  end
+end
diff --git a/db/migrate/20250211161238_make_ticker_not_null.rb b/db/migrate/20250211161238_make_ticker_not_null.rb
new file mode 100644
index 00000000..ee22e6da
--- /dev/null
+++ b/db/migrate/20250211161238_make_ticker_not_null.rb
@@ -0,0 +1,5 @@
+class MakeTickerNotNull < ActiveRecord::Migration[7.2]
+  def change
+    change_column_null :securities, :ticker, false
+  end
+end
diff --git a/db/migrate/20250212163624_add_status_to_plaid_items.rb b/db/migrate/20250212163624_add_status_to_plaid_items.rb
new file mode 100644
index 00000000..16c23de6
--- /dev/null
+++ b/db/migrate/20250212163624_add_status_to_plaid_items.rb
@@ -0,0 +1,5 @@
+class AddStatusToPlaidItems < ActiveRecord::Migration[7.2]
+  def change
+    add_column :plaid_items, :status, :string, null: false, default: "good"
+  end
+end
diff --git a/db/migrate/20250212213301_add_user_sidebar_preference.rb b/db/migrate/20250212213301_add_user_sidebar_preference.rb
new file mode 100644
index 00000000..ee23c1f7
--- /dev/null
+++ b/db/migrate/20250212213301_add_user_sidebar_preference.rb
@@ -0,0 +1,5 @@
+class AddUserSidebarPreference < ActiveRecord::Migration[7.2]
+  def change
+    add_column :users, :show_sidebar, :boolean, default: true
+  end
+end
diff --git a/db/migrate/20250220153958_update_imports_for_operating_mic_v2.rb b/db/migrate/20250220153958_update_imports_for_operating_mic_v2.rb
new file mode 100644
index 00000000..11f10191
--- /dev/null
+++ b/db/migrate/20250220153958_update_imports_for_operating_mic_v2.rb
@@ -0,0 +1,6 @@
+class UpdateImportsForOperatingMicV2 < ActiveRecord::Migration[7.2]
+  def change
+    add_column :import_rows, :exchange_operating_mic, :string
+    add_column :imports, :exchange_operating_mic_col_label, :string
+  end
+end
diff --git a/db/migrate/20250220200735_add_default_lucide_icon_to_categories.rb b/db/migrate/20250220200735_add_default_lucide_icon_to_categories.rb
new file mode 100644
index 00000000..d4be6eea
--- /dev/null
+++ b/db/migrate/20250220200735_add_default_lucide_icon_to_categories.rb
@@ -0,0 +1,23 @@
+class AddDefaultLucideIconToCategories < ActiveRecord::Migration[7.2]
+  def up
+    execute <<-SQL
+      UPDATE categories
+      SET lucide_icon = 'shapes'
+      WHERE lucide_icon IS NULL
+    SQL
+
+    change_column_null :categories, :lucide_icon, false
+    change_column_default :categories, :lucide_icon, 'shapes'
+  end
+
+  def down
+    change_column_default :categories, :lucide_icon, nil
+    change_column_null :categories, :lucide_icon, true
+
+    execute <<-SQL
+      UPDATE categories
+      SET lucide_icon = NULL
+      WHERE lucide_icon = 'shapes'
+    SQL
+  end
+end
diff --git a/db/migrate/20250303141007_add_optional_account_for_import.rb b/db/migrate/20250303141007_add_optional_account_for_import.rb
new file mode 100644
index 00000000..52da03d9
--- /dev/null
+++ b/db/migrate/20250303141007_add_optional_account_for_import.rb
@@ -0,0 +1,5 @@
+class AddOptionalAccountForImport < ActiveRecord::Migration[7.2]
+  def change
+    rename_column :imports, :original_account_id, :account_id
+  end
+end
diff --git a/db/migrate/20250304140435_add_default_period_to_users.rb b/db/migrate/20250304140435_add_default_period_to_users.rb
new file mode 100644
index 00000000..ee2f5e2f
--- /dev/null
+++ b/db/migrate/20250304140435_add_default_period_to_users.rb
@@ -0,0 +1,5 @@
+class AddDefaultPeriodToUsers < ActiveRecord::Migration[7.2]
+  def change
+    add_column :users, :default_period, :string, default: "last_30_days", null: false
+  end
+end
diff --git a/db/migrate/20250304200956_add_signage_type_to_imports.rb b/db/migrate/20250304200956_add_signage_type_to_imports.rb
new file mode 100644
index 00000000..b9651850
--- /dev/null
+++ b/db/migrate/20250304200956_add_signage_type_to_imports.rb
@@ -0,0 +1,20 @@
+class AddSignageTypeToImports < ActiveRecord::Migration[7.2]
+  def change
+    change_column_default :imports, :date_col_label, from: "date", to: nil
+    change_column_default :imports, :amount_col_label, from: "amount", to: nil
+    change_column_default :imports, :name_col_label, from: "name", to: nil
+    change_column_default :imports, :category_col_label, from: "category", to: nil
+    change_column_default :imports, :tags_col_label, from: "tags", to: nil
+    change_column_default :imports, :account_col_label, from: "account", to: nil
+    change_column_default :imports, :qty_col_label, from: "qty", to: nil
+    change_column_default :imports, :ticker_col_label, from: "ticker", to: nil
+    change_column_default :imports, :price_col_label, from: "price", to: nil
+    change_column_default :imports, :entity_type_col_label, from: "entity_type", to: nil
+    change_column_default :imports, :notes_col_label, from: "notes", to: nil
+    change_column_default :imports, :currency_col_label, from: "currency", to: nil
+
+    # User can select "custom", then assign "debit" or "credit" (or custom value) to determine inflow/outflow of txn
+    add_column :imports, :amount_type_strategy, :string, default: "signed_amount"
+    add_column :imports, :amount_type_inflow_value, :string
+  end
+end
diff --git a/db/migrate/20250315191233_remove_ticker_from_security_prices.rb b/db/migrate/20250315191233_remove_ticker_from_security_prices.rb
new file mode 100644
index 00000000..6fd33f06
--- /dev/null
+++ b/db/migrate/20250315191233_remove_ticker_from_security_prices.rb
@@ -0,0 +1,5 @@
+class RemoveTickerFromSecurityPrices < ActiveRecord::Migration[7.2]
+  def change
+    remove_column :security_prices, :ticker
+  end
+end
diff --git a/db/migrate/20250316103753_remove_issues.rb b/db/migrate/20250316103753_remove_issues.rb
new file mode 100644
index 00000000..31ae4179
--- /dev/null
+++ b/db/migrate/20250316103753_remove_issues.rb
@@ -0,0 +1,11 @@
+class RemoveIssues < ActiveRecord::Migration[7.2]
+  def change
+    drop_table :issues do |t|
+      t.references :issuable, polymorphic: true, null: false
+      t.string :type, null: false
+      t.integer :severity, null: false
+      t.datetime :last_observed_at
+      t.datetime :resolved_at
+    end
+  end
+end
diff --git a/db/migrate/20250316122019_security_price_unique_index.rb b/db/migrate/20250316122019_security_price_unique_index.rb
new file mode 100644
index 00000000..4a8dea64
--- /dev/null
+++ b/db/migrate/20250316122019_security_price_unique_index.rb
@@ -0,0 +1,31 @@
+class SecurityPriceUniqueIndex < ActiveRecord::Migration[7.2]
+  def change
+    # First, we have to delete duplicate prices from DB so we can apply the unique index
+    reversible do |dir|
+      dir.up do
+        execute <<~SQL
+          DELETE FROM security_prices
+          WHERE id IN (
+            SELECT id FROM (
+              SELECT id,
+              ROW_NUMBER() OVER (
+                PARTITION BY security_id, date, currency
+                ORDER BY updated_at DESC, id DESC
+              ) as row_num
+              FROM security_prices
+            ) as duplicates
+            WHERE row_num > 1
+          );
+        SQL
+      end
+    end
+
+    add_index :security_prices, [ :security_id, :date, :currency ], unique: true
+    change_column_null :security_prices, :date, false
+    change_column_null :security_prices, :price, false
+    change_column_null :security_prices, :currency, false
+
+    change_column_null :exchange_rates, :date, false
+    change_column_null :exchange_rates, :rate, false
+  end
+end
diff --git a/db/migrate/20250318212559_remove_good_job.rb b/db/migrate/20250318212559_remove_good_job.rb
new file mode 100644
index 00000000..e3b79eb6
--- /dev/null
+++ b/db/migrate/20250318212559_remove_good_job.rb
@@ -0,0 +1,14 @@
+class RemoveGoodJob < ActiveRecord::Migration[7.2]
+  def up
+    drop_table :good_job_batches
+    drop_table :good_job_executions
+    drop_table :good_job_processes
+    drop_table :good_job_settings
+    drop_table :good_jobs
+  end
+
+  def down
+    # Add the tables back if needed - see schema.rb for the full table definitions
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20250319145426_remove_self_host_upgrades.rb b/db/migrate/20250319145426_remove_self_host_upgrades.rb
new file mode 100644
index 00000000..a69cd79a
--- /dev/null
+++ b/db/migrate/20250319145426_remove_self_host_upgrades.rb
@@ -0,0 +1,6 @@
+class RemoveSelfHostUpgrades < ActiveRecord::Migration[7.2]
+  def change
+    remove_column :users, :last_prompted_upgrade_commit_sha
+    remove_column :users, :last_alerted_upgrade_commit_sha
+  end
+end
diff --git a/db/migrate/20250319212839_create_ai_chats.rb b/db/migrate/20250319212839_create_ai_chats.rb
new file mode 100644
index 00000000..1a2bc9a5
--- /dev/null
+++ b/db/migrate/20250319212839_create_ai_chats.rb
@@ -0,0 +1,46 @@
+class CreateAiChats < ActiveRecord::Migration[7.2]
+  def change
+    create_table :chats, id: :uuid do |t|
+      t.references :user, null: false, foreign_key: true, type: :uuid
+      t.string :title, null: false
+      t.string :instructions
+      t.jsonb :error
+      t.string :latest_assistant_response_id
+      t.timestamps
+    end
+
+    create_table :messages, id: :uuid do |t|
+      t.references :chat, null: false, foreign_key: true, type: :uuid
+      t.string :type, null: false
+      t.string :status, null: false, default: "complete"
+      t.text :content
+      t.string :ai_model
+      t.timestamps
+
+      # Developer message fields
+      t.boolean :debug, default: false
+
+      # Assistant message fields
+      t.string :provider_id
+      t.boolean :reasoning, default: false
+    end
+
+    create_table :tool_calls, id: :uuid do |t|
+      t.references :message, null: false, foreign_key: true, type: :uuid
+      t.string :provider_id, null: false
+      t.string :provider_call_id
+      t.string :type, null: false
+
+      # Function specific fields
+      t.string :function_name
+      t.jsonb :function_arguments
+      t.jsonb :function_result
+
+      t.timestamps
+    end
+
+    add_reference :users, :last_viewed_chat, foreign_key: { to_table: :chats }, null: true, type: :uuid
+    add_column :users, :show_ai_sidebar, :boolean, default: true
+    add_column :users, :ai_enabled, :boolean, default: false, null: false
+  end
+end
diff --git a/db/migrate/20250405210514_add_initial_balance_field.rb b/db/migrate/20250405210514_add_initial_balance_field.rb
new file mode 100644
index 00000000..5ddb974b
--- /dev/null
+++ b/db/migrate/20250405210514_add_initial_balance_field.rb
@@ -0,0 +1,5 @@
+class AddInitialBalanceField < ActiveRecord::Migration[7.2]
+  def change
+    add_column :loans, :initial_balance, :decimal, precision: 19, scale: 4
+  end
+end
diff --git a/db/migrate/20250410144939_add_theme_to_users.rb b/db/migrate/20250410144939_add_theme_to_users.rb
new file mode 100644
index 00000000..45c288a6
--- /dev/null
+++ b/db/migrate/20250410144939_add_theme_to_users.rb
@@ -0,0 +1,5 @@
+class AddThemeToUsers < ActiveRecord::Migration[7.2]
+  def change
+    add_column :users, :theme, :string, default: "system"
+  end
+end
diff --git a/db/migrate/20250411140604_add_parent_syncs.rb b/db/migrate/20250411140604_add_parent_syncs.rb
new file mode 100644
index 00000000..113d82ef
--- /dev/null
+++ b/db/migrate/20250411140604_add_parent_syncs.rb
@@ -0,0 +1,5 @@
+class AddParentSyncs < ActiveRecord::Migration[7.2]
+  def change
+    add_reference :syncs, :parent, foreign_key: { to_table: :syncs }, type: :uuid
+  end
+end
diff --git a/db/migrate/20250413141446_table_renames.rb b/db/migrate/20250413141446_table_renames.rb
new file mode 100644
index 00000000..08f3f8e7
--- /dev/null
+++ b/db/migrate/20250413141446_table_renames.rb
@@ -0,0 +1,50 @@
+class TableRenames < ActiveRecord::Migration[7.2]
+  def change
+    # Entryables
+    rename_table :account_entries, :entries
+    rename_table :account_trades, :trades
+    rename_table :account_valuations, :valuations
+    rename_table :account_transactions, :transactions
+
+    rename_table :account_balances, :balances
+    rename_table :account_holdings, :holdings
+
+    reversible do |dir|
+      dir.up do
+        execute <<~SQL
+          UPDATE entries
+          SET entryable_type = CASE
+            WHEN entryable_type = 'Account::Transaction' THEN 'Transaction'
+            WHEN entryable_type = 'Account::Trade' THEN 'Trade'
+            WHEN entryable_type = 'Account::Valuation' THEN 'Valuation'
+          END
+        SQL
+
+        execute <<~SQL
+          UPDATE taggings
+          SET taggable_type = CASE
+            WHEN taggable_type = 'Account::Transaction' THEN 'Transaction'
+          END
+        SQL
+      end
+
+      dir.down do
+        execute <<~SQL
+          UPDATE entries
+          SET entryable_type = CASE
+            WHEN entryable_type = 'Transaction' THEN 'Account::Transaction'
+            WHEN entryable_type = 'Trade' THEN 'Account::Trade'
+            WHEN entryable_type = 'Valuation' THEN 'Account::Valuation'
+          END
+        SQL
+
+        execute <<~SQL
+          UPDATE taggings
+          SET taggable_type = CASE
+            WHEN taggable_type = 'Transaction' THEN 'Account::Transaction'
+          END
+        SQL
+      end
+    end
+  end
+end
diff --git a/db/migrate/20250416235317_add_rules_engine.rb b/db/migrate/20250416235317_add_rules_engine.rb
new file mode 100644
index 00000000..960a479e
--- /dev/null
+++ b/db/migrate/20250416235317_add_rules_engine.rb
@@ -0,0 +1,33 @@
+class AddRulesEngine < ActiveRecord::Migration[7.2]
+  def change
+    create_table :rules, id: :uuid do |t|
+      t.references :family, null: false, foreign_key: true, type: :uuid
+
+      t.string :resource_type, null: false
+      t.date :effective_date
+      t.boolean :active, null: false, default: false
+      t.timestamps
+    end
+
+    create_table :rule_conditions, id: :uuid do |t|
+      t.references :rule, foreign_key: true, type: :uuid
+      t.references :parent, foreign_key: { to_table: :rule_conditions }, type: :uuid
+
+      t.string :condition_type, null: false
+      t.string :operator, null: false
+      t.string :value
+      t.timestamps
+    end
+
+    create_table :rule_actions, id: :uuid do |t|
+      t.references :rule, null: false, foreign_key: true, type: :uuid
+
+      t.string :action_type, null: false
+      t.string :value
+      t.timestamps
+    end
+
+    add_column :users, :rule_prompts_disabled, :boolean, default: false
+    add_column :users, :rule_prompt_dismissed_at, :datetime
+  end
+end
diff --git a/db/migrate/20250416235420_add_data_enrichments.rb b/db/migrate/20250416235420_add_data_enrichments.rb
new file mode 100644
index 00000000..1997461c
--- /dev/null
+++ b/db/migrate/20250416235420_add_data_enrichments.rb
@@ -0,0 +1,33 @@
+class AddDataEnrichments < ActiveRecord::Migration[7.2]
+  def change
+    create_table :data_enrichments, id: :uuid do |t|
+      t.references :enrichable, polymorphic: true, null: false, type: :uuid
+      t.string :source
+      t.string :attribute_name
+      t.jsonb :value
+      t.jsonb :metadata
+
+      t.timestamps
+    end
+
+    add_index :data_enrichments, [ :enrichable_id, :enrichable_type, :source, :attribute_name ], unique: true
+
+    # Entries
+    add_column :entries, :locked_attributes, :jsonb, default: {}
+    add_column :transactions, :locked_attributes, :jsonb, default: {}
+    add_column :trades, :locked_attributes, :jsonb, default: {}
+    add_column :valuations, :locked_attributes, :jsonb, default: {}
+
+    # Accounts
+    add_column :accounts, :locked_attributes, :jsonb, default: {}
+    add_column :depositories, :locked_attributes, :jsonb, default: {}
+    add_column :investments, :locked_attributes, :jsonb, default: {}
+    add_column :cryptos, :locked_attributes, :jsonb, default: {}
+    add_column :properties, :locked_attributes, :jsonb, default: {}
+    add_column :vehicles, :locked_attributes, :jsonb, default: {}
+    add_column :other_assets, :locked_attributes, :jsonb, default: {}
+    add_column :credit_cards, :locked_attributes, :jsonb, default: {}
+    add_column :loans, :locked_attributes, :jsonb, default: {}
+    add_column :other_liabilities, :locked_attributes, :jsonb, default: {}
+  end
+end
diff --git a/db/migrate/20250416235758_merchant_and_category_enrichment.rb b/db/migrate/20250416235758_merchant_and_category_enrichment.rb
new file mode 100644
index 00000000..0bde5a90
--- /dev/null
+++ b/db/migrate/20250416235758_merchant_and_category_enrichment.rb
@@ -0,0 +1,60 @@
+class MerchantAndCategoryEnrichment < ActiveRecord::Migration[7.2]
+  def change
+    change_column_null :merchants, :family_id, true
+    change_column_null :merchants, :color, true
+    change_column_default :merchants, :color, from: "#e99537", to: nil
+    remove_column :merchants, :enriched_at, :datetime
+    rename_column :merchants, :icon_url, :logo_url
+
+    add_column :merchants, :website_url, :string
+    add_column :merchants, :type, :string
+    add_index :merchants, :type
+
+    reversible do |dir|
+      dir.up do
+        ActiveRecord::Base.transaction do
+          # 1) Mark all existing as FamilyMerchant
+          Merchant.update_all(type: "FamilyMerchant")
+
+          # 2) Find duplicate family merchants
+          Merchant
+            .where(type: 'FamilyMerchant')
+            .group(:family_id, :name)
+            .having("COUNT(*) > 1")
+            .pluck(:family_id, :name)
+            .each do |family_id, name|
+            # 3) Grab sorted IDs, first is keeper
+            ids, duplicate_ids = Merchant
+              .where(family_id: family_id, name: name)
+              .order(:id)
+              .pluck(:id)
+              .then { |arr| [ arr.first, arr.drop(1) ] }
+
+            next if duplicate_ids.empty?
+
+            # 4) Reassign all transactions pointing at the duplicates
+            Transaction.where(merchant_id: duplicate_ids)
+                       .update_all(merchant_id: ids)
+
+            # 5) Delete the duplicate merchant rows
+            Merchant.where(id: duplicate_ids).delete_all
+          end
+        end
+      end
+    end
+
+    change_column_null :merchants, :type, false
+
+    add_column :merchants, :source, :string
+    add_column :merchants, :provider_merchant_id, :string
+
+    add_index :merchants, [ :family_id, :name ], unique: true, where: "type = 'FamilyMerchant'"
+    add_index :merchants, [ :source, :name ], unique: true, where: "type = 'ProviderMerchant'"
+
+    add_column :transactions, :plaid_category, :string
+    add_column :transactions, :plaid_category_detailed, :string
+
+    remove_column :entries, :enriched_name, :string
+    remove_column :entries, :enriched_at, :datetime
+  end
+end
diff --git a/db/migrate/20250429021255_add_name_to_rules.rb b/db/migrate/20250429021255_add_name_to_rules.rb
new file mode 100644
index 00000000..f69e1140
--- /dev/null
+++ b/db/migrate/20250429021255_add_name_to_rules.rb
@@ -0,0 +1,5 @@
+class AddNameToRules < ActiveRecord::Migration[7.2]
+  def change
+    add_column :rules, :name, :string
+  end
+end
diff --git a/db/migrate/20250501172430_add_user_goals.rb b/db/migrate/20250501172430_add_user_goals.rb
new file mode 100644
index 00000000..6691ecda
--- /dev/null
+++ b/db/migrate/20250501172430_add_user_goals.rb
@@ -0,0 +1,17 @@
+class AddUserGoals < ActiveRecord::Migration[7.2]
+  def change
+    add_column :users, :goals, :text, array: true, default: []
+    add_column :users, :set_onboarding_preferences_at, :datetime
+    add_column :users, :set_onboarding_goals_at, :datetime
+
+    add_column :families, :trial_started_at, :datetime
+    add_column :families, :early_access, :boolean, default: false
+
+    reversible do |dir|
+      # All existing families are marked as early access now that we're out of alpha
+      dir.up do
+        Family.update_all(early_access: true)
+      end
+    end
+  end
+end
diff --git a/db/migrate/20250502164951_create_subscriptions.rb b/db/migrate/20250502164951_create_subscriptions.rb
new file mode 100644
index 00000000..3dfd3cdc
--- /dev/null
+++ b/db/migrate/20250502164951_create_subscriptions.rb
@@ -0,0 +1,46 @@
+class CreateSubscriptions < ActiveRecord::Migration[7.2]
+  def change
+    create_table :subscriptions, id: :uuid do |t|
+      t.references :family, null: false, foreign_key: true, type: :uuid
+
+      t.string :status, null: false
+
+      t.string :stripe_id
+      t.decimal :amount, precision: 19, scale: 4
+      t.string :currency
+      t.string :interval
+
+      t.datetime :current_period_ends_at
+      t.datetime :trial_ends_at
+
+      t.timestamps
+    end
+
+    reversible do |dir|
+      dir.up do
+        if Rails.application.config.app_mode.managed?
+          execute <<~SQL
+            INSERT INTO subscriptions (family_id, status, trial_ends_at, created_at, updated_at)
+            SELECT
+              f.id,
+              CASE
+                WHEN f.trial_started_at IS NOT NULL THEN 'trialing'
+                ELSE COALESCE(f.stripe_subscription_status, 'incomplete')
+              END,
+              CASE
+                WHEN f.trial_started_at IS NOT NULL THEN f.trial_started_at + INTERVAL '14 days'
+                ELSE NULL
+              END,
+              now(),
+              now()
+            FROM families f
+          SQL
+        end
+      end
+    end
+
+    remove_column :families, :stripe_subscription_status, :string
+    remove_column :families, :trial_started_at, :datetime
+    remove_column :families, :stripe_plan_id, :string
+  end
+end
diff --git a/db/migrate/20250509182903_dynamic_last_synced.rb b/db/migrate/20250509182903_dynamic_last_synced.rb
new file mode 100644
index 00000000..6ade36eb
--- /dev/null
+++ b/db/migrate/20250509182903_dynamic_last_synced.rb
@@ -0,0 +1,7 @@
+class DynamicLastSynced < ActiveRecord::Migration[7.2]
+  def change
+    remove_column :plaid_items, :last_synced_at, :datetime
+    remove_column :accounts, :last_synced_at, :datetime
+    remove_column :families, :last_synced_at, :datetime
+  end
+end
diff --git a/db/migrate/20250512171654_update_sync_timestamps.rb b/db/migrate/20250512171654_update_sync_timestamps.rb
new file mode 100644
index 00000000..ac0830b6
--- /dev/null
+++ b/db/migrate/20250512171654_update_sync_timestamps.rb
@@ -0,0 +1,65 @@
+class UpdateSyncTimestamps < ActiveRecord::Migration[7.2]
+  def change
+    # Timestamps, managed by aasm
+    add_column :syncs, :pending_at, :datetime
+    add_column :syncs, :syncing_at, :datetime
+    add_column :syncs, :completed_at, :datetime
+    add_column :syncs, :failed_at, :datetime
+
+    add_column :syncs, :window_start_date, :date
+    add_column :syncs, :window_end_date, :date
+
+    reversible do |dir|
+      dir.up do
+        execute <<-SQL
+          UPDATE syncs
+          SET
+            completed_at = CASE
+              WHEN status = 'completed' THEN last_ran_at
+              ELSE NULL
+            END,
+            failed_at = CASE
+              WHEN status = 'failed' THEN last_ran_at
+              ELSE NULL
+            END
+        SQL
+
+        execute <<-SQL
+          UPDATE syncs
+          SET window_start_date = start_date
+        SQL
+
+        # Due to some recent bugs, some self hosters have syncs that are stuck.
+        # This manually fails those syncs so they stop seeing syncing UI notices.
+        if Rails.application.config.app_mode.self_hosted?
+          puts "Self hosted: Fail syncs older than 2 hours"
+          execute <<-SQL
+            UPDATE syncs
+            SET status = 'failed'
+            WHERE (
+              status = 'syncing' AND
+              created_at < NOW() - INTERVAL '2 hours'
+            )
+          SQL
+        end
+      end
+
+      dir.down do
+        execute <<-SQL
+          UPDATE syncs
+          SET
+            last_ran_at = COALESCE(completed_at, failed_at)
+        SQL
+
+        execute <<-SQL
+          UPDATE syncs
+          SET start_date = window_start_date
+        SQL
+      end
+    end
+
+    remove_column :syncs, :start_date, :date
+    remove_column :syncs, :last_ran_at, :datetime
+    remove_column :syncs, :error_backtrace, :text, array: true
+  end
+end
diff --git a/db/migrate/20250513122703_add_uniqueness_to_subscriptions.rb b/db/migrate/20250513122703_add_uniqueness_to_subscriptions.rb
new file mode 100644
index 00000000..f97b67f9
--- /dev/null
+++ b/db/migrate/20250513122703_add_uniqueness_to_subscriptions.rb
@@ -0,0 +1,6 @@
+class AddUniquenessToSubscriptions < ActiveRecord::Migration[7.2]
+  def change
+    remove_index :subscriptions, :family_id
+    add_index :subscriptions, :family_id, unique: true
+  end
+end
diff --git a/db/migrate/20250514214242_add_metadata_to_session.rb b/db/migrate/20250514214242_add_metadata_to_session.rb
new file mode 100644
index 00000000..849cdccf
--- /dev/null
+++ b/db/migrate/20250514214242_add_metadata_to_session.rb
@@ -0,0 +1,5 @@
+class AddMetadataToSession < ActiveRecord::Migration[7.2]
+  def change
+    add_column :sessions, :data, :jsonb, default: {}
+  end
+end
diff --git a/db/migrate/20250516180846_remove_stock_exchanges.rb b/db/migrate/20250516180846_remove_stock_exchanges.rb
new file mode 100644
index 00000000..19c4a529
--- /dev/null
+++ b/db/migrate/20250516180846_remove_stock_exchanges.rb
@@ -0,0 +1,11 @@
+class RemoveStockExchanges < ActiveRecord::Migration[7.2]
+  def change
+    drop_table :stock_exchanges do |t|
+      t.string :name, null: false
+      t.string :acronym
+      t.string :mic, null: false
+      t.string :country, null: false
+      t.string :country_code, null: false
+    end
+  end
+end
diff --git a/db/migrate/20250518181619_add_auto_sync_preference_to_family.rb b/db/migrate/20250518181619_add_auto_sync_preference_to_family.rb
new file mode 100644
index 00000000..80e1cd9f
--- /dev/null
+++ b/db/migrate/20250518181619_add_auto_sync_preference_to_family.rb
@@ -0,0 +1,5 @@
+class AddAutoSyncPreferenceToFamily < ActiveRecord::Migration[7.2]
+  def change
+    add_column :families, :auto_sync_on_login, :boolean, default: true, null: false
+  end
+end
diff --git a/db/migrate/20250521112347_add_security_resolver_fields.rb b/db/migrate/20250521112347_add_security_resolver_fields.rb
new file mode 100644
index 00000000..29391512
--- /dev/null
+++ b/db/migrate/20250521112347_add_security_resolver_fields.rb
@@ -0,0 +1,8 @@
+class AddSecurityResolverFields < ActiveRecord::Migration[7.2]
+  def change
+    add_column :securities, :offline, :boolean, default: false, null: false
+    add_column :securities, :failed_fetch_at, :datetime
+    add_column :securities, :failed_fetch_count, :integer, default: 0, null: false
+    add_column :securities, :last_health_check_at, :datetime
+  end
+end
diff --git a/db/migrate/20250522201031_stronger_unique_index_on_security.rb b/db/migrate/20250522201031_stronger_unique_index_on_security.rb
new file mode 100644
index 00000000..43672f81
--- /dev/null
+++ b/db/migrate/20250522201031_stronger_unique_index_on_security.rb
@@ -0,0 +1,13 @@
+class StrongerUniqueIndexOnSecurity < ActiveRecord::Migration[7.2]
+  def change
+    remove_index :securities, [ :ticker, :exchange_operating_mic ], unique: true
+
+    # Matches our ActiveRecord validation:
+    # - uppercase ticker
+    # - either exchange_operating_mic or empty string (unique index doesn't work with NULL values)
+    add_index :securities,
+              "UPPER(ticker), COALESCE(UPPER(exchange_operating_mic), '')",
+              unique: true,
+              name: "index_securities_on_ticker_and_exchange_operating_mic_unique"
+  end
+end
diff --git a/db/migrate/20250523131455_add_raw_payloads_to_plaid_accounts.rb b/db/migrate/20250523131455_add_raw_payloads_to_plaid_accounts.rb
new file mode 100644
index 00000000..981daef0
--- /dev/null
+++ b/db/migrate/20250523131455_add_raw_payloads_to_plaid_accounts.rb
@@ -0,0 +1,24 @@
+class AddRawPayloadsToPlaidAccounts < ActiveRecord::Migration[7.2]
+  def change
+    add_column :plaid_items, :raw_payload, :jsonb, default: {}
+    add_column :plaid_items, :raw_institution_payload, :jsonb, default: {}
+
+    change_column_null :plaid_items, :plaid_id, false
+    add_index :plaid_items, :plaid_id, unique: true
+
+    add_column :plaid_accounts, :raw_payload, :jsonb, default: {}
+    add_column :plaid_accounts, :raw_transactions_payload, :jsonb, default: {}
+    add_column :plaid_accounts, :raw_investments_payload, :jsonb, default: {}
+    add_column :plaid_accounts, :raw_liabilities_payload, :jsonb, default: {}
+
+    change_column_null :plaid_accounts, :plaid_id, false
+    change_column_null :plaid_accounts, :plaid_type, false
+    change_column_null :plaid_accounts, :currency, false
+    change_column_null :plaid_accounts, :name, false
+    add_index :plaid_accounts, :plaid_id, unique: true
+
+    # No longer need to store on transaction model because it is stored in raw_transactions_payload
+    remove_column :transactions, :plaid_category, :string
+    remove_column :transactions, :plaid_category_detailed, :string
+  end
+end
diff --git a/db/migrate/20250605031616_add_index_to_sync_status.rb b/db/migrate/20250605031616_add_index_to_sync_status.rb
new file mode 100644
index 00000000..d1187a35
--- /dev/null
+++ b/db/migrate/20250605031616_add_index_to_sync_status.rb
@@ -0,0 +1,7 @@
+class AddIndexToSyncStatus < ActiveRecord::Migration[7.2]
+  disable_ddl_transaction!
+
+  def change
+    add_index :syncs, :status, if_not_exists: true, algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20250610181219_add_sync_timestamps_to_family.rb b/db/migrate/20250610181219_add_sync_timestamps_to_family.rb
new file mode 100644
index 00000000..8d5f7cab
--- /dev/null
+++ b/db/migrate/20250610181219_add_sync_timestamps_to_family.rb
@@ -0,0 +1,6 @@
+class AddSyncTimestampsToFamily < ActiveRecord::Migration[7.2]
+  def change
+    add_column :families, :latest_sync_activity_at, :datetime, default: -> { "CURRENT_TIMESTAMP" }
+    add_column :families, :latest_sync_completed_at, :datetime, default: -> { "CURRENT_TIMESTAMP" }
+  end
+end
diff --git a/db/migrate/20250612150749_create_doorkeeper_tables.rb b/db/migrate/20250612150749_create_doorkeeper_tables.rb
new file mode 100644
index 00000000..8458de64
--- /dev/null
+++ b/db/migrate/20250612150749_create_doorkeeper_tables.rb
@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+class CreateDoorkeeperTables < ActiveRecord::Migration[7.2]
+  def change
+    create_table :oauth_applications do |t|
+      t.string  :name,    null: false
+      t.string  :uid,     null: false
+      # Remove `null: false` or use conditional constraint if you are planning to use public clients.
+      t.string  :secret,  null: false
+
+      # Remove `null: false` if you are planning to use grant flows
+      # that doesn't require redirect URI to be used during authorization
+      # like Client Credentials flow or Resource Owner Password.
+      t.text    :redirect_uri, null: false
+      t.string  :scopes,       null: false, default: ''
+      t.boolean :confidential, null: false, default: true
+      t.timestamps             null: false
+    end
+
+    add_index :oauth_applications, :uid, unique: true
+
+    create_table :oauth_access_grants do |t|
+      t.references :resource_owner,  null: false
+      t.references :application,     null: false
+      t.string   :token,             null: false
+      t.integer  :expires_in,        null: false
+      t.text     :redirect_uri,      null: false
+      t.string   :scopes,            null: false, default: ''
+      t.datetime :created_at,        null: false
+      t.datetime :revoked_at
+    end
+
+    add_index :oauth_access_grants, :token, unique: true
+    add_foreign_key(
+      :oauth_access_grants,
+      :oauth_applications,
+      column: :application_id
+    )
+
+    create_table :oauth_access_tokens do |t|
+      t.references :resource_owner, index: true
+
+      # Remove `null: false` if you are planning to use Password
+      # Credentials Grant flow that doesn't require an application.
+      t.references :application,    null: false
+
+      # If you use a custom token generator you may need to change this column
+      # from string to text, so that it accepts tokens larger than 255
+      # characters. More info on custom token generators in:
+      # https://github.com/doorkeeper-gem/doorkeeper/tree/v3.0.0.rc1#custom-access-token-generator
+      #
+      # t.text :token, null: false
+      t.string :token, null: false
+
+      t.string   :refresh_token
+      t.integer  :expires_in
+      t.string   :scopes
+      t.datetime :created_at, null: false
+      t.datetime :revoked_at
+
+      # The authorization server MAY issue a new refresh token, in which case
+      # *the client MUST discard the old refresh token* and replace it with the
+      # new refresh token. The authorization server MAY revoke the old
+      # refresh token after issuing a new refresh token to the client.
+      # @see https://datatracker.ietf.org/doc/html/rfc6749#section-6
+      #
+      # Doorkeeper implementation: if there is a `previous_refresh_token` column,
+      # refresh tokens will be revoked after a related access token is used.
+      # If there is no `previous_refresh_token` column, previous tokens are
+      # revoked as soon as a new access token is created.
+      #
+      # Comment out this line if you want refresh tokens to be instantly
+      # revoked after use.
+      t.string   :previous_refresh_token, null: false, default: ""
+    end
+
+    add_index :oauth_access_tokens, :token, unique: true
+
+    # See https://github.com/doorkeeper-gem/doorkeeper/issues/1592
+    if ActiveRecord::Base.connection.adapter_name == "SQLServer"
+      execute <<~SQL.squish
+        CREATE UNIQUE NONCLUSTERED INDEX index_oauth_access_tokens_on_refresh_token ON oauth_access_tokens(refresh_token)
+        WHERE refresh_token IS NOT NULL
+      SQL
+    else
+      add_index :oauth_access_tokens, :refresh_token, unique: true
+    end
+
+    add_foreign_key(
+      :oauth_access_tokens,
+      :oauth_applications,
+      column: :application_id
+    )
+
+    # Uncomment below to ensure a valid reference to the resource owner's table
+    # add_foreign_key :oauth_access_grants, <model>, column: :resource_owner_id
+    # add_foreign_key :oauth_access_tokens, <model>, column: :resource_owner_id
+  end
+end
diff --git a/db/migrate/20250612154522_fix_doorkeeper_resource_owner_id_for_uuid.rb b/db/migrate/20250612154522_fix_doorkeeper_resource_owner_id_for_uuid.rb
new file mode 100644
index 00000000..cc96446c
--- /dev/null
+++ b/db/migrate/20250612154522_fix_doorkeeper_resource_owner_id_for_uuid.rb
@@ -0,0 +1,9 @@
+class FixDoorkeeperResourceOwnerIdForUuid < ActiveRecord::Migration[7.1]
+  def up
+    change_column :oauth_access_tokens, :resource_owner_id, :string
+  end
+
+  def down
+    change_column :oauth_access_tokens, :resource_owner_id, :integer
+  end
+end
diff --git a/db/migrate/20250613002027_create_api_keys.rb b/db/migrate/20250613002027_create_api_keys.rb
new file mode 100644
index 00000000..3fdc6a7e
--- /dev/null
+++ b/db/migrate/20250613002027_create_api_keys.rb
@@ -0,0 +1,17 @@
+class CreateApiKeys < ActiveRecord::Migration[7.2]
+  def change
+    create_table :api_keys, id: :uuid do |t|
+      t.string :key
+      t.string :name
+      t.references :user, null: false, foreign_key: true, type: :uuid
+      t.json :scopes
+      t.datetime :last_used_at
+      t.datetime :expires_at
+      t.datetime :revoked_at
+
+      t.timestamps
+    end
+    add_index :api_keys, :key
+    add_index :api_keys, :revoked_at
+  end
+end
diff --git a/db/migrate/20250613100842_add_display_key_to_api_keys.rb b/db/migrate/20250613100842_add_display_key_to_api_keys.rb
new file mode 100644
index 00000000..870c5d7a
--- /dev/null
+++ b/db/migrate/20250613100842_add_display_key_to_api_keys.rb
@@ -0,0 +1,6 @@
+class AddDisplayKeyToApiKeys < ActiveRecord::Migration[7.2]
+  def change
+    add_column :api_keys, :display_key, :string, null: false
+    add_index :api_keys, :display_key, unique: true
+  end
+end
diff --git a/db/migrate/20250613101036_remove_key_from_api_keys.rb b/db/migrate/20250613101036_remove_key_from_api_keys.rb
new file mode 100644
index 00000000..5be91f50
--- /dev/null
+++ b/db/migrate/20250613101036_remove_key_from_api_keys.rb
@@ -0,0 +1,5 @@
+class RemoveKeyFromApiKeys < ActiveRecord::Migration[7.2]
+  def change
+    remove_column :api_keys, :key, :string
+  end
+end
diff --git a/db/migrate/20250613101051_remove_key_index_from_api_keys.rb b/db/migrate/20250613101051_remove_key_index_from_api_keys.rb
new file mode 100644
index 00000000..226d46e5
--- /dev/null
+++ b/db/migrate/20250613101051_remove_key_index_from_api_keys.rb
@@ -0,0 +1,5 @@
+class RemoveKeyIndexFromApiKeys < ActiveRecord::Migration[7.2]
+  def change
+    remove_index :api_keys, :key if index_exists?(:api_keys, :key)
+  end
+end
diff --git a/db/migrate/20250613152743_fix_doorkeeper_access_grants_resource_owner_id_for_uuid.rb b/db/migrate/20250613152743_fix_doorkeeper_access_grants_resource_owner_id_for_uuid.rb
new file mode 100644
index 00000000..f23b0ec8
--- /dev/null
+++ b/db/migrate/20250613152743_fix_doorkeeper_access_grants_resource_owner_id_for_uuid.rb
@@ -0,0 +1,9 @@
+class FixDoorkeeperAccessGrantsResourceOwnerIdForUuid < ActiveRecord::Migration[7.2]
+  def up
+    change_column :oauth_access_grants, :resource_owner_id, :string
+  end
+
+  def down
+    change_column :oauth_access_grants, :resource_owner_id, :bigint
+  end
+end
diff --git a/db/migrate/20250616183654_add_kind_to_transactions.rb b/db/migrate/20250616183654_add_kind_to_transactions.rb
new file mode 100644
index 00000000..ad356730
--- /dev/null
+++ b/db/migrate/20250616183654_add_kind_to_transactions.rb
@@ -0,0 +1,32 @@
+class AddKindToTransactions < ActiveRecord::Migration[7.2]
+  def change
+    add_column :transactions, :kind, :string, null: false, default: "standard"
+    add_index :transactions, :kind
+
+    reversible do |dir|
+      dir.up do
+        # Update transaction kinds based on transfer relationships
+        execute <<~SQL
+          UPDATE transactions
+          SET kind = CASE
+            WHEN destination_accounts.accountable_type = 'Loan' AND entries.amount > 0 THEN 'loan_payment'
+            WHEN destination_accounts.accountable_type = 'CreditCard' AND entries.amount > 0 THEN 'cc_payment'
+            ELSE 'funds_movement'
+          END
+          FROM transfers t
+          JOIN entries ON (
+            entries.entryable_id = t.inflow_transaction_id OR
+            entries.entryable_id = t.outflow_transaction_id
+          )
+          LEFT JOIN entries inflow_entries ON (
+            inflow_entries.entryable_id = t.inflow_transaction_id
+            AND inflow_entries.entryable_type = 'Transaction'
+          )
+          LEFT JOIN accounts destination_accounts ON destination_accounts.id = inflow_entries.account_id
+          WHERE transactions.id = entries.entryable_id
+            AND entries.entryable_type = 'Transaction'
+        SQL
+      end
+    end
+  end
+end
diff --git a/db/migrate/20250618104425_add_source_to_api_keys.rb b/db/migrate/20250618104425_add_source_to_api_keys.rb
new file mode 100644
index 00000000..23bad1f6
--- /dev/null
+++ b/db/migrate/20250618104425_add_source_to_api_keys.rb
@@ -0,0 +1,6 @@
+class AddSourceToApiKeys < ActiveRecord::Migration[7.2]
+  def change
+    add_column :api_keys, :source, :string, default: "web"
+    add_index :api_keys, [ :user_id, :source ]
+  end
+end
diff --git a/db/migrate/20250618110104_create_mobile_devices.rb b/db/migrate/20250618110104_create_mobile_devices.rb
new file mode 100644
index 00000000..ca06ac1b
--- /dev/null
+++ b/db/migrate/20250618110104_create_mobile_devices.rb
@@ -0,0 +1,17 @@
+class CreateMobileDevices < ActiveRecord::Migration[7.2]
+  def change
+    create_table :mobile_devices, id: :uuid do |t|
+      t.references :user, null: false, foreign_key: true, type: :uuid
+      t.string :device_id
+      t.string :device_name
+      t.string :device_type
+      t.string :os_version
+      t.string :app_version
+      t.datetime :last_seen_at
+
+      t.timestamps
+    end
+    add_index :mobile_devices, :device_id, unique: true
+    add_index :mobile_devices, [ :user_id, :device_id ], unique: true
+  end
+end
diff --git a/db/migrate/20250618110736_add_owner_to_oauth_applications.rb b/db/migrate/20250618110736_add_owner_to_oauth_applications.rb
new file mode 100644
index 00000000..d7913c1d
--- /dev/null
+++ b/db/migrate/20250618110736_add_owner_to_oauth_applications.rb
@@ -0,0 +1,7 @@
+class AddOwnerToOauthApplications < ActiveRecord::Migration[7.2]
+  def change
+    add_column :oauth_applications, :owner_id, :uuid
+    add_column :oauth_applications, :owner_type, :string
+    add_index :oauth_applications, [ :owner_id, :owner_type ]
+  end
+end
diff --git a/db/migrate/20250618120703_add_oauth_application_to_mobile_devices.rb b/db/migrate/20250618120703_add_oauth_application_to_mobile_devices.rb
new file mode 100644
index 00000000..391f8c81
--- /dev/null
+++ b/db/migrate/20250618120703_add_oauth_application_to_mobile_devices.rb
@@ -0,0 +1,6 @@
+class AddOauthApplicationToMobileDevices < ActiveRecord::Migration[7.2]
+  def change
+    add_column :mobile_devices, :oauth_application_id, :integer
+    add_index :mobile_devices, :oauth_application_id
+  end
+end
diff --git a/db/migrate/20250620204550_update_excluded_transactions_to_one_time.rb b/db/migrate/20250620204550_update_excluded_transactions_to_one_time.rb
new file mode 100644
index 00000000..865c0f10
--- /dev/null
+++ b/db/migrate/20250620204550_update_excluded_transactions_to_one_time.rb
@@ -0,0 +1,33 @@
+class UpdateExcludedTransactionsToOneTime < ActiveRecord::Migration[7.2]
+  def change
+    reversible do |dir|
+      dir.up do
+        # Update all transactions that have excluded entries to be one_time
+        # They remain excluded as well since users were using excluded as "one time" before
+        execute <<~SQL
+          UPDATE transactions
+          SET kind = 'one_time'
+          FROM entries
+          WHERE entries.entryable_id = transactions.id
+            AND entries.entryable_type = 'Transaction'
+            AND entries.excluded = true
+            AND transactions.kind = 'standard'
+        SQL
+      end
+
+      dir.down do
+        # Revert one_time transactions back to standard if their entry is excluded
+        # This assumes these were the ones we migrated in the up method
+        execute <<~SQL
+          UPDATE transactions
+          SET kind = 'standard'
+          FROM entries
+          WHERE entries.entryable_id = transactions.id
+            AND entries.entryable_type = 'Transaction'
+            AND entries.excluded = true
+            AND transactions.kind = 'one_time'
+        SQL
+      end
+    end
+  end
+end
diff --git a/db/migrate/20250623162207_update_outdated_timezones.rb b/db/migrate/20250623162207_update_outdated_timezones.rb
new file mode 100644
index 00000000..33509ec4
--- /dev/null
+++ b/db/migrate/20250623162207_update_outdated_timezones.rb
@@ -0,0 +1,31 @@
+class UpdateOutdatedTimezones < ActiveRecord::Migration[7.2]
+  TIMEZONE_MAPPINGS = {
+    "Europe/Kiev" => "Europe/Kyiv",
+    "Asia/Calcutta" => "Asia/Kolkata",
+    "Asia/Katmandu" => "Asia/Kathmandu",
+    "Asia/Rangoon" => "Asia/Yangon",
+    "Asia/Saigon" => "Asia/Ho_Chi_Minh",
+    "Pacific/Ponape" => "Pacific/Pohnpei",
+    "Pacific/Truk" => "Pacific/Chuuk"
+  }.freeze
+
+  def up
+    TIMEZONE_MAPPINGS.each do |old_tz, new_tz|
+      execute <<-SQL
+        UPDATE families#{' '}
+        SET timezone = '#{new_tz}'#{' '}
+        WHERE timezone = '#{old_tz}'
+      SQL
+    end
+  end
+
+  def down
+    TIMEZONE_MAPPINGS.each do |old_tz, new_tz|
+      execute <<-SQL
+        UPDATE families#{' '}
+        SET timezone = '#{old_tz}'#{' '}
+        WHERE timezone = '#{new_tz}'
+      SQL
+    end
+  end
+end
diff --git a/db/migrate/20250701161640_add_account_status.rb b/db/migrate/20250701161640_add_account_status.rb
new file mode 100644
index 00000000..afa4ede3
--- /dev/null
+++ b/db/migrate/20250701161640_add_account_status.rb
@@ -0,0 +1,41 @@
+class AddAccountStatus < ActiveRecord::Migration[7.2]
+  def up
+    add_column :accounts, :status, :string, default: "active"
+    change_column_null :entries, :amount, false
+
+    # Migrate existing data
+    execute <<-SQL
+      UPDATE accounts
+      SET status = CASE
+        WHEN scheduled_for_deletion = true THEN 'pending_deletion'
+        WHEN is_active = true THEN 'active'
+        WHEN is_active = false THEN 'disabled'
+        ELSE 'draft'
+      END
+    SQL
+
+    remove_column :accounts, :is_active
+    remove_column :accounts, :scheduled_for_deletion
+  end
+
+  def down
+    add_column :accounts, :is_active, :boolean, default: true, null: false
+    add_column :accounts, :scheduled_for_deletion, :boolean, default: false
+
+    # Restore the original boolean fields based on status
+    execute <<-SQL
+      UPDATE accounts
+      SET is_active = CASE
+        WHEN status = 'active' THEN true
+        WHEN status IN ('disabled', 'pending_deletion') THEN false
+        ELSE false
+      END,
+      scheduled_for_deletion = CASE
+        WHEN status = 'pending_deletion' THEN true
+        ELSE false
+      END
+    SQL
+
+    remove_column :accounts, :status
+  end
+end
diff --git a/db/migrate/20250702173231_fix_mobile_devices_unique_constraint.rb b/db/migrate/20250702173231_fix_mobile_devices_unique_constraint.rb
new file mode 100644
index 00000000..6ef8539e
--- /dev/null
+++ b/db/migrate/20250702173231_fix_mobile_devices_unique_constraint.rb
@@ -0,0 +1,9 @@
+class FixMobileDevicesUniqueConstraint < ActiveRecord::Migration[7.2]
+  def change
+    # Remove the old unique index on device_id only
+    remove_index :mobile_devices, :device_id, if_exists: true
+
+    # The composite unique index on user_id and device_id already exists
+    # This allows the same device_id to be used by different users
+  end
+end
diff --git a/db/migrate/20250710225721_add_valuation_kind.rb b/db/migrate/20250710225721_add_valuation_kind.rb
new file mode 100644
index 00000000..e6b80702
--- /dev/null
+++ b/db/migrate/20250710225721_add_valuation_kind.rb
@@ -0,0 +1,5 @@
+class AddValuationKind < ActiveRecord::Migration[7.2]
+  def change
+    add_column :valuations, :kind, :string, default: "reconciliation", null: false
+  end
+end
diff --git a/db/migrate/20250718120146_add_indexes_to_core_models.rb b/db/migrate/20250718120146_add_indexes_to_core_models.rb
new file mode 100644
index 00000000..bac38c8c
--- /dev/null
+++ b/db/migrate/20250718120146_add_indexes_to_core_models.rb
@@ -0,0 +1,20 @@
+class AddIndexesToCoreModels < ActiveRecord::Migration[7.2]
+  def change
+    # Accounts table indexes
+    add_index :accounts, [ :family_id, :status ]
+    add_index :accounts, :status
+    add_index :accounts, :currency
+
+    # Balances table indexes
+    add_index :balances, [ :account_id, :date ], order: { date: :desc }
+
+    # Entries table indexes
+    add_index :entries, [ :account_id, :date ]
+    add_index :entries, :date
+    add_index :entries, :entryable_type
+    add_index :entries, "lower(name)", name: "index_entries_on_lower_name"
+
+    # Transfers table indexes
+    add_index :transfers, :status
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d58dcce0..3b839c95 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2024_10_09_132959) do
+ActiveRecord::Schema[7.2].define(version: 2025_07_18_120146) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -18,94 +18,6 @@ ActiveRecord::Schema[7.2].define(version: 2024_10_09_132959) do
   # Custom types defined in this database.
   # Note that some types may not work with other database engines. Be careful if changing database.
   create_enum "account_status", ["ok", "syncing", "error"]
-  create_enum "import_status", ["pending", "importing", "complete", "failed"]
-  create_enum "user_role", ["admin", "member"]
-
-  create_table "account_balances", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.uuid "account_id", null: false
-    t.date "date", null: false
-    t.decimal "balance", precision: 19, scale: 4, null: false
-    t.string "currency", default: "USD", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id", "date", "currency"], name: "index_account_balances_on_account_id_date_currency_unique", unique: true
-    t.index ["account_id"], name: "index_account_balances_on_account_id"
-  end
-
-  create_table "account_entries", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.uuid "account_id", null: false
-    t.string "entryable_type"
-    t.uuid "entryable_id"
-    t.decimal "amount", precision: 19, scale: 4
-    t.string "currency"
-    t.date "date"
-    t.string "name"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.uuid "transfer_id"
-    t.boolean "marked_as_transfer", default: false, null: false
-    t.uuid "import_id"
-    t.text "notes"
-    t.boolean "excluded", default: false
-    t.index ["account_id"], name: "index_account_entries_on_account_id"
-    t.index ["import_id"], name: "index_account_entries_on_import_id"
-    t.index ["transfer_id"], name: "index_account_entries_on_transfer_id"
-  end
-
-  create_table "account_holdings", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.uuid "account_id", null: false
-    t.uuid "security_id", null: false
-    t.date "date"
-    t.decimal "qty", precision: 19, scale: 4
-    t.decimal "price", precision: 19, scale: 4
-    t.decimal "amount", precision: 19, scale: 4
-    t.string "currency"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id", "security_id", "date", "currency"], name: "idx_on_account_id_security_id_date_currency_234024c8e3", unique: true
-    t.index ["account_id"], name: "index_account_holdings_on_account_id"
-    t.index ["security_id"], name: "index_account_holdings_on_security_id"
-  end
-
-  create_table "account_syncs", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.uuid "account_id", null: false
-    t.string "status", default: "pending", null: false
-    t.date "start_date"
-    t.datetime "last_ran_at"
-    t.string "error"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_account_syncs_on_account_id"
-  end
-
-  create_table "account_trades", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.uuid "security_id", null: false
-    t.decimal "qty", precision: 19, scale: 4
-    t.decimal "price", precision: 19, scale: 4
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.string "currency"
-    t.index ["security_id"], name: "index_account_trades_on_security_id"
-  end
-
-  create_table "account_transactions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.uuid "category_id"
-    t.uuid "merchant_id"
-    t.index ["category_id"], name: "index_account_transactions_on_category_id"
-    t.index ["merchant_id"], name: "index_account_transactions_on_merchant_id"
-  end
-
-  create_table "account_transfers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
-  create_table "account_valuations", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
 
   create_table "accounts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "subtype"
@@ -117,15 +29,22 @@ ActiveRecord::Schema[7.2].define(version: 2024_10_09_132959) do
     t.uuid "accountable_id"
     t.decimal "balance", precision: 19, scale: 4
     t.string "currency"
-    t.boolean "is_active", default: true, null: false
-    t.date "last_sync_date"
-    t.uuid "institution_id"
     t.virtual "classification", type: :string, as: "\nCASE\n    WHEN ((accountable_type)::text = ANY ((ARRAY['Loan'::character varying, 'CreditCard'::character varying, 'OtherLiability'::character varying])::text[])) THEN 'liability'::text\n    ELSE 'asset'::text\nEND", stored: true
     t.uuid "import_id"
+    t.uuid "plaid_account_id"
+    t.decimal "cash_balance", precision: 19, scale: 4, default: "0.0"
+    t.jsonb "locked_attributes", default: {}
+    t.string "status", default: "active"
+    t.index ["accountable_id", "accountable_type"], name: "index_accounts_on_accountable_id_and_accountable_type"
     t.index ["accountable_type"], name: "index_accounts_on_accountable_type"
+    t.index ["currency"], name: "index_accounts_on_currency"
+    t.index ["family_id", "accountable_type"], name: "index_accounts_on_family_id_and_accountable_type"
+    t.index ["family_id", "id"], name: "index_accounts_on_family_id_and_id"
+    t.index ["family_id", "status"], name: "index_accounts_on_family_id_and_status"
     t.index ["family_id"], name: "index_accounts_on_family_id"
     t.index ["import_id"], name: "index_accounts_on_import_id"
-    t.index ["institution_id"], name: "index_accounts_on_institution_id"
+    t.index ["plaid_account_id"], name: "index_accounts_on_plaid_account_id"
+    t.index ["status"], name: "index_accounts_on_status"
   end
 
   create_table "active_storage_attachments", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
@@ -171,16 +90,84 @@ ActiveRecord::Schema[7.2].define(version: 2024_10_09_132959) do
     t.index ["addressable_type", "addressable_id"], name: "index_addresses_on_addressable"
   end
 
+  create_table "api_keys", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "name"
+    t.uuid "user_id", null: false
+    t.json "scopes"
+    t.datetime "last_used_at"
+    t.datetime "expires_at"
+    t.datetime "revoked_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "display_key", null: false
+    t.string "source", default: "web"
+    t.index ["display_key"], name: "index_api_keys_on_display_key", unique: true
+    t.index ["revoked_at"], name: "index_api_keys_on_revoked_at"
+    t.index ["user_id", "source"], name: "index_api_keys_on_user_id_and_source"
+    t.index ["user_id"], name: "index_api_keys_on_user_id"
+  end
+
+  create_table "balances", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "account_id", null: false
+    t.date "date", null: false
+    t.decimal "balance", precision: 19, scale: 4, null: false
+    t.string "currency", default: "USD", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.decimal "cash_balance", precision: 19, scale: 4, default: "0.0"
+    t.index ["account_id", "date", "currency"], name: "index_account_balances_on_account_id_date_currency_unique", unique: true
+    t.index ["account_id", "date"], name: "index_balances_on_account_id_and_date", order: { date: :desc }
+    t.index ["account_id"], name: "index_balances_on_account_id"
+  end
+
+  create_table "budget_categories", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "budget_id", null: false
+    t.uuid "category_id", null: false
+    t.decimal "budgeted_spending", precision: 19, scale: 4, null: false
+    t.string "currency", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["budget_id", "category_id"], name: "index_budget_categories_on_budget_id_and_category_id", unique: true
+    t.index ["budget_id"], name: "index_budget_categories_on_budget_id"
+    t.index ["category_id"], name: "index_budget_categories_on_category_id"
+  end
+
+  create_table "budgets", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "family_id", null: false
+    t.date "start_date", null: false
+    t.date "end_date", null: false
+    t.decimal "budgeted_spending", precision: 19, scale: 4
+    t.decimal "expected_income", precision: 19, scale: 4
+    t.string "currency", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["family_id", "start_date", "end_date"], name: "index_budgets_on_family_id_and_start_date_and_end_date", unique: true
+    t.index ["family_id"], name: "index_budgets_on_family_id"
+  end
+
   create_table "categories", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "name", null: false
     t.string "color", default: "#6172F3", null: false
-    t.string "internal_category"
     t.uuid "family_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.uuid "parent_id"
+    t.string "classification", default: "expense", null: false
+    t.string "lucide_icon", default: "shapes", null: false
     t.index ["family_id"], name: "index_categories_on_family_id"
   end
 
+  create_table "chats", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "user_id", null: false
+    t.string "title", null: false
+    t.string "instructions"
+    t.jsonb "error"
+    t.string "latest_assistant_response_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["user_id"], name: "index_chats_on_user_id"
+  end
+
   create_table "credit_cards", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -189,23 +176,62 @@ ActiveRecord::Schema[7.2].define(version: 2024_10_09_132959) do
     t.decimal "apr", precision: 10, scale: 2
     t.date "expiration_date"
     t.decimal "annual_fee", precision: 10, scale: 2
+    t.jsonb "locked_attributes", default: {}
   end
 
   create_table "cryptos", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.jsonb "locked_attributes", default: {}
+  end
+
+  create_table "data_enrichments", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "enrichable_type", null: false
+    t.uuid "enrichable_id", null: false
+    t.string "source"
+    t.string "attribute_name"
+    t.jsonb "value"
+    t.jsonb "metadata"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["enrichable_id", "enrichable_type", "source", "attribute_name"], name: "idx_on_enrichable_id_enrichable_type_source_attribu_5be5f63e08", unique: true
+    t.index ["enrichable_type", "enrichable_id"], name: "index_data_enrichments_on_enrichable"
   end
 
   create_table "depositories", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.jsonb "locked_attributes", default: {}
+  end
+
+  create_table "entries", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "account_id", null: false
+    t.string "entryable_type"
+    t.uuid "entryable_id"
+    t.decimal "amount", precision: 19, scale: 4, null: false
+    t.string "currency"
+    t.date "date"
+    t.string "name", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.uuid "import_id"
+    t.text "notes"
+    t.boolean "excluded", default: false
+    t.string "plaid_id"
+    t.jsonb "locked_attributes", default: {}
+    t.index "lower((name)::text)", name: "index_entries_on_lower_name"
+    t.index ["account_id", "date"], name: "index_entries_on_account_id_and_date"
+    t.index ["account_id"], name: "index_entries_on_account_id"
+    t.index ["date"], name: "index_entries_on_date"
+    t.index ["entryable_type"], name: "index_entries_on_entryable_type"
+    t.index ["import_id"], name: "index_entries_on_import_id"
   end
 
   create_table "exchange_rates", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "from_currency", null: false
     t.string "to_currency", null: false
-    t.decimal "rate"
-    t.date "date"
+    t.decimal "rate", null: false
+    t.date "date", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["from_currency", "to_currency", "date"], name: "index_exchange_rates_on_base_converted_date_unique", unique: true
@@ -218,99 +244,54 @@ ActiveRecord::Schema[7.2].define(version: 2024_10_09_132959) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "currency", default: "USD"
-    t.datetime "last_synced_at"
     t.string "locale", default: "en"
-    t.string "stripe_plan_id"
     t.string "stripe_customer_id"
-    t.string "stripe_subscription_status", default: "incomplete"
+    t.string "date_format", default: "%m-%d-%Y"
+    t.string "country", default: "US"
+    t.string "timezone"
+    t.boolean "data_enrichment_enabled", default: false
+    t.boolean "early_access", default: false
+    t.boolean "auto_sync_on_login", default: true, null: false
+    t.datetime "latest_sync_activity_at", default: -> { "CURRENT_TIMESTAMP" }
+    t.datetime "latest_sync_completed_at", default: -> { "CURRENT_TIMESTAMP" }
   end
 
-  create_table "good_job_batches", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+  create_table "holdings", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "account_id", null: false
+    t.uuid "security_id", null: false
+    t.date "date", null: false
+    t.decimal "qty", precision: 19, scale: 4, null: false
+    t.decimal "price", precision: 19, scale: 4, null: false
+    t.decimal "amount", precision: 19, scale: 4, null: false
+    t.string "currency", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.text "description"
-    t.jsonb "serialized_properties"
-    t.text "on_finish"
-    t.text "on_success"
-    t.text "on_discard"
-    t.text "callback_queue_name"
-    t.integer "callback_priority"
-    t.datetime "enqueued_at"
-    t.datetime "discarded_at"
-    t.datetime "finished_at"
+    t.index ["account_id", "security_id", "date", "currency"], name: "idx_on_account_id_security_id_date_currency_5323e39f8b", unique: true
+    t.index ["account_id"], name: "index_holdings_on_account_id"
+    t.index ["security_id"], name: "index_holdings_on_security_id"
   end
 
-  create_table "good_job_executions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+  create_table "impersonation_session_logs", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "impersonation_session_id", null: false
+    t.string "controller"
+    t.string "action"
+    t.text "path"
+    t.string "method"
+    t.string "ip_address"
+    t.text "user_agent"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.uuid "active_job_id", null: false
-    t.text "job_class"
-    t.text "queue_name"
-    t.jsonb "serialized_params"
-    t.datetime "scheduled_at"
-    t.datetime "finished_at"
-    t.text "error"
-    t.integer "error_event", limit: 2
-    t.text "error_backtrace", array: true
-    t.uuid "process_id"
-    t.interval "duration"
-    t.index ["active_job_id", "created_at"], name: "index_good_job_executions_on_active_job_id_and_created_at"
-    t.index ["process_id", "created_at"], name: "index_good_job_executions_on_process_id_and_created_at"
+    t.index ["impersonation_session_id"], name: "index_impersonation_session_logs_on_impersonation_session_id"
   end
 
-  create_table "good_job_processes", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+  create_table "impersonation_sessions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "impersonator_id", null: false
+    t.uuid "impersonated_id", null: false
+    t.string "status", default: "pending", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.jsonb "state"
-    t.integer "lock_type", limit: 2
-  end
-
-  create_table "good_job_settings", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.text "key"
-    t.jsonb "value"
-    t.index ["key"], name: "index_good_job_settings_on_key", unique: true
-  end
-
-  create_table "good_jobs", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.text "queue_name"
-    t.integer "priority"
-    t.jsonb "serialized_params"
-    t.datetime "scheduled_at"
-    t.datetime "performed_at"
-    t.datetime "finished_at"
-    t.text "error"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.uuid "active_job_id"
-    t.text "concurrency_key"
-    t.text "cron_key"
-    t.uuid "retried_good_job_id"
-    t.datetime "cron_at"
-    t.uuid "batch_id"
-    t.uuid "batch_callback_id"
-    t.boolean "is_discrete"
-    t.integer "executions_count"
-    t.text "job_class"
-    t.integer "error_event", limit: 2
-    t.text "labels", array: true
-    t.uuid "locked_by_id"
-    t.datetime "locked_at"
-    t.index ["active_job_id", "created_at"], name: "index_good_jobs_on_active_job_id_and_created_at"
-    t.index ["batch_callback_id"], name: "index_good_jobs_on_batch_callback_id", where: "(batch_callback_id IS NOT NULL)"
-    t.index ["batch_id"], name: "index_good_jobs_on_batch_id", where: "(batch_id IS NOT NULL)"
-    t.index ["concurrency_key"], name: "index_good_jobs_on_concurrency_key_when_unfinished", where: "(finished_at IS NULL)"
-    t.index ["cron_key", "created_at"], name: "index_good_jobs_on_cron_key_and_created_at_cond", where: "(cron_key IS NOT NULL)"
-    t.index ["cron_key", "cron_at"], name: "index_good_jobs_on_cron_key_and_cron_at_cond", unique: true, where: "(cron_key IS NOT NULL)"
-    t.index ["finished_at"], name: "index_good_jobs_jobs_on_finished_at", where: "((retried_good_job_id IS NULL) AND (finished_at IS NOT NULL))"
-    t.index ["labels"], name: "index_good_jobs_on_labels", where: "(labels IS NOT NULL)", using: :gin
-    t.index ["locked_by_id"], name: "index_good_jobs_on_locked_by_id", where: "(locked_by_id IS NOT NULL)"
-    t.index ["priority", "created_at"], name: "index_good_job_jobs_for_candidate_lookup", where: "(finished_at IS NULL)"
-    t.index ["priority", "created_at"], name: "index_good_jobs_jobs_on_priority_created_at_when_unfinished", order: { priority: "DESC NULLS LAST" }, where: "(finished_at IS NULL)"
-    t.index ["priority", "scheduled_at"], name: "index_good_jobs_on_priority_scheduled_at_unfinished_unlocked", where: "((finished_at IS NULL) AND (locked_by_id IS NULL))"
-    t.index ["queue_name", "scheduled_at"], name: "index_good_jobs_on_queue_name_and_scheduled_at", where: "(finished_at IS NULL)"
-    t.index ["scheduled_at"], name: "index_good_jobs_on_scheduled_at", where: "(finished_at IS NULL)"
+    t.index ["impersonated_id"], name: "index_impersonation_sessions_on_impersonated_id"
+    t.index ["impersonator_id"], name: "index_impersonation_sessions_on_impersonator_id"
   end
 
   create_table "import_mappings", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
@@ -343,51 +324,64 @@ ActiveRecord::Schema[7.2].define(version: 2024_10_09_132959) do
     t.text "notes"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "exchange_operating_mic"
     t.index ["import_id"], name: "index_import_rows_on_import_id"
   end
 
   create_table "imports", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.jsonb "column_mappings"
-    t.enum "status", default: "pending", enum_type: "import_status"
+    t.string "status"
     t.string "raw_file_str"
     t.string "normalized_csv_str"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "col_sep", default: ","
     t.uuid "family_id", null: false
-    t.uuid "original_account_id"
+    t.uuid "account_id"
     t.string "type", null: false
-    t.string "date_col_label", default: "date"
-    t.string "amount_col_label", default: "amount"
-    t.string "name_col_label", default: "name"
-    t.string "category_col_label", default: "category"
-    t.string "tags_col_label", default: "tags"
-    t.string "account_col_label", default: "account"
-    t.string "qty_col_label", default: "qty"
-    t.string "ticker_col_label", default: "ticker"
-    t.string "price_col_label", default: "price"
-    t.string "entity_type_col_label", default: "type"
-    t.string "notes_col_label", default: "notes"
-    t.string "currency_col_label", default: "currency"
+    t.string "date_col_label"
+    t.string "amount_col_label"
+    t.string "name_col_label"
+    t.string "category_col_label"
+    t.string "tags_col_label"
+    t.string "account_col_label"
+    t.string "qty_col_label"
+    t.string "ticker_col_label"
+    t.string "price_col_label"
+    t.string "entity_type_col_label"
+    t.string "notes_col_label"
+    t.string "currency_col_label"
     t.string "date_format", default: "%m/%d/%Y"
     t.string "signage_convention", default: "inflows_positive"
     t.string "error"
+    t.string "number_format"
+    t.string "exchange_operating_mic_col_label"
+    t.string "amount_type_strategy", default: "signed_amount"
+    t.string "amount_type_inflow_value"
     t.index ["family_id"], name: "index_imports_on_family_id"
   end
 
-  create_table "institutions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.string "name", null: false
-    t.string "logo_url"
-    t.uuid "family_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.datetime "last_synced_at"
-    t.index ["family_id"], name: "index_institutions_on_family_id"
-  end
-
   create_table "investments", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.jsonb "locked_attributes", default: {}
+  end
+
+  create_table "invitations", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "email"
+    t.string "role"
+    t.string "token"
+    t.uuid "family_id", null: false
+    t.uuid "inviter_id", null: false
+    t.datetime "accepted_at"
+    t.datetime "expires_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["email", "family_id"], name: "index_invitations_on_email_and_family_id", unique: true
+    t.index ["email"], name: "index_invitations_on_email"
+    t.index ["family_id"], name: "index_invitations_on_family_id"
+    t.index ["inviter_id"], name: "index_invitations_on_inviter_id"
+    t.index ["token"], name: "index_invitations_on_token", unique: true
   end
 
   create_table "invite_codes", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
@@ -397,44 +391,160 @@ ActiveRecord::Schema[7.2].define(version: 2024_10_09_132959) do
     t.index ["token"], name: "index_invite_codes_on_token", unique: true
   end
 
-  create_table "issues", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.string "issuable_type"
-    t.uuid "issuable_id"
-    t.string "type"
-    t.integer "severity"
-    t.datetime "last_observed_at"
-    t.datetime "resolved_at"
-    t.jsonb "data"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["issuable_type", "issuable_id"], name: "index_issues_on_issuable"
-  end
-
   create_table "loans", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "rate_type"
-    t.decimal "interest_rate", precision: 10, scale: 2
+    t.decimal "interest_rate", precision: 10, scale: 3
     t.integer "term_months"
+    t.decimal "initial_balance", precision: 19, scale: 4
+    t.jsonb "locked_attributes", default: {}
   end
 
   create_table "merchants", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "name", null: false
-    t.string "color", default: "#e99537", null: false
-    t.uuid "family_id", null: false
+    t.string "color"
+    t.uuid "family_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "logo_url"
+    t.string "website_url"
+    t.string "type", null: false
+    t.string "source"
+    t.string "provider_merchant_id"
+    t.index ["family_id", "name"], name: "index_merchants_on_family_id_and_name", unique: true, where: "((type)::text = 'FamilyMerchant'::text)"
     t.index ["family_id"], name: "index_merchants_on_family_id"
+    t.index ["source", "name"], name: "index_merchants_on_source_and_name", unique: true, where: "((type)::text = 'ProviderMerchant'::text)"
+    t.index ["type"], name: "index_merchants_on_type"
+  end
+
+  create_table "messages", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "chat_id", null: false
+    t.string "type", null: false
+    t.string "status", default: "complete", null: false
+    t.text "content"
+    t.string "ai_model"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.boolean "debug", default: false
+    t.string "provider_id"
+    t.boolean "reasoning", default: false
+    t.index ["chat_id"], name: "index_messages_on_chat_id"
+  end
+
+  create_table "mobile_devices", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "user_id", null: false
+    t.string "device_id"
+    t.string "device_name"
+    t.string "device_type"
+    t.string "os_version"
+    t.string "app_version"
+    t.datetime "last_seen_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "oauth_application_id"
+    t.index ["oauth_application_id"], name: "index_mobile_devices_on_oauth_application_id"
+    t.index ["user_id", "device_id"], name: "index_mobile_devices_on_user_id_and_device_id", unique: true
+    t.index ["user_id"], name: "index_mobile_devices_on_user_id"
+  end
+
+  create_table "oauth_access_grants", force: :cascade do |t|
+    t.string "resource_owner_id", null: false
+    t.bigint "application_id", null: false
+    t.string "token", null: false
+    t.integer "expires_in", null: false
+    t.text "redirect_uri", null: false
+    t.string "scopes", default: "", null: false
+    t.datetime "created_at", null: false
+    t.datetime "revoked_at"
+    t.index ["application_id"], name: "index_oauth_access_grants_on_application_id"
+    t.index ["resource_owner_id"], name: "index_oauth_access_grants_on_resource_owner_id"
+    t.index ["token"], name: "index_oauth_access_grants_on_token", unique: true
+  end
+
+  create_table "oauth_access_tokens", force: :cascade do |t|
+    t.string "resource_owner_id"
+    t.bigint "application_id", null: false
+    t.string "token", null: false
+    t.string "refresh_token"
+    t.integer "expires_in"
+    t.string "scopes"
+    t.datetime "created_at", null: false
+    t.datetime "revoked_at"
+    t.string "previous_refresh_token", default: "", null: false
+    t.index ["application_id"], name: "index_oauth_access_tokens_on_application_id"
+    t.index ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true
+    t.index ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id"
+    t.index ["token"], name: "index_oauth_access_tokens_on_token", unique: true
+  end
+
+  create_table "oauth_applications", force: :cascade do |t|
+    t.string "name", null: false
+    t.string "uid", null: false
+    t.string "secret", null: false
+    t.text "redirect_uri", null: false
+    t.string "scopes", default: "", null: false
+    t.boolean "confidential", default: true, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.uuid "owner_id"
+    t.string "owner_type"
+    t.index ["owner_id", "owner_type"], name: "index_oauth_applications_on_owner_id_and_owner_type"
+    t.index ["uid"], name: "index_oauth_applications_on_uid", unique: true
   end
 
   create_table "other_assets", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.jsonb "locked_attributes", default: {}
   end
 
   create_table "other_liabilities", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.jsonb "locked_attributes", default: {}
+  end
+
+  create_table "plaid_accounts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "plaid_item_id", null: false
+    t.string "plaid_id", null: false
+    t.string "plaid_type", null: false
+    t.string "plaid_subtype"
+    t.decimal "current_balance", precision: 19, scale: 4
+    t.decimal "available_balance", precision: 19, scale: 4
+    t.string "currency", null: false
+    t.string "name", null: false
+    t.string "mask"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.jsonb "raw_payload", default: {}
+    t.jsonb "raw_transactions_payload", default: {}
+    t.jsonb "raw_investments_payload", default: {}
+    t.jsonb "raw_liabilities_payload", default: {}
+    t.index ["plaid_id"], name: "index_plaid_accounts_on_plaid_id", unique: true
+    t.index ["plaid_item_id"], name: "index_plaid_accounts_on_plaid_item_id"
+  end
+
+  create_table "plaid_items", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "family_id", null: false
+    t.string "access_token"
+    t.string "plaid_id", null: false
+    t.string "name"
+    t.string "next_cursor"
+    t.boolean "scheduled_for_deletion", default: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "available_products", default: [], array: true
+    t.string "billed_products", default: [], array: true
+    t.string "plaid_region", default: "us", null: false
+    t.string "institution_url"
+    t.string "institution_id"
+    t.string "institution_color"
+    t.string "status", default: "good", null: false
+    t.jsonb "raw_payload", default: {}
+    t.jsonb "raw_institution_payload", default: {}
+    t.index ["family_id"], name: "index_plaid_items_on_family_id"
+    t.index ["plaid_id"], name: "index_plaid_items_on_plaid_id", unique: true
   end
 
   create_table "properties", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
@@ -443,22 +553,79 @@ ActiveRecord::Schema[7.2].define(version: 2024_10_09_132959) do
     t.integer "year_built"
     t.integer "area_value"
     t.string "area_unit"
+    t.jsonb "locked_attributes", default: {}
+  end
+
+  create_table "rejected_transfers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "inflow_transaction_id", null: false
+    t.uuid "outflow_transaction_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["inflow_transaction_id", "outflow_transaction_id"], name: "idx_on_inflow_transaction_id_outflow_transaction_id_412f8e7e26", unique: true
+    t.index ["inflow_transaction_id"], name: "index_rejected_transfers_on_inflow_transaction_id"
+    t.index ["outflow_transaction_id"], name: "index_rejected_transfers_on_outflow_transaction_id"
+  end
+
+  create_table "rule_actions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "rule_id", null: false
+    t.string "action_type", null: false
+    t.string "value"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["rule_id"], name: "index_rule_actions_on_rule_id"
+  end
+
+  create_table "rule_conditions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "rule_id"
+    t.uuid "parent_id"
+    t.string "condition_type", null: false
+    t.string "operator", null: false
+    t.string "value"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["parent_id"], name: "index_rule_conditions_on_parent_id"
+    t.index ["rule_id"], name: "index_rule_conditions_on_rule_id"
+  end
+
+  create_table "rules", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "family_id", null: false
+    t.string "resource_type", null: false
+    t.date "effective_date"
+    t.boolean "active", default: false, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "name"
+    t.index ["family_id"], name: "index_rules_on_family_id"
   end
 
   create_table "securities", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.string "ticker"
+    t.string "ticker", null: false
     t.string "name"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "country_code"
+    t.string "exchange_mic"
+    t.string "exchange_acronym"
+    t.string "logo_url"
+    t.string "exchange_operating_mic"
+    t.boolean "offline", default: false, null: false
+    t.datetime "failed_fetch_at"
+    t.integer "failed_fetch_count", default: 0, null: false
+    t.datetime "last_health_check_at"
+    t.index "upper((ticker)::text), COALESCE(upper((exchange_operating_mic)::text), ''::text)", name: "index_securities_on_ticker_and_exchange_operating_mic_unique", unique: true
+    t.index ["country_code"], name: "index_securities_on_country_code"
+    t.index ["exchange_operating_mic"], name: "index_securities_on_exchange_operating_mic"
   end
 
   create_table "security_prices", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.string "ticker"
-    t.date "date"
-    t.decimal "price", precision: 19, scale: 4
-    t.string "currency", default: "USD"
+    t.date "date", null: false
+    t.decimal "price", precision: 19, scale: 4, null: false
+    t.string "currency", default: "USD", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.uuid "security_id"
+    t.index ["security_id", "date", "currency"], name: "index_security_prices_on_security_id_and_date_and_currency", unique: true
+    t.index ["security_id"], name: "index_security_prices_on_security_id"
   end
 
   create_table "sessions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
@@ -467,6 +634,11 @@ ActiveRecord::Schema[7.2].define(version: 2024_10_09_132959) do
     t.string "ip_address"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.uuid "active_impersonator_session_id"
+    t.datetime "subscribed_at"
+    t.jsonb "prev_transaction_page_params", default: {}
+    t.jsonb "data", default: {}
+    t.index ["active_impersonator_session_id"], name: "index_sessions_on_active_impersonator_session_id"
     t.index ["user_id"], name: "index_sessions_on_user_id"
   end
 
@@ -478,6 +650,40 @@ ActiveRecord::Schema[7.2].define(version: 2024_10_09_132959) do
     t.index ["var"], name: "index_settings_on_var", unique: true
   end
 
+  create_table "subscriptions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "family_id", null: false
+    t.string "status", null: false
+    t.string "stripe_id"
+    t.decimal "amount", precision: 19, scale: 4
+    t.string "currency"
+    t.string "interval"
+    t.datetime "current_period_ends_at"
+    t.datetime "trial_ends_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["family_id"], name: "index_subscriptions_on_family_id", unique: true
+  end
+
+  create_table "syncs", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "syncable_type", null: false
+    t.uuid "syncable_id", null: false
+    t.string "status", default: "pending"
+    t.string "error"
+    t.jsonb "data"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.uuid "parent_id"
+    t.datetime "pending_at"
+    t.datetime "syncing_at"
+    t.datetime "completed_at"
+    t.datetime "failed_at"
+    t.date "window_start_date"
+    t.date "window_end_date"
+    t.index ["parent_id"], name: "index_syncs_on_parent_id"
+    t.index ["status"], name: "index_syncs_on_status"
+    t.index ["syncable_type", "syncable_id"], name: "index_syncs_on_syncable"
+  end
+
   create_table "taggings", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.uuid "tag_id", null: false
     t.string "taggable_type"
@@ -497,6 +703,55 @@ ActiveRecord::Schema[7.2].define(version: 2024_10_09_132959) do
     t.index ["family_id"], name: "index_tags_on_family_id"
   end
 
+  create_table "tool_calls", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "message_id", null: false
+    t.string "provider_id", null: false
+    t.string "provider_call_id"
+    t.string "type", null: false
+    t.string "function_name"
+    t.jsonb "function_arguments"
+    t.jsonb "function_result"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["message_id"], name: "index_tool_calls_on_message_id"
+  end
+
+  create_table "trades", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "security_id", null: false
+    t.decimal "qty", precision: 19, scale: 4
+    t.decimal "price", precision: 19, scale: 4
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "currency"
+    t.jsonb "locked_attributes", default: {}
+    t.index ["security_id"], name: "index_trades_on_security_id"
+  end
+
+  create_table "transactions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.uuid "category_id"
+    t.uuid "merchant_id"
+    t.jsonb "locked_attributes", default: {}
+    t.string "kind", default: "standard", null: false
+    t.index ["category_id"], name: "index_transactions_on_category_id"
+    t.index ["kind"], name: "index_transactions_on_kind"
+    t.index ["merchant_id"], name: "index_transactions_on_merchant_id"
+  end
+
+  create_table "transfers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "inflow_transaction_id", null: false
+    t.uuid "outflow_transaction_id", null: false
+    t.string "status", default: "pending", null: false
+    t.text "notes"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["inflow_transaction_id", "outflow_transaction_id"], name: "idx_on_inflow_transaction_id_outflow_transaction_id_8cd07a28bd", unique: true
+    t.index ["inflow_transaction_id"], name: "index_transfers_on_inflow_transaction_id"
+    t.index ["outflow_transaction_id"], name: "index_transfers_on_outflow_transaction_id"
+    t.index ["status"], name: "index_transfers_on_status"
+  end
+
   create_table "users", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.uuid "family_id", null: false
     t.string "first_name"
@@ -505,12 +760,35 @@ ActiveRecord::Schema[7.2].define(version: 2024_10_09_132959) do
     t.string "password_digest"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.string "last_prompted_upgrade_commit_sha"
-    t.string "last_alerted_upgrade_commit_sha"
-    t.enum "role", default: "member", null: false, enum_type: "user_role"
+    t.string "role", default: "member", null: false
     t.boolean "active", default: true, null: false
+    t.datetime "onboarded_at"
+    t.string "unconfirmed_email"
+    t.string "otp_secret"
+    t.boolean "otp_required", default: false, null: false
+    t.string "otp_backup_codes", default: [], array: true
+    t.boolean "show_sidebar", default: true
+    t.string "default_period", default: "last_30_days", null: false
+    t.uuid "last_viewed_chat_id"
+    t.boolean "show_ai_sidebar", default: true
+    t.boolean "ai_enabled", default: false, null: false
+    t.string "theme", default: "system"
+    t.boolean "rule_prompts_disabled", default: false
+    t.datetime "rule_prompt_dismissed_at"
+    t.text "goals", default: [], array: true
+    t.datetime "set_onboarding_preferences_at"
+    t.datetime "set_onboarding_goals_at"
     t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["family_id"], name: "index_users_on_family_id"
+    t.index ["last_viewed_chat_id"], name: "index_users_on_last_viewed_chat_id"
+    t.index ["otp_secret"], name: "index_users_on_otp_secret", unique: true, where: "(otp_secret IS NOT NULL)"
+  end
+
+  create_table "valuations", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.jsonb "locked_attributes", default: {}
+    t.string "kind", default: "reconciliation", null: false
   end
 
   create_table "vehicles", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
@@ -521,30 +799,58 @@ ActiveRecord::Schema[7.2].define(version: 2024_10_09_132959) do
     t.string "mileage_unit"
     t.string "make"
     t.string "model"
+    t.jsonb "locked_attributes", default: {}
   end
 
-  add_foreign_key "account_balances", "accounts", on_delete: :cascade
-  add_foreign_key "account_entries", "account_transfers", column: "transfer_id"
-  add_foreign_key "account_entries", "accounts"
-  add_foreign_key "account_entries", "imports"
-  add_foreign_key "account_holdings", "accounts"
-  add_foreign_key "account_holdings", "securities"
-  add_foreign_key "account_syncs", "accounts"
-  add_foreign_key "account_trades", "securities"
-  add_foreign_key "account_transactions", "categories", on_delete: :nullify
-  add_foreign_key "account_transactions", "merchants"
   add_foreign_key "accounts", "families"
   add_foreign_key "accounts", "imports"
-  add_foreign_key "accounts", "institutions"
+  add_foreign_key "accounts", "plaid_accounts"
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
+  add_foreign_key "api_keys", "users"
+  add_foreign_key "balances", "accounts", on_delete: :cascade
+  add_foreign_key "budget_categories", "budgets"
+  add_foreign_key "budget_categories", "categories"
+  add_foreign_key "budgets", "families"
   add_foreign_key "categories", "families"
+  add_foreign_key "chats", "users"
+  add_foreign_key "entries", "accounts"
+  add_foreign_key "entries", "imports"
+  add_foreign_key "holdings", "accounts"
+  add_foreign_key "holdings", "securities"
+  add_foreign_key "impersonation_session_logs", "impersonation_sessions"
+  add_foreign_key "impersonation_sessions", "users", column: "impersonated_id"
+  add_foreign_key "impersonation_sessions", "users", column: "impersonator_id"
   add_foreign_key "import_rows", "imports"
   add_foreign_key "imports", "families"
-  add_foreign_key "institutions", "families"
+  add_foreign_key "invitations", "families"
+  add_foreign_key "invitations", "users", column: "inviter_id"
   add_foreign_key "merchants", "families"
+  add_foreign_key "messages", "chats"
+  add_foreign_key "mobile_devices", "users"
+  add_foreign_key "oauth_access_grants", "oauth_applications", column: "application_id"
+  add_foreign_key "oauth_access_tokens", "oauth_applications", column: "application_id"
+  add_foreign_key "plaid_accounts", "plaid_items"
+  add_foreign_key "plaid_items", "families"
+  add_foreign_key "rejected_transfers", "transactions", column: "inflow_transaction_id"
+  add_foreign_key "rejected_transfers", "transactions", column: "outflow_transaction_id"
+  add_foreign_key "rule_actions", "rules"
+  add_foreign_key "rule_conditions", "rule_conditions", column: "parent_id"
+  add_foreign_key "rule_conditions", "rules"
+  add_foreign_key "rules", "families"
+  add_foreign_key "security_prices", "securities"
+  add_foreign_key "sessions", "impersonation_sessions", column: "active_impersonator_session_id"
   add_foreign_key "sessions", "users"
+  add_foreign_key "subscriptions", "families"
+  add_foreign_key "syncs", "syncs", column: "parent_id"
   add_foreign_key "taggings", "tags"
   add_foreign_key "tags", "families"
+  add_foreign_key "tool_calls", "messages"
+  add_foreign_key "trades", "securities"
+  add_foreign_key "transactions", "categories", on_delete: :nullify
+  add_foreign_key "transactions", "merchants"
+  add_foreign_key "transfers", "transactions", column: "inflow_transaction_id", on_delete: :cascade
+  add_foreign_key "transfers", "transactions", column: "outflow_transaction_id", on_delete: :cascade
+  add_foreign_key "users", "chats", column: "last_viewed_chat_id"
   add_foreign_key "users", "families"
 end
diff --git a/db/seeds.rb b/db/seeds.rb
index 4d7837d9..3de4ad5e 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -2,4 +2,9 @@
 # development, test). The code here should be idempotent so that it can be executed at any point in every environment.
 # The data can then be loaded with the bin/rails db:seed command (or created alongside the database with db:setup).
 
-puts 'Run the following command to create demo data: `rake demo_data:reset`' if Rails.env.development?
+puts 'Run the following command to create demo data: `rake demo_data:default`' if Rails.env.development?
+
+Dir[Rails.root.join('db', 'seeds', '*.rb')].sort.each do |file|
+  puts "Loading seed file: #{File.basename(file)}"
+  require file
+end
diff --git a/app/assets/images/.keep b/db/seeds/.keep
similarity index 100%
rename from app/assets/images/.keep
rename to db/seeds/.keep
diff --git a/db/seeds/oauth_applications.rb b/db/seeds/oauth_applications.rb
new file mode 100644
index 00000000..c84e6a24
--- /dev/null
+++ b/db/seeds/oauth_applications.rb
@@ -0,0 +1,14 @@
+# Create OAuth applications for Maybe's first-party apps
+# These are the only OAuth apps that will exist - external developers use API keys
+
+# Maybe iOS App
+ios_app = Doorkeeper::Application.find_or_create_by(name: "Maybe iOS") do |app|
+  app.redirect_uri = "maybe://oauth/callback"
+  app.scopes = "read_accounts read_transactions read_balances"
+  app.confidential = false # Public client (mobile app)
+end
+
+puts "Created OAuth applications:"
+puts "iOS App - Client ID: #{ios_app.uid}"
+puts ""
+puts "External developers should use API keys instead of OAuth."
diff --git a/docker-compose.example.yml b/docker-compose.example.yml
deleted file mode 100644
index 683d35de..00000000
--- a/docker-compose.example.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-# ===========================================================================
-# Example Docker Compose file
-# ===========================================================================
-#
-# Purpose:
-# --------
-#
-# This file is an example Docker Compose configuration for self hosting
-# Maybe on your local machine or on a cloud VPS.
-#
-# The configuration below is a "standard" setup, but may require modification
-# for your specific environment.
-#
-# Setup:
-# ------
-#
-# To run this, you should read the setup guide:
-#
-# https://github.com/maybe-finance/maybe/blob/main/docs/hosting/docker.md
-#
-# Troubleshooting:
-# ----------------
-#
-# If you run into problems, you should open a Discussion here:
-#
-# https://github.com/maybe-finance/maybe/discussions/categories/general
-#
-
-services:
-
-  app:
-    image: ghcr.io/maybe-finance/maybe:latest
-
-    volumes:
-      - app-storage:/rails/storage
-
-    ports:
-      - 3000:3000
-
-    restart: unless-stopped
-
-    environment:
-      SELF_HOSTED: "true"
-      RAILS_FORCE_SSL: "false"
-      RAILS_ASSUME_SSL: "false"
-      GOOD_JOB_EXECUTION_MODE: async
-      SECRET_KEY_BASE: ${SECRET_KEY_BASE:?}
-      DB_HOST: postgres
-      POSTGRES_DB: ${POSTGRES_DB:-maybe_production}
-      POSTGRES_USER: ${POSTGRES_USER:-maybe_user}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?}
-
-    depends_on:
-      postgres:
-        condition: service_healthy
-
-  postgres:
-    image: postgres:16
-    restart: unless-stopped
-    volumes:
-      - postgres-data:/var/lib/postgresql/data
-    environment:
-      POSTGRES_USER: ${POSTGRES_USER:-maybe_user}
-      POSTGRES_DB: ${POSTGRES_DB:-maybe_production}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?}
-    healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB" ]
-      interval: 5s
-      timeout: 5s
-      retries: 5
-
-volumes:
-  app-storage:
-  postgres-data:
\ No newline at end of file
diff --git a/docs/api/chats.md b/docs/api/chats.md
new file mode 100644
index 00000000..159994cb
--- /dev/null
+++ b/docs/api/chats.md
@@ -0,0 +1,228 @@
+# Chat API Documentation
+
+The Chat API allows external applications to interact with Maybe's AI chat functionality.
+
+## Authentication
+
+All chat endpoints require authentication via OAuth2 or API keys. The chat endpoints also require the user to have AI features enabled (`ai_enabled: true`).
+
+## Endpoints
+
+### List Chats
+```
+GET /api/v1/chats
+```
+
+**Required Scope:** `read`
+
+**Response:**
+```json
+{
+  "chats": [
+    {
+      "id": "uuid",
+      "title": "Chat title",
+      "last_message_at": "2024-01-01T00:00:00Z",
+      "message_count": 5,
+      "error": null,
+      "created_at": "2024-01-01T00:00:00Z",
+      "updated_at": "2024-01-01T00:00:00Z"
+    }
+  ],
+  "pagination": {
+    "page": 1,
+    "per_page": 20,
+    "total_count": 50,
+    "total_pages": 3
+  }
+}
+```
+
+### Get Chat
+```
+GET /api/v1/chats/:id
+```
+
+**Required Scope:** `read`
+
+**Response:**
+```json
+{
+  "id": "uuid",
+  "title": "Chat title",
+  "error": null,
+  "created_at": "2024-01-01T00:00:00Z",
+  "updated_at": "2024-01-01T00:00:00Z",
+  "messages": [
+    {
+      "id": "uuid",
+      "type": "user_message",
+      "role": "user",
+      "content": "Hello AI",
+      "created_at": "2024-01-01T00:00:00Z",
+      "updated_at": "2024-01-01T00:00:00Z"
+    },
+    {
+      "id": "uuid",
+      "type": "assistant_message",
+      "role": "assistant",
+      "content": "Hello! How can I help you?",
+      "model": "gpt-4",
+      "created_at": "2024-01-01T00:00:00Z",
+      "updated_at": "2024-01-01T00:00:00Z",
+      "tool_calls": []
+    }
+  ],
+  "pagination": {
+    "page": 1,
+    "per_page": 50,
+    "total_count": 2,
+    "total_pages": 1
+  }
+}
+```
+
+### Create Chat
+```
+POST /api/v1/chats
+```
+
+**Required Scope:** `write`
+
+**Request Body:**
+```json
+{
+  "title": "Optional chat title",
+  "message": "Initial message to AI",
+  "model": "gpt-4" // optional, defaults to gpt-4
+}
+```
+
+**Response:** Same as Get Chat endpoint
+
+### Update Chat
+```
+PATCH /api/v1/chats/:id
+```
+
+**Required Scope:** `write`
+
+**Request Body:**
+```json
+{
+  "title": "New chat title"
+}
+```
+
+**Response:** Same as Get Chat endpoint
+
+### Delete Chat
+```
+DELETE /api/v1/chats/:id
+```
+
+**Required Scope:** `write`
+
+**Response:** 204 No Content
+
+### Create Message
+```
+POST /api/v1/chats/:chat_id/messages
+```
+
+**Required Scope:** `write`
+
+**Request Body:**
+```json
+{
+  "content": "User message",
+  "model": "gpt-4" // optional, defaults to gpt-4
+}
+```
+
+**Response:**
+```json
+{
+  "id": "uuid",
+  "chat_id": "uuid",
+  "type": "user_message",
+  "role": "user",
+  "content": "User message",
+  "created_at": "2024-01-01T00:00:00Z",
+  "updated_at": "2024-01-01T00:00:00Z",
+  "ai_response_status": "pending",
+  "ai_response_message": "AI response is being generated"
+}
+```
+
+### Retry Last Message
+```
+POST /api/v1/chats/:chat_id/messages/retry
+```
+
+**Required Scope:** `write`
+
+Retries the last assistant message in the chat.
+
+**Response:**
+```json
+{
+  "message": "Retry initiated",
+  "message_id": "uuid"
+}
+```
+
+## AI Response Handling
+
+AI responses are processed asynchronously. When you create a message or chat with an initial message, the API returns immediately with the user message. The AI response is generated in the background.
+
+### Checking for AI Responses
+
+Currently, you need to poll the chat endpoint to check for new AI responses. Look for new messages with `type: "assistant_message"`.
+
+### Available AI Models
+
+- `gpt-4` (default)
+- `gpt-4-turbo`
+- `gpt-3.5-turbo`
+
+### Tool Calls
+
+The AI assistant can make tool calls to access user financial data. These appear in the `tool_calls` array of assistant messages:
+
+```json
+{
+  "tool_calls": [
+    {
+      "id": "uuid",
+      "function_name": "get_accounts",
+      "function_arguments": {},
+      "function_result": { ... },
+      "created_at": "2024-01-01T00:00:00Z"
+    }
+  ]
+}
+```
+
+## Error Handling
+
+All endpoints return standard error responses:
+
+```json
+{
+  "error": "error_code",
+  "message": "Human readable error message",
+  "details": ["Additional error details"] // optional
+}
+```
+
+Common error codes:
+- `unauthorized` - Invalid or missing authentication
+- `forbidden` - Insufficient permissions or AI not enabled
+- `not_found` - Resource not found
+- `unprocessable_entity` - Invalid request data
+- `rate_limit_exceeded` - Too many requests
+
+## Rate Limits
+
+Chat API endpoints are subject to the standard API rate limits based on your API key tier.
\ No newline at end of file
diff --git a/docs/hosting/docker.md b/docs/hosting/docker.md
index c112f42d..28ae6b16 100644
--- a/docs/hosting/docker.md
+++ b/docs/hosting/docker.md
@@ -2,10 +2,6 @@
 
 This guide will help you setup, update, and maintain your self-hosted Maybe application with Docker Compose. Docker Compose is the most popular and recommended way to self-host the Maybe app.
 
-If you want a _less
-technical_ way to host the Maybe app, you can [host on Render](/docs/hosting/one-click-deploy.md) as an
-_**alternative** to Docker Compose_.
-
 ## Setup Guide
 
 Follow the guide below to get your app running.
@@ -23,14 +19,14 @@ Complete the following steps:
 docker run hello-world
 ```
 
-### Step 2: Configure your Docker Compose file and environnment
+### Step 2: Configure your Docker Compose file and environment
 
 #### Create a directory for your app to run
 
 Open your terminal and create a directory where your app will run. Below is an example command with a recommended directory:
 
 ```bash
-# Create a directory on your computer for Docker files
+# Create a directory on your computer for Docker files (name whatever you'd like)
 mkdir -p ~/docker-apps/maybe
 
 # Once created, navigate your current working directory to the new folder
@@ -42,8 +38,8 @@ cd ~/docker-apps/maybe
 Make sure you are in the directory you just created and run the following command:
 
 ```bash
-# Download the sample docker-compose.yml file from the Maybe Github repository
-curl -o compose.yml https://raw.githubusercontent.com/maybe-finance/maybe/main/docker-compose.example.yml
+# Download the sample compose.yml file from the Maybe Github repository
+curl -o compose.yml https://raw.githubusercontent.com/maybe-finance/maybe/main/compose.example.yml
 ```
 
 This command will do the following:
@@ -53,6 +49,12 @@ This command will do the following:
 
 At this point, the only file in your current working directory should be `compose.yml`.
 
+### Step 3 (optional): Configure your environment
+
+By default, our `compose.example.yml` file runs without any configuration.  That said, if you would like extra security (important if you're running outside of a local network), you can follow the steps below to set things up.
+
+If you're running the app locally and don't care much about security, you can skip this step.
+
 #### Create your environment file
 
 In order to configure the app, you will need to create a file called `.env`, which is where Docker will read environment variables from.
@@ -92,7 +94,7 @@ SECRET_KEY_BASE="replacemewiththegeneratedstringfromthepriorstep"
 POSTGRES_PASSWORD="replacemewithyourdesireddatabasepassword"
 ```
 
-### Step 3: Test your app
+### Step 4: Run the app
 
 You are now ready to run the app. Start with the following command to make sure everything is working:
 
@@ -106,14 +108,14 @@ Open your browser, and navigate to `http://localhost:3000`.
 
 If everything is working, you will see the Maybe login screen.
 
-### Step 4: Create your account
+### Step 5: Create your account
 
 The first time you run the app, you will need to register a new account by hitting "create your account" on the login page.
 
 1. Enter your email
 2. Enter a password
 
-### Step 5: Run the app in the background
+### Step 6: Run the app in the background
 
 Most self-hosting users will want the Maybe app to run in the background on their computer so they can access it at all times. To do this, hit `Ctrl+C` to stop the running process, and then run the following command:
 
@@ -127,7 +129,7 @@ The `-d` flag will run Docker Compose in "detached" mode. To verify it is runnin
 docker compose ls
 ```
 
-### Step 6: Enjoy!
+### Step 7: Enjoy!
 
 Your app is now set up. You can visit it at `http://localhost:3000` in your browser.
 
@@ -135,7 +137,7 @@ If you find bugs or have a feature request, be sure to read through our [contrib
 
 ## How to update your app
 
-The mechanism that updates your self-hosted Maybe app is the GHCR (Github Container Registry) Docker image that you see in the `docker-compose.yml` file:
+The mechanism that updates your self-hosted Maybe app is the GHCR (Github Container Registry) Docker image that you see in the `compose.yml` file:
 
 ```yml
 image: ghcr.io/maybe-finance/maybe:latest
@@ -152,13 +154,13 @@ NOT_ automatically update. To update your self-hosted app, run the following com
 ```bash
 cd ~/docker-apps/maybe # Navigate to whatever directory you configured the app in
 docker compose pull # This pulls the "latest" published image from GHCR
-docker compose build app # This rebuilds the app with updates
-docker compose up --no-deps -d app # This restarts the app using the newest version
+docker compose build # This rebuilds the app with updates
+docker compose up --no-deps -d web worker # This restarts the app using the newest version
 ```
 
 ## How to change which updates your app receives
 
-If you'd like to pin the app to a specific version or tag, all you need to do is edit the `docker-compose.yml` file:
+If you'd like to pin the app to a specific version or tag, all you need to do is edit the `compose.yml` file:
 
 ```yml
 image: ghcr.io/maybe-finance/maybe:stable
@@ -168,7 +170,7 @@ After doing this, make sure and restart the app:
 
 ```bash
 docker compose pull # This pulls the "latest" published image from GHCR
-docker compose build app # This rebuilds the app with updates
+docker compose build # This rebuilds the app with updates
 docker compose up --no-deps -d app # This restarts the app using the newest version
 ```
 
diff --git a/docs/hosting/one-click-deploy.md b/docs/hosting/one-click-deploy.md
deleted file mode 100644
index 629f87fb..00000000
--- a/docs/hosting/one-click-deploy.md
+++ /dev/null
@@ -1,90 +0,0 @@
-# Deploy Maybe in One Click
-
-Below are our "one-click deploy" options for running Maybe in the cloud:
-
-## Render
-
-Welcome to the one-click deploy guide for Maybe on [Render](https://render.com/)!
-
-Render is a hosting platform with a generous free tier and makes it easy to get
-started with Maybe:
-
-- Getting started is FREE
-- Up and running in <5 minutes
-- Your Maybe app is automatically deployed to a live URL
-
-### Estimated Costs
-
-- FREE to _get up and running_
-- $7 per month for a basic app (Render requires you to upgrade your database to
-  keep using it)
-- $14+ per month for optimal performance
-
-_**IMPORTANT:** if you plan to host Maybe on Render long-term, you MUST upgrade
-your database to a paid Render service._
-
-### Instructions
-
-#### Step 1: Create Render Blueprint
-
-<a href="https://render.com/deploy?repo=https://github.com/maybe-finance/maybe">
-<img src="https://render.com/images/deploy-to-render-button.svg" alt="Deploy to Render" />
-</a>
-
-1. Click the button above.
-2. Sign in or create your account with Render (FREE)
-3. Give your blueprint a name (we suggest `Maybe`)
-4. Select the `main` branch
-5. You should see a section at the bottom with a "Key:Value" field
-   for `SECRET_KEY_BASE`. Do NOT click "generate".
-6. On your computer, open a terminal and make sure you have
-   the [openssl](https://github.com/openssl/openssl) utility installed on your
-   computer. You can run `openssl --version` to verify it is installed.
-7. Generate your `SECRET_KEY_BASE` by running the following command in your
-   terminal: `openssl rand -hex 64` ([docs](https://www.openssl.org/docs/man1.1.1/man1/rand.html)).
-8. Do NOT share this value with anyone.
-9. Go back to your browser and paste this value in the "Value" field
-   for `SECRET_KEY_BASE`
-10. Click "Apply". This will take a few minutes.
-11. Once complete, click on the `maybe` "Web Service". You should see a custom
-    URL in the format `https://maybe-abcd.onrender.com`. Click on it, and you'll
-    see your running Maybe app!
-
-#### Step 2: Add your deploy hook for auto-updates
-
-To get new releases, you will need to add your deploy hook to the app.
-
-1. Click on the `maybe` "Web Service"
-2. Click "Settings"
-3. Scroll down to the end of the "Build and Deploy" section until you find the "
-   Deploy Hook"
-4. Copy this value
-5. Open your new Maybe app, click your profile, click "Self Host Settings"
-6. Paste your deploy hook in the settings and save
-7. You're all set!
-
-#### Step 3 (IMPORTANT!!!): Upgrade your Render services
-
-By default, we set you up with a FREE Render web service and a FREE postgres
-database. We do this for a few reasons:
-
-- It allows you to take self-hosted Maybe for a FREE test-drive
-- It prevents newcomers from incurring unexpected hosting charges
-
-##### Upgrade your Database (REQUIRED)
-
-All FREE Render databases **will be deleted after a few months**. This means
-that **you will lose all of your Maybe data**.
-
-**To avoid losing data, you MUST upgrade your Render database** (a "starter"
-instance is $7/month)
-
-You can upgrade your instance directly in the Render dashboard.
-
-##### Upgrade your Web Service (RECOMMENDED)
-
-All FREE Render web services use a small amount of memory and "sleep" after
-periods of inactivity.
-
-For the _fastest_ Maybe experience, you should upgrade your web service (a "
-starter" instance is $7/month)
diff --git a/lib/money.rb b/lib/money.rb
index 37ab7cdb..ed1e00d4 100644
--- a/lib/money.rb
+++ b/lib/money.rb
@@ -46,7 +46,7 @@ class Money
     if iso_code == other_iso_code
       self
     else
-      exchange_rate = store.find_rate(from: iso_code, to: other_iso_code, date: date)&.rate || fallback_rate
+      exchange_rate = store.find_or_fetch_rate(from: iso_code, to: other_iso_code, date: date)&.rate || fallback_rate
 
       raise ConversionError.new(from_currency: iso_code, to_currency: other_iso_code, date: date) unless exchange_rate
 
@@ -55,7 +55,7 @@ class Money
   end
 
   def as_json
-    { amount: amount, currency: currency.iso_code }.as_json
+    { amount: amount, currency: currency.iso_code, formatted: format }.as_json
   end
 
   def <=>(other)
diff --git a/lib/money/arithmetic.rb b/lib/money/arithmetic.rb
index 99000066..03183e41 100644
--- a/lib/money/arithmetic.rb
+++ b/lib/money/arithmetic.rb
@@ -54,6 +54,10 @@ module Money::Arithmetic
     amount.positive?
   end
 
+  def to_f
+    amount.to_f
+  end
+
   # Override Ruby's coerce method so the order of operands doesn't matter
   # Wrap in Coerced so we can distinguish between Money and other types
   def coerce(other)
diff --git a/lib/money/currency.rb b/lib/money/currency.rb
index 47dbc077..e38cd1f6 100644
--- a/lib/money/currency.rb
+++ b/lib/money/currency.rb
@@ -23,13 +23,24 @@ class Money::Currency
     end
 
     def all
-      @all ||= YAML.load_file(CURRENCIES_FILE_PATH)
+      @all ||= YAML.safe_load(
+        File.read(CURRENCIES_FILE_PATH),
+        permitted_classes: [],
+        permitted_symbols: [],
+        aliases: true
+      )
     end
 
     def all_instances
       all.values.map { |currency_data| new(currency_data["iso_code"]) }
     end
 
+    def as_options
+      all_instances.sort_by do |currency|
+        [ currency.priority, currency.name ]
+      end
+    end
+
     def popular
       all.values.sort_by { |currency| currency["priority"] }.first(12).map { |currency_data| new(currency_data["iso_code"]) }
     end
diff --git a/lib/money/formatting.rb b/lib/money/formatting.rb
index 3a5cb092..cd160bef 100644
--- a/lib/money/formatting.rb
+++ b/lib/money/formatting.rb
@@ -1,11 +1,11 @@
 module Money::Formatting
-  # Fallback formatting.  For advanced formatting, use Rails number_to_currency helper.
-  def format
-    whole_part, fractional_part = sprintf("%.#{currency.default_precision}f", amount).split(".")
-    whole_with_delimiters = whole_part.chars.to_a.reverse.each_slice(3).map(&:join).join(currency.delimiter).reverse
-    formatted_amount = "#{whole_with_delimiters}#{currency.separator}#{fractional_part}"
+  include ActiveSupport::NumberHelper
 
-    currency.default_format.gsub("%n", formatted_amount).gsub("%u", currency.symbol)
+  def format(options = {})
+    locale = options[:locale] || I18n.locale
+    default_opts = format_options(locale)
+
+    number_to_currency(amount, default_opts.merge(options))
   end
   alias_method :to_s, :format
 
@@ -13,7 +13,7 @@ module Money::Formatting
     local_option_overrides = locale_options(locale)
 
     {
-      unit: currency.symbol,
+      unit: get_symbol,
       precision: currency.default_precision,
       delimiter: currency.delimiter,
       separator: currency.separator,
@@ -22,6 +22,14 @@ module Money::Formatting
   end
 
   private
+    def get_symbol
+      if currency.symbol == "$" && currency.iso_code != "USD"
+        [ currency.iso_code.first(2), currency.symbol ].join
+      else
+        currency.symbol
+      end
+    end
+
     def locale_options(locale)
       case [ currency.iso_code, locale.to_sym ]
       when [ "EUR", :nl ], [ "EUR", :pt ]
diff --git a/lib/retryable.rb b/lib/retryable.rb
deleted file mode 100644
index 2f1bd002..00000000
--- a/lib/retryable.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-module Retryable
-  def retrying(retryable_errors = [], max_retries: 3)
-    attempts = 0
-
-    begin
-      on_last_attempt = attempts == max_retries - 1
-
-      yield on_last_attempt
-    rescue *retryable_errors => e
-      attempts += 1
-
-      if attempts < max_retries
-        retry
-      else
-        raise e
-      end
-    end
-  end
-end
diff --git a/lib/tasks/benchmarking.rake b/lib/tasks/benchmarking.rake
new file mode 100644
index 00000000..793c521c
--- /dev/null
+++ b/lib/tasks/benchmarking.rake
@@ -0,0 +1,192 @@
+# Benchmarking requires a production-like data sample, so requires some up-front setup.
+#
+# 1. Load a scrubbed production-like slice of data into maybe_benchmarking DB locally
+# 2. Setup .env.production so that the Rails app can boot with RAILS_ENV=production and connect to local maybe_benchmarking DB
+# 3. Run `rake benchmark_dump:06_setup_bench_user`
+# 4. Run locally, find endpoint needed
+# 5. Run an endpoint, example: `ENDPOINT=/budgets/jun-2025/budget_categories/245637cb-129f-4612-b0a8-1de57559372b RAILS_ENV=production BENCHMARKING_ENABLED=true RAILS_LOG_LEVEL=debug rake benchmarking:ips`
+namespace :benchmarking do
+  desc "Benchmark specific code"
+  task code: :environment do
+    Benchmark.ips do |x|
+      x.config(time: 30, warmup: 10)
+
+      family = User.find_by(email: "user@maybe.local").family
+      scope = family.transactions.active
+
+      # x.report("IncomeStatement::Totals") do
+      #   IncomeStatement::Totals.new(family, transactions_scope: scope).call
+      # end
+
+      # x.report("IncomeStatement::CategoryStats") do
+      #   IncomeStatement::CategoryStats.new(family).call
+      # end
+
+      # x.report("IncomeStatement::FamilyStats") do
+      #   IncomeStatement::FamilyStats.new(family).call
+      # end
+
+      puts family.entries.count
+
+      x.report("Transaction::Totals") do
+        search = Transaction::Search.new(family)
+        search.totals
+      end
+
+      x.compare!
+    end
+  end
+
+  desc "Shorthand task for running warm/cold benchmark"
+  task endpoint: :environment do
+    system(
+      "RAILS_ENV=production BENCHMARKING_ENABLED=true ENDPOINT=#{ENV.fetch("ENDPOINT", "/")} rake benchmarking:warm_cold_endpoint_ips"
+    )
+  end
+
+  # When to use: Track overall endpoint speed improvements over time (recommended, most practical test)
+  desc "Run cold & warm performance benchmarks and append to history"
+  task warm_cold_endpoint_ips: :environment do
+    path = ENV.fetch("ENDPOINT", "/")
+
+    # 🚫 Fail fast unless the benchmark is run in production mode
+    unless Rails.env.production?
+      raise "benchmark:ips must be run with RAILS_ENV=production (current: #{Rails.env})"
+    end
+
+    # ---------------------------------------------------------------------------
+    # Tunable parameters – override with environment variables if needed
+    # ---------------------------------------------------------------------------
+    cold_warmup     = Integer(ENV.fetch("COLD_WARMUP", 0))  # seconds to warm up before *cold* timing (0 == true cold)
+    cold_iterations = Integer(ENV.fetch("COLD_ITERATIONS", 1)) # requests to measure for the cold run
+
+    warm_warmup     = Integer(ENV.fetch("WARM_WARMUP", 5))  # seconds benchmark-ips uses to stabilise JIT/caches
+    warm_time       = Integer(ENV.fetch("WARM_TIME", 10))   # seconds benchmark-ips samples for warm statistics
+    # ---------------------------------------------------------------------------
+
+    setup_benchmark_env(path)
+    FileUtils.mkdir_p("tmp/benchmarks")
+
+    timestamp  = Time.current.strftime("%Y-%m-%d %H:%M:%S")
+    commit_sha = `git rev-parse --short HEAD 2>/dev/null`.strip rescue "unknown"
+    puts "🕒 Starting benchmark run at #{timestamp} (#{commit_sha})"
+
+    # 🚿  Flush application caches so the first request is a *true* cold hit
+    Rails.cache&.clear if defined?(Rails)
+
+    # ---------------------------
+    # 1️⃣  Cold measurement
+    # ---------------------------
+    puts "❄️  Running cold benchmark for #{path} (#{cold_iterations} iteration)..."
+    cold_cmd = "IPS_WARMUP=#{cold_warmup} IPS_TIME=0 IPS_ITERATIONS=#{cold_iterations} " \
+               "bundle exec derailed exec perf:ips"
+    cold_output = `#{cold_cmd} 2>&1`
+
+    puts "Cold output:"
+    puts cold_output
+
+    cold_result = extract_clean_results(cold_output)
+
+    # ---------------------------
+    # 2️⃣  Warm measurement
+    # ---------------------------
+    puts "🔥 Running warm benchmark for #{path} (#{warm_time}s sample)..."
+    warm_cmd = "IPS_WARMUP=#{warm_warmup} IPS_TIME=#{warm_time} " \
+               "bundle exec derailed exec perf:ips"
+    warm_output = `#{warm_cmd} 2>&1`
+
+    puts "Warm output:"
+    puts warm_output
+
+    warm_result = extract_clean_results(warm_output)
+
+    # ---------------------------------------------------------------------------
+    # Persist results
+    # ---------------------------------------------------------------------------
+    separator        = "\n" + "=" * 70 + "\n"
+    timestamp_header = "#{separator}📊 BENCHMARK RUN - #{timestamp} (#{commit_sha})#{separator}"
+
+    # Table header
+    table_header    = "| Type | IPS | Deviation | Time/Iteration | Iterations | Total Time |\n"
+    table_separator = "|------|-----|-----------|----------------|------------|------------|\n"
+
+    cold_row        = format_table_row("COLD", cold_result)
+    warm_row        = format_table_row("WARM", warm_result)
+
+    combined_result = table_header + table_separator + cold_row + warm_row + "\n"
+
+    File.open(benchmark_file(path), "a") { |f| f.write(timestamp_header + combined_result) }
+
+    puts "✅ Results saved to #{benchmark_file(path)}"
+  end
+
+  private
+    def setup_benchmark_env(path)
+      ENV["USE_AUTH"]      = "true"
+      ENV["USE_SERVER"]    = "puma"
+      ENV["PATH_TO_HIT"]   = path
+      ENV["HTTP_METHOD"]   = "GET"
+      ENV["RAILS_LOG_LEVEL"] ||= "error" # keep output clean
+    end
+
+    def benchmark_file(path)
+      filename = case path
+      when "/" then "dashboard"
+      else
+        path.gsub("/", "_").gsub(/^_+/, "")
+      end
+      "tmp/benchmarks/#{filename}.txt"
+    end
+
+    def extract_clean_results(output)
+      lines = output.split("\n")
+
+      # Example benchmark-ips output line:
+      # "         SomeLabel    14.416k (± 3.8%) i/s -     72.000k in   5.004618s"
+      result_line = lines.find { |line| line.match(/\d[\d\.kM]*\s+\(±\s*[0-9\.]+%\)\s+i\/s/) }
+
+      if result_line
+        if (match = result_line.match(/(\d[\d\.kM]*)\s+\(±\s*([0-9\.]+)%\)\s+i\/s\s+(?:\(([^)]+)\)\s+)?-\s+(\d[\d\.kM]*)\s+in\s+(\d+\.\d+)s/))
+          ips_value          = match[1]
+          deviation_percent  = match[2].to_f
+          time_per_iteration = match[3] || "-"
+          iterations         = match[4]
+          total_time         = "#{match[5]}s"
+
+          {
+            ips:                ips_value,
+            deviation:          "± %.2f%%" % deviation_percent,
+            time_per_iteration: time_per_iteration,
+            iterations:         iterations,
+            total_time:         total_time
+          }
+        else
+          no_data_hash
+        end
+      else
+        no_data_hash("No results")
+      end
+    end
+
+    def format_table_row(type, data)
+      # Wider deviation column accommodates strings like "± 0.12%"
+      "| %-4s | %-5s | %-11s | %-14s | %-10s | %-10s |\n" % [
+        type,
+        data[:ips],
+        data[:deviation],
+        data[:time_per_iteration],
+        data[:iterations],
+        data[:total_time]
+      ]
+    end
+
+    def no_data_hash(ips_msg = "No data")
+      {
+        ips:                ips_msg,
+        deviation:          "-",
+        time_per_iteration: "-",
+        iterations:         "-",
+        total_time:         "-"
+      }
+    end
+end
diff --git a/lib/tasks/data_migration.rake b/lib/tasks/data_migration.rake
new file mode 100644
index 00000000..6d3a14fd
--- /dev/null
+++ b/lib/tasks/data_migration.rake
@@ -0,0 +1,157 @@
+namespace :data_migration do
+  desc "Migrate EU Plaid webhooks"
+  # 2025-02-07: EU Plaid items need to be moved over to a new webhook URL so that we can
+  # instantiate the correct Plaid client for verification based on which Plaid instance it comes from
+  task eu_plaid_webhooks: :environment do
+    provider = Provider::Plaid.new(Rails.application.config.plaid_eu, region: :eu)
+
+    eu_items = PlaidItem.where(plaid_region: "eu")
+
+    eu_items.find_each do |item|
+      request = Plaid::ItemWebhookUpdateRequest.new(
+        access_token: item.access_token,
+        webhook: "https://app.maybefinance.com/webhooks/plaid_eu"
+      )
+
+      provider.client.item_webhook_update(request)
+
+      puts "Updated webhook for Plaid item #{item.plaid_id}"
+    rescue => error
+      puts "Error updating webhook for Plaid item #{item.plaid_id}: #{error.message}"
+    end
+  end
+
+  desc "Migrate duplicate securities"
+  # 2025-05-22: older data allowed multiple rows with the same
+  # ticker / exchange_operating_mic (case-insensitive, NULLs collapsed).
+  # This task:
+  #   1. Finds each duplicate group
+  #   2. Chooses the earliest-created row as the keeper
+  #   3. Re-points holdings and trades to the keeper
+  #   4. Destroys the duplicate (which also removes its prices)
+  task migrate_duplicate_securities: :environment do
+    puts "==> Scanning for duplicate securities…"
+
+    duplicate_sets = Security
+      .select("UPPER(ticker) AS up_ticker,
+               COALESCE(UPPER(exchange_operating_mic), '') AS up_mic,
+               COUNT(*) AS dup_count")
+      .group("up_ticker, up_mic")
+      .having("COUNT(*) > 1")
+      .to_a
+
+    puts "Found #{duplicate_sets.size} duplicate groups."
+
+    duplicate_sets.each_with_index do |set, idx|
+      # Fetch duplicates ordered by creation; the first row becomes keeper
+      duplicates_scope = Security
+                           .where("UPPER(ticker) = ? AND COALESCE(UPPER(exchange_operating_mic), '') = ?",
+                                  set.up_ticker, set.up_mic)
+                           .order(:created_at)
+
+      keeper = duplicates_scope.first
+      next unless keeper
+
+      duplicates = duplicates_scope.offset(1)
+
+      dup_ids    = duplicates.ids
+
+      # Skip if nothing to merge (defensive; shouldn't occur)
+      next if dup_ids.empty?
+
+      begin
+        ActiveRecord::Base.transaction do
+          # --------------------------------------------------------------
+          # HOLDINGS
+          # --------------------------------------------------------------
+          holdings_moved   = 0
+          holdings_deleted = 0
+
+          dup_ids.each do |dup_id|
+            Holding.where(security_id: dup_id).find_each(batch_size: 1_000) do |holding|
+              # Will this holding collide with an existing keeper row?
+              conflict_exists = Holding.where(
+                account_id: holding.account_id,
+                security_id: keeper.id,
+                date:        holding.date,
+                currency:    holding.currency
+              ).exists?
+
+              if conflict_exists
+                holding.destroy!
+                holdings_deleted += 1
+              else
+                holding.update!(security_id: keeper.id)
+                holdings_moved += 1
+              end
+            end
+          end
+
+          # --------------------------------------------------------------
+          # TRADES — no uniqueness constraints -> bulk update is fine
+          # --------------------------------------------------------------
+          trades_moved = Trade.where(security_id: dup_ids).update_all(security_id: keeper.id)
+
+          # Ensure no rows remain pointing at duplicates before deletion
+          raise "Leftover holdings detected" if Holding.where(security_id: dup_ids).exists?
+          raise "Leftover trades detected"   if Trade.where(security_id: dup_ids).exists?
+
+          duplicates.each(&:destroy!)   # destroys its security_prices via dependent: :destroy
+
+          # Log inside the transaction so counters are in-scope
+          total_holdings = holdings_moved + holdings_deleted
+          puts "[#{idx + 1}/#{duplicate_sets.size}] Merged #{dup_ids.join(', ')} → #{keeper.id} " \
+               "(#{total_holdings} holdings → #{holdings_moved} moved, #{holdings_deleted} removed, " \
+               "#{trades_moved} trades)"
+        end
+      rescue => e
+        puts "ERROR migrating #{dup_ids.join(', ')}: #{e.message}"
+      end
+    end
+
+    puts "✅  Duplicate security migration complete."
+  end
+
+  desc "Migrate account valuation anchors"
+  # 2025-07-10: Set opening_anchor kinds for valuations to support event-sourced ledger model.
+  # Manual accounts get their oldest valuation marked as opening_anchor, which acts as the
+  # starting balance for the account. Current anchors are only used for Plaid accounts.
+  task migrate_account_valuation_anchors: :environment do
+    puts "==> Migrating account valuation anchors..."
+
+    manual_accounts = Account.manual.includes(valuations: :entry)
+    total_accounts = manual_accounts.count
+    accounts_processed = 0
+    opening_anchors_set = 0
+
+    manual_accounts.find_each do |account|
+      accounts_processed += 1
+
+      # Find oldest account entry
+      oldest_entry = account.entries
+                           .order("date ASC, created_at ASC")
+                           .first
+
+      # Check if it's a valuation that isn't already an anchor
+      if oldest_entry && oldest_entry.valuation?
+        derived_valuation_name = Valuation.build_opening_anchor_name(account.accountable_type)
+
+        Account.transaction do
+          oldest_entry.valuation.update!(kind: "opening_anchor")
+          oldest_entry.update!(name: derived_valuation_name)
+        end
+        opening_anchors_set += 1
+      end
+
+      if accounts_processed % 100 == 0
+        puts "[#{accounts_processed}/#{total_accounts}] Processed #{accounts_processed} accounts..."
+      end
+    rescue => e
+      puts "ERROR processing account #{account.id}: #{e.message}"
+    end
+
+    puts "✅  Account valuation anchor migration complete."
+    puts "    Processed: #{accounts_processed} accounts"
+    puts "    Opening anchors set: #{opening_anchors_set}"
+  end
+end
diff --git a/lib/tasks/demo_data.rake b/lib/tasks/demo_data.rake
index 7526d8a4..f750e09c 100644
--- a/lib/tasks/demo_data.rake
+++ b/lib/tasks/demo_data.rake
@@ -1,10 +1,65 @@
 namespace :demo_data do
-  desc "Creates or resets demo data used in development environment"
+  desc "Load empty demo dataset (no financial data)"
   task empty: :environment do
-    Demo::Generator.new.reset_and_clear_data!
+    start = Time.now
+    puts "🚀 Loading EMPTY demo data…"
+
+    Demo::Generator.new.generate_empty_data!
+
+    puts "✅ Done in #{(Time.now - start).round(2)}s"
   end
 
-  task reset: :environment do
-    Demo::Generator.new.reset_data!
+  desc "Load new-user demo dataset (family created but not onboarded)"
+  task new_user: :environment do
+    start = Time.now
+    puts "🚀 Loading NEW-USER demo data…"
+
+    Demo::Generator.new.generate_new_user_data!
+
+    puts "✅ Done in #{(Time.now - start).round(2)}s"
+  end
+
+  desc "Load full realistic demo dataset"
+  task default: :environment do
+    start    = Time.now
+    seed     = ENV.fetch("SEED", Random.new_seed)
+    puts "🚀 Loading FULL demo data (seed=#{seed})…"
+
+    generator = Demo::Generator.new(seed: seed)
+    generator.generate_default_data!
+
+    validate_demo_data
+
+    elapsed = Time.now - start
+    puts "🎉 Demo data ready in #{elapsed.round(2)}s"
+  end
+
+  # ---------------------------------------------------------------------------
+  # Validation helpers
+  # ---------------------------------------------------------------------------
+  def validate_demo_data
+    total_entries   = Entry.count
+    trade_entries   = Entry.where(entryable_type: "Trade").count
+    categorized_txn = Transaction.joins(:category).count
+    txn_total       = Transaction.count
+
+    coverage = ((categorized_txn.to_f / txn_total) * 100).round(1)
+
+    puts "\n📊 Validation Summary".ljust(40, "-")
+    puts "Entries total:              #{total_entries}"
+    puts "Trade entries:             #{trade_entries} (#{trade_entries.between?(500, 1000) ? '✅' : '❌'})"
+    puts "Txn categorization:        #{coverage}% (>=75% ✅)"
+
+    unless total_entries.between?(8_000, 12_000)
+      puts "Total entries #{total_entries} outside 8k–12k range"
+    end
+
+    unless trade_entries.between?(500, 1000)
+      puts "Trade entries #{trade_entries} outside 500–1 000 range"
+    end
+
+    unless coverage >= 75
+      puts "Categorization coverage below 75%"
+    end
   end
 end
diff --git a/lib/tasks/securities.rake b/lib/tasks/securities.rake
new file mode 100644
index 00000000..4254b8c6
--- /dev/null
+++ b/lib/tasks/securities.rake
@@ -0,0 +1,177 @@
+# frozen_string_literal: true
+
+namespace :securities do
+  desc "Backfill exchange_operating_mic for securities using Synth API"
+  task backfill_exchange_mic: :environment do
+    puts "Starting exchange_operating_mic backfill..."
+
+    api_key = Rails.application.config.app_mode.self_hosted? ? Setting.synth_api_key : ENV["SYNTH_API_KEY"]
+    unless api_key.present?
+      puts "ERROR: No Synth API key found. Please set SYNTH_API_KEY env var or configure it in Settings for self-hosted mode."
+      exit 1
+    end
+
+    securities = Security.where(exchange_operating_mic: nil).where.not(ticker: nil)
+    total = securities.count
+    processed = 0
+    errors = []
+
+    securities.find_each do |security|
+      processed += 1
+      print "\rProcessing #{processed}/#{total} (#{(processed.to_f/total * 100).round(1)}%)"
+
+      begin
+        response = Faraday.get("https://api.synthfinance.com/tickers/#{security.ticker}") do |req|
+          req.params["country_code"] = security.country_code if security.country_code.present?
+          req.headers["Authorization"] = "Bearer #{api_key}"
+        end
+
+        if response.success?
+          data = JSON.parse(response.body).dig("data")
+          exchange_data = data["exchange"]
+
+          # Update security with exchange info and other metadata
+          security.update!(
+            exchange_operating_mic: exchange_data["operating_mic_code"],
+            exchange_mic: exchange_data["mic_code"],
+            exchange_acronym: exchange_data["acronym"],
+            name: data["name"],
+            logo_url: data["logo_url"],
+            country_code: exchange_data["country_code"]
+          )
+        else
+          errors << "#{security.ticker}: HTTP #{response.status} - #{response.body}"
+        end
+      rescue => e
+        errors << "#{security.ticker}: #{e.message}"
+      end
+
+      # Add a small delay to not overwhelm the API
+      sleep(0.1)
+    end
+
+    puts "\n\nBackfill complete!"
+    puts "Processed #{processed} securities"
+
+    if errors.any?
+      puts "\nErrors encountered:"
+      errors.each { |error| puts "  - #{error}" }
+    end
+  end
+
+  desc "De-duplicate securities based on ticker + exchange_operating_mic"
+  task :deduplicate, [ :dry_run ] => :environment do |_t, args|
+    dry_run = args[:dry_run].present?
+    puts "Starting securities de-duplication... #{dry_run ? '(DRY RUN)' : ''}"
+
+    # First handle securities without exchange_operating_mic
+    securities_without_mic = Security.where(exchange_operating_mic: nil).where.not(ticker: nil)
+    puts "\nFound #{securities_without_mic.count} securities without exchange_operating_mic"
+
+    securities_without_mic.find_each do |security|
+      # Find if there's a security with the same ticker that has an exchange_operating_mic
+      canonical = Security.where.not(exchange_operating_mic: nil)
+                        .where(ticker: security.ticker)
+                        .order(created_at: :asc)
+                        .first
+
+      if canonical
+        puts "\nProcessing #{security.ticker} (no MIC):"
+        puts "  Canonical: #{canonical.id} (created: #{canonical.created_at}, MIC: #{canonical.exchange_operating_mic})"
+        puts "  Duplicate without MIC: #{security.id}"
+
+        # Count affected records
+        holdings_count = Holding.where(security_id: security.id).count
+        trades_count = Trade.where(security_id: security.id).count
+        prices_count = Security::Price.where(security_id: security.id).count
+
+        puts "  Would update:"
+        puts "    - #{holdings_count} holdings"
+        puts "    - #{trades_count} trades"
+        puts "    - #{prices_count} prices"
+
+        unless dry_run
+          begin
+            ActiveRecord::Base.transaction do
+              # Update all references to point to the canonical security
+              Holding.where(security_id: security.id).update_all(security_id: canonical.id)
+              Trade.where(security_id: security.id).update_all(security_id: canonical.id)
+              Security::Price.where(security_id: security.id).update_all(security_id: canonical.id)
+
+              # Delete the duplicate
+              security.destroy!
+            end
+            puts "  ✓ Successfully merged and removed duplicate"
+          rescue => e
+            puts "  ✗ Error processing #{security.ticker}: #{e.message}"
+          end
+        end
+      end
+    end
+
+    # Now handle duplicates with same ticker + exchange_operating_mic
+    duplicates = Security
+      .where.not(ticker: nil)
+      .where.not(exchange_operating_mic: nil)
+      .group(:ticker, :exchange_operating_mic)
+      .having("COUNT(*) > 1")
+      .pluck(:ticker, :exchange_operating_mic)
+
+    puts "\nFound #{duplicates.length} sets of duplicate securities with same ticker + MIC"
+    total_holdings = 0
+    total_trades = 0
+    total_prices = 0
+
+    duplicates.each do |ticker, exchange_operating_mic|
+      securities = Security.where(ticker: ticker, exchange_operating_mic: exchange_operating_mic)
+        .order(created_at: :asc)
+
+      canonical = securities.first
+      duplicates = securities[1..]
+
+      puts "\nProcessing #{ticker} (#{exchange_operating_mic}):"
+      puts "  Canonical: #{canonical.id} (created: #{canonical.created_at})"
+      puts "  Duplicates: #{duplicates.map(&:id).join(', ')}"
+
+      # Count affected records
+      holdings_count = Holding.where(security_id: duplicates).count
+      trades_count = Trade.where(security_id: duplicates).count
+      prices_count = Security::Price.where(security_id: duplicates).count
+
+      total_holdings += holdings_count
+      total_trades += trades_count
+      total_prices += prices_count
+
+      puts "  Would update:"
+      puts "    - #{holdings_count} holdings"
+      puts "    - #{trades_count} trades"
+      puts "    - #{prices_count} prices"
+
+      unless dry_run
+        begin
+          ActiveRecord::Base.transaction do
+            # Update all references to point to the canonical security
+            Holding.where(security_id: duplicates).update_all(security_id: canonical.id)
+            Trade.where(security_id: duplicates).update_all(security_id: canonical.id)
+            Security::Price.where(security_id: duplicates).update_all(security_id: canonical.id)
+
+            # Delete the duplicates
+            duplicates.each(&:destroy!)
+          end
+          puts "  ✓ Successfully merged and removed duplicates"
+        rescue => e
+          puts "  ✗ Error processing #{ticker}: #{e.message}"
+        end
+      end
+    end
+
+    puts "\nSummary:"
+    puts "  Total duplicate sets: #{duplicates.length}"
+    puts "  Total affected records:"
+    puts "    - #{total_holdings} holdings"
+    puts "    - #{total_trades} trades"
+    puts "    - #{total_prices} prices"
+    puts "  Mode: #{dry_run ? 'Dry run (no changes made)' : 'Live run (changes applied)'}"
+    puts "\nDe-duplication complete!"
+  end
+end
diff --git a/lib/tasks/stripe.rake b/lib/tasks/stripe.rake
new file mode 100644
index 00000000..7e2124de
--- /dev/null
+++ b/lib/tasks/stripe.rake
@@ -0,0 +1,28 @@
+namespace :stripe do
+  desc "Sync legacy Stripe subscriptions"
+  task sync_legacy_subscriptions: :environment do
+    cli = Stripe::StripeClient.new(ENV["STRIPE_SECRET_KEY"])
+
+    subs = cli.v1.subscriptions.list
+
+    subs.auto_paging_each do |sub|
+      details = sub.items.data.first
+
+      family = Family.find_by(stripe_customer_id: sub.customer)
+
+      if family.nil?
+        puts "Family not found for Stripe customer ID: #{sub.customer}, skipping"
+        next
+      end
+
+      family.subscription.update!(
+        stripe_id: sub.id,
+        status: sub.status,
+        interval: details.plan.interval,
+        amount: details.plan.amount / 100.0,
+        currency: details.plan.currency.upcase,
+        current_period_ends_at: Time.at(details.current_period_end)
+      )
+    end
+  end
+end
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..3bdae723
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,180 @@
+{
+	"name": "maybe",
+	"version": "1.0.0",
+	"lockfileVersion": 3,
+	"requires": true,
+	"packages": {
+		"": {
+			"name": "maybe",
+			"version": "1.0.0",
+			"license": "ISC",
+			"devDependencies": {
+				"@biomejs/biome": "^1.9.3"
+			}
+		},
+		"node_modules/@biomejs/biome": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-1.9.3.tgz",
+			"integrity": "sha512-POjAPz0APAmX33WOQFGQrwLvlu7WLV4CFJMlB12b6ZSg+2q6fYu9kZwLCOA+x83zXfcPd1RpuWOKJW0GbBwLIQ==",
+			"dev": true,
+			"hasInstallScript": true,
+			"license": "MIT OR Apache-2.0",
+			"bin": {
+				"biome": "bin/biome"
+			},
+			"engines": {
+				"node": ">=14.21.3"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/biome"
+			},
+			"optionalDependencies": {
+				"@biomejs/cli-darwin-arm64": "1.9.3",
+				"@biomejs/cli-darwin-x64": "1.9.3",
+				"@biomejs/cli-linux-arm64": "1.9.3",
+				"@biomejs/cli-linux-arm64-musl": "1.9.3",
+				"@biomejs/cli-linux-x64": "1.9.3",
+				"@biomejs/cli-linux-x64-musl": "1.9.3",
+				"@biomejs/cli-win32-arm64": "1.9.3",
+				"@biomejs/cli-win32-x64": "1.9.3"
+			}
+		},
+		"node_modules/@biomejs/cli-darwin-arm64": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-1.9.3.tgz",
+			"integrity": "sha512-QZzD2XrjJDUyIZK+aR2i5DDxCJfdwiYbUKu9GzkCUJpL78uSelAHAPy7m0GuPMVtF/Uo+OKv97W3P9nuWZangQ==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT OR Apache-2.0",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">=14.21.3"
+			}
+		},
+		"node_modules/@biomejs/cli-darwin-x64": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-1.9.3.tgz",
+			"integrity": "sha512-vSCoIBJE0BN3SWDFuAY/tRavpUtNoqiceJ5PrU3xDfsLcm/U6N93JSM0M9OAiC/X7mPPfejtr6Yc9vSgWlEgVw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT OR Apache-2.0",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">=14.21.3"
+			}
+		},
+		"node_modules/@biomejs/cli-linux-arm64": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-1.9.3.tgz",
+			"integrity": "sha512-vJkAimD2+sVviNTbaWOGqEBy31cW0ZB52KtpVIbkuma7PlfII3tsLhFa+cwbRAcRBkobBBhqZ06hXoZAN8NODQ==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT OR Apache-2.0",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=14.21.3"
+			}
+		},
+		"node_modules/@biomejs/cli-linux-arm64-musl": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.9.3.tgz",
+			"integrity": "sha512-VBzyhaqqqwP3bAkkBrhVq50i3Uj9+RWuj+pYmXrMDgjS5+SKYGE56BwNw4l8hR3SmYbLSbEo15GcV043CDSk+Q==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT OR Apache-2.0",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=14.21.3"
+			}
+		},
+		"node_modules/@biomejs/cli-linux-x64": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-1.9.3.tgz",
+			"integrity": "sha512-x220V4c+romd26Mu1ptU+EudMXVS4xmzKxPVb9mgnfYlN4Yx9vD5NZraSx/onJnd3Gh/y8iPUdU5CDZJKg9COA==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT OR Apache-2.0",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=14.21.3"
+			}
+		},
+		"node_modules/@biomejs/cli-linux-x64-musl": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-1.9.3.tgz",
+			"integrity": "sha512-TJmnOG2+NOGM72mlczEsNki9UT+XAsMFAOo8J0me/N47EJ/vkLXxf481evfHLlxMejTY6IN8SdRSiPVLv6AHlA==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT OR Apache-2.0",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=14.21.3"
+			}
+		},
+		"node_modules/@biomejs/cli-win32-arm64": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-1.9.3.tgz",
+			"integrity": "sha512-lg/yZis2HdQGsycUvHWSzo9kOvnGgvtrYRgoCEwPBwwAL8/6crOp3+f47tPwI/LI1dZrhSji7PNsGKGHbwyAhw==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT OR Apache-2.0",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=14.21.3"
+			}
+		},
+		"node_modules/@biomejs/cli-win32-x64": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-1.9.3.tgz",
+			"integrity": "sha512-cQMy2zanBkVLpmmxXdK6YePzmZx0s5Z7KEnwmrW54rcXK3myCNbQa09SwGZ8i/8sLw0H9F3X7K4rxVNGU8/D4Q==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT OR Apache-2.0",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=14.21.3"
+			}
+		}
+	}
+}
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..1b0e7c43
--- /dev/null
+++ b/package.json
@@ -0,0 +1,18 @@
+{
+	"devDependencies": {
+		"@biomejs/biome": "^1.9.3"
+	},
+	"name": "maybe",
+	"version": "1.0.0",
+	"description": "The OS for your personal finances",
+	"scripts": {
+		"style:check": "biome check",
+		"style:fix": "biome check --write",
+		"lint": "biome lint",
+		"lint:fix": "biome lint --write",
+		"format:check": "biome format",
+		"format": "biome format --write"
+	},
+	"author": "",
+	"license": "ISC"
+}
diff --git a/perf.rake b/perf.rake
new file mode 100644
index 00000000..4f7cc67b
--- /dev/null
+++ b/perf.rake
@@ -0,0 +1,37 @@
+# Must be in root of repo for derailed_benchmarks to read the benchmark file
+
+require 'bundler'
+Bundler.setup
+
+require 'derailed_benchmarks'
+require 'derailed_benchmarks/tasks'
+
+# Custom auth helper for Maybe's session-based authentication
+class CustomAuth < DerailedBenchmarks::AuthHelper
+  def setup
+    # No setup needed
+  end
+
+  def call(env)
+    # Make sure this user is created in the DB with realistic data before running benchmarks
+    user = User.find_by!(email: "user@maybe.local")
+
+    Rails.logger.debug "Found user for benchmarking: #{user.email}"
+
+    # Mimic the way Rails handles browser cookies
+    session = user.sessions.create!
+    key_generator = Rails.application.key_generator
+    secret = key_generator.generate_key('signed cookie')
+    verifier = ActiveSupport::MessageVerifier.new(secret)
+    signed_value = verifier.generate(session.id)
+
+    env['HTTP_COOKIE'] = "session_token=#{signed_value}"
+
+    Rails.logger.debug "Setting up session for user: #{user.email}"
+
+    app.call(env)
+  end
+end
+
+# Tells derailed_benchmarks to use our custom auth helper
+DerailedBenchmarks.auth = CustomAuth.new
diff --git a/public/logo-pwa.png b/public/logo-pwa.png
new file mode 100644
index 00000000..61a7c94c
Binary files /dev/null and b/public/logo-pwa.png differ
diff --git a/public/site.webmanifest b/public/site.webmanifest
index b20abb7c..15a5afe8 100644
--- a/public/site.webmanifest
+++ b/public/site.webmanifest
@@ -15,5 +15,5 @@
     ],
     "theme_color": "#ffffff",
     "background_color": "#ffffff",
-    "display": "standalone"
+    "display": "fullscreen"
 }
diff --git a/render.yaml b/render.yaml
deleted file mode 100644
index 69b298ff..00000000
--- a/render.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-databases:
-  - name: maybe
-    user: maybe
-    plan: free
-
-services:
-  - type: web
-    plan: free
-    autoDeploy: false
-    runtime: ruby
-    name: maybe
-    repo: https://github.com/maybe-finance/maybe.git
-    branch: main
-    healthCheckPath: /up
-    buildCommand: "./bin/render-build.sh"
-    preDeployCommand: "bundle exec rails db:migrate"
-    startCommand: "bundle exec rails server"
-    envVars:
-      - key: DATABASE_URL
-        fromDatabase:
-          name: maybe
-          property: connectionString
-
-      - key: SELF_HOSTED
-        value: true
-      - key: HOSTING_PLATFORM
-        value: render
-
-      # Since the app is self-hosted, we cannot use master.key to encrypt credentials.  App depends entirely on ENV variables
-      # https://api.rubyonrails.org/v7.1.3.2/classes/Rails/Application.html#method-i-secret_key_base
-      #
-      # To generate this, run: `openssl rand -hex 64` or `rails secret`
-      - key: SECRET_KEY_BASE
-        sync: false
-
-      - key: WEB_CONCURRENCY
-        value: 2
-      - key: GOOD_JOB_EXECUTION_MODE
-        value: async # Typically, `external` is used in prod, but this avoids another cron service and is generally fine for a self-hoster given low traffic
-
-      # The app uses this info to know which repo to fetch latest commit data from for upgrades
-      # This should MATCH the `repo` and `branch` keys in the config above ALWAYS
-      - key: GITHUB_REPO_OWNER
-        value: maybe-finance
-      - key: GITHUB_REPO_NAME
-        value: maybe
-      - key: GITHUB_REPO_BRANCH
-        value: main
-
-      # Required to allow your self-hosted instance to be able to upgrade itself
-      - key: UPGRADES_ENABLED
-        value: true
-
-      # If you upgrade your instance to a paid plan, you can set this to false (or remove it)
-      # See note in `render-build.sh` script.
-      - key: RUN_DB_MIGRATIONS_IN_BUILD_STEP
-        value: true
diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index 80b2711b..438e98c6 100644
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -3,12 +3,9 @@ require "test_helper"
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
   setup do
     Capybara.default_max_wait_time = 5
-
-    # Prevent "auto sync" from running when tests execute enqueued jobs
-    families(:dylan_family).update! last_synced_at: Time.now
   end
 
-  driven_by :selenium, using: ENV["CI"].present? ? :headless_chrome : :chrome, screen_size: [ 1400, 1400 ]
+  driven_by :selenium, using: ENV["CI"].present? ? :headless_chrome : ENV.fetch("E2E_BROWSER", :chrome).to_sym, screen_size: [ 1400, 1400 ]
 
   private
 
@@ -16,12 +13,16 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
       visit new_session_path
       within "form" do
         fill_in "Email", with: user.email
-        fill_in "Password", with: "password"
+        fill_in "Password", with: user_password_test
         click_on "Log in"
       end
 
       # Trigger Capybara's wait mechanism to avoid timing issues with logins
-      find("h1", text: "Dashboard")
+      find("h1", text: "Welcome back, #{user.first_name}")
+    end
+
+    def login_as(user)
+      sign_in(user)
     end
 
     def sign_out
@@ -31,4 +32,10 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
       # Trigger Capybara's wait mechanism to avoid timing issues with logout
       find("h2", text: "Sign in to your account")
     end
+
+    def within_testid(testid)
+      within "[data-testid='#{testid}']" do
+        yield
+      end
+    end
 end
diff --git a/test/components/previews/alert_component_preview.rb b/test/components/previews/alert_component_preview.rb
new file mode 100644
index 00000000..ddd91183
--- /dev/null
+++ b/test/components/previews/alert_component_preview.rb
@@ -0,0 +1,7 @@
+class AlertComponentPreview < Lookbook::Preview
+  # @param message text
+  # @param variant select [info, success, warning, error]
+  def default(message: "This is an alert message.", variant: :info)
+    render DS::Alert.new(message: message, variant: variant.to_sym)
+  end
+end
diff --git a/test/components/previews/button_component_preview.rb b/test/components/previews/button_component_preview.rb
new file mode 100644
index 00000000..e6045ab2
--- /dev/null
+++ b/test/components/previews/button_component_preview.rb
@@ -0,0 +1,16 @@
+class ButtonComponentPreview < ViewComponent::Preview
+  # @param variant select {{ DS::Button::VARIANTS.keys }}
+  # @param size select {{ DS::Button::SIZES.keys }}
+  # @param disabled toggle
+  # @param icon select ["plus", "circle"]
+  def default(variant: "primary", size: "md", disabled: false, icon: "plus")
+    render DS::Button.new(
+      text: "Sample button",
+      variant: variant,
+      size: size,
+      disabled: disabled,
+      icon: icon,
+      data: { menu_target: "button" }
+    )
+  end
+end
diff --git a/test/components/previews/dialog_component_preview.rb b/test/components/previews/dialog_component_preview.rb
new file mode 100644
index 00000000..5f5c78d9
--- /dev/null
+++ b/test/components/previews/dialog_component_preview.rb
@@ -0,0 +1,46 @@
+class DialogComponentPreview < ViewComponent::Preview
+  # @param show_overflow toggle
+  def modal(show_overflow: false)
+    render DS::Dialog.new(variant: "modal") do |dialog|
+      dialog.with_header(title: "Sample modal title")
+
+      dialog.with_body do
+        "Welcome to Maybe!  This is some test modal content."
+      end
+
+      dialog.with_action(cancel_action: true, text: "Cancel", variant: "outline")
+      dialog.with_action(text: "Submit")
+
+      if show_overflow
+        content_tag(:div, class: "p-4 font-semibold h-[800px] bg-surface-inset") do
+          "Example of overflow content"
+        end
+      end
+    end
+  end
+
+  # @param show_overflow toggle
+  def drawer(show_overflow: false)
+    render DS::Dialog.new(variant: "drawer") do |dialog|
+      dialog.with_header(title: "Drawer title")
+
+      dialog.with_body do
+        dialog.with_section(title: "Section 1", open: true) do
+          content_tag(:div, "Section 1 content", class: "p-2")
+        end
+
+        dialog.with_section(title: "Section 2", open: true) do
+          content_tag(:div, "Section 2 content", class: "p-2")
+        end
+      end
+
+      dialog.with_action(text: "Example action")
+
+      if show_overflow
+        content_tag(:div, class: "p-4 font-semibold h-[800px] bg-surface-inset") do
+          "Example of overflow content"
+        end
+      end
+    end
+  end
+end
diff --git a/test/components/previews/disclosure_component_preview.rb b/test/components/previews/disclosure_component_preview.rb
new file mode 100644
index 00000000..51b9a8a0
--- /dev/null
+++ b/test/components/previews/disclosure_component_preview.rb
@@ -0,0 +1,13 @@
+class DisclosureComponentPreview < ViewComponent::Preview
+  # @display container_classes max-w-[400px]
+  # @param align select ["left", "right"]
+  def default(align: "right")
+    render DS::Disclosure.new(title: "Title", align: align, open: true) do |disclosure|
+      disclosure.with_summary_content do
+        content_tag(:p, "$200.25", class: "text-xs font-mono font-medium")
+      end
+
+      content_tag(:p, "Sample disclosure content", class: "text-sm")
+    end
+  end
+end
diff --git a/test/components/previews/filled_icon_component_preview.rb b/test/components/previews/filled_icon_component_preview.rb
new file mode 100644
index 00000000..3b0ee022
--- /dev/null
+++ b/test/components/previews/filled_icon_component_preview.rb
@@ -0,0 +1,11 @@
+class FilledIconComponentPreview < ViewComponent::Preview
+  # @param size select ["sm", "md", "lg"]
+  def default(size: "md")
+    render DS::FilledIcon.new(icon: "home", variant: :default, size: size)
+  end
+
+  # @param size select ["sm", "md", "lg"]
+  def text(size: "md")
+    render DS::FilledIcon.new(variant: :text, text: "Test", size: size, rounded: true)
+  end
+end
diff --git a/test/components/previews/link_component_preview.rb b/test/components/previews/link_component_preview.rb
new file mode 100644
index 00000000..d3600bf3
--- /dev/null
+++ b/test/components/previews/link_component_preview.rb
@@ -0,0 +1,25 @@
+class LinkComponentPreview < ViewComponent::Preview
+  # Usage
+  # -------------
+  #
+  # DS::Link is a small abstraction on top of the `link_to` helper.
+  #
+  # It can be used as a regular link or styled as a "Link button" using any of the available DS::Button variants.
+  #
+  # @param variant select {{ DS::Link::VARIANTS.keys }}
+  # @param size select {{ DS::Link::SIZES.keys }}
+  # @param icon select ["", "plus", "arrow-right"]
+  # @param icon_position select ["left", "right"]
+  # @param full_width toggle
+  def default(variant: "default", size: "md", icon: "plus", icon_position: "left", full_width: false)
+    render DS::Link.new(
+      href: "#",
+      text: "Preview link",
+      variant: variant,
+      size: size,
+      icon: icon,
+      icon_position: icon_position,
+      full_width: full_width
+    )
+  end
+end
diff --git a/test/components/previews/menu_component_preview.rb b/test/components/previews/menu_component_preview.rb
new file mode 100644
index 00000000..592b276c
--- /dev/null
+++ b/test/components/previews/menu_component_preview.rb
@@ -0,0 +1,44 @@
+class MenuComponentPreview < ViewComponent::Preview
+  def icon
+    render DS::Menu.new(variant: "icon") do |menu|
+      menu_contents(menu)
+    end
+  end
+
+  def button
+    render DS::Menu.new(variant: "button") do |menu|
+      menu.with_button(text: "Open menu", variant: "secondary")
+      menu_contents(menu)
+    end
+  end
+
+  def avatar
+    render DS::Menu.new(variant: "avatar") do |menu|
+      menu_contents(menu)
+    end
+  end
+
+  private
+    def menu_contents(menu)
+      menu.with_header do
+        content_tag(:div, class: "p-3") do
+          content_tag(:h3, "Menu header", class: "font-medium text-gray-900")
+        end
+      end
+
+      menu.with_item(variant: "link", text: "Link", href: "#", icon: "plus")
+      menu.with_item(variant: "button", text: "Action", href: "#", method: :post, icon: "circle")
+      menu.with_item(variant: "button", text: "Action destructive", href: "#", method: :delete, icon: "circle")
+
+      menu.with_item(variant: "divider")
+
+      menu.with_custom_content do
+        content_tag(:div, class: "p-4") do
+          safe_join([
+            content_tag(:h3, "Custom content header", class: "font-medium text-gray-900"),
+            content_tag(:p, "Some custom content", class: "text-sm text-gray-500")
+          ])
+        end
+      end
+    end
+end
diff --git a/test/components/previews/tabs_component_preview.rb b/test/components/previews/tabs_component_preview.rb
new file mode 100644
index 00000000..ac3d2eef
--- /dev/null
+++ b/test/components/previews/tabs_component_preview.rb
@@ -0,0 +1,7 @@
+class TabsComponentPreview < ViewComponent::Preview
+  def default
+  end
+
+  def custom
+  end
+end
diff --git a/test/components/previews/tabs_component_preview/custom.html.erb b/test/components/previews/tabs_component_preview/custom.html.erb
new file mode 100644
index 00000000..3ecbbf9f
--- /dev/null
+++ b/test/components/previews/tabs_component_preview/custom.html.erb
@@ -0,0 +1,29 @@
+<%= render TabsComponent.new(
+  variant: :unstyled,
+  active_tab: "tab1", 
+  active_btn_classes: "bg-white text-primary", 
+  inactive_btn_classes: "text-secondary",
+) do |tabs| %>
+  <div class="flex border border-secondary rounded-lg h-full max-w-[400px]">
+    <%= tabs.with_nav(classes: "flex flex-col py-2 px-3 border-r border-secondary") do |nav| %>
+      <%= nav.with_btn(id: "tab1", label: "Tab 1", classes: "px-2 py-1 rounded-md w-full whitespace-nowrap") %>
+      <%= nav.with_btn(id: "tab2", label: "Tab 2", classes: "px-2 py-1 rounded-md w-full whitespace-nowrap") %>
+    <% end %>
+
+    <div class="flex flex-col w-full">
+      <div class="h-[200px] p-4">
+        <%= tabs.with_panel(tab_id: "tab1") do %>
+          <%= content_tag(:p, "Content for tab 1") %>
+        <% end %>
+
+        <%= tabs.with_panel(tab_id: "tab2") do %>
+          <%= content_tag(:p, "Content for tab 2") %>
+        <% end %>
+      </div>
+
+      <div class="w-full border-t border-secondary p-4">
+        Footer
+      </div>
+    </div>
+  </div>
+<% end %>
diff --git a/test/components/previews/tabs_component_preview/default.html.erb b/test/components/previews/tabs_component_preview/default.html.erb
new file mode 100644
index 00000000..da98d471
--- /dev/null
+++ b/test/components/previews/tabs_component_preview/default.html.erb
@@ -0,0 +1,16 @@
+<div class="max-w-[400px]">
+  <%= render TabsComponent.new(active_tab: "tab1") do |tabs| %>
+    <%= tabs.with_nav do |tab_nav| %>
+      <%= tab_nav.with_btn(id: "tab1", label: "Tab 1") %>
+      <%= tab_nav.with_btn(id: "tab2", label: "Tab 2") %>
+    <% end %>
+
+    <%= tabs.with_panel(tab_id: "tab1") do %>
+      <%= content_tag(:p, "Content for tab 1") %>
+    <% end %>
+
+    <%= tabs.with_panel(tab_id: "tab2") do %>
+      <%= content_tag(:p, "Content for tab 2") %>
+    <% end %>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/test/components/previews/toggle_component_preview.rb b/test/components/previews/toggle_component_preview.rb
new file mode 100644
index 00000000..27eeff52
--- /dev/null
+++ b/test/components/previews/toggle_component_preview.rb
@@ -0,0 +1,15 @@
+class ToggleComponentPreview < ViewComponent::Preview
+  # @param disabled toggle
+  def default(disabled: false)
+    render(
+      DS::Toggle.new(
+        id: "toggle-component-id",
+        name: "toggle-component-name",
+        checked: false,
+        disabled: disabled,
+        checked_value: "on",
+        unchecked_value: "off"
+      )
+    )
+  end
+end
diff --git a/test/components/previews/tooltip_component_preview.rb b/test/components/previews/tooltip_component_preview.rb
new file mode 100644
index 00000000..68bd6c32
--- /dev/null
+++ b/test/components/previews/tooltip_component_preview.rb
@@ -0,0 +1,32 @@
+class TooltipComponentPreview < ViewComponent::Preview
+  # @param text text
+  # @param placement select [top, right, bottom, left]
+  # @param offset number
+  # @param cross_axis number
+  # @param icon text
+  # @param size select [xs, sm, md, lg, xl, 2xl]
+  # @param color select [default, white, success, warning, destructive, current]
+  def default(text: "This is helpful information", placement: "top", offset: 10, cross_axis: 0, icon: "info", size: "sm", color: "default")
+    render DS::Tooltip.new(
+      text: text,
+      placement: placement,
+      offset: offset,
+      cross_axis: cross_axis,
+      icon: icon,
+      size: size,
+      color: color
+    )
+  end
+
+  def with_block_content
+    render DS::Tooltip.new(icon: "help-circle", color: "warning") do
+      tag.div do
+        tag.p("Custom content with formatting:", class: "font-medium mb-1") +
+        tag.ul(class: "list-disc list-inside text-xs") do
+          tag.li("First item") +
+          tag.li("Second item")
+        end
+      end
+    end
+  end
+end
diff --git a/test/controllers/account/entries_controller_test.rb b/test/controllers/account/entries_controller_test.rb
deleted file mode 100644
index b8b38357..00000000
--- a/test/controllers/account/entries_controller_test.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-require "test_helper"
-
-class Account::EntriesControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in @user = users(:family_admin)
-    @transaction = account_entries :transaction
-    @valuation = account_entries :valuation
-    @trade = account_entries :trade
-  end
-
-  # =================
-  # Shared
-  # =================
-
-  test "should destroy entry" do
-    [ @transaction, @valuation, @trade ].each do |entry|
-      assert_difference -> { Account::Entry.count } => -1, -> { entry.entryable_class.count } => -1 do
-        delete account_entry_url(entry.account, entry)
-      end
-
-      assert_redirected_to account_url(entry.account)
-      assert_enqueued_with(job: AccountSyncJob)
-    end
-  end
-
-  test "gets show" do
-    [ @transaction, @valuation, @trade ].each do |entry|
-      get account_entry_url(entry.account, entry)
-      assert_response :success
-    end
-  end
-
-  test "gets edit" do
-    [ @valuation ].each do |entry|
-      get edit_account_entry_url(entry.account, entry)
-      assert_response :success
-    end
-  end
-
-  test "can update generic entry" do
-    [ @transaction, @valuation, @trade ].each do |entry|
-      assert_no_difference_in_entries do
-        patch account_entry_url(entry.account, entry), params: {
-          account_entry: {
-            name: "Name",
-            date: Date.current,
-            currency: "USD",
-            amount: 100
-          }
-        }
-      end
-
-      assert_redirected_to account_entry_url(entry.account, entry)
-      assert_enqueued_with(job: AccountSyncJob)
-    end
-  end
-
-  private
-
-    # Simple guard to verify that nested attributes are passed the record ID to avoid new creation of record
-    # See `update_only` option of accepts_nested_attributes_for
-    def assert_no_difference_in_entries(&block)
-      assert_no_difference [ "Account::Entry.count", "Account::Transaction.count", "Account::Valuation.count" ], &block
-    end
-end
diff --git a/test/controllers/account/holdings_controller_test.rb b/test/controllers/account/holdings_controller_test.rb
deleted file mode 100644
index 3a556908..00000000
--- a/test/controllers/account/holdings_controller_test.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require "test_helper"
-
-class Account::HoldingsControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in users(:family_admin)
-    @account = accounts(:investment)
-    @holding = @account.holdings.current.first
-  end
-
-  test "gets holdings" do
-    get account_holdings_url(@account)
-    assert_response :success
-  end
-
-  test "gets holding" do
-    get account_holding_path(@account, @holding)
-
-    assert_response :success
-  end
-
-  test "destroys holding and associated entries" do
-    assert_difference -> { Account::Holding.count } => -1,
-                      -> { Account::Entry.count } => -1 do
-      delete account_holding_path(@account, @holding)
-    end
-
-    assert_redirected_to account_holdings_path(@account)
-    assert_empty @account.entries.where(entryable: @account.trades.where(security: @holding.security))
-  end
-end
diff --git a/test/controllers/account/trades_controller_test.rb b/test/controllers/account/trades_controller_test.rb
deleted file mode 100644
index 46f53046..00000000
--- a/test/controllers/account/trades_controller_test.rb
+++ /dev/null
@@ -1,138 +0,0 @@
-require "test_helper"
-
-class Account::TradesControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in @user = users(:family_admin)
-    @entry = account_entries :trade
-  end
-
-  test "should get index" do
-    get account_trades_url(@entry.account)
-    assert_response :success
-  end
-
-  test "should get new" do
-    get new_account_trade_url(@entry.account)
-    assert_response :success
-  end
-
-  test "creates deposit entry" do
-    from_account = accounts(:depository) # Account the deposit is coming from
-
-    assert_difference -> { Account::Entry.count } => 2,
-                      -> { Account::Transaction.count } => 2,
-                      -> { Account::Transfer.count } => 1 do
-      post account_trades_url(@entry.account), params: {
-        account_entry: {
-          type: "transfer_in",
-          date: Date.current,
-          amount: 10,
-          transfer_account_id: from_account.id
-        }
-      }
-    end
-
-    assert_redirected_to account_path(@entry.account)
-  end
-
-  test "creates withdrawal entry" do
-    to_account = accounts(:depository) # Account the withdrawal is going to
-
-    assert_difference -> { Account::Entry.count } => 2,
-                      -> { Account::Transaction.count } => 2,
-                      -> { Account::Transfer.count } => 1 do
-      post account_trades_url(@entry.account), params: {
-        account_entry: {
-          type: "transfer_out",
-          date: Date.current,
-          amount: 10,
-          transfer_account_id: to_account.id
-        }
-      }
-    end
-
-    assert_redirected_to account_path(@entry.account)
-  end
-
-  test "deposit and withdrawal has optional transfer account" do
-    assert_difference -> { Account::Entry.count } => 1,
-                      -> { Account::Transaction.count } => 1,
-                      -> { Account::Transfer.count } => 0 do
-      post account_trades_url(@entry.account), params: {
-        account_entry: {
-          type: "transfer_out",
-          date: Date.current,
-          amount: 10
-        }
-      }
-    end
-
-    created_entry = Account::Entry.order(created_at: :desc).first
-
-    assert created_entry.amount.positive?
-    assert created_entry.marked_as_transfer
-    assert_redirected_to account_path(@entry.account)
-  end
-
-  test "creates interest entry" do
-    assert_difference [ "Account::Entry.count", "Account::Transaction.count" ], 1 do
-      post account_trades_url(@entry.account), params: {
-        account_entry: {
-          type: "interest",
-          date: Date.current,
-          amount: 10
-        }
-      }
-    end
-
-    created_entry = Account::Entry.order(created_at: :desc).first
-
-    assert created_entry.amount.negative?
-    assert_redirected_to account_path(@entry.account)
-  end
-
-  test "creates trade buy entry" do
-    assert_difference [ "Account::Entry.count", "Account::Trade.count", "Security.count" ], 1 do
-      post account_trades_url(@entry.account), params: {
-        account_entry: {
-          type: "buy",
-          date: Date.current,
-          ticker: "NVDA",
-          qty: 10,
-          price: 10
-        }
-      }
-    end
-
-    created_entry = Account::Entry.order(created_at: :desc).first
-
-    assert created_entry.amount.positive?
-    assert created_entry.account_trade.qty.positive?
-    assert_equal "Transaction created successfully.", flash[:notice]
-    assert_enqueued_with job: AccountSyncJob
-    assert_redirected_to account_path(@entry.account)
-  end
-
-  test "creates trade sell entry" do
-    assert_difference [ "Account::Entry.count", "Account::Trade.count" ], 1 do
-      post account_trades_url(@entry.account), params: {
-        account_entry: {
-          type: "sell",
-          ticker: "AAPL",
-          date: Date.current,
-          currency: "USD",
-          qty: 10,
-          price: 10
-        }
-      }
-    end
-
-    created_entry = Account::Entry.order(created_at: :desc).first
-
-    assert created_entry.amount.negative?
-    assert created_entry.account_trade.qty.negative?
-    assert_equal "Transaction created successfully.", flash[:notice]
-    assert_enqueued_with job: AccountSyncJob
-    assert_redirected_to account_path(@entry.account)
-  end
-end
diff --git a/test/controllers/account/transactions_controller_test.rb b/test/controllers/account/transactions_controller_test.rb
deleted file mode 100644
index f5290229..00000000
--- a/test/controllers/account/transactions_controller_test.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require "test_helper"
-
-class Account::TransactionsControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in @user = users(:family_admin)
-    @entry = account_entries :transaction
-  end
-
-  test "should get index" do
-    get account_transactions_url(@entry.account)
-    assert_response :success
-  end
-
-  test "update" do
-    assert_no_difference [ "Account::Entry.count", "Account::Transaction.count" ] do
-      patch account_transaction_url(@entry.account, @entry), params: {
-        account_entry: {
-          name: "Name",
-          date: Date.current,
-          currency: "USD",
-          amount: 100,
-          nature: "income",
-          entryable_type: @entry.entryable_type,
-          entryable_attributes: {
-            id: @entry.entryable_id,
-            tag_ids: [ Tag.first.id, Tag.second.id ],
-            category_id: Category.first.id,
-            merchant_id: Merchant.first.id,
-            notes: "test notes",
-            excluded: false
-          }
-        }
-      }
-    end
-
-    assert_equal "Transaction updated successfully.", flash[:notice]
-    assert_redirected_to account_entry_url(@entry.account, @entry)
-    assert_enqueued_with(job: AccountSyncJob)
-  end
-end
diff --git a/test/controllers/account/transfers_controller_test.rb b/test/controllers/account/transfers_controller_test.rb
deleted file mode 100644
index 06289fd5..00000000
--- a/test/controllers/account/transfers_controller_test.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require "test_helper"
-
-class Account::TransfersControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in users(:family_admin)
-  end
-
-  test "should get new" do
-    get new_account_transfer_url
-    assert_response :success
-  end
-
-  test "can create transfers" do
-    assert_difference "Account::Transfer.count", 1 do
-      post account_transfers_url, params: {
-        account_transfer: {
-          from_account_id: accounts(:depository).id,
-          to_account_id: accounts(:credit_card).id,
-          date: Date.current,
-          amount: 100,
-          name: "Test Transfer"
-        }
-      }
-      assert_enqueued_with job: AccountSyncJob
-    end
-  end
-
-  test "can destroy transfer" do
-    assert_difference -> { Account::Transfer.count } => -1, -> { Account::Transaction.count } => 0 do
-      delete account_transfer_url(account_transfers(:one))
-    end
-  end
-end
diff --git a/test/controllers/account/valuations_controller_test.rb b/test/controllers/account/valuations_controller_test.rb
deleted file mode 100644
index 0523a19e..00000000
--- a/test/controllers/account/valuations_controller_test.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require "test_helper"
-
-class Account::ValuationsControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in @user = users(:family_admin)
-    @entry = account_entries :valuation
-  end
-
-  test "should get index" do
-    get account_valuations_url(@entry.account)
-    assert_response :success
-  end
-
-  test "should get new" do
-    get new_account_valuation_url(@entry.account)
-    assert_response :success
-  end
-
-  test "create" do
-    assert_difference [ "Account::Entry.count", "Account::Valuation.count" ], 1 do
-      post account_valuations_url(@entry.account), params: {
-        account_entry: {
-          name: "Manual valuation",
-          amount: 19800,
-          date: Date.current,
-          currency: "USD"
-        }
-      }
-    end
-
-    assert_equal "Valuation created successfully.", flash[:notice]
-    assert_enqueued_with job: AccountSyncJob
-    assert_redirected_to account_valuations_path(@entry.account)
-  end
-
-  test "error when valuation already exists for date" do
-    assert_no_difference [ "Account::Entry.count", "Account::Valuation.count" ] do
-      post account_valuations_url(@entry.account), params: {
-        account_entry: {
-          amount: 19800,
-          date: @entry.date,
-          currency: "USD"
-        }
-      }
-    end
-
-    assert_equal "Date has already been taken", flash[:alert]
-    assert_redirected_to account_path(@entry.account)
-  end
-end
diff --git a/test/controllers/accountable_sparklines_controller_test.rb b/test/controllers/accountable_sparklines_controller_test.rb
new file mode 100644
index 00000000..51ec49f3
--- /dev/null
+++ b/test/controllers/accountable_sparklines_controller_test.rb
@@ -0,0 +1,12 @@
+require "test_helper"
+
+class AccountableSparklinesControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in @user = users(:family_admin)
+  end
+
+  test "should get show for depository" do
+    get accountable_sparkline_url("depository")
+    assert_response :success
+  end
+end
diff --git a/test/controllers/accounts_controller_test.rb b/test/controllers/accounts_controller_test.rb
index 09e64c09..ec26ef49 100644
--- a/test/controllers/accounts_controller_test.rb
+++ b/test/controllers/accounts_controller_test.rb
@@ -6,115 +6,30 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     @account = accounts(:depository)
   end
 
-  test "gets accounts list" do
+  test "should get index" do
     get accounts_url
     assert_response :success
-
-    @user.family.accounts.each do |account|
-      assert_dom "#" + dom_id(account), count: 1
-    end
   end
 
-  test "new" do
-    get new_account_path
-    assert_response :ok
+  test "should get show" do
+    get account_url(@account)
+    assert_response :success
   end
 
-  test "show" do
-    get account_path(@account)
-    assert_response :ok
-  end
-
-  test "can sync an account" do
-    post sync_account_path(@account)
-    assert_response :no_content
-  end
-
-  test "can sync all accounts" do
-    post sync_all_accounts_path
-    assert_redirected_to accounts_url
-    assert_equal "Successfully queued accounts for syncing.", flash[:notice]
-  end
-
-  test "should update account" do
-    patch account_url(@account), params: {
-      account: {
-        name: "Updated name",
-        is_active: "0",
-        institution_id: institutions(:chase).id
-      }
-    }
-
+  test "should sync account" do
+    post sync_account_url(@account)
     assert_redirected_to account_url(@account)
-    assert_enqueued_with job: AccountSyncJob
-    assert_equal "Account updated", flash[:notice]
   end
 
-  test "updates account balance by creating new valuation" do
-    assert_difference [ "Account::Entry.count", "Account::Valuation.count" ], 1 do
-      patch account_url(@account), params: {
-        account: {
-          balance: 10000
-        }
-      }
-    end
-
-    assert_redirected_to account_url(@account)
-    assert_enqueued_with job: AccountSyncJob
-    assert_equal "Account updated", flash[:notice]
+  test "should get sparkline" do
+    get sparkline_account_url(@account)
+    assert_response :success
   end
 
-  test "updates account balance by editing existing valuation for today" do
-    @account.entries.create! date: Date.current, amount: 6000, currency: "USD", entryable: Account::Valuation.new
-
-    assert_no_difference [ "Account::Entry.count", "Account::Valuation.count" ] do
-      patch account_url(@account), params: {
-        account: {
-          balance: 10000
-        }
-      }
-    end
-
-    assert_redirected_to account_url(@account)
-    assert_enqueued_with job: AccountSyncJob
-    assert_equal "Account updated", flash[:notice]
-  end
-
-  test "should create an account" do
-    assert_difference [ "Account.count", "Account::Valuation.count", "Account::Entry.count" ], 1 do
-      post accounts_path, params: {
-        account: {
-          name: "Test",
-          accountable_type: "Depository",
-          balance: 200,
-          currency: "USD",
-          subtype: "checking",
-          institution_id: institutions(:chase).id
-        }
-      }
-
-      assert_equal "New account created successfully", flash[:notice]
-      assert_redirected_to account_url(Account.order(:created_at).last)
-    end
-  end
-
-  test "can add optional start date and balance to an account on create" do
-    assert_difference -> { Account.count } => 1, -> { Account::Valuation.count } => 2 do
-      post accounts_path, params: {
-        account: {
-          name: "Test",
-          accountable_type: "Depository",
-          balance: 200,
-          currency: "USD",
-          subtype: "checking",
-          institution_id: institutions(:chase).id,
-          start_balance: 100,
-          start_date: 10.days.ago
-        }
-      }
-
-      assert_equal "New account created successfully", flash[:notice]
-      assert_redirected_to account_url(Account.order(:created_at).last)
-    end
+  test "destroys account" do
+    delete account_url(@account)
+    assert_redirected_to accounts_path
+    assert_enqueued_with job: DestroyJob
+    assert_equal "Account scheduled for deletion", flash[:notice]
   end
 end
diff --git a/test/controllers/api/v1/accounts_controller_test.rb b/test/controllers/api/v1/accounts_controller_test.rb
new file mode 100644
index 00000000..9d95b454
--- /dev/null
+++ b/test/controllers/api/v1/accounts_controller_test.rb
@@ -0,0 +1,217 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class Api::V1::AccountsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = users(:family_admin) # dylan_family user
+    @other_family_user = users(:family_member)
+    @other_family_user.update!(family: families(:empty))
+
+    @oauth_app = Doorkeeper::Application.create!(
+      name: "Test API App",
+      redirect_uri: "https://example.com/callback",
+      scopes: "read read_write"
+    )
+  end
+
+  test "should require authentication" do
+    get "/api/v1/accounts"
+    assert_response :unauthorized
+
+    response_body = JSON.parse(response.body)
+    assert_equal "unauthorized", response_body["error"]
+  end
+
+  test "should require read_accounts scope" do
+  # TODO: Re-enable this test after fixing scope checking
+  skip "Scope checking temporarily disabled - needs configuration fix"
+
+  # Create token with wrong scope - using a non-existent scope to test rejection
+  access_token = Doorkeeper::AccessToken.create!(
+    application: @oauth_app,
+    resource_owner_id: @user.id,
+    scopes: "invalid_scope" # Wrong scope
+  )
+
+  get "/api/v1/accounts", params: {}, headers: {
+    "Authorization" => "Bearer #{access_token.token}"
+  }
+
+  assert_response :forbidden
+
+  # Doorkeeper returns a standard OAuth error response
+  response_body = JSON.parse(response.body)
+  assert_equal "insufficient_scope", response_body["error"]
+end
+
+  test "should return user's family accounts successfully" do
+    access_token = Doorkeeper::AccessToken.create!(
+      application: @oauth_app,
+      resource_owner_id: @user.id,
+      scopes: "read"
+    )
+
+    get "/api/v1/accounts", params: {}, headers: {
+      "Authorization" => "Bearer #{access_token.token}"
+    }
+
+    assert_response :success
+    response_body = JSON.parse(response.body)
+
+    # Should have accounts array
+    assert response_body.key?("accounts")
+    assert response_body["accounts"].is_a?(Array)
+
+    # Should have pagination metadata
+    assert response_body.key?("pagination")
+    assert response_body["pagination"].key?("page")
+    assert response_body["pagination"].key?("per_page")
+    assert response_body["pagination"].key?("total_count")
+    assert response_body["pagination"].key?("total_pages")
+
+    # All accounts should belong to user's family
+    response_body["accounts"].each do |account|
+      # We'll validate this by checking the user's family has these accounts
+      family_account_names = @user.family.accounts.pluck(:name)
+      assert_includes family_account_names, account["name"]
+    end
+  end
+
+  test "should only return active accounts" do
+    # Make one account inactive
+    inactive_account = accounts(:depository)
+    inactive_account.disable!
+
+    access_token = Doorkeeper::AccessToken.create!(
+      application: @oauth_app,
+      resource_owner_id: @user.id,
+      scopes: "read"
+    )
+
+    get "/api/v1/accounts", params: {}, headers: {
+      "Authorization" => "Bearer #{access_token.token}"
+    }
+
+    assert_response :success
+    response_body = JSON.parse(response.body)
+
+    # Should not include the inactive account
+    account_names = response_body["accounts"].map { |a| a["name"] }
+    assert_not_includes account_names, inactive_account.name
+  end
+
+  test "should not return other family's accounts" do
+    access_token = Doorkeeper::AccessToken.create!(
+      application: @oauth_app,
+      resource_owner_id: @other_family_user.id,  # User from different family
+      scopes: "read"
+    )
+
+    get "/api/v1/accounts", params: {}, headers: {
+      "Authorization" => "Bearer #{access_token.token}"
+    }
+
+    assert_response :success
+    response_body = JSON.parse(response.body)
+
+    # Should return empty array since other family has no accounts in fixtures
+    assert_equal [], response_body["accounts"]
+    assert_equal 0, response_body["pagination"]["total_count"]
+  end
+
+  test "should handle pagination parameters" do
+    access_token = Doorkeeper::AccessToken.create!(
+      application: @oauth_app,
+      resource_owner_id: @user.id,
+      scopes: "read"
+    )
+
+    # Test with pagination params
+    get "/api/v1/accounts", params: { page: 1, per_page: 2 }, headers: {
+      "Authorization" => "Bearer #{access_token.token}"
+    }
+
+    assert_response :success
+    response_body = JSON.parse(response.body)
+
+    # Should respect per_page limit
+    assert response_body["accounts"].length <= 2
+    assert_equal 1, response_body["pagination"]["page"]
+    assert_equal 2, response_body["pagination"]["per_page"]
+  end
+
+  test "should return proper account data structure" do
+    access_token = Doorkeeper::AccessToken.create!(
+      application: @oauth_app,
+      resource_owner_id: @user.id,
+      scopes: "read"
+    )
+
+    get "/api/v1/accounts", params: {}, headers: {
+      "Authorization" => "Bearer #{access_token.token}"
+    }
+
+    assert_response :success
+    response_body = JSON.parse(response.body)
+
+    # Should have at least one account from fixtures
+    assert response_body["accounts"].length > 0
+
+    account = response_body["accounts"].first
+
+    # Check required fields are present
+    required_fields = %w[id name balance currency classification account_type]
+    required_fields.each do |field|
+      assert account.key?(field), "Account should have #{field} field"
+    end
+
+    # Check data types
+    assert account["id"].is_a?(String), "ID should be string (UUID)"
+    assert account["name"].is_a?(String), "Name should be string"
+    assert account["balance"].is_a?(String), "Balance should be string (money)"
+    assert account["currency"].is_a?(String), "Currency should be string"
+    assert %w[asset liability].include?(account["classification"]), "Classification should be asset or liability"
+  end
+
+  test "should handle invalid pagination parameters gracefully" do
+    access_token = Doorkeeper::AccessToken.create!(
+      application: @oauth_app,
+      resource_owner_id: @user.id,
+      scopes: "read"
+    )
+
+    # Test with invalid page number
+    get "/api/v1/accounts", params: { page: -1, per_page: "invalid" }, headers: {
+      "Authorization" => "Bearer #{access_token.token}"
+    }
+
+    # Should still return success with default pagination
+    assert_response :success
+    response_body = JSON.parse(response.body)
+
+    # Should have pagination info (with defaults applied)
+    assert response_body.key?("pagination")
+    assert response_body["pagination"]["page"] >= 1
+    assert response_body["pagination"]["per_page"] > 0
+  end
+
+  test "should sort accounts alphabetically" do
+    access_token = Doorkeeper::AccessToken.create!(
+      application: @oauth_app,
+      resource_owner_id: @user.id,
+      scopes: "read"
+    )
+
+    get "/api/v1/accounts", params: {}, headers: {
+      "Authorization" => "Bearer #{access_token.token}"
+    }
+
+    assert_response :success
+    response_body = JSON.parse(response.body)
+
+    # Should be sorted alphabetically by name
+    account_names = response_body["accounts"].map { |a| a["name"] }
+    assert_equal account_names.sort, account_names
+  end
+end
diff --git a/test/controllers/api/v1/auth_controller_test.rb b/test/controllers/api/v1/auth_controller_test.rb
new file mode 100644
index 00000000..959de108
--- /dev/null
+++ b/test/controllers/api/v1/auth_controller_test.rb
@@ -0,0 +1,410 @@
+require "test_helper"
+
+class Api::V1::AuthControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    # Clean up any existing invite codes
+    InviteCode.destroy_all
+    @device_info = {
+      device_id: "test-device-123",
+      device_name: "Test iPhone",
+      device_type: "ios",
+      os_version: "17.0",
+      app_version: "1.0.0"
+    }
+  end
+
+  test "should signup new user and return OAuth tokens" do
+    assert_difference("User.count", 1) do
+      assert_difference("MobileDevice.count", 1) do
+        assert_difference("Doorkeeper::Application.count", 1) do
+          assert_difference("Doorkeeper::AccessToken.count", 1) do
+            post "/api/v1/auth/signup", params: {
+              user: {
+                email: "newuser@example.com",
+                password: "SecurePass123!",
+                first_name: "New",
+                last_name: "User"
+              },
+              device: @device_info
+            }
+          end
+        end
+      end
+    end
+
+    assert_response :created
+    response_data = JSON.parse(response.body)
+
+    assert response_data["user"]["id"].present?
+    assert_equal "newuser@example.com", response_data["user"]["email"]
+    assert_equal "New", response_data["user"]["first_name"]
+    assert_equal "User", response_data["user"]["last_name"]
+
+    # OAuth token assertions
+    assert response_data["access_token"].present?
+    assert response_data["refresh_token"].present?
+    assert_equal "Bearer", response_data["token_type"]
+    assert_equal 2592000, response_data["expires_in"] # 30 days
+    assert response_data["created_at"].present?
+
+    # Verify the device was created
+    new_user = User.find(response_data["user"]["id"])
+    device = new_user.mobile_devices.first
+    assert_equal @device_info[:device_id], device.device_id
+    assert_equal @device_info[:device_name], device.device_name
+    assert_equal @device_info[:device_type], device.device_type
+  end
+
+  test "should not signup without device info" do
+    assert_no_difference("User.count") do
+      post "/api/v1/auth/signup", params: {
+        user: {
+          email: "newuser@example.com",
+          password: "SecurePass123!",
+          first_name: "New",
+          last_name: "User"
+        }
+      }
+    end
+
+    assert_response :bad_request
+    response_data = JSON.parse(response.body)
+    assert_equal "Device information is required", response_data["error"]
+  end
+
+  test "should not signup with invalid password" do
+    assert_no_difference("User.count") do
+      post "/api/v1/auth/signup", params: {
+        user: {
+          email: "newuser@example.com",
+          password: "weak",
+          first_name: "New",
+          last_name: "User"
+        },
+        device: @device_info
+      }
+    end
+
+    assert_response :unprocessable_entity
+    response_data = JSON.parse(response.body)
+    assert response_data["errors"].include?("Password must be at least 8 characters")
+  end
+
+  test "should not signup with duplicate email" do
+    existing_user = users(:family_admin)
+
+    assert_no_difference("User.count") do
+      post "/api/v1/auth/signup", params: {
+        user: {
+          email: existing_user.email,
+          password: "SecurePass123!",
+          first_name: "Duplicate",
+          last_name: "User"
+        },
+        device: @device_info
+      }
+    end
+
+    assert_response :unprocessable_entity
+  end
+
+  test "should create user with admin role and family" do
+    post "/api/v1/auth/signup", params: {
+      user: {
+        email: "newuser@example.com",
+        password: "SecurePass123!",
+        first_name: "New",
+        last_name: "User"
+      },
+      device: @device_info
+    }
+
+    assert_response :created
+    response_data = JSON.parse(response.body)
+
+    new_user = User.find(response_data["user"]["id"])
+    assert_equal "admin", new_user.role
+    assert new_user.family.present?
+  end
+
+  test "should require invite code when enabled" do
+    # Mock invite code requirement
+    Api::V1::AuthController.any_instance.stubs(:invite_code_required?).returns(true)
+
+    assert_no_difference("User.count") do
+      post "/api/v1/auth/signup", params: {
+        user: {
+          email: "newuser@example.com",
+          password: "SecurePass123!",
+          first_name: "New",
+          last_name: "User"
+        },
+        device: @device_info
+      }
+    end
+
+    assert_response :forbidden
+    response_data = JSON.parse(response.body)
+    assert_equal "Invite code is required", response_data["error"]
+  end
+
+  test "should signup with valid invite code when required" do
+    # Create a valid invite code
+    invite_code = InviteCode.create!
+
+    # Mock invite code requirement
+    Api::V1::AuthController.any_instance.stubs(:invite_code_required?).returns(true)
+
+    assert_difference("User.count", 1) do
+      assert_difference("InviteCode.count", -1) do
+        post "/api/v1/auth/signup", params: {
+          user: {
+            email: "newuser@example.com",
+            password: "SecurePass123!",
+            first_name: "New",
+            last_name: "User"
+          },
+          device: @device_info,
+          invite_code: invite_code.token
+        }
+      end
+    end
+
+    assert_response :created
+  end
+
+  test "should reject invalid invite code" do
+    # Mock invite code requirement
+    Api::V1::AuthController.any_instance.stubs(:invite_code_required?).returns(false)
+
+    assert_no_difference("User.count") do
+      post "/api/v1/auth/signup", params: {
+        user: {
+          email: "newuser@example.com",
+          password: "SecurePass123!",
+          first_name: "New",
+          last_name: "User"
+        },
+        device: @device_info,
+        invite_code: "invalid_code"
+      }
+    end
+
+    assert_response :forbidden
+    response_data = JSON.parse(response.body)
+    assert_equal "Invalid invite code", response_data["error"]
+  end
+
+  test "should login existing user and return OAuth tokens" do
+    user = users(:family_admin)
+    password = user_password_test
+
+    # Ensure user has no mobile devices
+    user.mobile_devices.destroy_all
+
+    assert_difference("MobileDevice.count", 1) do
+      assert_difference("Doorkeeper::AccessToken.count", 1) do
+        post "/api/v1/auth/login", params: {
+          email: user.email,
+          password: password,
+          device: @device_info
+        }
+      end
+    end
+
+    assert_response :success
+    response_data = JSON.parse(response.body)
+
+    assert_equal user.id.to_s, response_data["user"]["id"]
+    assert_equal user.email, response_data["user"]["email"]
+
+    # OAuth token assertions
+    assert response_data["access_token"].present?
+    assert response_data["refresh_token"].present?
+    assert_equal "Bearer", response_data["token_type"]
+    assert_equal 2592000, response_data["expires_in"] # 30 days
+
+    # Verify the device
+    device = user.mobile_devices.where(device_id: @device_info[:device_id]).first
+    assert device.present?
+    assert device.active?
+  end
+
+  test "should require MFA when enabled" do
+    user = users(:family_admin)
+    password = user_password_test
+
+    # Enable MFA for user
+    user.setup_mfa!
+    user.enable_mfa!
+
+    post "/api/v1/auth/login", params: {
+      email: user.email,
+      password: password,
+      device: @device_info
+    }
+
+    assert_response :unauthorized
+    response_data = JSON.parse(response.body)
+    assert_equal "Two-factor authentication required", response_data["error"]
+    assert response_data["mfa_required"]
+  end
+
+  test "should login with valid MFA code" do
+    user = users(:family_admin)
+    password = user_password_test
+
+    # Enable MFA for user
+    user.setup_mfa!
+    user.enable_mfa!
+    totp = ROTP::TOTP.new(user.otp_secret)
+
+    assert_difference("Doorkeeper::AccessToken.count", 1) do
+      post "/api/v1/auth/login", params: {
+        email: user.email,
+        password: password,
+        otp_code: totp.now,
+        device: @device_info
+      }
+    end
+
+    assert_response :success
+    response_data = JSON.parse(response.body)
+    assert response_data["access_token"].present?
+  end
+
+  test "should revoke existing tokens for same device on login" do
+    user = users(:family_admin)
+    password = user_password_test
+
+    # Create an existing device and token
+    device = user.mobile_devices.create!(@device_info)
+    oauth_app = device.create_oauth_application!
+    existing_token = Doorkeeper::AccessToken.create!(
+      application: oauth_app,
+      resource_owner_id: user.id,
+      expires_in: 30.days.to_i,
+      scopes: "read_write"
+    )
+
+    assert existing_token.accessible?
+
+    post "/api/v1/auth/login", params: {
+      email: user.email,
+      password: password,
+      device: @device_info
+    }
+
+    assert_response :success
+
+    # Check that old token was revoked
+    existing_token.reload
+    assert existing_token.revoked?
+  end
+
+  test "should not login with invalid password" do
+    user = users(:family_admin)
+
+    assert_no_difference("Doorkeeper::AccessToken.count") do
+      post "/api/v1/auth/login", params: {
+        email: user.email,
+        password: "wrong_password",
+        device: @device_info
+      }
+    end
+
+    assert_response :unauthorized
+    response_data = JSON.parse(response.body)
+    assert_equal "Invalid email or password", response_data["error"]
+  end
+
+  test "should not login with non-existent email" do
+    assert_no_difference("Doorkeeper::AccessToken.count") do
+      post "/api/v1/auth/login", params: {
+        email: "nonexistent@example.com",
+        password: user_password_test,
+        device: @device_info
+      }
+    end
+
+    assert_response :unauthorized
+    response_data = JSON.parse(response.body)
+    assert_equal "Invalid email or password", response_data["error"]
+  end
+
+  test "should not login without device info" do
+    user = users(:family_admin)
+
+    assert_no_difference("Doorkeeper::AccessToken.count") do
+      post "/api/v1/auth/login", params: {
+        email: user.email,
+        password: user_password_test
+      }
+    end
+
+    assert_response :bad_request
+    response_data = JSON.parse(response.body)
+    assert_equal "Device information is required", response_data["error"]
+  end
+
+  test "should refresh access token with valid refresh token" do
+    user = users(:family_admin)
+    device = user.mobile_devices.create!(@device_info)
+    oauth_app = device.create_oauth_application!
+
+    # Create initial token
+    initial_token = Doorkeeper::AccessToken.create!(
+      application: oauth_app,
+      resource_owner_id: user.id,
+      expires_in: 30.days.to_i,
+      scopes: "read_write",
+      use_refresh_token: true
+    )
+
+    # Wait to ensure different timestamps
+    sleep 0.1
+
+    assert_difference("Doorkeeper::AccessToken.count", 1) do
+      post "/api/v1/auth/refresh", params: {
+        refresh_token: initial_token.refresh_token,
+        device: @device_info
+      }
+    end
+
+    assert_response :success
+    response_data = JSON.parse(response.body)
+
+    # New token assertions
+    assert response_data["access_token"].present?
+    assert response_data["refresh_token"].present?
+    assert_not_equal initial_token.token, response_data["access_token"]
+    assert_equal 2592000, response_data["expires_in"]
+
+    # Old token should be revoked
+    initial_token.reload
+    assert initial_token.revoked?
+  end
+
+  test "should not refresh with invalid refresh token" do
+    assert_no_difference("Doorkeeper::AccessToken.count") do
+      post "/api/v1/auth/refresh", params: {
+        refresh_token: "invalid_token",
+        device: @device_info
+      }
+    end
+
+    assert_response :unauthorized
+    response_data = JSON.parse(response.body)
+    assert_equal "Invalid refresh token", response_data["error"]
+  end
+
+  test "should not refresh without refresh token" do
+    post "/api/v1/auth/refresh", params: {
+      device: @device_info
+    }
+
+    assert_response :bad_request
+    response_data = JSON.parse(response.body)
+    assert_equal "Refresh token is required", response_data["error"]
+  end
+end
diff --git a/test/controllers/api/v1/base_controller_test.rb b/test/controllers/api/v1/base_controller_test.rb
new file mode 100644
index 00000000..af9e7066
--- /dev/null
+++ b/test/controllers/api/v1/base_controller_test.rb
@@ -0,0 +1,441 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class Api::V1::BaseControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = users(:family_admin)
+    @oauth_app = Doorkeeper::Application.create!(
+      name: "Test API App",
+      redirect_uri: "https://example.com/callback",
+      scopes: "read read_write"
+    )
+
+    # Clean up any existing API keys for the test user
+    @user.api_keys.destroy_all
+
+    # Create a test API key
+    @plain_api_key = "base_test_#{SecureRandom.hex(8)}"
+    @api_key = ApiKey.create!(
+      user: @user,
+      name: "Test API Key",
+      display_key: @plain_api_key,
+      scopes: [ "read_write" ]
+    )
+
+    # Clear any existing rate limit data
+    Redis.new.del("api_rate_limit:#{@api_key.id}")
+  end
+
+  teardown do
+    # Clean up Redis data after each test
+    Redis.new.del("api_rate_limit:#{@api_key.id}")
+  end
+
+  test "should require authentication" do
+    # Test that endpoints require OAuth tokens
+    get "/api/v1/test"
+    assert_response :unauthorized
+
+    response_body = JSON.parse(response.body)
+    assert_equal "unauthorized", response_body["error"]
+  end
+
+  test "should authenticate with valid access token" do
+    # Create a valid access token
+    access_token = Doorkeeper::AccessToken.create!(
+      application: @oauth_app,
+      resource_owner_id: @user.id,
+      scopes: "read"
+    )
+
+    get "/api/v1/test", params: {}, headers: {
+      "Authorization" => "Bearer #{access_token.token}"
+    }
+
+    # Should not be unauthorized when token is valid
+    assert_response :success
+    response_body = JSON.parse(response.body)
+    assert_equal "test_success", response_body["message"]
+    assert_equal @user.email, response_body["user"]
+  end
+
+  test "should reject invalid access token" do
+    get "/api/v1/test", params: {}, headers: {
+      "Authorization" => "Bearer invalid_token"
+    }
+
+    assert_response :unauthorized
+    response_body = JSON.parse(response.body)
+    assert_equal "unauthorized", response_body["error"]
+  end
+
+  test "should authenticate with valid API key" do
+    get "/api/v1/test", params: {}, headers: {
+      "X-Api-Key" => @plain_api_key
+    }
+
+    assert_response :success
+    response_body = JSON.parse(response.body)
+    assert_equal "test_success", response_body["message"]
+    assert_equal @user.email, response_body["user"]
+  end
+
+  test "should reject invalid API key" do
+    get "/api/v1/test", params: {}, headers: {
+      "X-Api-Key" => "invalid_api_key"
+    }
+
+    assert_response :unauthorized
+    response_body = JSON.parse(response.body)
+    assert_equal "unauthorized", response_body["error"]
+    assert_includes response_body["message"], "Access token or API key"
+  end
+
+  test "should reject expired API key" do
+    @api_key.update!(expires_at: 1.day.ago)
+
+    get "/api/v1/test", params: {}, headers: {
+      "X-Api-Key" => @plain_api_key
+    }
+
+    assert_response :unauthorized
+    response_body = JSON.parse(response.body)
+    assert_equal "unauthorized", response_body["error"]
+  end
+
+  test "should reject revoked API key" do
+    @api_key.revoke!
+
+    get "/api/v1/test", params: {}, headers: {
+      "X-Api-Key" => @plain_api_key
+    }
+
+    assert_response :unauthorized
+    response_body = JSON.parse(response.body)
+    assert_equal "unauthorized", response_body["error"]
+  end
+
+  test "should update last_used_at when API key is used" do
+    original_time = @api_key.last_used_at
+
+    get "/api/v1/test", params: {}, headers: {
+      "X-Api-Key" => @plain_api_key
+    }
+
+    assert_response :success
+    @api_key.reload
+    assert_not_equal original_time, @api_key.last_used_at
+    assert @api_key.last_used_at > (original_time || Time.at(0))
+  end
+
+  test "should prioritize OAuth over API key when both are provided" do
+    access_token = Doorkeeper::AccessToken.create!(
+      application: @oauth_app,
+      resource_owner_id: @user.id,
+      scopes: "read"
+    )
+
+    # Capture log output to verify OAuth is used
+    logs = capture_log do
+      get "/api/v1/test", params: {}, headers: {
+        "Authorization" => "Bearer #{access_token.token}",
+        "X-Api-Key" => @plain_api_key
+      }
+    end
+
+    assert_response :success
+    assert_includes logs, "OAuth Token"
+    assert_not_includes logs, "API Key:"
+  end
+
+  test "should provide current_scopes for API key authentication" do
+    get "/api/v1/test_scope_required", params: {}, headers: {
+      "X-Api-Key" => @plain_api_key
+    }
+
+    assert_response :success
+    response_body = JSON.parse(response.body)
+    assert_equal "scope_authorized", response_body["message"]
+    assert_includes response_body["scopes"], "read_write"
+  end
+
+  test "should authorize API key with required scope" do
+    get "/api/v1/test_scope_required", params: {}, headers: {
+      "X-Api-Key" => @plain_api_key
+    }
+
+    assert_response :success
+    response_body = JSON.parse(response.body)
+    assert_equal "scope_authorized", response_body["message"]
+    assert_equal "write", response_body["required_scope"]
+  end
+
+  test "should reject API key without required scope" do
+    # Revoke existing API key and create one with limited scopes
+    @api_key.revoke!
+    limited_api_key = ApiKey.create!(
+      user: @user,
+      name: "Limited API Key",
+      display_key: "limited_key_#{SecureRandom.hex(8)}",
+      scopes: [ "read" ]  # Only read scope
+    )
+
+    get "/api/v1/test_scope_required", params: {}, headers: {
+      "X-Api-Key" => limited_api_key.display_key
+    }
+
+    assert_response :forbidden
+    response_body = JSON.parse(response.body)
+    assert_equal "insufficient_scope", response_body["error"]
+    assert_includes response_body["message"], "write"
+  end
+
+  test "should authorize API key with multiple required scopes" do
+    get "/api/v1/test_multiple_scopes_required", params: {}, headers: {
+      "X-Api-Key" => @plain_api_key
+    }
+
+    assert_response :success
+    response_body = JSON.parse(response.body)
+    assert_equal "read_scope_authorized", response_body["message"]
+    assert_includes response_body["scopes"], "read_write"
+  end
+
+  test "should reject API key missing one of multiple required scopes" do
+    # The multiple scopes test now just checks for "read" permission,
+    # so we need to create an API key without any scopes at all.
+    # First revoke the existing key, then create one with empty scopes array won't work due to validation.
+    # Instead, we'll test by trying to access the write endpoint with a read-only key.
+    @api_key.revoke!
+
+    read_only_key = ApiKey.create!(
+      user: @user,
+      name: "Read Only API Key",
+      display_key: "read_only_key_#{SecureRandom.hex(8)}",
+      scopes: [ "read" ]  # Only read scope, no write
+    )
+
+    # Try to access the write-requiring endpoint with read-only key
+    get "/api/v1/test_scope_required", params: {}, headers: {
+      "X-Api-Key" => read_only_key.display_key
+    }
+
+    assert_response :forbidden
+    response_body = JSON.parse(response.body)
+    assert_equal "insufficient_scope", response_body["error"]
+  end
+
+  test "should log API access with API key information" do
+    logs = capture_log do
+      get "/api/v1/test", params: {}, headers: {
+        "X-Api-Key" => @plain_api_key
+      }
+    end
+
+    assert_includes logs, "API Request"
+    assert_includes logs, "GET /api/v1/test"
+    assert_includes logs, @user.email
+  end
+
+  test "should provide current_resource_owner method" do
+    # This will be tested through the test controller once implemented
+    skip "Will test via test controller implementation"
+  end
+
+  test "should handle ActiveRecord::RecordNotFound errors" do
+    access_token = Doorkeeper::AccessToken.create!(
+      application: @oauth_app,
+      resource_owner_id: @user.id,
+      scopes: "read"
+    )
+
+    # This will trigger a not found error in the test controller
+    get "/api/v1/test_not_found", params: {}, headers: {
+      "Authorization" => "Bearer #{access_token.token}"
+    }
+
+    assert_response :not_found
+    response_body = JSON.parse(response.body)
+    assert_equal "record_not_found", response_body["error"]
+  end
+
+  test "should log API access" do
+    access_token = Doorkeeper::AccessToken.create!(
+      application: @oauth_app,
+      resource_owner_id: @user.id,
+      scopes: "read"
+    )
+
+    # Capture log output
+    logs = capture_log do
+      get "/api/v1/test", params: {}, headers: {
+        "Authorization" => "Bearer #{access_token.token}"
+      }
+    end
+
+    assert_includes logs, "API Request"
+    assert_includes logs, "GET /api/v1/test"
+    assert_includes logs, @user.email
+  end
+
+  test "should enforce family-based access control" do
+    # Create another family user
+    other_family = families(:dylan_family)
+    other_user = users(:family_member)
+    other_user.update!(family: other_family)
+
+    access_token = Doorkeeper::AccessToken.create!(
+      application: @oauth_app,
+      resource_owner_id: other_user.id,
+      scopes: "read"
+    )
+
+    # Try to access data from a different family
+    get "/api/v1/test_family_access", params: {}, headers: {
+      "Authorization" => "Bearer #{access_token.token}"
+    }
+
+    assert_response :forbidden
+    response_body = JSON.parse(response.body)
+    assert_equal "forbidden", response_body["error"]
+  end
+
+  test "should enforce family-based access control with API key" do
+    # Create API key for a user in a different family
+    other_family = families(:dylan_family)
+    other_user = users(:family_member)
+    other_user.update!(family: other_family)
+    other_user.api_keys.destroy_all
+
+    other_user_api_key = ApiKey.create!(
+      user: other_user,
+      name: "Other User API Key",
+      display_key: "other_user_key_#{SecureRandom.hex(8)}",
+      scopes: [ "read" ]
+    )
+
+    # Try to access data from a different family
+    get "/api/v1/test_family_access", params: {}, headers: {
+      "X-Api-Key" => other_user_api_key.display_key
+    }
+
+    assert_response :forbidden
+    response_body = JSON.parse(response.body)
+    assert_equal "forbidden", response_body["error"]
+  end
+
+  test "should include rate limit headers on successful API key requests" do
+    get "/api/v1/test", headers: { "X-Api-Key" => @plain_api_key }
+
+    assert_response :success
+    assert_not_nil response.headers["X-RateLimit-Limit"]
+    assert_not_nil response.headers["X-RateLimit-Remaining"]
+    assert_not_nil response.headers["X-RateLimit-Reset"]
+
+    assert_equal "100", response.headers["X-RateLimit-Limit"]
+    assert_equal "99", response.headers["X-RateLimit-Remaining"]
+  end
+
+  test "should increment rate limit count with each request" do
+    # First request
+    get "/api/v1/test", headers: { "X-Api-Key" => @plain_api_key }
+    assert_response :success
+    assert_equal "99", response.headers["X-RateLimit-Remaining"]
+
+    # Second request
+    get "/api/v1/test", headers: { "X-Api-Key" => @plain_api_key }
+    assert_response :success
+    assert_equal "98", response.headers["X-RateLimit-Remaining"]
+  end
+
+  test "should return 429 when rate limit exceeded" do
+    # Make 100 requests to exhaust the rate limit
+    100.times do
+      get "/api/v1/test", headers: { "X-Api-Key" => @plain_api_key }
+      assert_response :success
+    end
+
+    # 101st request should be rate limited
+    get "/api/v1/test", headers: { "X-Api-Key" => @plain_api_key }
+    assert_response :too_many_requests
+
+    response_body = JSON.parse(response.body)
+    assert_equal "rate_limit_exceeded", response_body["error"]
+    assert_includes response_body["message"], "Rate limit exceeded"
+
+    # Check response headers
+    assert_equal "100", response.headers["X-RateLimit-Limit"]
+    assert_equal "0", response.headers["X-RateLimit-Remaining"]
+    assert_not_nil response.headers["X-RateLimit-Reset"]
+    assert_not_nil response.headers["Retry-After"]
+  end
+
+  test "should not apply rate limiting to OAuth requests" do
+    # This would need to be implemented based on your OAuth setup
+    # For now, just verify that requests without API keys don't trigger rate limiting
+    get "/api/v1/test"
+    assert_response :unauthorized
+
+    # Should not have rate limit headers for unauthorized requests
+    assert_nil response.headers["X-RateLimit-Limit"]
+  end
+
+  test "should provide detailed rate limit information in 429 response" do
+    # Exhaust the rate limit
+    100.times do
+      get "/api/v1/test", headers: { "X-Api-Key" => @plain_api_key }
+    end
+
+    # Make the rate-limited request
+    get "/api/v1/test", headers: { "X-Api-Key" => @plain_api_key }
+    assert_response :too_many_requests
+
+    response_body = JSON.parse(response.body)
+    assert_equal "rate_limit_exceeded", response_body["error"]
+    assert response_body["details"]["limit"] == 100
+    assert response_body["details"]["current"] >= 100
+    assert response_body["details"]["reset_in_seconds"] > 0
+  end
+
+  test "rate limiting should be per API key" do
+    # Create a second user for independent API keys
+    other_user = users(:family_member)
+    other_api_key = ApiKey.create!(
+      user: other_user,
+      name: "Other Test API Key",
+      scopes: [ "read" ],
+      display_key: "other_rate_test_#{SecureRandom.hex(8)}"
+    )
+
+    begin
+      # Make 50 requests with first API key
+      50.times do
+        get "/api/v1/test", headers: { "X-Api-Key" => @plain_api_key }
+        assert_response :success
+      end
+
+      # Should still be able to make requests with second API key
+      get "/api/v1/test", headers: { "X-Api-Key" => other_api_key.display_key }
+      assert_response :success
+      assert_equal "99", response.headers["X-RateLimit-Remaining"]
+    ensure
+      Redis.new.del("api_rate_limit:#{other_api_key.id}")
+      other_api_key.destroy
+    end
+  end
+
+private
+
+  def capture_log(&block)
+    io = StringIO.new
+    original_logger = Rails.logger
+    Rails.logger = Logger.new(io)
+
+    yield
+
+    io.string
+  ensure
+    Rails.logger = original_logger
+  end
+end
diff --git a/test/controllers/api/v1/chats_controller_test.rb b/test/controllers/api/v1/chats_controller_test.rb
new file mode 100644
index 00000000..f56ed353
--- /dev/null
+++ b/test/controllers/api/v1/chats_controller_test.rb
@@ -0,0 +1,133 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class Api::V1::ChatsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = users(:family_admin)
+    @user.update!(ai_enabled: true)
+
+    @oauth_app = Doorkeeper::Application.create!(
+      name: "Test API App",
+      redirect_uri: "https://example.com/callback",
+      scopes: "read write read_write"
+    )
+
+    @read_token = Doorkeeper::AccessToken.create!(
+      application: @oauth_app,
+      resource_owner_id: @user.id,
+      scopes: "read"
+    )
+
+    @write_token = Doorkeeper::AccessToken.create!(
+      application: @oauth_app,
+      resource_owner_id: @user.id,
+      scopes: "read_write"
+    )
+
+    @chat = chats(:one)
+  end
+
+  test "should require authentication" do
+    get "/api/v1/chats"
+    assert_response :unauthorized
+  end
+
+  test "should require AI to be enabled" do
+    @user.update!(ai_enabled: false)
+
+    get "/api/v1/chats", headers: bearer_auth_header(@read_token)
+    assert_response :forbidden
+
+    response_body = JSON.parse(response.body)
+    assert_equal "feature_disabled", response_body["error"]
+  end
+
+  test "should list chats with read scope" do
+    get "/api/v1/chats", headers: bearer_auth_header(@read_token)
+    assert_response :success
+
+    response_body = JSON.parse(response.body)
+    assert response_body["chats"].is_a?(Array)
+    assert response_body["pagination"].present?
+  end
+
+  test "should show chat with messages" do
+    get "/api/v1/chats/#{@chat.id}", headers: bearer_auth_header(@read_token)
+    assert_response :success
+
+    response_body = JSON.parse(response.body)
+    assert_equal @chat.id, response_body["id"]
+    assert response_body["messages"].is_a?(Array)
+  end
+
+  test "should create chat with write scope" do
+    assert_difference "Chat.count" do
+      post "/api/v1/chats",
+        params: { title: "New chat", message: "Hello AI" },
+        headers: bearer_auth_header(@write_token)
+    end
+
+    assert_response :created
+    response_body = JSON.parse(response.body)
+    assert_equal "New chat", response_body["title"]
+  end
+
+  test "should not create chat with read scope" do
+    post "/api/v1/chats",
+      params: { title: "New chat" },
+      headers: bearer_auth_header(@read_token)
+
+    assert_response :forbidden
+  end
+
+  test "should update chat" do
+    patch "/api/v1/chats/#{@chat.id}",
+      params: { title: "Updated title" },
+      headers: bearer_auth_header(@write_token)
+
+    assert_response :success
+    response_body = JSON.parse(response.body)
+    assert_equal "Updated title", response_body["title"]
+  end
+
+  test "should delete chat" do
+    assert_difference "Chat.count", -1 do
+      delete "/api/v1/chats/#{@chat.id}", headers: bearer_auth_header(@write_token)
+    end
+
+    assert_response :no_content
+  end
+
+  test "should not access other user's chat" do
+    other_user = users(:family_member)
+    other_user.update!(family: families(:empty))
+    other_chat = chats(:two)
+    other_chat.update!(user: other_user)
+
+    get "/api/v1/chats/#{other_chat.id}", headers: bearer_auth_header(@read_token)
+    assert_response :not_found
+  end
+
+  test "should support API key authentication" do
+    # Remove any existing API keys for this user
+    @user.api_keys.destroy_all
+
+    plain_key = ApiKey.generate_secure_key
+    api_key = @user.api_keys.build(
+      name: "Test API Key",
+      scopes: [ "read_write" ]
+    )
+    api_key.key = plain_key
+    api_key.save!
+
+    get "/api/v1/chats", headers: { "X-Api-Key" => plain_key }
+    assert_response :success
+  end
+
+  private
+
+    def bearer_auth_header(token)
+      { "Authorization" => "Bearer #{token.token}" }
+    end
+end
diff --git a/test/controllers/api/v1/messages_controller_test.rb b/test/controllers/api/v1/messages_controller_test.rb
new file mode 100644
index 00000000..da0ff01f
--- /dev/null
+++ b/test/controllers/api/v1/messages_controller_test.rb
@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class Api::V1::MessagesControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = users(:family_admin)
+    @user.update!(ai_enabled: true)
+
+    @oauth_app = Doorkeeper::Application.create!(
+      name: "Test API App",
+      redirect_uri: "https://example.com/callback",
+      scopes: "read write read_write"
+    )
+
+    @write_token = Doorkeeper::AccessToken.create!(
+      application: @oauth_app,
+      resource_owner_id: @user.id,
+      scopes: "read_write"
+    )
+
+    @chat = chats(:one)
+  end
+
+  test "should require authentication" do
+    post "/api/v1/chats/#{@chat.id}/messages"
+    assert_response :unauthorized
+  end
+
+  test "should require AI to be enabled" do
+    @user.update!(ai_enabled: false)
+
+    post "/api/v1/chats/#{@chat.id}/messages",
+      params: { content: "Hello" },
+      headers: bearer_auth_header(@write_token)
+    assert_response :forbidden
+  end
+
+  test "should create message with write scope" do
+    assert_difference "Message.count" do
+      post "/api/v1/chats/#{@chat.id}/messages",
+        params: { content: "Test message", model: "gpt-4" },
+        headers: bearer_auth_header(@write_token)
+    end
+
+    assert_response :created
+    response_body = JSON.parse(response.body)
+    assert_equal "Test message", response_body["content"]
+    assert_equal "user_message", response_body["type"]
+    assert_equal "pending", response_body["ai_response_status"]
+  end
+
+  test "should enqueue assistant response job" do
+    assert_enqueued_with(job: AssistantResponseJob) do
+      post "/api/v1/chats/#{@chat.id}/messages",
+        params: { content: "Test message" },
+        headers: bearer_auth_header(@write_token)
+    end
+  end
+
+  test "should retry last assistant message" do
+    skip "Retry functionality needs debugging"
+
+    # Create an assistant message to retry
+    assistant_message = @chat.messages.create!(
+      type: "AssistantMessage",
+      content: "Previous response",
+      ai_model: "gpt-4"
+    )
+
+    assert_enqueued_with(job: AssistantResponseJob) do
+      post "/api/v1/chats/#{@chat.id}/messages/retry",
+        headers: bearer_auth_header(@write_token)
+    end
+
+    assert_response :accepted
+    response_body = JSON.parse(response.body)
+    assert response_body["message_id"].present?
+  end
+
+  test "should not retry if no assistant message exists" do
+    # Remove all assistant messages
+    @chat.messages.where(type: "AssistantMessage").destroy_all
+
+    post "/api/v1/chats/#{@chat.id}/messages/retry.json",
+      headers: bearer_auth_header(@write_token)
+
+    assert_response :unprocessable_entity
+    response_body = JSON.parse(response.body)
+    assert_equal "No assistant message to retry", response_body["error"]
+  end
+
+  test "should not access messages in other user's chat" do
+    other_user = users(:family_member)
+    other_user.update!(family: families(:empty))
+    other_chat = chats(:two)
+    other_chat.update!(user: other_user)
+
+    post "/api/v1/chats/#{other_chat.id}/messages",
+      params: { content: "Test" },
+      headers: bearer_auth_header(@write_token)
+
+    assert_response :not_found
+  end
+
+  private
+
+    def bearer_auth_header(token)
+      { "Authorization" => "Bearer #{token.token}" }
+    end
+end
diff --git a/test/controllers/api/v1/transactions_controller_test.rb b/test/controllers/api/v1/transactions_controller_test.rb
new file mode 100644
index 00000000..b028562a
--- /dev/null
+++ b/test/controllers/api/v1/transactions_controller_test.rb
@@ -0,0 +1,361 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class Api::V1::TransactionsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = users(:family_admin)
+    @family = @user.family
+    @account = @family.accounts.first
+    @transaction = @family.transactions.first
+
+    # Destroy existing active API keys to avoid validation errors
+    @user.api_keys.active.destroy_all
+
+    # Create fresh API keys instead of using fixtures to avoid parallel test conflicts (rate limiting in test)
+    @api_key = ApiKey.create!(
+      user: @user,
+      name: "Test Read-Write Key",
+      scopes: [ "read_write" ],
+      display_key: "test_rw_#{SecureRandom.hex(8)}"
+    )
+
+    @read_only_api_key = ApiKey.create!(
+      user: @user,
+      name: "Test Read-Only Key",
+      scopes: [ "read" ],
+      display_key: "test_ro_#{SecureRandom.hex(8)}",
+      source: "mobile"  # Use different source to allow multiple keys
+    )
+
+    # Clear any existing rate limit data
+    Redis.new.del("api_rate_limit:#{@api_key.id}")
+    Redis.new.del("api_rate_limit:#{@read_only_api_key.id}")
+  end
+
+  # INDEX action tests
+  test "should get index with valid API key" do
+    get api_v1_transactions_url, headers: api_headers(@api_key)
+    assert_response :success
+
+    response_data = JSON.parse(response.body)
+    assert response_data.key?("transactions")
+    assert response_data.key?("pagination")
+    assert response_data["pagination"].key?("page")
+    assert response_data["pagination"].key?("per_page")
+    assert response_data["pagination"].key?("total_count")
+    assert response_data["pagination"].key?("total_pages")
+  end
+
+  test "should get index with read-only API key" do
+    get api_v1_transactions_url, headers: api_headers(@read_only_api_key)
+    assert_response :success
+  end
+
+  test "should filter transactions by account_id" do
+    get api_v1_transactions_url, params: { account_id: @account.id }, headers: api_headers(@api_key)
+    assert_response :success
+
+    response_data = JSON.parse(response.body)
+    response_data["transactions"].each do |transaction|
+      assert_equal @account.id, transaction["account"]["id"]
+    end
+  end
+
+  test "should filter transactions by date range" do
+    start_date = 1.month.ago.to_date
+    end_date = Date.current
+
+    get api_v1_transactions_url,
+        params: { start_date: start_date, end_date: end_date },
+        headers: api_headers(@api_key)
+    assert_response :success
+
+    response_data = JSON.parse(response.body)
+    response_data["transactions"].each do |transaction|
+      transaction_date = Date.parse(transaction["date"])
+      assert transaction_date >= start_date
+      assert transaction_date <= end_date
+    end
+  end
+
+  test "should search transactions" do
+    # Create a transaction with a specific name for testing
+    entry = @account.entries.create!(
+      name: "Test Coffee Purchase",
+      amount: 5.50,
+      currency: "USD",
+      date: Date.current,
+      entryable: Transaction.new
+    )
+
+    get api_v1_transactions_url,
+        params: { search: "Coffee" },
+        headers: api_headers(@api_key)
+    assert_response :success
+
+    response_data = JSON.parse(response.body)
+    found_transaction = response_data["transactions"].find { |t| t["id"] == entry.transaction.id }
+    assert_not_nil found_transaction, "Should find the coffee transaction"
+  end
+
+  test "should paginate transactions" do
+    get api_v1_transactions_url,
+        params: { page: 1, per_page: 5 },
+        headers: api_headers(@api_key)
+    assert_response :success
+
+    response_data = JSON.parse(response.body)
+    assert response_data["transactions"].size <= 5
+    assert_equal 1, response_data["pagination"]["page"]
+    assert_equal 5, response_data["pagination"]["per_page"]
+  end
+
+  test "should reject index request without API key" do
+    get api_v1_transactions_url
+    assert_response :unauthorized
+  end
+
+  test "should reject index request with invalid API key" do
+    get api_v1_transactions_url, headers: { "X-Api-Key" => "invalid-key" }
+    assert_response :unauthorized
+  end
+
+  # SHOW action tests
+  test "should show transaction with valid API key" do
+    get api_v1_transaction_url(@transaction), headers: api_headers(@api_key)
+    assert_response :success
+
+    response_data = JSON.parse(response.body)
+    assert_equal @transaction.id, response_data["id"]
+    assert response_data.key?("name")
+    assert response_data.key?("amount")
+    assert response_data.key?("date")
+    assert response_data.key?("account")
+  end
+
+  test "should show transaction with read-only API key" do
+    get api_v1_transaction_url(@transaction), headers: api_headers(@read_only_api_key)
+    assert_response :success
+  end
+
+  test "should return 404 for non-existent transaction" do
+    get api_v1_transaction_url(999999), headers: api_headers(@api_key)
+    assert_response :not_found
+  end
+
+  test "should reject show request without API key" do
+    get api_v1_transaction_url(@transaction)
+    assert_response :unauthorized
+  end
+
+  # CREATE action tests
+  test "should create transaction with valid parameters" do
+    transaction_params = {
+      transaction: {
+        account_id: @account.id,
+        name: "Test Transaction",
+        amount: 25.00,
+        date: Date.current,
+        currency: "USD",
+        nature: "expense"
+      }
+    }
+
+    assert_difference("@account.entries.count", 1) do
+      post api_v1_transactions_url,
+           params: transaction_params,
+           headers: api_headers(@api_key)
+    end
+
+    assert_response :created
+    response_data = JSON.parse(response.body)
+    assert_equal "Test Transaction", response_data["name"]
+    assert_equal @account.id, response_data["account"]["id"]
+  end
+
+  test "should reject create with read-only API key" do
+    transaction_params = {
+      transaction: {
+        account_id: @account.id,
+        name: "Test Transaction",
+        amount: 25.00,
+        date: Date.current
+      }
+    }
+
+    post api_v1_transactions_url,
+         params: transaction_params,
+         headers: api_headers(@read_only_api_key)
+    assert_response :forbidden
+  end
+
+  test "should reject create with invalid parameters" do
+    transaction_params = {
+      transaction: {
+        # Missing required fields
+        name: "Test Transaction"
+      }
+    }
+
+    post api_v1_transactions_url,
+         params: transaction_params,
+         headers: api_headers(@api_key)
+    assert_response :unprocessable_entity
+  end
+
+  test "should reject create without API key" do
+    post api_v1_transactions_url, params: { transaction: { name: "Test" } }
+    assert_response :unauthorized
+  end
+
+  # UPDATE action tests
+  test "should update transaction with valid parameters" do
+    update_params = {
+      transaction: {
+        name: "Updated Transaction Name",
+        amount: 30.00
+      }
+    }
+
+    put api_v1_transaction_url(@transaction),
+        params: update_params,
+        headers: api_headers(@api_key)
+    assert_response :success
+
+    response_data = JSON.parse(response.body)
+    assert_equal "Updated Transaction Name", response_data["name"]
+  end
+
+  test "should reject update with read-only API key" do
+    update_params = {
+      transaction: {
+        name: "Updated Transaction Name"
+      }
+    }
+
+    put api_v1_transaction_url(@transaction),
+        params: update_params,
+        headers: api_headers(@read_only_api_key)
+    assert_response :forbidden
+  end
+
+  test "should reject update for non-existent transaction" do
+    put api_v1_transaction_url(999999),
+        params: { transaction: { name: "Test" } },
+        headers: api_headers(@api_key)
+    assert_response :not_found
+  end
+
+  test "should reject update without API key" do
+    put api_v1_transaction_url(@transaction), params: { transaction: { name: "Test" } }
+    assert_response :unauthorized
+  end
+
+  # DESTROY action tests
+  test "should destroy transaction" do
+  entry_to_delete = @account.entries.create!(
+    name: "Transaction to Delete",
+    amount: 10.00,
+    currency: "USD",
+    date: Date.current,
+    entryable: Transaction.new
+  )
+  transaction_to_delete = entry_to_delete.transaction
+
+  assert_difference("@account.entries.count", -1) do
+    delete api_v1_transaction_url(transaction_to_delete), headers: api_headers(@api_key)
+  end
+
+  assert_response :success
+  response_data = JSON.parse(response.body)
+  assert response_data.key?("message")
+end
+
+  test "should reject destroy with read-only API key" do
+    delete api_v1_transaction_url(@transaction), headers: api_headers(@read_only_api_key)
+    assert_response :forbidden
+  end
+
+  test "should reject destroy for non-existent transaction" do
+    delete api_v1_transaction_url(999999), headers: api_headers(@api_key)
+    assert_response :not_found
+  end
+
+  test "should reject destroy without API key" do
+    delete api_v1_transaction_url(@transaction)
+    assert_response :unauthorized
+  end
+
+  # JSON structure tests
+  test "transaction JSON should have expected structure" do
+    get api_v1_transaction_url(@transaction), headers: api_headers(@api_key)
+    assert_response :success
+
+    transaction_data = JSON.parse(response.body)
+
+    # Basic fields
+    assert transaction_data.key?("id")
+    assert transaction_data.key?("date")
+    assert transaction_data.key?("amount")
+    assert transaction_data.key?("currency")
+    assert transaction_data.key?("name")
+    assert transaction_data.key?("classification")
+    assert transaction_data.key?("created_at")
+    assert transaction_data.key?("updated_at")
+
+    # Account information
+    assert transaction_data.key?("account")
+    assert transaction_data["account"].key?("id")
+    assert transaction_data["account"].key?("name")
+    assert transaction_data["account"].key?("account_type")
+
+    # Optional fields should be present (even if nil)
+    assert transaction_data.key?("category")
+    assert transaction_data.key?("merchant")
+    assert transaction_data.key?("tags")
+    assert transaction_data.key?("transfer")
+    assert transaction_data.key?("notes")
+  end
+
+  test "transactions with transfers should include transfer information" do
+    # Create a transfer between two accounts to test transfer rendering
+    from_account = @family.accounts.create!(
+      name: "Transfer From Account",
+      balance: 1000,
+      currency: "USD",
+      accountable: Depository.new
+    )
+
+    to_account = @family.accounts.create!(
+      name: "Transfer To Account",
+      balance: 0,
+      currency: "USD",
+      accountable: Depository.new
+    )
+
+    transfer = Transfer::Creator.new(
+      family: @family,
+      source_account_id: from_account.id,
+      destination_account_id: to_account.id,
+      date: Date.current,
+      amount: 100
+    ).create
+
+    get api_v1_transaction_url(transfer.inflow_transaction), headers: api_headers(@api_key)
+    assert_response :success
+
+    transaction_data = JSON.parse(response.body)
+    assert_not_nil transaction_data["transfer"]
+    assert transaction_data["transfer"].key?("id")
+    assert transaction_data["transfer"].key?("amount")
+    assert transaction_data["transfer"].key?("currency")
+    assert transaction_data["transfer"].key?("other_account")
+  end
+
+  private
+
+    def api_headers(api_key)
+      { "X-Api-Key" => api_key.display_key }
+    end
+end
diff --git a/test/controllers/api/v1/usage_controller_test.rb b/test/controllers/api/v1/usage_controller_test.rb
new file mode 100644
index 00000000..27235826
--- /dev/null
+++ b/test/controllers/api/v1/usage_controller_test.rb
@@ -0,0 +1,136 @@
+require "test_helper"
+
+class Api::V1::UsageControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = users(:family_admin)
+    # Destroy any existing active API keys for this user
+    @user.api_keys.active.destroy_all
+
+    @api_key = ApiKey.create!(
+      user: @user,
+      name: "Test API Key",
+      scopes: [ "read" ],
+      display_key: "usage_test_#{SecureRandom.hex(8)}"
+    )
+
+    # Clear any existing rate limit data
+    Redis.new.del("api_rate_limit:#{@api_key.id}")
+  end
+
+  teardown do
+    # Clean up Redis data after each test
+    Redis.new.del("api_rate_limit:#{@api_key.id}")
+  end
+
+  test "should return usage information for API key authentication" do
+    # Make a few requests to generate some usage
+    3.times do
+      get "/api/v1/test", headers: { "X-Api-Key" => @api_key.display_key }
+      assert_response :success
+    end
+
+    # Now check usage
+    get "/api/v1/usage", headers: { "X-Api-Key" => @api_key.display_key }
+    assert_response :success
+
+    response_body = JSON.parse(response.body)
+
+    # Check API key information
+    assert_equal "Test API Key", response_body["api_key"]["name"]
+    assert_equal [ "read" ], response_body["api_key"]["scopes"]
+    assert_not_nil response_body["api_key"]["last_used_at"]
+    assert_not_nil response_body["api_key"]["created_at"]
+
+    # Check rate limit information
+    assert_equal "standard", response_body["rate_limit"]["tier"]
+    assert_equal 100, response_body["rate_limit"]["limit"]
+    assert_equal 4, response_body["rate_limit"]["current_count"] # 3 test requests + 1 usage request
+    assert_equal 96, response_body["rate_limit"]["remaining"]
+    assert response_body["rate_limit"]["reset_in_seconds"] > 0
+    assert_not_nil response_body["rate_limit"]["reset_at"]
+  end
+
+  test "should require read scope for usage endpoint" do
+    # Create an API key without read scope (this shouldn't be possible with current validations, but let's test)
+    api_key_no_read = ApiKey.new(
+      user: @user,
+      name: "No Read Key",
+      scopes: [],
+      display_key: "no_read_key_#{SecureRandom.hex(8)}"
+    )
+    # Skip validations to create invalid key for testing
+    api_key_no_read.save(validate: false)
+
+    begin
+      get "/api/v1/usage", headers: { "X-Api-Key" => api_key_no_read.display_key }
+      assert_response :forbidden
+
+      response_body = JSON.parse(response.body)
+      assert_equal "insufficient_scope", response_body["error"]
+    ensure
+      Redis.new.del("api_rate_limit:#{api_key_no_read.id}")
+      api_key_no_read.destroy
+    end
+  end
+
+  test "should return correct message for OAuth authentication" do
+    # This test would need OAuth setup, but for now we can mock it
+    # For the current implementation, we'll test what happens with no authentication
+    get "/api/v1/usage"
+    assert_response :unauthorized
+  end
+
+  test "should update usage count when accessing usage endpoint" do
+    # Check initial state
+    get "/api/v1/usage", headers: { "X-Api-Key" => @api_key.display_key }
+    assert_response :success
+
+    response_body = JSON.parse(response.body)
+    first_count = response_body["rate_limit"]["current_count"]
+
+    # Make another usage request
+    get "/api/v1/usage", headers: { "X-Api-Key" => @api_key.display_key }
+    assert_response :success
+
+    response_body = JSON.parse(response.body)
+    second_count = response_body["rate_limit"]["current_count"]
+
+    assert_equal first_count + 1, second_count
+  end
+
+  test "should include rate limit headers in usage response" do
+    get "/api/v1/usage", headers: { "X-Api-Key" => @api_key.display_key }
+    assert_response :success
+
+    assert_not_nil response.headers["X-RateLimit-Limit"]
+    assert_not_nil response.headers["X-RateLimit-Remaining"]
+    assert_not_nil response.headers["X-RateLimit-Reset"]
+
+    assert_equal "100", response.headers["X-RateLimit-Limit"]
+    assert_equal "99", response.headers["X-RateLimit-Remaining"]
+  end
+
+  test "should work correctly when approaching rate limit" do
+    # Make 98 requests to get close to the limit
+    98.times do
+      get "/api/v1/test", headers: { "X-Api-Key" => @api_key.display_key }
+      assert_response :success
+    end
+
+    # Check usage - this should be request 99
+    get "/api/v1/usage", headers: { "X-Api-Key" => @api_key.display_key }
+    assert_response :success
+
+    response_body = JSON.parse(response.body)
+    assert_equal 99, response_body["rate_limit"]["current_count"]
+    assert_equal 1, response_body["rate_limit"]["remaining"]
+
+    # One more request should hit the limit
+    get "/api/v1/test", headers: { "X-Api-Key" => @api_key.display_key }
+    assert_response :success
+
+    # Now we should be rate limited
+    get "/api/v1/usage", headers: { "X-Api-Key" => @api_key.display_key }
+    assert_response :too_many_requests
+  end
+end
diff --git a/test/controllers/categories_controller_test.rb b/test/controllers/categories_controller_test.rb
index cc71a340..2cbb46f5 100644
--- a/test/controllers/categories_controller_test.rb
+++ b/test/controllers/categories_controller_test.rb
@@ -3,7 +3,7 @@ require "test_helper"
 class CategoriesControllerTest < ActionDispatch::IntegrationTest
   setup do
     sign_in users(:family_admin)
-    @transaction = account_transactions :one
+    @transaction = transactions :one
   end
 
   test "index" do
@@ -28,11 +28,22 @@ class CategoriesControllerTest < ActionDispatch::IntegrationTest
 
     new_category = Category.order(:created_at).last
 
-    assert_redirected_to transactions_url
+    assert_redirected_to categories_url
     assert_equal "New Category", new_category.name
     assert_equal color, new_category.color
   end
 
+  test "create fails if name is not unique" do
+    assert_no_difference "Category.count" do
+      post categories_url, params: {
+        category: {
+          name: categories(:food_and_drink).name,
+          color: Category::COLORS.sample } }
+    end
+
+    assert_response :unprocessable_entity
+  end
+
   test "create and assign to transaction" do
     color = Category::COLORS.sample
 
@@ -46,7 +57,7 @@ class CategoriesControllerTest < ActionDispatch::IntegrationTest
 
     new_category = Category.order(:created_at).last
 
-    assert_redirected_to transactions_url
+    assert_redirected_to categories_url
     assert_equal "New Category", new_category.name
     assert_equal color, new_category.color
     assert_equal @transaction.reload.category, new_category
@@ -69,6 +80,14 @@ class CategoriesControllerTest < ActionDispatch::IntegrationTest
       end
     end
 
-    assert_redirected_to transactions_url
+    assert_redirected_to categories_url
+  end
+
+  test "bootstrap" do
+    assert_difference "Category.count", 12 do
+      post bootstrap_categories_url
+    end
+
+    assert_redirected_to categories_url
   end
 end
diff --git a/test/controllers/category/deletions_controller_test.rb b/test/controllers/category/deletions_controller_test.rb
index 51900fc4..c8bd3d37 100644
--- a/test/controllers/category/deletions_controller_test.rb
+++ b/test/controllers/category/deletions_controller_test.rb
@@ -30,7 +30,7 @@ class Category::DeletionsControllerTest < ActionDispatch::IntegrationTest
     assert_not_empty @category.transactions
 
     assert_difference "Category.count", -1 do
-      assert_difference "Account::Transaction.where(category: nil).count", @category.transactions.count do
+      assert_difference "Transaction.where(category: nil).count", @category.transactions.count do
         post category_deletions_url(@category)
       end
     end
diff --git a/test/controllers/chats_controller_test.rb b/test/controllers/chats_controller_test.rb
new file mode 100644
index 00000000..a3f7f58e
--- /dev/null
+++ b/test/controllers/chats_controller_test.rb
@@ -0,0 +1,46 @@
+require "test_helper"
+
+class ChatsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = users(:family_admin)
+    @family = families(:dylan_family)
+    sign_in @user
+  end
+
+  test "gets index" do
+    get chats_url
+    assert_response :success
+  end
+
+  test "creates chat" do
+    assert_difference("Chat.count") do
+      post chats_url, params: { chat: { content: "Hello", ai_model: "gpt-4.1" } }
+    end
+
+    assert_redirected_to chat_path(Chat.order(created_at: :desc).first, thinking: true)
+  end
+
+  test "shows chat" do
+    get chat_url(chats(:one))
+    assert_response :success
+  end
+
+  test "destroys chat" do
+    assert_difference("Chat.count", -1) do
+      delete chat_url(chats(:one))
+    end
+
+    assert_redirected_to chats_url
+  end
+
+  test "should not allow access to other user's chats" do
+    other_user = users(:family_member)
+    other_chat = Chat.create!(user: other_user, title: "Other User's Chat")
+
+    get chat_url(other_chat)
+    assert_response :not_found
+
+    delete chat_url(other_chat)
+    assert_response :not_found
+  end
+end
diff --git a/test/controllers/concerns/auto_sync_test.rb b/test/controllers/concerns/auto_sync_test.rb
new file mode 100644
index 00000000..d0fb83e3
--- /dev/null
+++ b/test/controllers/concerns/auto_sync_test.rb
@@ -0,0 +1,51 @@
+require "test_helper"
+
+class AutoSyncTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in @user = users(:family_admin)
+    @family = @user.family
+
+    # Start fresh
+    Sync.destroy_all
+  end
+
+  test "auto-syncs family if hasn't synced" do
+    skip "AutoSync functionality temporarily disabled"
+    assert_difference "Sync.count", 1 do
+      get root_path
+    end
+  end
+
+  test "auto-syncs family if hasn't synced in last 24 hours" do
+    skip "AutoSync functionality temporarily disabled"
+    # If request comes in at beginning of day, but last sync was 1 hour ago ("yesterday"), we still sync
+    travel_to Time.current.beginning_of_day
+    last_sync_datetime = 1.hour.ago
+
+    Sync.create!(syncable: @family, created_at: last_sync_datetime, status: "completed")
+
+    assert_difference "Sync.count", 1 do
+      get root_path
+    end
+  end
+
+  test "does not auto-sync if family has synced today already" do
+    travel_to Time.current.end_of_day
+
+    last_created_sync_at = 23.hours.ago
+
+    Sync.create!(syncable: @family, created_at: last_created_sync_at, status: "completed")
+
+    assert_no_difference "Sync.count" do
+      get root_path
+    end
+  end
+
+  test "does not auto-sync if preference is disabled" do
+    @family.update!(auto_sync_on_login: false)
+
+    assert_no_difference "Sync.count" do
+      get root_path
+    end
+  end
+end
diff --git a/test/controllers/concerns/onboardable_test.rb b/test/controllers/concerns/onboardable_test.rb
new file mode 100644
index 00000000..0d04d077
--- /dev/null
+++ b/test/controllers/concerns/onboardable_test.rb
@@ -0,0 +1,30 @@
+require "test_helper"
+
+class OnboardableTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in @user = users(:empty)
+    @user.family.subscription.destroy
+  end
+
+  test "must complete onboarding before any other action" do
+    @user.update!(onboarded_at: nil)
+
+    get root_path
+    assert_redirected_to onboarding_path
+  end
+
+  test "must have subscription to visit dashboard" do
+    @user.update!(onboarded_at: 1.day.ago)
+
+    get root_path
+    assert_redirected_to trial_onboarding_path
+  end
+
+  test "onboarded subscribed user can visit dashboard" do
+    @user.update!(onboarded_at: 1.day.ago)
+    @user.family.start_trial_subscription!
+
+    get root_path
+    assert_response :success
+  end
+end
diff --git a/test/controllers/credit_cards_controller_test.rb b/test/controllers/credit_cards_controller_test.rb
index d8f6772c..d19db651 100644
--- a/test/controllers/credit_cards_controller_test.rb
+++ b/test/controllers/credit_cards_controller_test.rb
@@ -1,27 +1,27 @@
 require "test_helper"
 
 class CreditCardsControllerTest < ActionDispatch::IntegrationTest
+  include AccountableResourceInterfaceTest
+
   setup do
     sign_in @user = users(:family_admin)
     @account = accounts(:credit_card)
   end
 
-  test "creates credit card" do
+  test "creates with credit card details" do
     assert_difference -> { Account.count } => 1,
       -> { CreditCard.count } => 1,
-      -> { Account::Valuation.count } => 2,
-      -> { Account::Entry.count } => 2 do
+      -> { Valuation.count } => 1,
+      -> { Entry.count } => 1 do
       post credit_cards_path, params: {
         account: {
           name: "New Credit Card",
           balance: 1000,
           currency: "USD",
           accountable_type: "CreditCard",
-          start_date: 1.month.ago.to_date,
-          start_balance: 0,
           accountable_attributes: {
             available_credit: 5000,
-            minimum_payment: 25,
+            minimum_payment: 25.51,
             apr: 15.99,
             expiration_date: 2.years.from_now.to_date,
             annual_fee: 99
@@ -35,18 +35,18 @@ class CreditCardsControllerTest < ActionDispatch::IntegrationTest
     assert_equal "New Credit Card", created_account.name
     assert_equal 1000, created_account.balance
     assert_equal "USD", created_account.currency
-    assert_equal 5000, created_account.credit_card.available_credit
-    assert_equal 25, created_account.credit_card.minimum_payment
-    assert_equal 15.99, created_account.credit_card.apr
-    assert_equal 2.years.from_now.to_date, created_account.credit_card.expiration_date
-    assert_equal 99, created_account.credit_card.annual_fee
+    assert_equal 5000, created_account.accountable.available_credit
+    assert_equal 25.51, created_account.accountable.minimum_payment
+    assert_equal 15.99, created_account.accountable.apr
+    assert_equal 2.years.from_now.to_date, created_account.accountable.expiration_date
+    assert_equal 99, created_account.accountable.annual_fee
 
-    assert_redirected_to account_path(created_account)
-    assert_equal "Credit card created successfully", flash[:notice]
-    assert_enqueued_with(job: AccountSyncJob)
+    assert_redirected_to created_account
+    assert_equal "Credit card account created", flash[:notice]
+    assert_enqueued_with(job: SyncJob)
   end
 
-  test "updates credit card" do
+  test "updates with credit card details" do
     assert_no_difference [ "Account.count", "CreditCard.count" ] do
       patch credit_card_path(@account), params: {
         account: {
@@ -70,14 +70,14 @@ class CreditCardsControllerTest < ActionDispatch::IntegrationTest
 
     assert_equal "Updated Credit Card", @account.name
     assert_equal 2000, @account.balance
-    assert_equal 6000, @account.credit_card.available_credit
-    assert_equal 50, @account.credit_card.minimum_payment
-    assert_equal 14.99, @account.credit_card.apr
-    assert_equal 3.years.from_now.to_date, @account.credit_card.expiration_date
-    assert_equal 0, @account.credit_card.annual_fee
+    assert_equal 6000, @account.accountable.available_credit
+    assert_equal 50, @account.accountable.minimum_payment
+    assert_equal 14.99, @account.accountable.apr
+    assert_equal 3.years.from_now.to_date, @account.accountable.expiration_date
+    assert_equal 0, @account.accountable.annual_fee
 
-    assert_redirected_to account_path(@account)
-    assert_equal "Credit card updated successfully", flash[:notice]
-    assert_enqueued_with(job: AccountSyncJob)
+    assert_redirected_to @account
+    assert_equal "Credit card account updated", flash[:notice]
+    assert_enqueued_with(job: SyncJob)
   end
 end
diff --git a/test/controllers/cryptos_controller_test.rb b/test/controllers/cryptos_controller_test.rb
new file mode 100644
index 00000000..c0a9d1b2
--- /dev/null
+++ b/test/controllers/cryptos_controller_test.rb
@@ -0,0 +1,10 @@
+require "test_helper"
+
+class CryptosControllerTest < ActionDispatch::IntegrationTest
+  include AccountableResourceInterfaceTest
+
+  setup do
+    sign_in @user = users(:family_admin)
+    @account = accounts(:crypto)
+  end
+end
diff --git a/test/controllers/current_sessions_controller_test.rb b/test/controllers/current_sessions_controller_test.rb
new file mode 100644
index 00000000..9d498fb3
--- /dev/null
+++ b/test/controllers/current_sessions_controller_test.rb
@@ -0,0 +1,15 @@
+require "test_helper"
+
+class CurrentSessionsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = users(:family_admin)
+    sign_in @user
+  end
+
+  test "can update the preferred tab for any namespace" do
+    put current_session_url, params: { current_session: { tab_key: "accounts_sidebar_tab", tab_value: "asset" } }
+    assert_response :success
+    session = Session.order(updated_at: :desc).first
+    assert_equal "asset", session.get_preferred_tab("accounts_sidebar_tab")
+  end
+end
diff --git a/test/controllers/depositories_controller_test.rb b/test/controllers/depositories_controller_test.rb
new file mode 100644
index 00000000..3c6e443a
--- /dev/null
+++ b/test/controllers/depositories_controller_test.rb
@@ -0,0 +1,10 @@
+require "test_helper"
+
+class DepositoriesControllerTest < ActionDispatch::IntegrationTest
+  include AccountableResourceInterfaceTest
+
+  setup do
+    sign_in @user = users(:family_admin)
+    @account = accounts(:depository)
+  end
+end
diff --git a/test/controllers/email_confirmations_controller_test.rb b/test/controllers/email_confirmations_controller_test.rb
new file mode 100644
index 00000000..beee4f73
--- /dev/null
+++ b/test/controllers/email_confirmations_controller_test.rb
@@ -0,0 +1,12 @@
+require "test_helper"
+
+class EmailConfirmationsControllerTest < ActionDispatch::IntegrationTest
+  test "should get confirm" do
+    user = users(:new_email)
+    user.update!(unconfirmed_email: "new@example.com")
+    token = user.generate_token_for(:email_confirmation)
+
+    get new_email_confirmation_path(token: token)
+    assert_redirected_to new_session_path
+  end
+end
diff --git a/test/controllers/family_merchants_controller_test.rb b/test/controllers/family_merchants_controller_test.rb
new file mode 100644
index 00000000..eda482a1
--- /dev/null
+++ b/test/controllers/family_merchants_controller_test.rb
@@ -0,0 +1,39 @@
+require "test_helper"
+
+class FamilyMerchantsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in @user = users(:family_admin)
+    @merchant = merchants(:netflix)
+  end
+
+  test "index" do
+    get family_merchants_path
+    assert_response :success
+  end
+
+  test "new" do
+    get new_family_merchant_path
+    assert_response :success
+  end
+
+  test "should create merchant" do
+    assert_difference("FamilyMerchant.count") do
+      post family_merchants_url, params: { family_merchant: { name: "new merchant", color: "#000000" } }
+    end
+
+    assert_redirected_to family_merchants_path
+  end
+
+  test "should update merchant" do
+    patch family_merchant_url(@merchant), params: { family_merchant: { name: "new name", color: "#000000" } }
+    assert_redirected_to family_merchants_path
+  end
+
+  test "should destroy merchant" do
+    assert_difference("FamilyMerchant.count", -1) do
+      delete family_merchant_url(@merchant)
+    end
+
+    assert_redirected_to family_merchants_path
+  end
+end
diff --git a/test/controllers/holdings_controller_test.rb b/test/controllers/holdings_controller_test.rb
new file mode 100644
index 00000000..2e03b9f4
--- /dev/null
+++ b/test/controllers/holdings_controller_test.rb
@@ -0,0 +1,30 @@
+require "test_helper"
+
+class HoldingsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in users(:family_admin)
+    @account = accounts(:investment)
+    @holding = @account.holdings.first
+  end
+
+  test "gets holdings" do
+    get holdings_url(account_id: @account.id)
+    assert_response :success
+  end
+
+  test "gets holding" do
+    get holding_path(@holding)
+
+    assert_response :success
+  end
+
+  test "destroys holding and associated entries" do
+    assert_difference -> { Holding.count } => -1,
+                      -> { Entry.count } => -1 do
+      delete holding_path(@holding)
+    end
+
+    assert_redirected_to account_path(@holding.account)
+    assert_empty @holding.account.entries.where(entryable: @holding.account.trades.where(security: @holding.security))
+  end
+end
diff --git a/test/controllers/impersonation_sessions_controller_test.rb b/test/controllers/impersonation_sessions_controller_test.rb
new file mode 100644
index 00000000..65fe4bf5
--- /dev/null
+++ b/test/controllers/impersonation_sessions_controller_test.rb
@@ -0,0 +1,112 @@
+require "test_helper"
+
+class ImpersonationSessionsControllerTest < ActionDispatch::IntegrationTest
+  test "impersonation session logs all activity for auditing" do
+    sign_in impersonator = users(:maybe_support_staff)
+    impersonated = users(:family_member)
+
+    impersonator_session = impersonation_sessions(:in_progress)
+
+    post join_impersonation_sessions_path, params: { impersonation_session_id: impersonator_session.id }
+
+    assert_difference "impersonator_session.logs.count", 2 do
+      get root_path
+      get account_path(impersonated.family.accounts.first)
+    end
+  end
+
+  test "super admin can request an impersonation session" do
+    sign_in users(:maybe_support_staff)
+
+    post impersonation_sessions_path, params: { impersonation_session: { impersonated_id: users(:family_member).id } }
+
+    assert_equal "Request sent to user. Waiting for approval.", flash[:notice]
+    assert_redirected_to root_path
+  end
+
+  test "super admin can join and leave an in progress impersonation session" do
+    sign_in super_admin = users(:maybe_support_staff)
+
+    impersonator_session = impersonation_sessions(:in_progress)
+
+    super_admin_session = super_admin.sessions.order(created_at: :desc).first
+
+    assert_nil super_admin_session.active_impersonator_session
+
+    # Joining the session
+    post join_impersonation_sessions_path, params: { impersonation_session_id: impersonator_session.id }
+    assert_equal impersonator_session, super_admin_session.reload.active_impersonator_session
+    assert_equal "Joined session", flash[:notice]
+    assert_redirected_to root_path
+
+    follow_redirect!
+
+    # Leaving the session
+    delete leave_impersonation_sessions_path
+    assert_nil super_admin_session.reload.active_impersonator_session
+    assert_equal "Left session", flash[:notice]
+    assert_redirected_to root_path
+
+    # Impersonation session still in progress because nobody has ended it yet
+    assert_equal "in_progress", impersonator_session.reload.status
+  end
+
+  test "super admin can complete an impersonation session" do
+    sign_in super_admin = users(:maybe_support_staff)
+
+    impersonator_session = impersonation_sessions(:in_progress)
+
+    put complete_impersonation_session_path(impersonator_session)
+
+    assert_equal "Session completed", flash[:notice]
+    assert_nil super_admin.sessions.order(created_at: :desc).first.active_impersonator_session
+    assert_equal "complete", impersonator_session.reload.status
+    assert_redirected_to root_path
+  end
+
+  test "regular user can complete an impersonation session" do
+    sign_in regular_user = users(:family_member)
+
+    impersonator_session = impersonation_sessions(:in_progress)
+
+    put complete_impersonation_session_path(impersonator_session)
+
+    assert_equal "Session completed", flash[:notice]
+    assert_equal "complete", impersonator_session.reload.status
+    assert_redirected_to root_path
+  end
+
+  test "super admin cannot accept an impersonation session" do
+    sign_in super_admin = users(:maybe_support_staff)
+
+    impersonator_session = impersonation_sessions(:in_progress)
+
+    put approve_impersonation_session_path(impersonator_session)
+
+    assert_response :not_found
+  end
+
+  test "regular user can accept an impersonation session" do
+    sign_in regular_user = users(:family_member)
+
+    impersonator_session = impersonation_sessions(:in_progress)
+
+    put approve_impersonation_session_path(impersonator_session)
+
+    assert_equal "Request approved", flash[:notice]
+    assert_equal "in_progress", impersonator_session.reload.status
+    assert_redirected_to root_path
+  end
+
+  test "regular user can reject an impersonation session" do
+    sign_in regular_user = users(:family_member)
+
+    impersonator_session = impersonation_sessions(:in_progress)
+
+    put reject_impersonation_session_path(impersonator_session)
+
+    assert_equal "Request rejected", flash[:notice]
+    assert_equal "rejected", impersonator_session.reload.status
+    assert_redirected_to root_path
+  end
+end
diff --git a/test/controllers/import/configurations_controller_test.rb b/test/controllers/import/configurations_controller_test.rb
index 95edf0c3..078c17fe 100644
--- a/test/controllers/import/configurations_controller_test.rb
+++ b/test/controllers/import/configurations_controller_test.rb
@@ -23,11 +23,24 @@ class Import::ConfigurationsControllerTest < ActionDispatch::IntegrationTest
         tags_col_label: "Tags",
         amount_col_label: "Amount",
         signage_convention: "inflows_positive",
-        account_col_label: "Account"
+        account_col_label: "Account",
+        number_format: "1.234,56"
       }
     }
 
     assert_redirected_to import_clean_url(@import)
     assert_equal "Import configured successfully.", flash[:notice]
+
+    # Verify configurations were saved
+    @import.reload
+    assert_equal "Date", @import.date_col_label
+    assert_equal "%Y-%m-%d", @import.date_format
+    assert_equal "Name", @import.name_col_label
+    assert_equal "Category", @import.category_col_label
+    assert_equal "Tags", @import.tags_col_label
+    assert_equal "Amount", @import.amount_col_label
+    assert_equal "inflows_positive", @import.signage_convention
+    assert_equal "Account", @import.account_col_label
+    assert_equal "1.234,56", @import.number_format
   end
 end
diff --git a/test/controllers/import/rows_controller_test.rb b/test/controllers/import/rows_controller_test.rb
index d16fd143..e6394d94 100644
--- a/test/controllers/import/rows_controller_test.rb
+++ b/test/controllers/import/rows_controller_test.rb
@@ -22,7 +22,7 @@ class Import::RowsControllerTest < ActionDispatch::IntegrationTest
 
     get import_row_path(import, row)
 
-    assert_row_fields(row, [ :date, :ticker, :qty, :price, :currency, :account, :name ])
+    assert_row_fields(row, [ :date, :ticker, :qty, :price, :currency, :account, :name, :account ])
 
     assert_response :success
   end
diff --git a/test/controllers/import/uploads_controller_test.rb b/test/controllers/import/uploads_controller_test.rb
index 75db3c4a..647815d4 100644
--- a/test/controllers/import/uploads_controller_test.rb
+++ b/test/controllers/import/uploads_controller_test.rb
@@ -14,29 +14,32 @@ class Import::UploadsControllerTest < ActionDispatch::IntegrationTest
   test "uploads valid csv by copy and pasting" do
     patch import_upload_url(@import), params: {
       import: {
-        raw_file_str: file_fixture("imports/valid.csv").read
+        raw_file_str: file_fixture("imports/valid.csv").read,
+        col_sep: ","
       }
     }
 
-    assert_redirected_to import_configuration_url(@import)
+    assert_redirected_to import_configuration_url(@import, template_hint: true)
     assert_equal "CSV uploaded successfully.", flash[:notice]
   end
 
   test "uploads valid csv by file" do
     patch import_upload_url(@import), params: {
       import: {
-        csv_file: file_fixture_upload("imports/valid.csv")
+        csv_file: file_fixture_upload("imports/valid.csv"),
+        col_sep: ","
       }
     }
 
-    assert_redirected_to import_configuration_url(@import)
+    assert_redirected_to import_configuration_url(@import, template_hint: true)
     assert_equal "CSV uploaded successfully.", flash[:notice]
   end
 
   test "invalid csv cannot be uploaded" do
     patch import_upload_url(@import), params: {
       import: {
-        csv_file: file_fixture_upload("imports/invalid.csv")
+        csv_file: file_fixture_upload("imports/invalid.csv"),
+        col_sep: ","
       }
     }
 
diff --git a/test/controllers/institutions_controller_test.rb b/test/controllers/institutions_controller_test.rb
deleted file mode 100644
index ce5d9664..00000000
--- a/test/controllers/institutions_controller_test.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require "test_helper"
-
-class InstitutionsControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in users(:family_admin)
-    @institution = institutions(:chase)
-  end
-
-  test "should get new" do
-    get new_institution_url
-    assert_response :success
-  end
-
-  test "can create institution" do
-    assert_difference("Institution.count", 1) do
-      post institutions_url, params: {
-        institution: {
-          name: "New institution"
-        }
-      }
-    end
-
-    assert_redirected_to accounts_url
-    assert_equal "Institution created", flash[:notice]
-  end
-
-  test "should get edit" do
-    get edit_institution_url(@institution)
-
-    assert_response :success
-  end
-
-  test "should update institution" do
-    patch institution_url(@institution), params: {
-      institution: {
-        name: "New Institution Name",
-        logo: file_fixture_upload("square-placeholder.png", "image/png", :binary)
-      }
-    }
-
-    assert_redirected_to accounts_url
-    assert_equal "Institution updated", flash[:notice]
-  end
-
-  test "can destroy institution without destroying accounts" do
-    assert @institution.accounts.count > 0
-
-    assert_difference -> { Institution.count } => -1, -> { Account.count } => 0 do
-      delete institution_url(@institution)
-    end
-
-    assert_redirected_to accounts_url
-    assert_equal "Institution deleted", flash[:notice]
-  end
-
-  test "can sync institution" do
-    post sync_institution_url(@institution)
-
-    assert_redirected_to accounts_url
-    assert_equal "Institution sync started", flash[:notice]
-  end
-end
diff --git a/test/controllers/investments_controller_test.rb b/test/controllers/investments_controller_test.rb
new file mode 100644
index 00000000..e9caf260
--- /dev/null
+++ b/test/controllers/investments_controller_test.rb
@@ -0,0 +1,10 @@
+require "test_helper"
+
+class InvestmentsControllerTest < ActionDispatch::IntegrationTest
+  include AccountableResourceInterfaceTest
+
+  setup do
+    sign_in @user = users(:family_admin)
+    @account = accounts(:investment)
+  end
+end
diff --git a/test/controllers/invitations_controller_test.rb b/test/controllers/invitations_controller_test.rb
new file mode 100644
index 00000000..e6a596e1
--- /dev/null
+++ b/test/controllers/invitations_controller_test.rb
@@ -0,0 +1,114 @@
+require "test_helper"
+
+class InvitationsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in @admin = users(:family_admin)
+    @invitation = invitations(:one)
+  end
+
+  test "should get new" do
+    get new_invitation_url
+    assert_response :success
+  end
+
+  test "should create invitation for member" do
+    assert_difference("Invitation.count") do
+      assert_enqueued_with(job: ActionMailer::MailDeliveryJob) do
+        post invitations_url, params: {
+          invitation: {
+            email: "new@example.com",
+            role: "member"
+          }
+        }
+      end
+    end
+
+    invitation = Invitation.order(created_at: :desc).first
+    assert_equal "member", invitation.role
+    assert_equal @admin, invitation.inviter
+    assert_equal "new@example.com", invitation.email
+    assert_redirected_to settings_profile_path
+    assert_equal I18n.t("invitations.create.success"), flash[:notice]
+  end
+
+  test "non-admin cannot create invitations" do
+    sign_in users(:family_member)
+
+    assert_no_difference("Invitation.count") do
+      post invitations_url, params: {
+        invitation: {
+          email: "new@example.com",
+          role: "admin"
+        }
+      }
+    end
+
+    assert_redirected_to settings_profile_path
+    assert_equal I18n.t("invitations.create.failure"), flash[:alert]
+  end
+
+  test "admin can create admin invitation" do
+    assert_difference("Invitation.count") do
+      post invitations_url, params: {
+        invitation: {
+          email: "new@example.com",
+          role: "admin"
+        }
+      }
+    end
+
+    invitation = Invitation.order(created_at: :desc).first
+    assert_equal "admin", invitation.role
+    assert_equal @admin.family, invitation.family
+    assert_equal @admin, invitation.inviter
+  end
+
+  test "should handle invalid invitation creation" do
+    assert_no_difference("Invitation.count") do
+      post invitations_url, params: {
+        invitation: {
+          email: "",
+          role: "member"
+        }
+      }
+    end
+
+    assert_redirected_to settings_profile_path
+    assert_equal I18n.t("invitations.create.failure"), flash[:alert]
+  end
+
+  test "should accept invitation and redirect to registration" do
+    get accept_invitation_url(@invitation.token)
+    assert_redirected_to new_registration_path(invitation: @invitation.token)
+  end
+
+  test "should not accept invalid invitation token" do
+    get accept_invitation_url("invalid-token")
+    assert_response :not_found
+  end
+
+  test "admin can remove pending invitation" do
+    assert_difference("Invitation.count", -1) do
+      delete invitation_url(@invitation)
+    end
+
+    assert_redirected_to settings_profile_path
+    assert_equal I18n.t("invitations.destroy.success"), flash[:notice]
+  end
+
+  test "non-admin cannot remove invitations" do
+    sign_in users(:family_member)
+
+    assert_no_difference("Invitation.count") do
+      delete invitation_url(@invitation)
+    end
+
+    assert_redirected_to settings_profile_path
+    assert_equal I18n.t("invitations.destroy.not_authorized"), flash[:alert]
+  end
+
+  test "should handle invalid invitation removal" do
+    delete invitation_url(id: "invalid-id")
+    assert_response :not_found
+  end
+end
diff --git a/test/controllers/invite_codes_controller_test.rb b/test/controllers/invite_codes_controller_test.rb
new file mode 100644
index 00000000..ea39395f
--- /dev/null
+++ b/test/controllers/invite_codes_controller_test.rb
@@ -0,0 +1,20 @@
+require "test_helper"
+
+class InviteCodesControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    Rails.application.config.app_mode.stubs(:self_hosted?).returns(true)
+  end
+  test "admin can generate invite codes" do
+    sign_in users(:family_admin)
+
+    assert_difference("InviteCode.count") do
+      post invite_codes_url, params: {}
+    end
+  end
+
+  test "non-admin cannot generate invite codes" do
+    sign_in users(:family_member)
+
+    assert_raises(StandardError) { post invite_codes_url, params: {} }
+  end
+end
diff --git a/test/controllers/issue/exchange_rate_provider_missings_controller_test.rb b/test/controllers/issue/exchange_rate_provider_missings_controller_test.rb
deleted file mode 100644
index 10cb6f1a..00000000
--- a/test/controllers/issue/exchange_rate_provider_missings_controller_test.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require "test_helper"
-
-class Issue::ExchangeRateProviderMissingsControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in users(:family_admin)
-    @issue = issues(:one)
-  end
-
-  test "should update issue" do
-    patch issue_exchange_rate_provider_missing_url(@issue), params: {
-      issue_exchange_rate_provider_missing: {
-        synth_api_key: "1234"
-      }
-    }
-
-    assert_enqueued_with job: AccountSyncJob
-    assert_redirected_to account_url(@issue.issuable)
-  end
-end
diff --git a/test/controllers/issues_controller_test.rb b/test/controllers/issues_controller_test.rb
deleted file mode 100644
index 6ba1705f..00000000
--- a/test/controllers/issues_controller_test.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require "test_helper"
-
-class IssuesControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in users(:family_admin)
-  end
-
-  test "should get show polymorphically" do
-    issues.each do |issue|
-      get issue_url(issue)
-      assert_response :success
-      assert_dom "h2", text: issue.title
-      assert_dom "h3", text: "Issue Description"
-      assert_dom "h3", text: "How to fix this issue"
-    end
-  end
-end
diff --git a/test/controllers/loans_controller_test.rb b/test/controllers/loans_controller_test.rb
index 3ec9efc0..47809400 100644
--- a/test/controllers/loans_controller_test.rb
+++ b/test/controllers/loans_controller_test.rb
@@ -1,28 +1,29 @@
 require "test_helper"
 
 class LoansControllerTest < ActionDispatch::IntegrationTest
+  include AccountableResourceInterfaceTest
+
   setup do
     sign_in @user = users(:family_admin)
     @account = accounts(:loan)
   end
 
-  test "creates loan" do
+  test "creates with loan details" do
     assert_difference -> { Account.count } => 1,
       -> { Loan.count } => 1,
-      -> { Account::Valuation.count } => 2,
-      -> { Account::Entry.count } => 2 do
+      -> { Valuation.count } => 1,
+      -> { Entry.count } => 1 do
       post loans_path, params: {
         account: {
           name: "New Loan",
           balance: 50000,
           currency: "USD",
           accountable_type: "Loan",
-          start_date: 1.month.ago.to_date,
-          start_balance: 50000,
           accountable_attributes: {
             interest_rate: 5.5,
             term_months: 60,
-            rate_type: "fixed"
+            rate_type: "fixed",
+            initial_balance: 50000
           }
         }
       }
@@ -33,16 +34,17 @@ class LoansControllerTest < ActionDispatch::IntegrationTest
     assert_equal "New Loan", created_account.name
     assert_equal 50000, created_account.balance
     assert_equal "USD", created_account.currency
-    assert_equal 5.5, created_account.loan.interest_rate
-    assert_equal 60, created_account.loan.term_months
-    assert_equal "fixed", created_account.loan.rate_type
+    assert_equal 5.5, created_account.accountable.interest_rate
+    assert_equal 60, created_account.accountable.term_months
+    assert_equal "fixed", created_account.accountable.rate_type
+    assert_equal 50000, created_account.accountable.initial_balance
 
-    assert_redirected_to account_path(created_account)
-    assert_equal "Loan created successfully", flash[:notice]
-    assert_enqueued_with(job: AccountSyncJob)
+    assert_redirected_to created_account
+    assert_equal "Loan account created", flash[:notice]
+    assert_enqueued_with(job: SyncJob)
   end
 
-  test "updates loan" do
+  test "updates with loan details" do
     assert_no_difference [ "Account.count", "Loan.count" ] do
       patch loan_path(@account), params: {
         account: {
@@ -54,7 +56,8 @@ class LoansControllerTest < ActionDispatch::IntegrationTest
             id: @account.accountable_id,
             interest_rate: 4.5,
             term_months: 48,
-            rate_type: "fixed"
+            rate_type: "fixed",
+            initial_balance: 48000
           }
         }
       }
@@ -64,12 +67,13 @@ class LoansControllerTest < ActionDispatch::IntegrationTest
 
     assert_equal "Updated Loan", @account.name
     assert_equal 45000, @account.balance
-    assert_equal 4.5, @account.loan.interest_rate
-    assert_equal 48, @account.loan.term_months
-    assert_equal "fixed", @account.loan.rate_type
+    assert_equal 4.5, @account.accountable.interest_rate
+    assert_equal 48, @account.accountable.term_months
+    assert_equal "fixed", @account.accountable.rate_type
+    assert_equal 48000, @account.accountable.initial_balance
 
-    assert_redirected_to account_path(@account)
-    assert_equal "Loan updated successfully", flash[:notice]
-    assert_enqueued_with(job: AccountSyncJob)
+    assert_redirected_to @account
+    assert_equal "Loan account updated", flash[:notice]
+    assert_enqueued_with(job: SyncJob)
   end
 end
diff --git a/test/controllers/merchants_controller_test.rb b/test/controllers/merchants_controller_test.rb
deleted file mode 100644
index 4f84bb0d..00000000
--- a/test/controllers/merchants_controller_test.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require "test_helper"
-
-class MerchantsControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in @user = users(:family_admin)
-    @merchant = merchants(:netflix)
-  end
-
-  test "index" do
-    get merchants_path
-    assert_response :success
-  end
-
-  test "new" do
-    get new_merchant_path
-    assert_response :success
-  end
-
-  test "should create merchant" do
-    assert_difference("Merchant.count") do
-      post merchants_url, params: { merchant: { name: "new merchant", color: "#000000" } }
-    end
-
-    assert_redirected_to merchants_path
-  end
-
-  test "should update merchant" do
-    patch merchant_url(@merchant), params: { merchant: { name: "new name", color: "#000000" } }
-    assert_redirected_to merchants_path
-  end
-
-  test "should destroy merchant" do
-    assert_difference("Merchant.count", -1) do
-      delete merchant_url(@merchant)
-    end
-
-    assert_redirected_to merchants_path
-  end
-end
diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb
new file mode 100644
index 00000000..5f6d21e5
--- /dev/null
+++ b/test/controllers/messages_controller_test.rb
@@ -0,0 +1,22 @@
+require "test_helper"
+
+class MessagesControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in @user = users(:family_admin)
+    @chat = @user.chats.first
+  end
+
+  test "can create a message" do
+    post chat_messages_url(@chat), params: { message: { content: "Hello", ai_model: "gpt-4.1" } }
+
+    assert_redirected_to chat_path(@chat, thinking: true)
+  end
+
+  test "cannot create a message if AI is disabled" do
+    @user.update!(ai_enabled: false)
+
+    post chat_messages_url(@chat), params: { message: { content: "Hello", ai_model: "gpt-4.1" } }
+
+    assert_response :forbidden
+  end
+end
diff --git a/test/controllers/mfa_controller_test.rb b/test/controllers/mfa_controller_test.rb
new file mode 100644
index 00000000..49e4b622
--- /dev/null
+++ b/test/controllers/mfa_controller_test.rb
@@ -0,0 +1,119 @@
+require "test_helper"
+
+class MfaControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = users(:family_member)
+    sign_in @user
+  end
+
+  def sign_out
+    @user.sessions.each do |session|
+      delete session_path(session)
+    end
+  end
+
+  test "redirects to root if MFA already enabled" do
+    @user.setup_mfa!
+    @user.enable_mfa!
+
+    get new_mfa_path
+    assert_redirected_to root_path
+  end
+
+  test "sets up MFA when visiting new" do
+    get new_mfa_path
+
+    assert_response :success
+    assert @user.reload.otp_secret.present?
+    assert_not @user.otp_required?
+    assert_select "svg" # QR code should be present
+  end
+
+  test "enables MFA with valid code" do
+    @user.setup_mfa!
+    totp = ROTP::TOTP.new(@user.otp_secret, issuer: "Maybe")
+
+    post mfa_path, params: { code: totp.now }
+
+    assert_response :success
+    assert @user.reload.otp_required?
+    assert_equal 8, @user.otp_backup_codes.length
+    assert_select "div.grid-cols-2" # Check for backup codes grid
+  end
+
+  test "does not enable MFA with invalid code" do
+    @user.setup_mfa!
+
+    post mfa_path, params: { code: "invalid" }
+
+    assert_redirected_to new_mfa_path
+    assert_not @user.reload.otp_required?
+    assert_empty @user.otp_backup_codes
+  end
+
+  test "verify shows MFA verification page" do
+    @user.setup_mfa!
+    @user.enable_mfa!
+    sign_out
+
+    post sessions_path, params: { email: @user.email, password: user_password_test }
+    assert_redirected_to verify_mfa_path
+
+    get verify_mfa_path
+    assert_response :success
+    assert_select "form[action=?]", verify_mfa_path
+  end
+
+  test "verify_code authenticates with valid TOTP" do
+    @user.setup_mfa!
+    @user.enable_mfa!
+    sign_out
+
+    post sessions_path, params: { email: @user.email, password: user_password_test }
+    totp = ROTP::TOTP.new(@user.otp_secret, issuer: "Maybe")
+
+    post verify_mfa_path, params: { code: totp.now }
+
+    assert_redirected_to root_path
+    assert Session.exists?(user_id: @user.id)
+  end
+
+  test "verify_code authenticates with valid backup code" do
+    @user.setup_mfa!
+    @user.enable_mfa!
+    sign_out
+
+    post sessions_path, params: { email: @user.email, password: user_password_test }
+    backup_code = @user.otp_backup_codes.first
+
+    post verify_mfa_path, params: { code: backup_code }
+
+    assert_redirected_to root_path
+    assert Session.exists?(user_id: @user.id)
+    assert_not @user.reload.otp_backup_codes.include?(backup_code)
+  end
+
+  test "verify_code rejects invalid codes" do
+    @user.setup_mfa!
+    @user.enable_mfa!
+    sign_out
+
+    post sessions_path, params: { email: @user.email, password: user_password_test }
+    post verify_mfa_path, params: { code: "invalid" }
+
+    assert_response :unprocessable_entity
+    assert_not Session.exists?(user_id: @user.id)
+  end
+
+  test "disable removes MFA" do
+    @user.setup_mfa!
+    @user.enable_mfa!
+
+    delete disable_mfa_path
+
+    assert_redirected_to settings_security_path
+    assert_not @user.reload.otp_required?
+    assert_nil @user.otp_secret
+    assert_empty @user.otp_backup_codes
+  end
+end
diff --git a/test/controllers/onboardings_controller_test.rb b/test/controllers/onboardings_controller_test.rb
new file mode 100644
index 00000000..c35c1409
--- /dev/null
+++ b/test/controllers/onboardings_controller_test.rb
@@ -0,0 +1,169 @@
+require "test_helper"
+
+class OnboardingsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = users(:family_admin)
+    @family = @user.family
+
+    # Reset onboarding state
+    @user.update!(set_onboarding_preferences_at: nil)
+
+    sign_in @user
+  end
+
+  test "should get show" do
+    get onboarding_url
+    assert_response :success
+    assert_select "h1", text: /set up your account/i
+  end
+
+  test "should get preferences" do
+    get preferences_onboarding_url
+    assert_response :success
+    assert_select "h1", text: /preferences/i
+  end
+
+  test "preferences page renders Series chart data without errors" do
+    get preferences_onboarding_url
+    assert_response :success
+
+    # This test specifically targets the Series model bug
+    # The page should render without throwing the "unknown keyword: :trend" error
+    assert_select "[data-controller='time-series-chart']"
+    assert_select "#previewChart"
+
+    # Verify that the Series.from_raw_values call in the view works
+    # If the Series bug existed, this would raise an ActionView::Template::Error
+    assert_no_match /unknown keyword: :trend/, response.body
+  end
+
+  test "preferences page includes chart with valid JSON data" do
+    get preferences_onboarding_url
+    assert_response :success
+
+    # Extract the chart data from the response
+    chart_data_match = response.body.match(/data-time-series-chart-data-value="([^"]*)"/)
+    assert chart_data_match, "Chart data attribute should be present"
+
+    # Decode HTML entities and parse JSON
+    chart_data_json = CGI.unescapeHTML(chart_data_match[1])
+
+    # Should be valid JSON
+    assert_nothing_raised do
+      chart_data = JSON.parse(chart_data_json)
+
+      # Verify expected structure
+      assert chart_data.key?("start_date")
+      assert chart_data.key?("end_date")
+      assert chart_data.key?("interval")
+      assert chart_data.key?("trend")
+      assert chart_data.key?("values")
+
+      # Verify trend has expected structure
+      trend = chart_data["trend"]
+      assert trend.key?("value")
+      assert trend.key?("percent")
+      assert trend.key?("current")
+      assert trend.key?("previous")
+
+      # Verify values array has expected structure
+      values = chart_data["values"]
+      assert values.is_a?(Array)
+      assert values.length > 0
+
+      values.each do |value|
+        assert value.key?("date")
+        assert value.key?("value")
+        assert value.key?("trend")
+      end
+    end
+  end
+
+  test "should get goals" do
+    get goals_onboarding_url
+    assert_response :success
+    assert_select "h1", text: /What brings you to Maybe/i
+  end
+
+  test "should get trial" do
+    get trial_onboarding_url
+    assert_response :success
+  end
+
+  test "preferences page shows currency formatting example" do
+    get preferences_onboarding_url
+    assert_response :success
+
+    # Should show formatted currency example
+    assert_select "p", text: /\$2,325\.25/
+    assert_select "span", text: /\+\$78\.90/
+  end
+
+  test "preferences page shows date formatting example" do
+  get preferences_onboarding_url
+  assert_response :success
+
+  # Should show formatted date example (checking for the specific format shown)
+  assert_match /10-23-2024/, response.body
+end
+
+  test "preferences page includes all required form fields" do
+  get preferences_onboarding_url
+  assert_response :success
+
+  # Verify all form fields are present
+  assert_select "select[name='user[family_attributes][locale]']"
+  assert_select "select[name='user[family_attributes][currency]']"
+  assert_select "select[name='user[family_attributes][date_format]']"
+  assert_select "select[name='user[theme]']"
+  assert_select "button[type='submit']"
+end
+
+  test "preferences page includes JavaScript controllers" do
+    get preferences_onboarding_url
+    assert_response :success
+
+    # Should include onboarding controller for dynamic updates
+    assert_select "[data-controller*='onboarding']"
+    assert_select "[data-controller*='time-series-chart']"
+  end
+
+  test "all onboarding pages set correct layout" do
+    # Test that all onboarding pages use the wizard layout
+    get onboarding_url
+    assert_response :success
+
+    get preferences_onboarding_url
+    assert_response :success
+
+    get goals_onboarding_url
+    assert_response :success
+
+    get trial_onboarding_url
+    assert_response :success
+  end
+
+  test "onboarding pages require authentication" do
+  sign_out
+
+  get onboarding_url
+  assert_redirected_to new_session_url
+
+  get preferences_onboarding_url
+  assert_redirected_to new_session_url
+
+  get goals_onboarding_url
+  assert_redirected_to new_session_url
+
+  get trial_onboarding_url
+  assert_redirected_to new_session_url
+end
+
+    private
+
+      def sign_out
+        @user.sessions.each do |session|
+          delete session_path(session)
+        end
+      end
+end
diff --git a/test/controllers/other_assets_controller_test.rb b/test/controllers/other_assets_controller_test.rb
new file mode 100644
index 00000000..3a10fda0
--- /dev/null
+++ b/test/controllers/other_assets_controller_test.rb
@@ -0,0 +1,10 @@
+require "test_helper"
+
+class OtherAssetsControllerTest < ActionDispatch::IntegrationTest
+  include AccountableResourceInterfaceTest
+
+  setup do
+    sign_in @user = users(:family_admin)
+    @account = accounts(:other_asset)
+  end
+end
diff --git a/test/controllers/other_liabilities_controller_test.rb b/test/controllers/other_liabilities_controller_test.rb
new file mode 100644
index 00000000..ef6ac646
--- /dev/null
+++ b/test/controllers/other_liabilities_controller_test.rb
@@ -0,0 +1,10 @@
+require "test_helper"
+
+class OtherLiabilitiesControllerTest < ActionDispatch::IntegrationTest
+  include AccountableResourceInterfaceTest
+
+  setup do
+    sign_in @user = users(:family_admin)
+    @account = accounts(:other_liability)
+  end
+end
diff --git a/test/controllers/pages_controller_test.rb b/test/controllers/pages_controller_test.rb
index 47fdc936..49ee225b 100644
--- a/test/controllers/pages_controller_test.rb
+++ b/test/controllers/pages_controller_test.rb
@@ -16,4 +16,35 @@ class PagesControllerTest < ActionDispatch::IntegrationTest
       assert_response :ok
     end
   end
+
+  test "changelog with nil release notes" do
+    # Mock the GitHub provider to return nil (simulating API failure or no releases)
+    github_provider = mock
+    github_provider.expects(:fetch_latest_release_notes).returns(nil)
+    Provider::Registry.stubs(:get_provider).with(:github).returns(github_provider)
+
+    get changelog_path
+    assert_response :ok
+    assert_select "h2", text: "Release notes unavailable"
+    assert_select "a[href='https://github.com/maybe-finance/maybe/releases']"
+  end
+
+  test "changelog with incomplete release notes" do
+    # Mock the GitHub provider to return incomplete data (missing some fields)
+    github_provider = mock
+    incomplete_data = {
+      avatar: nil,
+      username: "maybe-finance",
+      name: "Test Release",
+      published_at: nil,
+      body: nil
+    }
+    github_provider.expects(:fetch_latest_release_notes).returns(incomplete_data)
+    Provider::Registry.stubs(:get_provider).with(:github).returns(github_provider)
+
+    get changelog_path
+    assert_response :ok
+    assert_select "h2", text: "Test Release"
+    # Should not crash even with nil values
+  end
 end
diff --git a/test/controllers/password_resets_controller_test.rb b/test/controllers/password_resets_controller_test.rb
index e9a1b956..aa2d5521 100644
--- a/test/controllers/password_resets_controller_test.rb
+++ b/test/controllers/password_resets_controller_test.rb
@@ -13,7 +13,7 @@ class PasswordResetsControllerTest < ActionDispatch::IntegrationTest
   test "create" do
     assert_enqueued_emails 1 do
       post password_reset_path, params: { email: @user.email }
-      assert_redirected_to root_url
+      assert_redirected_to new_password_reset_url(step: "pending")
     end
   end
 
diff --git a/test/controllers/plaid_items_controller_test.rb b/test/controllers/plaid_items_controller_test.rb
new file mode 100644
index 00000000..f04f9c4d
--- /dev/null
+++ b/test/controllers/plaid_items_controller_test.rb
@@ -0,0 +1,49 @@
+require "test_helper"
+require "ostruct"
+
+class PlaidItemsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in @user = users(:family_admin)
+  end
+
+  test "create" do
+    @plaid_provider = mock
+    Provider::Registry.expects(:plaid_provider_for_region).with("us").returns(@plaid_provider)
+
+    public_token = "public-sandbox-1234"
+
+    @plaid_provider.expects(:exchange_public_token).with(public_token).returns(
+      OpenStruct.new(access_token: "access-sandbox-1234", item_id: "item-sandbox-1234")
+    )
+
+    assert_difference "PlaidItem.count", 1 do
+      post plaid_items_url, params: {
+        plaid_item: {
+          public_token: public_token,
+          region: "us",
+          metadata: { institution: { name: "Plaid Item Name" } }
+        }
+      }
+    end
+
+    assert_equal "Account linked successfully.  Please wait for accounts to sync.", flash[:notice]
+    assert_redirected_to accounts_path
+  end
+
+  test "destroy" do
+    delete plaid_item_url(plaid_items(:one))
+
+    assert_equal "Accounts scheduled for deletion.", flash[:notice]
+    assert_enqueued_with job: DestroyJob
+    assert_redirected_to accounts_path
+  end
+
+  test "sync" do
+    plaid_item = plaid_items(:one)
+    PlaidItem.any_instance.expects(:sync_later).once
+
+    post sync_plaid_item_url(plaid_item)
+
+    assert_redirected_to accounts_path
+  end
+end
diff --git a/test/controllers/properties_controller_test.rb b/test/controllers/properties_controller_test.rb
index 1e017eed..34f76734 100644
--- a/test/controllers/properties_controller_test.rb
+++ b/test/controllers/properties_controller_test.rb
@@ -1,79 +1,170 @@
 require "test_helper"
 
 class PropertiesControllerTest < ActionDispatch::IntegrationTest
+  include AccountableResourceInterfaceTest
+
   setup do
     sign_in @user = users(:family_admin)
     @account = accounts(:property)
   end
 
-  test "creates property" do
-    assert_difference -> { Account.count } => 1,
-      -> { Property.count } => 1,
-      -> { Account::Valuation.count } => 2,
-      -> { Account::Entry.count } => 2 do
+  test "creates property in draft status and redirects to balances step" do
+    assert_difference -> { Account.count } => 1 do
       post properties_path, params: {
         account: {
-          name: "Property",
-          balance: 500000,
-          currency: "USD",
+          name: "New Property",
+          subtype: "house",
           accountable_type: "Property",
-          start_date: 3.years.ago.to_date,
-          start_balance: 450000,
           accountable_attributes: {
-            year_built: 2002,
-            area_value: 1000,
-            area_unit: "sqft",
-            address_attributes: {
-              line1: "123 Main St",
-              line2: "Apt 1",
-              locality: "Los Angeles",
-              region: "CA", # ISO3166-2 code
-              country: "US", # ISO3166-1 Alpha-2 code
-              postal_code: "90001"
-            }
+            year_built: 1990,
+            area_value: 1200,
+            area_unit: "sqft"
           }
         }
       }
     end
 
     created_account = Account.order(:created_at).last
-
-    assert created_account.property.year_built.present?
-    assert created_account.property.address.line1.present?
-
-    assert_redirected_to account_path(created_account)
-    assert_equal "Property created successfully", flash[:notice]
-    assert_enqueued_with(job: AccountSyncJob)
+    assert created_account.accountable.is_a?(Property)
+    assert_equal "draft", created_account.status
+    assert_equal 0, created_account.balance
+    assert_equal 1990, created_account.accountable.year_built
+    assert_equal 1200, created_account.accountable.area_value
+    assert_equal "sqft", created_account.accountable.area_unit
+    assert_redirected_to balances_property_path(created_account)
   end
 
-  test "updates property" do
+  test "updates property overview" do
     assert_no_difference [ "Account.count", "Property.count" ] do
       patch property_path(@account), params: {
         account: {
           name: "Updated Property",
-          balance: 500000,
-          currency: "USD",
-          accountable_type: "Property",
-          accountable_attributes: {
-            id: @account.accountable_id,
-            year_built: 2002,
-            area_value: 1000,
-            area_unit: "sqft",
-            address_attributes: {
-              line1: "123 Main St",
-              line2: "Apt 1",
-              locality: "Los Angeles",
-              region: "CA", # ISO3166-2 code
-              country: "US", # ISO3166-1 Alpha-2 code
-              postal_code: "90001"
-            }
-          }
+          subtype: "condo"
         }
       }
     end
 
-    assert_redirected_to account_path(@account)
-    assert_equal "Property updated successfully", flash[:notice]
-    assert_enqueued_with(job: AccountSyncJob)
+    @account.reload
+    assert_equal "Updated Property", @account.name
+    assert_equal "condo", @account.subtype
+
+    # If account is active, it renders edit view; otherwise redirects to balances
+    if @account.active?
+      assert_response :success
+    else
+      assert_redirected_to balances_property_path(@account)
+    end
+  end
+
+  # Tab view tests
+  test "shows balances tab" do
+    get balances_property_path(@account)
+    assert_response :success
+  end
+
+  test "shows address tab" do
+    get address_property_path(@account)
+    assert_response :success
+  end
+
+  # Tab update tests
+  test "updates balances tab" do
+    original_balance = @account.balance
+
+    patch update_balances_property_path(@account), params: {
+      account: {
+        balance: 600000,
+        currency: "EUR"
+      }
+    }
+
+    # If account is active, it renders balances view; otherwise redirects to address
+    if @account.reload.active?
+      assert_response :success
+    else
+      assert_redirected_to address_property_path(@account)
+    end
+  end
+
+  test "updates address tab" do
+    patch update_address_property_path(@account), params: {
+      property: {
+        address_attributes: {
+          line1: "456 New Street",
+          locality: "San Francisco",
+          region: "CA",
+          country: "US",
+          postal_code: "94102"
+        }
+      }
+    }
+
+    @account.reload
+    assert_equal "456 New Street", @account.accountable.address.line1
+    assert_equal "San Francisco", @account.accountable.address.locality
+
+    # If account is draft, it activates and redirects; otherwise renders address
+    if @account.draft?
+      assert_redirected_to account_path(@account)
+    else
+      assert_response :success
+    end
+  end
+
+  test "balances update handles validation errors" do
+    Account.any_instance.stubs(:set_current_balance).returns(OpenStruct.new(success?: false, error_message: "Invalid balance"))
+
+    patch update_balances_property_path(@account), params: {
+      account: {
+        balance: 600000,
+        currency: "EUR"
+      }
+    }
+
+    assert_response :unprocessable_entity
+  end
+
+  test "address update handles validation errors" do
+    Property.any_instance.stubs(:update).returns(false)
+
+    patch update_address_property_path(@account), params: {
+      property: {
+        address_attributes: {
+          line1: "123 Test St"
+        }
+      }
+    }
+
+    assert_response :unprocessable_entity
+  end
+
+  test "address update activates draft account" do
+    # Create a draft property account
+    draft_account = Account.create!(
+      family: @user.family,
+      name: "Draft Property",
+      accountable: Property.new,
+      status: "draft",
+      balance: 500000,
+      currency: "USD"
+    )
+
+    assert draft_account.draft?
+
+    patch update_address_property_path(draft_account), params: {
+      property: {
+        address_attributes: {
+          line1: "789 Activate St",
+          locality: "New York",
+          region: "NY",
+          country: "US",
+          postal_code: "10001"
+        }
+      }
+    }
+
+    draft_account.reload
+    assert draft_account.active?
+    assert_redirected_to account_path(draft_account)
   end
 end
diff --git a/test/controllers/registrations_controller_test.rb b/test/controllers/registrations_controller_test.rb
index 1c3169f6..1050627e 100644
--- a/test/controllers/registrations_controller_test.rb
+++ b/test/controllers/registrations_controller_test.rb
@@ -9,34 +9,22 @@ class RegistrationsControllerTest < ActionDispatch::IntegrationTest
   test "create redirects to correct URL" do
     post registration_url, params: { user: {
       email: "john@example.com",
-      password: "password",
-      password_confirmation: "password" } }
+      password: "Password1!" } }
 
     assert_redirected_to root_url
   end
 
-  test "create seeds default transaction categories" do
-    assert_difference "Category.count", Category::DEFAULT_CATEGORIES.size do
-      post registration_url, params: { user: {
-      email: "john@example.com",
-      password: "password",
-      password_confirmation: "password" } }
-    end
-  end
-
   test "create when hosted requires an invite code" do
     with_env_overrides REQUIRE_INVITE_CODE: "true" do
       assert_no_difference "User.count" do
         post registration_url, params: { user: {
           email: "john@example.com",
-          password: "password",
-          password_confirmation: "password" } }
+          password: "Password1!" } }
         assert_redirected_to new_registration_url
 
         post registration_url, params: { user: {
           email: "john@example.com",
-          password: "password",
-          password_confirmation: "password",
+          password: "Password1!",
           invite_code: "foo" } }
         assert_redirected_to new_registration_url
       end
@@ -44,8 +32,7 @@ class RegistrationsControllerTest < ActionDispatch::IntegrationTest
       assert_difference "User.count", +1 do
         post registration_url, params: { user: {
           email: "john@example.com",
-          password: "password",
-          password_confirmation: "password",
+          password: "Password1!",
           invite_code: InviteCode.generate! } }
         assert_redirected_to root_url
       end
diff --git a/test/controllers/rules_controller_test.rb b/test/controllers/rules_controller_test.rb
new file mode 100644
index 00000000..cb5f8a0d
--- /dev/null
+++ b/test/controllers/rules_controller_test.rb
@@ -0,0 +1,165 @@
+require "test_helper"
+
+class RulesControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in @user = users(:family_admin)
+  end
+
+  test "should get new" do
+    get new_rule_url(resource_type: "transaction")
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get edit_rule_url(rules(:one))
+    assert_response :success
+  end
+
+  # "Set all transactions with a name like 'starbucks' and an amount between 20 and 40 to the 'food and drink' category"
+  test "creates rule with nested conditions" do
+    post rules_url, params: {
+      rule: {
+        effective_date: 30.days.ago.to_date,
+        resource_type: "transaction",
+        conditions_attributes: {
+          "0" => {
+            condition_type: "transaction_name",
+            operator: "like",
+            value: "starbucks"
+          },
+          "1" => {
+            condition_type: "compound",
+            operator: "and",
+            sub_conditions_attributes: {
+              "0" => {
+                condition_type: "transaction_amount",
+                operator: ">",
+                value: 20
+              },
+              "1" => {
+                condition_type: "transaction_amount",
+                operator: "<",
+                value: 40
+              }
+            }
+          }
+        },
+        actions_attributes: {
+          "0" => {
+            action_type: "set_transaction_category",
+            value: categories(:food_and_drink).id
+          }
+        }
+      }
+    }
+
+    rule = @user.family.rules.order("created_at DESC").first
+
+    # Rule
+    assert_equal "transaction", rule.resource_type
+    assert_not rule.active # Not active by default
+    assert_equal 30.days.ago.to_date, rule.effective_date
+
+    # Conditions assertions
+    assert_equal 2, rule.conditions.count
+    compound_condition = rule.conditions.find { |condition| condition.condition_type == "compound" }
+    assert_equal "compound", compound_condition.condition_type
+    assert_equal 2, compound_condition.sub_conditions.count
+
+    # Actions assertions
+    assert_equal 1, rule.actions.count
+    assert_equal "set_transaction_category", rule.actions.first.action_type
+    assert_equal categories(:food_and_drink).id, rule.actions.first.value
+
+    assert_redirected_to confirm_rule_url(rule)
+  end
+
+  test "can update rule" do
+    rule = rules(:one)
+
+    assert_difference -> { Rule.count } => 0,
+      -> { Rule::Condition.count } => 1,
+      -> { Rule::Action.count } => 1 do
+      patch rule_url(rule), params: {
+        rule: {
+          active: false,
+          conditions_attributes: {
+            "0" => {
+              id: rule.conditions.first.id,
+              value: "new_value"
+            },
+            "1" => {
+              condition_type: "transaction_amount",
+              operator: ">",
+              value: 100
+            }
+          },
+          actions_attributes: {
+            "0" => {
+              id: rule.actions.first.id,
+              value: "new_value"
+            },
+            "1" => {
+              action_type: "set_transaction_tags",
+              value: tags(:one).id
+            }
+          }
+        }
+      }
+    end
+
+    rule.reload
+
+    assert_not rule.active
+    assert_equal "new_value", rule.conditions.order("created_at ASC").first.value
+    assert_equal "new_value", rule.actions.order("created_at ASC").first.value
+    assert_equal tags(:one).id, rule.actions.order("created_at ASC").last.value
+    assert_equal "100", rule.conditions.order("created_at ASC").last.value
+
+    assert_redirected_to rules_url
+  end
+
+  test "can destroy conditions and actions while editing" do
+    rule = rules(:one)
+
+    assert_equal 1, rule.conditions.count
+    assert_equal 1, rule.actions.count
+
+    patch rule_url(rule), params: {
+      rule: {
+        conditions_attributes: {
+          "0" => { id: rule.conditions.first.id, _destroy: true },
+          "1" => {
+            condition_type: "transaction_name",
+            operator: "like",
+            value: "new_condition"
+          }
+        },
+        actions_attributes: {
+          "0" => { id: rule.actions.first.id, _destroy: true },
+          "1" => {
+            action_type: "set_transaction_tags",
+            value: tags(:one).id
+          }
+        }
+      }
+    }
+
+    assert_redirected_to rules_url
+
+    rule.reload
+
+    assert_equal 1, rule.conditions.count
+    assert_equal 1, rule.actions.count
+  end
+
+  test "can destroy rule" do
+    rule = rules(:one)
+
+    assert_difference [ "Rule.count", "Rule::Condition.count", "Rule::Action.count" ], -1 do
+      delete rule_url(rule)
+    end
+
+    assert_redirected_to rules_url
+  end
+end
diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
index 6360e849..8383ac0b 100644
--- a/test/controllers/sessions_controller_test.rb
+++ b/test/controllers/sessions_controller_test.rb
@@ -13,6 +13,7 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
   test "can sign in" do
     sign_in @user
     assert_redirected_to root_url
+    assert Session.exists?(user_id: @user.id)
 
     get root_url
     assert_response :success
@@ -26,9 +27,25 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
 
   test "can sign out" do
     sign_in @user
+    session_record = @user.sessions.last
 
-    delete session_url(@user.sessions.order(:created_at).last)
-    assert_redirected_to root_url
+    delete session_url(session_record)
+    assert_redirected_to new_session_path
     assert_equal "You have signed out successfully.", flash[:notice]
+
+    # Verify session is destroyed
+    assert_nil Session.find_by(id: session_record.id)
+  end
+
+  test "redirects to MFA verification when MFA enabled" do
+    @user.setup_mfa!
+    @user.enable_mfa!
+    @user.sessions.destroy_all # Clean up any existing sessions
+
+    post sessions_path, params: { email: @user.email, password: user_password_test }
+
+    assert_redirected_to verify_mfa_path
+    assert_equal @user.id, session[:mfa_user_id]
+    assert_not Session.exists?(user_id: @user.id)
   end
 end
diff --git a/test/controllers/settings/api_keys_controller_test.rb b/test/controllers/settings/api_keys_controller_test.rb
new file mode 100644
index 00000000..1905a4ca
--- /dev/null
+++ b/test/controllers/settings/api_keys_controller_test.rb
@@ -0,0 +1,191 @@
+require "test_helper"
+
+class Settings::ApiKeysControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = users(:family_admin)
+    @user.api_keys.destroy_all # Ensure clean state
+    sign_in @user
+  end
+
+  test "should show no API key page when user has no active keys" do
+    get settings_api_key_path
+    assert_response :success
+  end
+
+  test "should show current API key when user has active key" do
+    @api_key = ApiKey.create!(
+      user: @user,
+      name: "Test API Key",
+      display_key: "test_key_123",
+      scopes: [ "read" ]
+    )
+
+    get settings_api_key_path
+    assert_response :success
+  end
+
+  test "should show new API key form" do
+    get new_settings_api_key_path
+    assert_response :success
+  end
+
+  test "should redirect to show when user already has active key and tries to visit new" do
+    ApiKey.create!(
+      user: @user,
+      name: "Existing API Key",
+      display_key: "existing_key_123",
+      scopes: [ "read" ]
+    )
+
+    get new_settings_api_key_path
+    assert_redirected_to settings_api_key_path
+  end
+
+  test "should create new API key with valid parameters" do
+    assert_difference "ApiKey.count", 1 do
+      post settings_api_key_path, params: {
+        api_key: {
+          name: "Test Integration Key",
+          scopes: "read_write"
+        }
+      }
+    end
+
+    assert_redirected_to settings_api_key_path
+    follow_redirect!
+    assert_response :success
+
+    api_key = @user.api_keys.active.first
+    assert_equal "Test Integration Key", api_key.name
+    assert_includes api_key.scopes, "read_write"
+  end
+
+  test "should revoke existing key when creating new one" do
+    old_key = ApiKey.create!(
+      user: @user,
+      name: "Old API Key",
+      display_key: "old_key_123",
+      scopes: [ "read" ]
+    )
+
+    post settings_api_key_path, params: {
+      api_key: {
+        name: "New API Key",
+        scopes: "read_write"
+      }
+    }
+
+    assert_redirected_to settings_api_key_path
+    follow_redirect!
+    assert_response :success
+
+    old_key.reload
+    assert old_key.revoked?
+
+    new_key = @user.api_keys.active.first
+    assert_equal "New API Key", new_key.name
+  end
+
+  test "should not create API key without name" do
+    assert_no_difference "ApiKey.count" do
+      post settings_api_key_path, params: {
+        api_key: {
+          name: "",
+          scopes: "read"
+        }
+      }
+    end
+
+    assert_response :unprocessable_entity
+  end
+
+  test "should not create API key without scopes" do
+  # Ensure clean state for this specific test
+  @user.api_keys.destroy_all
+  initial_user_count = @user.api_keys.count
+
+  assert_no_difference "@user.api_keys.count" do
+    post settings_api_key_path, params: {
+      api_key: {
+        name: "Test Key",
+        scopes: []
+      }
+    }
+  end
+
+  assert_response :unprocessable_entity
+  assert_equal initial_user_count, @user.api_keys.reload.count
+end
+
+  test "should revoke API key" do
+    @api_key = ApiKey.create!(
+      user: @user,
+      name: "Test API Key",
+      display_key: "test_key_123",
+      scopes: [ "read" ]
+    )
+
+    delete settings_api_key_path
+
+    assert_redirected_to settings_api_key_path
+    follow_redirect!
+    assert_response :success
+
+    @api_key.reload
+    assert @api_key.revoked?
+  end
+
+  test "should handle revoke when no API key exists" do
+    delete settings_api_key_path
+
+    assert_redirected_to settings_api_key_path
+    # Should not error even when no API key exists
+  end
+
+  test "should only allow one active API key per user" do
+    # Create first API key
+    post settings_api_key_path, params: {
+      api_key: {
+        name: "First Key",
+        scopes: "read"
+      }
+    }
+
+    first_key = @user.api_keys.active.first
+
+    # Create second API key
+    post settings_api_key_path, params: {
+      api_key: {
+        name: "Second Key",
+        scopes: "read_write"
+      }
+    }
+
+    # First key should be revoked
+    first_key.reload
+    assert first_key.revoked?
+
+    # Only one active key should exist
+    assert_equal 1, @user.api_keys.active.count
+    assert_equal "Second Key", @user.api_keys.active.first.name
+  end
+
+  test "should generate secure random API key" do
+    post settings_api_key_path, params: {
+      api_key: {
+        name: "Random Key Test",
+        scopes: "read"
+      }
+    }
+
+    assert_redirected_to settings_api_key_path
+    follow_redirect!
+    assert_response :success
+
+    # Verify the API key was created with expected properties
+    api_key = @user.api_keys.active.first
+    assert api_key.present?
+    assert_equal "Random Key Test", api_key.name
+    assert_includes api_key.scopes, "read"
+  end
+end
diff --git a/test/controllers/settings/hostings_controller_test.rb b/test/controllers/settings/hostings_controller_test.rb
index 283b70bc..4e10e901 100644
--- a/test/controllers/settings/hostings_controller_test.rb
+++ b/test/controllers/settings/hostings_controller_test.rb
@@ -1,21 +1,37 @@
 require "test_helper"
+require "ostruct"
 
 class Settings::HostingsControllerTest < ActionDispatch::IntegrationTest
+  include ProviderTestHelper
+
   setup do
     sign_in users(:family_admin)
+
+    @provider = mock
+    Provider::Registry.stubs(:get_provider).with(:synth).returns(@provider)
+    @usage_response = provider_success_response(
+      OpenStruct.new(
+        used: 10,
+        limit: 100,
+        utilization: 10,
+        plan: "free",
+      )
+    )
   end
 
   test "cannot edit when self hosting is disabled" do
-    assert_raises(RuntimeError, "Settings not available on non-self-hosted instance") do
+    with_env_overrides SELF_HOSTED: "false" do
       get settings_hosting_url
-    end
+      assert_response :forbidden
 
-    assert_raises(RuntimeError, "Settings not available on non-self-hosted instance") do
-      patch settings_hosting_url, params: { setting: { render_deploy_hook: "https://example.com" } }
+      patch settings_hosting_url, params: { setting: { require_invite_for_signup: true } }
+      assert_response :forbidden
     end
   end
 
   test "should get edit when self hosting is enabled" do
+    @provider.expects(:usage).returns(@usage_response)
+
     with_self_hosting do
       get settings_hosting_url
       assert_response :success
@@ -24,25 +40,44 @@ class Settings::HostingsControllerTest < ActionDispatch::IntegrationTest
 
   test "can update settings when self hosting is enabled" do
     with_self_hosting do
-      NEW_RENDER_DEPLOY_HOOK = "https://api.render.com/deploy/srv-abc123"
-      assert_nil Setting.render_deploy_hook
+      patch settings_hosting_url, params: { setting: { synth_api_key: "1234567890" } }
 
-      patch settings_hosting_url, params: { setting: { render_deploy_hook: NEW_RENDER_DEPLOY_HOOK } }
-
-      assert_equal NEW_RENDER_DEPLOY_HOOK, Setting.render_deploy_hook
+      assert_equal "1234567890", Setting.synth_api_key
     end
   end
 
-  test "can choose auto upgrades mode with a deploy hook" do
+  test "can clear data cache when self hosting is enabled" do
+    account = accounts(:investment)
+    holding = account.holdings.first
+    exchange_rate = exchange_rates(:one)
+    security_price = holding.security.prices.first
+    account_balance = account.balances.create!(date: Date.current, balance: 1000, currency: "USD")
+
     with_self_hosting do
-      NEW_RENDER_DEPLOY_HOOK = "https://api.render.com/deploy/srv-abc123"
-      assert_nil Setting.render_deploy_hook
+      perform_enqueued_jobs(only: DataCacheClearJob) do
+        delete clear_cache_settings_hosting_url
+      end
+    end
 
-      patch settings_hosting_url, params: { setting: { render_deploy_hook: NEW_RENDER_DEPLOY_HOOK, upgrades_setting: "release" } }
+    assert_redirected_to settings_hosting_url
+    assert_equal I18n.t("settings.hostings.clear_cache.cache_cleared"), flash[:notice]
 
-      assert_equal "auto", Setting.upgrades_mode
-      assert_equal "release", Setting.upgrades_target
-      assert_equal NEW_RENDER_DEPLOY_HOOK, Setting.render_deploy_hook
+    assert_not ExchangeRate.exists?(exchange_rate.id)
+    assert_not Security::Price.exists?(security_price.id)
+    assert_not Holding.exists?(holding.id)
+    assert_not Balance.exists?(account_balance.id)
+  end
+
+  test "can clear data only when admin" do
+    with_self_hosting do
+      sign_in users(:family_member)
+
+      assert_no_enqueued_jobs do
+        delete clear_cache_settings_hosting_url
+      end
+
+      assert_redirected_to settings_hosting_url
+      assert_equal I18n.t("settings.hostings.not_authorized"), flash[:alert]
     end
   end
 end
diff --git a/test/controllers/settings/profiles_controller_test.rb b/test/controllers/settings/profiles_controller_test.rb
index 19503fff..deae066d 100644
--- a/test/controllers/settings/profiles_controller_test.rb
+++ b/test/controllers/settings/profiles_controller_test.rb
@@ -2,42 +2,66 @@ require "test_helper"
 
 class Settings::ProfilesControllerTest < ActionDispatch::IntegrationTest
   setup do
-    sign_in @user = users(:family_admin)
+    @admin = users(:family_admin)
+    @member = users(:family_member)
   end
 
-  test "get" do
-    get settings_profile_url
+  test "should get show" do
+    sign_in @admin
+    get settings_profile_path
     assert_response :success
   end
 
-  test "member can deactivate their account" do
-    sign_in @member = users(:family_member)
-    delete settings_profile_url
+  test "admin can remove a family member" do
+    sign_in @admin
+    assert_difference("User.count", -1) do
+      delete settings_profile_path(user_id: @member)
+    end
 
-    assert_redirected_to root_url
-
-    assert_not User.find(@member.id).active?
-    assert_enqueued_with(job: UserPurgeJob, args: [ @member ])
+    assert_redirected_to settings_profile_path
+    assert_equal "Member removed successfully.", flash[:notice]
+    assert_raises(ActiveRecord::RecordNotFound) { User.find(@member.id) }
   end
 
-  test "admin prevented from deactivating when other users are present" do
-    sign_in @admin = users(:family_admin)
-    delete settings_profile_url
+  test "admin cannot remove themselves" do
+    sign_in @admin
+    assert_no_difference("User.count") do
+      delete settings_profile_path(user_id: @admin)
+    end
 
-    assert_redirected_to settings_profile_url
-    assert_equal "Admin cannot delete account while other users are present. Please delete all members first.", flash[:alert]
-    assert_no_enqueued_jobs only: UserPurgeJob
-    assert User.find(@admin.id).active?
+    assert_redirected_to settings_profile_path
+    assert_equal I18n.t("settings.profiles.destroy.cannot_remove_self"), flash[:alert]
+    assert User.find(@admin.id)
   end
 
-  test "admin can deactivate their account when they are the last user in the family" do
-    sign_in @admin = users(:family_admin)
-    users(:family_member).destroy
+  test "non-admin cannot remove members" do
+    sign_in @member
+    assert_no_difference("User.count") do
+      delete settings_profile_path(user_id: @admin)
+    end
 
-    delete settings_profile_url
+    assert_redirected_to settings_profile_path
+    assert_equal I18n.t("settings.profiles.destroy.not_authorized"), flash[:alert]
+    assert User.find(@admin.id)
+  end
 
-    assert_redirected_to root_url
-    assert_not User.find(@admin.id).active?
-    assert_enqueued_with(job: UserPurgeJob, args: [ @admin ])
+  test "admin removing a family member also destroys their invitation" do
+    # Create an invitation for the member
+    invitation = @admin.family.invitations.create!(
+      email: @member.email,
+      role: "member",
+      inviter: @admin
+    )
+
+    sign_in @admin
+
+    assert_difference [ "User.count", "Invitation.count" ], -1 do
+      delete settings_profile_path(user_id: @member)
+    end
+
+    assert_redirected_to settings_profile_path
+    assert_equal "Member removed successfully.", flash[:notice]
+    assert_raises(ActiveRecord::RecordNotFound) { User.find(@member.id) }
+    assert_raises(ActiveRecord::RecordNotFound) { Invitation.find(invitation.id) }
   end
 end
diff --git a/test/controllers/subscriptions_controller_test.rb b/test/controllers/subscriptions_controller_test.rb
index 3fda28d4..0b406dca 100644
--- a/test/controllers/subscriptions_controller_test.rb
+++ b/test/controllers/subscriptions_controller_test.rb
@@ -1,7 +1,76 @@
 require "test_helper"
+require "ostruct"
 
 class SubscriptionsControllerTest < ActionDispatch::IntegrationTest
-  # test "the truth" do
-  #   assert true
-  # end
+  setup do
+    sign_in @user = users(:empty)
+    @family = @user.family
+
+    @mock_stripe = mock
+    Provider::Registry.stubs(:get_provider).with(:stripe).returns(@mock_stripe)
+  end
+
+  test "disabled for self hosted users" do
+    Rails.application.config.app_mode.stubs(:self_hosted?).returns(true)
+    post subscription_path
+    assert_response :forbidden
+  end
+
+  # Trial subscriptions are managed internally and do NOT go through Stripe
+  test "can create trial subscription" do
+    @family.subscription.destroy
+    @family.reload
+
+    assert_difference "Subscription.count", 1 do
+      post subscription_path
+    end
+
+    assert_redirected_to root_path
+    assert_equal "Welcome to Maybe!", flash[:notice]
+    assert_equal "trialing", @family.subscription.status
+    assert_in_delta Subscription::TRIAL_DAYS.days.from_now, @family.subscription.trial_ends_at, 1.minute
+  end
+
+  test "users who have already trialed cannot create a new subscription" do
+    assert_no_difference "Subscription.count" do
+      post subscription_path
+    end
+
+    assert_redirected_to root_path
+    assert_equal "You have already started or completed a trial. Please upgrade to continue.", flash[:alert]
+  end
+
+  test "creates new checkout session" do
+    @mock_stripe.expects(:create_checkout_session).with(
+      plan: "monthly",
+      family_id: @family.id,
+      family_email: @family.billing_email,
+      success_url: success_subscription_url + "?session_id={CHECKOUT_SESSION_ID}",
+      cancel_url: upgrade_subscription_url
+    ).returns(
+      OpenStruct.new(
+        url: "https://checkout.stripe.com/c/pay/test-session-id",
+        customer_id: "test-customer-id"
+      )
+    )
+
+    get new_subscription_path(plan: "monthly")
+
+    assert_redirected_to "https://checkout.stripe.com/c/pay/test-session-id"
+    assert_equal "test-customer-id", @family.reload.stripe_customer_id
+  end
+
+  test "creates active subscription on checkout success" do
+    @mock_stripe.expects(:get_checkout_result).with("test-session-id").returns(
+      OpenStruct.new(
+        success?: true,
+        subscription_id: "test-subscription-id"
+      )
+    )
+
+    get success_subscription_url(session_id: "test-session-id")
+
+    assert @family.subscription.active?
+    assert_equal "Welcome to Maybe!  Your subscription has been created.", flash[:notice]
+  end
 end
diff --git a/test/controllers/trades_controller_test.rb b/test/controllers/trades_controller_test.rb
new file mode 100644
index 00000000..0cb4d89a
--- /dev/null
+++ b/test/controllers/trades_controller_test.rb
@@ -0,0 +1,159 @@
+require "test_helper"
+
+class TradesControllerTest < ActionDispatch::IntegrationTest
+  include EntryableResourceInterfaceTest
+
+  setup do
+    sign_in @user = users(:family_admin)
+    @entry = entries(:trade)
+  end
+
+  test "updates trade entry" do
+    assert_no_difference [ "Entry.count", "Trade.count" ] do
+      patch trade_url(@entry), params: {
+        entry: {
+          currency: "USD",
+          entryable_attributes: {
+            id: @entry.entryable_id,
+            qty: 20,
+            price: 20
+          }
+        }
+      }
+    end
+
+    @entry.reload
+
+    assert_enqueued_with job: SyncJob
+
+    assert_equal 20, @entry.trade.qty
+    assert_equal 20, @entry.trade.price
+    assert_equal "USD", @entry.currency
+
+    assert_redirected_to account_url(@entry.account)
+  end
+
+  test "creates deposit entry" do
+    from_account = accounts(:depository) # Account the deposit is coming from
+
+    assert_difference -> { Entry.count } => 2,
+                      -> { Transaction.count } => 2,
+                      -> { Transfer.count } => 1 do
+      post trades_url(account_id: @entry.account_id), params: {
+        model: {
+          type: "deposit",
+          date: Date.current,
+          amount: 10,
+          currency: "USD",
+          transfer_account_id: from_account.id
+        }
+      }
+    end
+
+    assert_redirected_to @entry.account
+  end
+
+  test "creates withdrawal entry" do
+    to_account = accounts(:depository) # Account the withdrawal is going to
+
+    assert_difference -> { Entry.count } => 2,
+                      -> { Transaction.count } => 2,
+                      -> { Transfer.count } => 1 do
+      post trades_url(account_id: @entry.account_id), params: {
+        model: {
+          type: "withdrawal",
+          date: Date.current,
+          amount: 10,
+          currency: "USD",
+          transfer_account_id: to_account.id
+        }
+      }
+    end
+
+    assert_redirected_to @entry.account
+  end
+
+  test "deposit and withdrawal has optional transfer account" do
+    assert_difference -> { Entry.count } => 1,
+                      -> { Transaction.count } => 1,
+                      -> { Transfer.count } => 0 do
+      post trades_url(account_id: @entry.account_id), params: {
+        model: {
+          type: "withdrawal",
+          date: Date.current,
+          amount: 10,
+          currency: "USD"
+        }
+      }
+    end
+
+    created_entry = Entry.order(created_at: :desc).first
+
+    assert created_entry.amount.positive?
+    assert_redirected_to @entry.account
+  end
+
+  test "creates interest entry" do
+    assert_difference [ "Entry.count", "Transaction.count" ], 1 do
+      post trades_url(account_id: @entry.account_id), params: {
+        model: {
+          type: "interest",
+          date: Date.current,
+          amount: 10,
+          currency: "USD"
+        }
+      }
+    end
+
+    created_entry = Entry.order(created_at: :desc).first
+
+    assert created_entry.amount.negative?
+    assert_redirected_to @entry.account
+  end
+
+  test "creates trade buy entry" do
+    assert_difference [ "Entry.count", "Trade.count", "Security.count" ], 1 do
+      post trades_url(account_id: @entry.account_id), params: {
+        model: {
+          type: "buy",
+          date: Date.current,
+          ticker: "NVDA (NASDAQ)",
+          qty: 10,
+          price: 10,
+          currency: "USD"
+        }
+      }
+    end
+
+    created_entry = Entry.order(created_at: :desc).first
+
+    assert created_entry.amount.positive?
+    assert created_entry.trade.qty.positive?
+    assert_equal "Entry created", flash[:notice]
+    assert_enqueued_with job: SyncJob
+    assert_redirected_to account_url(created_entry.account)
+  end
+
+  test "creates trade sell entry" do
+    assert_difference [ "Entry.count", "Trade.count" ], 1 do
+      post trades_url(account_id: @entry.account_id), params: {
+        model: {
+          type: "sell",
+          ticker: "AAPL (NYSE)",
+          date: Date.current,
+          currency: "USD",
+          qty: 10,
+          price: 10
+        }
+      }
+    end
+
+    created_entry = Entry.order(created_at: :desc).first
+
+    assert created_entry.amount.negative?
+    assert created_entry.trade.qty.negative?
+    assert_equal "Entry created", flash[:notice]
+    assert_enqueued_with job: SyncJob
+    assert_redirected_to account_url(created_entry.account)
+  end
+end
diff --git a/test/controllers/transactions/bulk_deletions_controller_test.rb b/test/controllers/transactions/bulk_deletions_controller_test.rb
new file mode 100644
index 00000000..aa981d6c
--- /dev/null
+++ b/test/controllers/transactions/bulk_deletions_controller_test.rb
@@ -0,0 +1,24 @@
+require "test_helper"
+
+class Transactions::BulkDeletionsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in @user = users(:family_admin)
+    @entry = entries(:transaction)
+  end
+
+  test "bulk delete" do
+    transactions = @user.family.entries.transactions
+    delete_count = transactions.size
+
+    assert_difference([ "Transaction.count", "Entry.count" ], -delete_count) do
+      post transactions_bulk_deletion_url, params: {
+        bulk_delete: {
+          entry_ids: transactions.pluck(:id)
+        }
+      }
+    end
+
+    assert_redirected_to transactions_url
+    assert_equal "#{delete_count} transactions deleted", flash[:notice]
+  end
+end
diff --git a/test/controllers/transactions/bulk_updates_controller_test.rb b/test/controllers/transactions/bulk_updates_controller_test.rb
new file mode 100644
index 00000000..d7f360fa
--- /dev/null
+++ b/test/controllers/transactions/bulk_updates_controller_test.rb
@@ -0,0 +1,35 @@
+require "test_helper"
+
+class Transactions::BulkUpdatesControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in @user = users(:family_admin)
+  end
+
+  test "bulk update" do
+    transactions = @user.family.entries.transactions
+
+    assert_difference [ "Entry.count", "Transaction.count" ], 0 do
+      post transactions_bulk_update_url, params: {
+        bulk_update: {
+          entry_ids: transactions.map(&:id),
+          date: 1.day.ago.to_date,
+          category_id: Category.second.id,
+          merchant_id: Merchant.second.id,
+          tag_ids: [ Tag.first.id, Tag.second.id ],
+          notes: "Updated note"
+        }
+      }
+    end
+
+    assert_redirected_to transactions_url
+    assert_equal "#{transactions.count} transactions updated", flash[:notice]
+
+    transactions.reload.each do |transaction|
+      assert_equal 1.day.ago.to_date, transaction.date
+      assert_equal Category.second, transaction.transaction.category
+      assert_equal Merchant.second, transaction.transaction.merchant
+      assert_equal "Updated note", transaction.notes
+      assert_equal [ Tag.first.id, Tag.second.id ], transaction.entryable.tag_ids.sort
+    end
+  end
+end
diff --git a/test/controllers/transactions_controller_test.rb b/test/controllers/transactions_controller_test.rb
index 09b31910..2500615c 100644
--- a/test/controllers/transactions_controller_test.rb
+++ b/test/controllers/transactions_controller_test.rb
@@ -1,93 +1,82 @@
 require "test_helper"
 
 class TransactionsControllerTest < ActionDispatch::IntegrationTest
-  include Account::EntriesTestHelper
+  include EntryableResourceInterfaceTest, EntriesTestHelper
 
   setup do
     sign_in @user = users(:family_admin)
-    @transaction = account_entries(:transaction)
+    @entry = entries(:transaction)
   end
 
-  test "should get new" do
-    get new_transaction_url
-    assert_response :success
-  end
-
-  test "prefills account_id" do
-    get new_transaction_url(account_id: @transaction.account.id)
-    assert_response :success
-    assert_select "option[selected][value='#{@transaction.account.id}']"
-  end
-
-  test "should create transaction" do
-    account = @user.family.accounts.first
-    entry_params = {
-      account_id: account.id,
-      amount: 100.45,
-      currency: "USD",
-      date: Date.current,
-      name: "Test transaction",
-      entryable_type: "Account::Transaction",
-      entryable_attributes: { category_id: categories(:food_and_drink).id }
-    }
-
-    assert_difference [ "Account::Entry.count", "Account::Transaction.count" ], 1 do
-      post transactions_url, params: { account_entry: entry_params }
-    end
-
-    assert_equal entry_params[:amount].to_d, Account::Transaction.order(created_at: :desc).first.entry.amount
-    assert_equal "New transaction created successfully", flash[:notice]
-    assert_enqueued_with(job: AccountSyncJob)
-    assert_redirected_to account_url(account)
-  end
-
-  test "expenses are positive" do
-    assert_difference([ "Account::Transaction.count", "Account::Entry.count" ], 1) do
+  test "creates with transaction details" do
+    assert_difference [ "Entry.count", "Transaction.count" ], 1 do
       post transactions_url, params: {
-        account_entry: {
-          nature: "expense",
-          account_id: @transaction.account_id,
-          amount: @transaction.amount,
-          currency: @transaction.currency,
-          date: @transaction.date,
-          name: @transaction.name,
-          entryable_type: "Account::Transaction",
-          entryable_attributes: {}
+        entry: {
+          account_id: @entry.account_id,
+          name: "New transaction",
+          date: Date.current,
+          currency: "USD",
+          amount: 100,
+          nature: "inflow",
+          entryable_type: @entry.entryable_type,
+          entryable_attributes: {
+            tag_ids: [ Tag.first.id, Tag.second.id ],
+            category_id: Category.first.id,
+            merchant_id: Merchant.first.id
+          }
         }
       }
     end
 
-    created_entry = Account::Entry.order(created_at: :desc).first
+    created_entry = Entry.order(:created_at).last
 
-    assert_redirected_to account_url(@transaction.account)
-    assert created_entry.amount.positive?, "Amount should be positive"
+    assert_redirected_to account_url(created_entry.account)
+    assert_equal "Transaction created", flash[:notice]
+    assert_enqueued_with(job: SyncJob)
   end
 
-  test "incomes are negative" do
-    assert_difference("Account::Transaction.count") do
-      post transactions_url, params: {
-        account_entry: {
-          nature: "income",
-          account_id: @transaction.account_id,
-          amount: @transaction.amount,
-          currency: @transaction.currency,
-          date: @transaction.date,
-          name: @transaction.name,
-          entryable_type: "Account::Transaction",
-          entryable_attributes: { category_id: categories(:food_and_drink).id }
+  test "updates with transaction details" do
+    assert_no_difference [ "Entry.count", "Transaction.count" ] do
+      patch transaction_url(@entry), params: {
+        entry: {
+          name: "Updated name",
+          date: Date.current,
+          currency: "USD",
+          amount: 100,
+          nature: "inflow",
+          entryable_type: @entry.entryable_type,
+          notes: "test notes",
+          excluded: false,
+          entryable_attributes: {
+            id: @entry.entryable_id,
+            tag_ids: [ Tag.first.id, Tag.second.id ],
+            category_id: Category.first.id,
+            merchant_id: Merchant.first.id
+          }
         }
       }
     end
 
-    created_entry = Account::Entry.order(created_at: :desc).first
+    @entry.reload
 
-    assert_redirected_to account_url(@transaction.account)
-    assert created_entry.amount.negative?, "Amount should be negative"
+    assert_equal "Updated name", @entry.name
+    assert_equal Date.current, @entry.date
+    assert_equal "USD", @entry.currency
+    assert_equal -100, @entry.amount
+    assert_equal [ Tag.first.id, Tag.second.id ], @entry.entryable.tag_ids.sort
+    assert_equal Category.first.id, @entry.entryable.category_id
+    assert_equal Merchant.first.id, @entry.entryable.merchant_id
+    assert_equal "test notes", @entry.notes
+    assert_equal false, @entry.excluded
+
+    assert_equal "Transaction updated", flash[:notice]
+    assert_redirected_to account_url(@entry.account)
+    assert_enqueued_with(job: SyncJob)
   end
 
   test "transaction count represents filtered total" do
     family = families(:empty)
-    sign_in family.users.first
+    sign_in users(:empty)
     account = family.accounts.create! name: "Test", balance: 0, currency: "USD", accountable: Depository.new
 
     3.times do
@@ -96,7 +85,7 @@ class TransactionsControllerTest < ActionDispatch::IntegrationTest
 
     get transactions_url(per_page: 10)
 
-    assert_dom "#total-transactions", count: 1, text: family.entries.account_transactions.size.to_s
+    assert_dom "#total-transactions", count: 1, text: family.entries.transactions.size.to_s
 
     searchable_transaction = create_transaction(account: account, name: "Unique test name")
 
@@ -108,73 +97,98 @@ class TransactionsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "can paginate" do
+  family = families(:empty)
+  sign_in users(:empty)
+
+  # Clean up any existing entries to ensure clean test
+  family.accounts.each { |account| account.entries.delete_all }
+
+  account = family.accounts.create! name: "Test", balance: 0, currency: "USD", accountable: Depository.new
+
+  # Create multiple transactions for pagination
+  25.times do |i|
+    create_transaction(
+      account: account,
+      name: "Transaction #{i + 1}",
+      amount: 100 + i,  # Different amounts to prevent transfer matching
+      date: Date.current - i.days  # Different dates
+    )
+  end
+
+  total_transactions = family.entries.transactions.count
+  assert_operator total_transactions, :>=, 20, "Should have at least 20 transactions for testing"
+
+  # Test page 1 - should show limited transactions
+  get transactions_url(page: 1, per_page: 10)
+  assert_response :success
+
+  page_1_count = css_select("turbo-frame[id^='entry_']").count
+  assert_equal 10, page_1_count, "Page 1 should respect per_page limit"
+
+  # Test page 2 - should show different transactions
+  get transactions_url(page: 2, per_page: 10)
+  assert_response :success
+
+  page_2_count = css_select("turbo-frame[id^='entry_']").count
+  assert_operator page_2_count, :>, 0, "Page 2 should show some transactions"
+  assert_operator page_2_count, :<=, 10, "Page 2 should not exceed per_page limit"
+
+  # Test Pagy overflow handling - should redirect or handle gracefully
+  get transactions_url(page: 9999999, per_page: 10)
+
+  # Either success (if Pagy shows last page) or redirect (if Pagy redirects)
+  assert_includes [ 200, 302 ], response.status, "Pagy should handle overflow gracefully"
+
+  if response.status == 302
+    follow_redirect!
+    assert_response :success
+  end
+
+  overflow_count = css_select("turbo-frame[id^='entry_']").count
+  assert_operator overflow_count, :>, 0, "Overflow should show some transactions"
+end
+
+  test "calls Transaction::Search totals method with correct search parameters" do
     family = families(:empty)
-    sign_in family.users.first
+    sign_in users(:empty)
     account = family.accounts.create! name: "Test", balance: 0, currency: "USD", accountable: Depository.new
 
-    11.times do
-      create_transaction(account: account)
-    end
+    create_transaction(account: account, amount: 100)
 
-    sorted_transactions = family.entries.account_transactions.reverse_chronological.to_a
+    search = Transaction::Search.new(family)
+    totals = OpenStruct.new(
+      count: 1,
+      expense_money: Money.new(10000, "USD"),
+      income_money: Money.new(0, "USD")
+    )
 
-    assert_equal 11, sorted_transactions.count
-
-    get transactions_url(page: 1, per_page: 10)
+    expected_filters = { "start_date" => 30.days.ago.to_date }
+    Transaction::Search.expects(:new).with(family, filters: expected_filters).returns(search)
+    search.expects(:totals).once.returns(totals)
 
+    get transactions_url
     assert_response :success
-    sorted_transactions.first(10).each do |transaction|
-      assert_dom "#" + dom_id(transaction), count: 1
-    end
-
-    get transactions_url(page: 2, per_page: 10)
-
-    assert_dom "#" + dom_id(sorted_transactions.last), count: 1
-
-    get transactions_url(page: 9999999, per_page: 10) # out of range loads last page
-
-    assert_dom "#" + dom_id(sorted_transactions.last), count: 1
   end
 
-  test "can destroy many transactions at once" do
-    transactions = @user.family.entries.account_transactions
-    delete_count = transactions.size
+  test "calls Transaction::Search totals method with filtered search parameters" do
+    family = families(:empty)
+    sign_in users(:empty)
+    account = family.accounts.create! name: "Test", balance: 0, currency: "USD", accountable: Depository.new
+    category = family.categories.create! name: "Food", color: "#ff0000"
 
-    assert_difference([ "Account::Transaction.count", "Account::Entry.count" ], -delete_count) do
-      post bulk_delete_transactions_url, params: {
-        bulk_delete: {
-          entry_ids: transactions.pluck(:id)
-        }
-      }
-    end
+    create_transaction(account: account, amount: 100, category: category)
 
-    assert_redirected_to transactions_url
-    assert_equal "#{delete_count} transactions deleted", flash[:notice]
-  end
+    search = Transaction::Search.new(family, filters: { "categories" => [ "Food" ], "types" => [ "expense" ] })
+    totals = OpenStruct.new(
+      count: 1,
+      expense_money: Money.new(10000, "USD"),
+      income_money: Money.new(0, "USD")
+    )
 
-  test "can update many transactions at once" do
-    transactions = @user.family.entries.account_transactions
+    Transaction::Search.expects(:new).with(family, filters: { "categories" => [ "Food" ], "types" => [ "expense" ] }).returns(search)
+    search.expects(:totals).once.returns(totals)
 
-    assert_difference [ "Account::Entry.count", "Account::Transaction.count" ], 0 do
-      post bulk_update_transactions_url, params: {
-        bulk_update: {
-          entry_ids: transactions.map(&:id),
-          date: 1.day.ago.to_date,
-          category_id: Category.second.id,
-          merchant_id: Merchant.second.id,
-          notes: "Updated note"
-        }
-      }
-    end
-
-    assert_redirected_to transactions_url
-    assert_equal "#{transactions.count} transactions updated", flash[:notice]
-
-    transactions.reload.each do |transaction|
-      assert_equal 1.day.ago.to_date, transaction.date
-      assert_equal Category.second, transaction.account_transaction.category
-      assert_equal Merchant.second, transaction.account_transaction.merchant
-      assert_equal "Updated note", transaction.notes
-    end
+    get transactions_url(q: { categories: [ "Food" ], types: [ "expense" ] })
+    assert_response :success
   end
 end
diff --git a/test/controllers/transfer_matches_controller_test.rb b/test/controllers/transfer_matches_controller_test.rb
new file mode 100644
index 00000000..aff23f4f
--- /dev/null
+++ b/test/controllers/transfer_matches_controller_test.rb
@@ -0,0 +1,42 @@
+require "test_helper"
+
+class TransferMatchesControllerTest < ActionDispatch::IntegrationTest
+  include EntriesTestHelper
+
+  setup do
+    sign_in @user = users(:family_admin)
+  end
+
+  test "matches existing transaction and creates transfer" do
+    inflow_transaction = create_transaction(amount: 100, account: accounts(:depository))
+    outflow_transaction = create_transaction(amount: -100, account: accounts(:investment))
+
+    assert_difference "Transfer.count", 1 do
+      post transaction_transfer_match_path(inflow_transaction), params: {
+        transfer_match: {
+          method: "existing",
+          matched_entry_id: outflow_transaction.id
+        }
+      }
+    end
+
+    assert_redirected_to transactions_url
+    assert_equal "Transfer created", flash[:notice]
+  end
+
+  test "creates transfer for target account" do
+    inflow_transaction = create_transaction(amount: 100, account: accounts(:depository))
+
+    assert_difference [ "Transfer.count", "Entry.count", "Transaction.count" ], 1 do
+      post transaction_transfer_match_path(inflow_transaction), params: {
+        transfer_match: {
+          method: "new",
+          target_account_id: accounts(:investment).id
+        }
+      }
+    end
+
+    assert_redirected_to transactions_url
+    assert_equal "Transfer created", flash[:notice]
+  end
+end
diff --git a/test/controllers/transfers_controller_test.rb b/test/controllers/transfers_controller_test.rb
new file mode 100644
index 00000000..9959f45b
--- /dev/null
+++ b/test/controllers/transfers_controller_test.rb
@@ -0,0 +1,64 @@
+require "test_helper"
+
+class TransfersControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in users(:family_admin)
+  end
+
+  test "should get new" do
+    get new_transfer_url
+    assert_response :success
+  end
+
+  test "can create transfers" do
+    assert_difference "Transfer.count", 1 do
+      post transfers_url, params: {
+        transfer: {
+          from_account_id: accounts(:depository).id,
+          to_account_id: accounts(:credit_card).id,
+          date: Date.current,
+          amount: 100,
+          name: "Test Transfer"
+        }
+      }
+      assert_enqueued_with job: SyncJob
+    end
+  end
+
+  test "soft deletes transfer" do
+    assert_difference -> { Transfer.count }, -1 do
+      delete transfer_url(transfers(:one))
+    end
+  end
+
+  test "can add notes to transfer" do
+    transfer = transfers(:one)
+    assert_nil transfer.notes
+
+    patch transfer_url(transfer), params: { transfer: { notes: "Test notes" } }
+
+    assert_redirected_to transactions_url
+    assert_equal "Transfer updated", flash[:notice]
+    assert_equal "Test notes", transfer.reload.notes
+  end
+
+  test "handles rejection without FrozenError" do
+    transfer = transfers(:one)
+
+    assert_difference "Transfer.count", -1 do
+      patch transfer_url(transfer), params: {
+        transfer: {
+          status: "rejected"
+        }
+      }
+    end
+
+    assert_redirected_to transactions_url
+    assert_equal "Transfer updated", flash[:notice]
+
+    # Verify the transfer was actually destroyed
+    assert_raises(ActiveRecord::RecordNotFound) do
+      transfer.reload
+    end
+  end
+end
diff --git a/test/controllers/upgrades_controller_test.rb b/test/controllers/upgrades_controller_test.rb
deleted file mode 100644
index c5978488..00000000
--- a/test/controllers/upgrades_controller_test.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-require "test_helper"
-
-class UpgradesControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in @user = users(:family_admin)
-
-    @completed_upgrade = Upgrader::Upgrade.new(
-      "commit",
-      commit_sha: "47bb430954292d2fdcc81082af731a16b9587da3",
-      version: Semver.new("0.0.0"),
-      url: ""
-    )
-
-    @completed_upgrade.stubs(:complete?).returns(true)
-    @completed_upgrade.stubs(:available?).returns(false)
-
-    @available_upgrade = Upgrader::Upgrade.new(
-      "commit",
-      commit_sha: "47bb430954292d2fdcc81082af731a16b9587da4",
-      version: Semver.new("0.1.0"),
-      url: ""
-    )
-
-    @available_upgrade.stubs(:available?).returns(true)
-    @available_upgrade.stubs(:complete?).returns(false)
-  end
-
-  test "controller not available when upgrades are disabled" do
-    MOCK_COMMIT = "47bb430954292d2fdcc81082af731a16b9587da3"
-
-    post acknowledge_upgrade_url(MOCK_COMMIT)
-    assert_response :not_found
-
-    post deploy_upgrade_url(MOCK_COMMIT)
-    assert_response :not_found
-  end
-
-  test "should acknowledge an upgrade prompt" do
-    with_env_overrides UPGRADES_ENABLED: "true" do
-      Upgrader.stubs(:find_upgrade).returns(@available_upgrade)
-
-      post acknowledge_upgrade_url(@available_upgrade.commit_sha)
-
-      @user.reload
-      assert_equal @user.last_prompted_upgrade_commit_sha, @available_upgrade.commit_sha
-      assert :redirect
-    end
-  end
-
-  test "should acknowledge an upgrade alert" do
-    with_env_overrides UPGRADES_ENABLED: "true" do
-      Upgrader.stubs(:find_upgrade).returns(@completed_upgrade)
-
-      post acknowledge_upgrade_url(@completed_upgrade.commit_sha)
-
-      @user.reload
-      assert_equal @user.last_alerted_upgrade_commit_sha, @completed_upgrade.commit_sha
-      assert :redirect
-    end
-  end
-
-  test "should deploy an upgrade" do
-    with_env_overrides UPGRADES_ENABLED: "true" do
-      Upgrader.stubs(:find_upgrade).returns(@available_upgrade)
-
-      post deploy_upgrade_path(@available_upgrade.commit_sha)
-
-      @user.reload
-      assert_equal @user.last_prompted_upgrade_commit_sha, @available_upgrade.commit_sha
-      assert :redirect
-    end
-  end
-
-  test "should rollback user state if upgrade fails" do
-    with_env_overrides UPGRADES_ENABLED: "true" do
-      PRIOR_COMMIT = "47bb430954292d2fdcc81082af731a16b9587da2"
-      @user.update!(last_prompted_upgrade_commit_sha: PRIOR_COMMIT)
-
-      Upgrader.stubs(:find_upgrade).returns(@available_upgrade)
-      Upgrader.stubs(:upgrade_to).returns({ success: false })
-
-      post deploy_upgrade_path(@available_upgrade.commit_sha)
-
-      @user.reload
-      assert_equal @user.last_prompted_upgrade_commit_sha, PRIOR_COMMIT
-      assert :redirect
-    end
-  end
-end
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
new file mode 100644
index 00000000..3909c62d
--- /dev/null
+++ b/test/controllers/users_controller_test.rb
@@ -0,0 +1,101 @@
+require "test_helper"
+
+class UsersControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in @user = users(:family_admin)
+  end
+
+  test "can supply custom redirect after update" do
+    patch user_url(@user), params: { user: { redirect_to: "home" } }
+    assert_redirected_to root_url
+  end
+
+  test "can update user profile" do
+    patch user_url(@user), params: {
+      user: {
+        first_name: "John",
+        last_name: "Doe",
+        onboarded_at: Time.current,
+        profile_image: file_fixture_upload("profile_image.png", "image/png", :binary),
+        family_attributes: {
+          name: "New Family Name",
+          country: "US",
+          date_format: "%m/%d/%Y",
+          currency: "USD",
+          locale: "en"
+        }
+      }
+    }
+
+    assert_redirected_to settings_profile_url
+    assert_equal "Your profile has been updated.", flash[:notice]
+  end
+
+  test "admin can reset family data" do
+    account = accounts(:investment)
+    category = categories(:income)
+    tag = tags(:one)
+    merchant = merchants(:netflix)
+    import = imports(:transaction)
+    budget = budgets(:one)
+    plaid_item = plaid_items(:one)
+
+    Provider::Plaid.any_instance.expects(:remove_item).with(plaid_item.access_token).once
+
+    perform_enqueued_jobs(only: FamilyResetJob) do
+      delete reset_user_url(@user)
+    end
+
+    assert_redirected_to settings_profile_url
+    assert_equal I18n.t("users.reset.success"), flash[:notice]
+
+    assert_not Account.exists?(account.id)
+    assert_not Category.exists?(category.id)
+    assert_not Tag.exists?(tag.id)
+    assert_not Merchant.exists?(merchant.id)
+    assert_not Import.exists?(import.id)
+    assert_not Budget.exists?(budget.id)
+    assert_not PlaidItem.exists?(plaid_item.id)
+  end
+
+  test "non-admin cannot reset family data" do
+    sign_in @member = users(:family_member)
+
+    delete reset_user_url(@member)
+
+    assert_redirected_to settings_profile_url
+    assert_equal I18n.t("users.reset.unauthorized"), flash[:alert]
+    assert_no_enqueued_jobs only: FamilyResetJob
+  end
+
+  test "member can deactivate their account" do
+    sign_in @member = users(:family_member)
+    delete user_url(@member)
+
+    assert_redirected_to root_url
+
+    assert_not User.find(@member.id).active?
+    assert_enqueued_with(job: UserPurgeJob, args: [ @member ])
+  end
+
+  test "admin prevented from deactivating when other users are present" do
+    sign_in @admin = users(:family_admin)
+    delete user_url(users(:family_member))
+
+    assert_redirected_to settings_profile_url
+    assert_equal "Admin cannot delete account while other users are present. Please delete all members first.", flash[:alert]
+    assert_no_enqueued_jobs only: UserPurgeJob
+    assert User.find(@admin.id).active?
+  end
+
+  test "admin can deactivate their account when they are the last user in the family" do
+    sign_in @admin = users(:family_admin)
+    users(:family_member).destroy
+
+    delete user_url(@admin)
+
+    assert_redirected_to root_url
+    assert_not User.find(@admin.id).active?
+    assert_enqueued_with(job: UserPurgeJob, args: [ @admin ])
+  end
+end
diff --git a/test/controllers/valuations_controller_test.rb b/test/controllers/valuations_controller_test.rb
new file mode 100644
index 00000000..7827906b
--- /dev/null
+++ b/test/controllers/valuations_controller_test.rb
@@ -0,0 +1,53 @@
+require "test_helper"
+
+class ValuationsControllerTest < ActionDispatch::IntegrationTest
+  include EntryableResourceInterfaceTest
+
+  setup do
+    sign_in @user = users(:family_admin)
+    @entry = entries(:valuation)
+  end
+
+  test "can create reconciliation" do
+    account = accounts(:investment)
+
+    assert_difference [ "Entry.count", "Valuation.count" ], 1 do
+      post valuations_url, params: {
+        entry: {
+          amount: account.balance + 100,
+          date: Date.current.to_s,
+          account_id: account.id
+        }
+      }
+    end
+
+    created_entry = Entry.order(created_at: :desc).first
+    assert_equal "Manual value update", created_entry.name
+    assert_equal Date.current, created_entry.date
+    assert_equal account.balance + 100, created_entry.amount_money.to_f
+
+    assert_enqueued_with job: SyncJob
+
+    assert_redirected_to account_url(created_entry.account)
+  end
+
+  test "updates entry with basic attributes" do
+    assert_no_difference [ "Entry.count", "Valuation.count" ] do
+      patch valuation_url(@entry), params: {
+        entry: {
+          amount: 22000,
+          date: Date.current,
+          notes: "Test notes"
+        }
+      }
+    end
+
+    assert_enqueued_with job: SyncJob
+
+    assert_redirected_to account_url(@entry.account)
+
+    @entry.reload
+    assert_equal 22000, @entry.amount
+    assert_equal "Test notes", @entry.notes
+  end
+end
diff --git a/test/controllers/vehicles_controller_test.rb b/test/controllers/vehicles_controller_test.rb
index 6908f969..55aa89cf 100644
--- a/test/controllers/vehicles_controller_test.rb
+++ b/test/controllers/vehicles_controller_test.rb
@@ -1,24 +1,24 @@
 require "test_helper"
 
 class VehiclesControllerTest < ActionDispatch::IntegrationTest
+  include AccountableResourceInterfaceTest
+
   setup do
     sign_in @user = users(:family_admin)
     @account = accounts(:vehicle)
   end
 
-  test "creates vehicle" do
+  test "creates with vehicle details" do
     assert_difference -> { Account.count } => 1,
       -> { Vehicle.count } => 1,
-      -> { Account::Valuation.count } => 2,
-      -> { Account::Entry.count } => 2 do
+      -> { Valuation.count } => 1,
+      -> { Entry.count } => 1 do
       post vehicles_path, params: {
         account: {
           name: "Vehicle",
           balance: 30000,
           currency: "USD",
           accountable_type: "Vehicle",
-          start_date: 1.year.ago.to_date,
-          start_balance: 35000,
           accountable_attributes: {
             make: "Toyota",
             model: "Camry",
@@ -32,18 +32,18 @@ class VehiclesControllerTest < ActionDispatch::IntegrationTest
 
     created_account = Account.order(:created_at).last
 
-    assert_equal "Toyota", created_account.vehicle.make
-    assert_equal "Camry", created_account.vehicle.model
-    assert_equal 2020, created_account.vehicle.year
-    assert_equal 15000, created_account.vehicle.mileage_value
-    assert_equal "mi", created_account.vehicle.mileage_unit
+    assert_equal "Toyota", created_account.accountable.make
+    assert_equal "Camry", created_account.accountable.model
+    assert_equal 2020, created_account.accountable.year
+    assert_equal 15000, created_account.accountable.mileage_value
+    assert_equal "mi", created_account.accountable.mileage_unit
 
-    assert_redirected_to account_path(created_account)
-    assert_equal "Vehicle created successfully", flash[:notice]
-    assert_enqueued_with(job: AccountSyncJob)
+    assert_redirected_to created_account
+    assert_equal "Vehicle account created", flash[:notice]
+    assert_enqueued_with(job: SyncJob)
   end
 
-  test "updates vehicle" do
+  test "updates with vehicle details" do
     assert_no_difference [ "Account.count", "Vehicle.count" ] do
       patch vehicle_path(@account), params: {
         account: {
@@ -65,7 +65,7 @@ class VehiclesControllerTest < ActionDispatch::IntegrationTest
     end
 
     assert_redirected_to account_path(@account)
-    assert_equal "Vehicle updated successfully", flash[:notice]
-    assert_enqueued_with(job: AccountSyncJob)
+    assert_equal "Vehicle account updated", flash[:notice]
+    assert_enqueued_with(job: SyncJob)
   end
 end
diff --git a/test/fixtures/account/syncs.yml b/test/fixtures/account/syncs.yml
deleted file mode 100644
index f042d3b1..00000000
--- a/test/fixtures/account/syncs.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-one:
-  account: depository
-  status: failed
-  start_date: 2024-07-07
-  last_ran_at: 2024-07-07 09:03:31
-  error: test sync error
-
-two:
-  account: investment
-  status: completed
-  start_date: 2024-07-07
-  last_ran_at: 2024-07-07 09:03:32
diff --git a/test/fixtures/account/transactions.yml b/test/fixtures/account/transactions.yml
deleted file mode 100644
index 426d7d58..00000000
--- a/test/fixtures/account/transactions.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-one:
-  category: food_and_drink
-  merchant: amazon
-
-transfer_out: { }
-transfer_in: { }
\ No newline at end of file
diff --git a/test/fixtures/account/transfers.yml b/test/fixtures/account/transfers.yml
deleted file mode 100644
index 6aab7788..00000000
--- a/test/fixtures/account/transfers.yml
+++ /dev/null
@@ -1 +0,0 @@
-one: { }
diff --git a/test/fixtures/account/valuations.yml b/test/fixtures/account/valuations.yml
deleted file mode 100644
index 21aeae24..00000000
--- a/test/fixtures/account/valuations.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-one: { }
-two: { }
\ No newline at end of file
diff --git a/test/fixtures/accounts.yml b/test/fixtures/accounts.yml
index eeb616f3..8692522e 100644
--- a/test/fixtures/accounts.yml
+++ b/test/fixtures/accounts.yml
@@ -5,6 +5,7 @@ other_asset:
   currency: USD
   accountable_type: OtherAsset
   accountable: one
+  status: active
 
 other_liability:
   family: dylan_family
@@ -13,6 +14,7 @@ other_liability:
   currency: USD
   accountable_type: OtherLiability
   accountable: one
+  status: active
 
 depository:
   family: dylan_family
@@ -21,7 +23,18 @@ depository:
   currency: USD
   accountable_type: Depository
   accountable: one
-  institution: chase
+  status: active
+
+connected:
+  family: dylan_family
+  name: Plaid Depository Account
+  balance: 5000
+  currency: USD
+  subtype: checking
+  accountable_type: Depository
+  accountable: two
+  plaid_account: one
+  status: active
 
 credit_card:
   family: dylan_family
@@ -30,15 +43,17 @@ credit_card:
   currency: USD
   accountable_type: CreditCard
   accountable: one
-  institution: chase
+  status: active
 
 investment:
   family: dylan_family
   name: Robinhood Brokerage Account
   balance: 10000
+  cash_balance: 5000
   currency: USD
   accountable_type: Investment
   accountable: one
+  status: active
 
 loan:
   family: dylan_family
@@ -47,6 +62,7 @@ loan:
   currency: USD
   accountable_type: Loan
   accountable: one
+  status: active
 
 property:
   family: dylan_family
@@ -55,6 +71,7 @@ property:
   currency: USD
   accountable_type: Property
   accountable: one
+  status: active
 
 vehicle:
   family: dylan_family
@@ -63,3 +80,13 @@ vehicle:
   currency: USD
   accountable_type: Vehicle
   accountable: one
+  status: active
+
+crypto:
+  family: dylan_family
+  name: Bitcoin
+  balance: 10000
+  currency: USD
+  accountable_type: Crypto
+  accountable: one
+  status: active
diff --git a/test/fixtures/api_keys.yml b/test/fixtures/api_keys.yml
new file mode 100644
index 00000000..7ef0dbb0
--- /dev/null
+++ b/test/fixtures/api_keys.yml
@@ -0,0 +1,43 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+active_key:
+  display_key: "test_key_123"
+  name: "Production API Key"
+  user: family_admin
+  scopes: ["read_write"]
+  last_used_at: <%= 1.hour.ago %>
+  expires_at: <%= 1.year.from_now %>
+  revoked_at: null
+
+expired_key:
+  display_key: "expired_key_456"
+  name: "Expired API Key"
+  user: family_member
+  scopes: ["read"]
+  last_used_at: <%= 1.week.ago %>
+  expires_at: <%= 1.day.ago %>
+  revoked_at: null
+
+revoked_key:
+  display_key: "revoked_key_789"
+  name: "Revoked API Key"
+  user: family_admin
+  scopes: ["read_write"]
+  last_used_at: <%= 1.day.ago %>
+  expires_at: null
+  revoked_at: <%= 1.hour.ago %>
+
+one:
+  id: <%= SecureRandom.uuid %>
+  user: family_admin
+  name: "Test API Key"
+  display_key: "test_one_key_123"
+  scopes: [ "read" ]
+
+two:
+  id: <%= SecureRandom.uuid %>
+  user: family_admin
+  name: "Second API Key"
+  display_key: "test_two_key_456"
+  scopes: [ "read_write" ]
+  revoked_at: <%= 1.day.ago %>
diff --git a/test/fixtures/account/balances.yml b/test/fixtures/balances.yml
similarity index 100%
rename from test/fixtures/account/balances.yml
rename to test/fixtures/balances.yml
diff --git a/test/fixtures/budgets.yml b/test/fixtures/budgets.yml
new file mode 100644
index 00000000..e95ef917
--- /dev/null
+++ b/test/fixtures/budgets.yml
@@ -0,0 +1,7 @@
+one:
+  family: dylan_family
+  start_date: <%= Date.current.beginning_of_month %>
+  end_date: <%= Date.current.end_of_month %>
+  budgeted_spending: 5000
+  expected_income: 7000 
+  currency: USD
diff --git a/test/fixtures/categories.yml b/test/fixtures/categories.yml
index 1c32bf80..958e450e 100644
--- a/test/fixtures/categories.yml
+++ b/test/fixtures/categories.yml
@@ -4,11 +4,14 @@ one:
 
 income:
   name: Income
-  internal_category: income
   color: "#fd7f6f"
   family: dylan_family
 
 food_and_drink:
   name: Food & Drink
-  internal_category: food_and_drink
+  family: dylan_family
+
+subcategory:
+  name: Restaurants
+  parent: food_and_drink
   family: dylan_family
diff --git a/test/fixtures/chats.yml b/test/fixtures/chats.yml
new file mode 100644
index 00000000..6e5c5d38
--- /dev/null
+++ b/test/fixtures/chats.yml
@@ -0,0 +1,7 @@
+one:
+  title: First Chat
+  user: family_admin
+
+two:
+  title: Second Chat
+  user: family_member
\ No newline at end of file
diff --git a/test/fixtures/depositories.yml b/test/fixtures/depositories.yml
index e0553ab0..acfb5a66 100644
--- a/test/fixtures/depositories.yml
+++ b/test/fixtures/depositories.yml
@@ -1 +1,2 @@
-one: { }
\ No newline at end of file
+one: { }
+two: {}
\ No newline at end of file
diff --git a/test/fixtures/account/entries.yml b/test/fixtures/entries.yml
similarity index 74%
rename from test/fixtures/account/entries.yml
rename to test/fixtures/entries.yml
index 680710be..6eac29d2 100644
--- a/test/fixtures/account/entries.yml
+++ b/test/fixtures/entries.yml
@@ -4,7 +4,7 @@ valuation:
   amount: 4995
   currency: USD
   account: depository
-  entryable_type: Account::Valuation
+  entryable_type: Valuation
   entryable: one
 
 trade:
@@ -13,7 +13,7 @@ trade:
   amount: 2140 # 10 shares * $214 per share
   currency: USD
   account: investment
-  entryable_type: Account::Trade
+  entryable_type: Trade
   entryable: one
 
 transaction:
@@ -22,7 +22,7 @@ transaction:
   amount: 10
   currency: USD
   account: depository
-  entryable_type: Account::Transaction
+  entryable_type: Transaction
   entryable: one
 
 transfer_out:
@@ -31,9 +31,7 @@ transfer_out:
   amount: 100
   currency: USD
   account: depository
-  marked_as_transfer: true
-  transfer: one
-  entryable_type: Account::Transaction
+  entryable_type: Transaction
   entryable: transfer_out
 
 transfer_in:
@@ -42,7 +40,5 @@ transfer_in:
   amount: -100
   currency: USD
   account: credit_card
-  marked_as_transfer: true
-  transfer: one
-  entryable_type: Account::Transaction
+  entryable_type: Transaction
   entryable: transfer_in
diff --git a/test/fixtures/families.yml b/test/fixtures/families.yml
index c1b0831a..10d5bd18 100644
--- a/test/fixtures/families.yml
+++ b/test/fixtures/families.yml
@@ -3,4 +3,3 @@ empty:
 
 dylan_family:
   name: The Dylan Family
-
diff --git a/test/fixtures/files/imports/accounts.csv b/test/fixtures/files/imports/accounts.csv
index fb3974f8..a24b1f81 100644
--- a/test/fixtures/files/imports/accounts.csv
+++ b/test/fixtures/files/imports/accounts.csv
@@ -1,5 +1,5 @@
 type,name,amount,currency
 Checking,Main Checking Account,5000.00,USD
 Savings,Emergency Fund,10000.00,USD
-Credit Card,Rewards Credit Card,-1500.00,USD
+Credit Card,Rewards Credit Card,1500.00,USD
 Investment,Retirement Portfolio,75000.00,USD
diff --git a/test/fixtures/files/imports/invalid.csv b/test/fixtures/files/imports/invalid.csv
index cae4503c..b8552222 100644
--- a/test/fixtures/files/imports/invalid.csv
+++ b/test/fixtures/files/imports/invalid.csv
@@ -1,3 +1 @@
-name,age
-"John Doe,23
-"Jane Doe",25
\ No newline at end of file
+name,description,amount,currency
\ No newline at end of file
diff --git a/test/fixtures/account/holdings.yml b/test/fixtures/holdings.yml
similarity index 100%
rename from test/fixtures/account/holdings.yml
rename to test/fixtures/holdings.yml
diff --git a/test/fixtures/impersonation_session_logs.yml b/test/fixtures/impersonation_session_logs.yml
new file mode 100644
index 00000000..e11ea93e
--- /dev/null
+++ b/test/fixtures/impersonation_session_logs.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the "{}" from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+#one: {}
+# column: value
+#
+#two: {}
+# column: value
diff --git a/test/fixtures/impersonation_sessions.yml b/test/fixtures/impersonation_sessions.yml
new file mode 100644
index 00000000..becd9e7c
--- /dev/null
+++ b/test/fixtures/impersonation_sessions.yml
@@ -0,0 +1,4 @@
+in_progress:
+  impersonator: maybe_support_staff
+  impersonated: family_member
+  status: in_progress
diff --git a/test/fixtures/imports.yml b/test/fixtures/imports.yml
index 00c09eff..b0172532 100644
--- a/test/fixtures/imports.yml
+++ b/test/fixtures/imports.yml
@@ -1,3 +1,14 @@
 transaction:
   family: dylan_family
   type: TransactionImport
+  status: pending
+
+trade:
+  family: dylan_family
+  type: TradeImport
+  status: pending
+
+account:
+  family: dylan_family
+  type: AccountImport
+  status: pending
diff --git a/test/fixtures/institutions.yml b/test/fixtures/institutions.yml
deleted file mode 100644
index 18625a91..00000000
--- a/test/fixtures/institutions.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-chase:
-  name: Chase
-  family: dylan_family
-
-revolut:
-  name: Revolut
-  family: dylan_family
-  logo_url: <%= "file://" + Rails.root.join('test/fixtures/files/square-placeholder.png').to_s %>
diff --git a/test/fixtures/investments.yml b/test/fixtures/investments.yml
index e0553ab0..386cd707 100644
--- a/test/fixtures/investments.yml
+++ b/test/fixtures/investments.yml
@@ -1 +1 @@
-one: { }
\ No newline at end of file
+one: {}
\ No newline at end of file
diff --git a/test/fixtures/invitations.yml b/test/fixtures/invitations.yml
new file mode 100644
index 00000000..09cd96f7
--- /dev/null
+++ b/test/fixtures/invitations.yml
@@ -0,0 +1,29 @@
+one:
+  email: "test@example.com"
+  token: "valid-token-123"
+  role: "member"
+  inviter: family_admin
+  family: dylan_family
+  created_at: <%= Time.current %>
+  updated_at: <%= Time.current %>
+  expires_at: <%= 3.days.from_now %>
+
+two:
+  email: "another@example.com"
+  token: "valid-token-456"
+  role: "admin"
+  inviter: family_admin
+  family: dylan_family
+  created_at: <%= Time.current %>
+  updated_at: <%= Time.current %>
+  expires_at: <%= 3.days.from_now %>
+
+other_family:
+  email: "other@example.com"
+  token: "valid-token-789"
+  role: "member"
+  inviter: empty
+  family: empty
+  created_at: <%= Time.current %>
+  updated_at: <%= Time.current %>
+  expires_at: <%= 3.days.from_now %>
diff --git a/test/fixtures/issues.yml b/test/fixtures/issues.yml
deleted file mode 100644
index 23ccd35d..00000000
--- a/test/fixtures/issues.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-one:
-  issuable: depository
-  issuable_type: Account
-  type: Issue::Unknown
-  last_observed_at: 2024-08-15 08:54:04
diff --git a/test/fixtures/merchants.yml b/test/fixtures/merchants.yml
index 3e3ca05a..6ac64ef4 100644
--- a/test/fixtures/merchants.yml
+++ b/test/fixtures/merchants.yml
@@ -1,13 +1,16 @@
 one:
+  type: FamilyMerchant
   name: Test
   family: empty
 
 netflix:
+  type: FamilyMerchant
   name: Netflix
   color: "#fd7f6f"
   family: dylan_family
 
 amazon:
+  type: FamilyMerchant
   name: Amazon
   color: "#fd7f6f"
   family: dylan_family
diff --git a/test/fixtures/messages.yml b/test/fixtures/messages.yml
new file mode 100644
index 00000000..cf3c6df8
--- /dev/null
+++ b/test/fixtures/messages.yml
@@ -0,0 +1,43 @@
+chat1_developer:
+  type: DeveloperMessage
+  content: You are a personal finance assistant.  Be concise and helpful.
+  chat: one
+  created_at: 2025-03-20 12:00:00
+  debug: false
+
+chat1_developer_debug:
+  type: DeveloperMessage
+  content: An internal debug message
+  chat: one
+  created_at: 2025-03-20 12:00:02
+  debug: true
+
+chat1_user:
+  type: UserMessage
+  content: Can you help me understand my spending habits?
+  chat: one
+  ai_model: gpt-4.1
+  created_at: 2025-03-20 12:00:01
+
+chat2_user:
+  type: UserMessage
+  content: Can you help me understand my spending habits?
+  ai_model: gpt-4.1
+  chat: two
+  created_at: 2025-03-20 12:00:01
+
+chat1_assistant_reasoning:
+  type: AssistantMessage
+  content: I'm thinking...
+  ai_model: gpt-4.1
+  chat: one
+  created_at: 2025-03-20 12:01:00
+  reasoning: true
+
+chat1_assistant_response:
+  type: AssistantMessage
+  content: Hello! I can help you understand your spending habits.
+  ai_model: gpt-4.1
+  chat: one
+  created_at: 2025-03-20 12:02:00
+  reasoning: false
diff --git a/test/fixtures/mobile_devices.yml b/test/fixtures/mobile_devices.yml
new file mode 100644
index 00000000..28dc37ea
--- /dev/null
+++ b/test/fixtures/mobile_devices.yml
@@ -0,0 +1,3 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# Empty fixtures to avoid conflicts
\ No newline at end of file
diff --git a/test/fixtures/plaid_accounts.yml b/test/fixtures/plaid_accounts.yml
new file mode 100644
index 00000000..3679e767
--- /dev/null
+++ b/test/fixtures/plaid_accounts.yml
@@ -0,0 +1,9 @@
+one:
+  current_balance: 1000
+  available_balance: 1000
+  currency: USD
+  name: Plaid Depository Account
+  plaid_item: one
+  plaid_id: "acc_mock_1"
+  plaid_type: depository
+  plaid_subtype: checking
\ No newline at end of file
diff --git a/test/fixtures/plaid_items.yml b/test/fixtures/plaid_items.yml
new file mode 100644
index 00000000..03e7cdfb
--- /dev/null
+++ b/test/fixtures/plaid_items.yml
@@ -0,0 +1,7 @@
+one:
+  family: dylan_family
+  plaid_id: "item_mock_1"
+  access_token: encrypted_token_1
+  name: "Test Bank"
+  billed_products: ["transactions", "investments", "liabilities"]
+  available_products: []
\ No newline at end of file
diff --git a/test/fixtures/rule/actions.yml b/test/fixtures/rule/actions.yml
new file mode 100644
index 00000000..4a56bf29
--- /dev/null
+++ b/test/fixtures/rule/actions.yml
@@ -0,0 +1,4 @@
+one:
+  rule: one
+  action_type: set_transaction_category
+  value: "some_category_id"
\ No newline at end of file
diff --git a/test/fixtures/rule/conditions.yml b/test/fixtures/rule/conditions.yml
new file mode 100644
index 00000000..3c140f45
--- /dev/null
+++ b/test/fixtures/rule/conditions.yml
@@ -0,0 +1,5 @@
+one:
+  rule: one
+  condition_type: transaction_name
+  operator: like
+  value: "starbucks"
diff --git a/test/fixtures/rules.yml b/test/fixtures/rules.yml
new file mode 100644
index 00000000..db7a3566
--- /dev/null
+++ b/test/fixtures/rules.yml
@@ -0,0 +1,3 @@
+one:
+  family: dylan_family
+  resource_type: "transaction"
\ No newline at end of file
diff --git a/test/fixtures/securities.yml b/test/fixtures/securities.yml
index 20c676a5..9133f008 100644
--- a/test/fixtures/securities.yml
+++ b/test/fixtures/securities.yml
@@ -1,7 +1,12 @@
 aapl:
   ticker: AAPL
   name: Apple
+  exchange_operating_mic: XNAS
+  country_code: US
 
 msft:
   ticker: MSFT
   name: Microsoft
+  exchange_operating_mic: XNAS
+  country_code: US
+
diff --git a/test/fixtures/security/prices.yml b/test/fixtures/security/prices.yml
index f49de36c..75686bac 100644
--- a/test/fixtures/security/prices.yml
+++ b/test/fixtures/security/prices.yml
@@ -1,11 +1,11 @@
 one:
-  ticker: AAPL
+  security: aapl
   date: <%= Date.current %>
   price: 215
   currency: USD
 
 two:
-  ticker: AAPL
+  security: aapl
   date: <%= 1.day.ago.to_date %>
   price: 214
   currency: USD
diff --git a/test/fixtures/subscriptions.yml b/test/fixtures/subscriptions.yml
new file mode 100644
index 00000000..333ba7fe
--- /dev/null
+++ b/test/fixtures/subscriptions.yml
@@ -0,0 +1,9 @@
+active:
+  family: dylan_family 
+  status: active 
+  stripe_id: "test_1234567890"
+
+trialing:
+  family: empty
+  status: trialing
+  trial_ends_at: <%= 12.days.from_now %>
diff --git a/test/fixtures/syncs.yml b/test/fixtures/syncs.yml
new file mode 100644
index 00000000..5d954280
--- /dev/null
+++ b/test/fixtures/syncs.yml
@@ -0,0 +1,17 @@
+account:
+  syncable_type: Account
+  syncable: depository
+  status: completed
+  completed_at: <%= Time.now %>
+
+plaid_item:
+  syncable_type: PlaidItem
+  syncable: one
+  status: completed
+  completed_at: <%= Time.now %>
+
+family:
+  syncable_type: Family
+  syncable: dylan_family
+  status: completed
+  completed_at: <%= Time.now %>
diff --git a/test/fixtures/taggings.yml b/test/fixtures/taggings.yml
index 5039ba27..12432311 100644
--- a/test/fixtures/taggings.yml
+++ b/test/fixtures/taggings.yml
@@ -1,10 +1,10 @@
 one:
   tag: one
   taggable: one
-  taggable_type: Account::Transaction
+  taggable_type: Transaction
 
 two:
   tag: two
   taggable: one
-  taggable_type: Account::Transaction
+  taggable_type: Transaction
 
diff --git a/test/fixtures/tool_calls.yml b/test/fixtures/tool_calls.yml
new file mode 100644
index 00000000..470e00e6
--- /dev/null
+++ b/test/fixtures/tool_calls.yml
@@ -0,0 +1,7 @@
+one:
+  type: ToolCall::Function
+  function_name: get_user_info
+  provider_id: fc_12345xyz
+  provider_call_id: call_12345xyz
+  function_arguments: {}
+  message: chat1_assistant_response
diff --git a/test/fixtures/account/trades.yml b/test/fixtures/trades.yml
similarity index 100%
rename from test/fixtures/account/trades.yml
rename to test/fixtures/trades.yml
diff --git a/test/fixtures/transactions.yml b/test/fixtures/transactions.yml
new file mode 100644
index 00000000..7420c310
--- /dev/null
+++ b/test/fixtures/transactions.yml
@@ -0,0 +1,8 @@
+one:
+  category: food_and_drink
+  merchant: amazon
+
+transfer_out:
+  kind: payment
+transfer_in:
+  kind: transfer
\ No newline at end of file
diff --git a/test/fixtures/transfers.yml b/test/fixtures/transfers.yml
new file mode 100644
index 00000000..90c1ea94
--- /dev/null
+++ b/test/fixtures/transfers.yml
@@ -0,0 +1,3 @@
+one:
+  inflow_transaction: transfer_in
+  outflow_transaction: transfer_out
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 3c9aa4ed..1973ba37 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -3,19 +3,46 @@ empty:
   first_name: User
   last_name: One
   email: user1@email.com
-  password_digest: <%= BCrypt::Password.create('password') %>
+  password_digest: $2a$12$XoNBo/cMCyzpYtvhrPAhsubG21mELX48RAcjSVCRctW8dG8wrDIla 
+  onboarded_at: <%= 3.days.ago %>
+  role: admin
+  ai_enabled: true
+
+maybe_support_staff:
+  family: empty
+  first_name: Support
+  last_name: Admin
+  email: support@maybefinance.com
+  password_digest: $2a$12$XoNBo/cMCyzpYtvhrPAhsubG21mELX48RAcjSVCRctW8dG8wrDIla 
+  role: super_admin
+  onboarded_at: <%= 3.days.ago %>
+  ai_enabled: true
 
 family_admin:
   family: dylan_family
   first_name: Bob
   last_name: Dylan
   email: bob@bobdylan.com
-  password_digest: <%= BCrypt::Password.create('password') %>
+  password_digest: $2a$12$XoNBo/cMCyzpYtvhrPAhsubG21mELX48RAcjSVCRctW8dG8wrDIla 
   role: admin
+  onboarded_at: <%= 3.days.ago %>
+  ai_enabled: true
 
 family_member:
   family: dylan_family
   first_name: Jakob
   last_name: Dylan
   email: jakobdylan@yahoo.com
-  password_digest: <%= BCrypt::Password.create('password') %>
+  password_digest: $2a$12$XoNBo/cMCyzpYtvhrPAhsubG21mELX48RAcjSVCRctW8dG8wrDIla 
+  onboarded_at: <%= 3.days.ago %>
+  ai_enabled: true
+
+new_email:
+  family: empty
+  first_name: Test
+  last_name: User
+  email: user@example.com
+  unconfirmed_email: new@example.com
+  password_digest: $2a$12$XoNBo/cMCyzpYtvhrPAhsubG21mELX48RAcjSVCRctW8dG8wrDIla 
+  onboarded_at: <%= Time.current %>
+  ai_enabled: true
\ No newline at end of file
diff --git a/test/fixtures/valuations.yml b/test/fixtures/valuations.yml
new file mode 100644
index 00000000..27891bd4
--- /dev/null
+++ b/test/fixtures/valuations.yml
@@ -0,0 +1,2 @@
+one:
+  kind: reconciliation
diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index d4c1be45..e4c3bf36 100644
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -11,12 +11,6 @@ class ApplicationHelperTest < ActionView::TestCase
     assert_equal "Test Header Title", content_for(:header_title)
   end
 
-  test "#permitted_accountable_partial(accountable_type)" do
-    assert_equal "account", permitted_accountable_partial("Account")
-    assert_equal "user", permitted_accountable_partial("User")
-    assert_equal "admin_user", permitted_accountable_partial("AdminUser")
-  end
-
   def setup
     @account1 = Account.new(currency: "USD", balance: 1)
     @account2 = Account.new(currency: "USD", balance: 2)
diff --git a/test/i18n_test.rb b/test/i18n_test.rb
index 62ab7d2a..51e7f480 100644
--- a/test/i18n_test.rb
+++ b/test/i18n_test.rb
@@ -1,17 +1,22 @@
 require "i18n/tasks"
 
+# We're currently skipping some i18n tests to speed up development.  Eventually, we'll make a dedicated
+# project for getting i18n working.  More details on that here:
+# https://github.com/maybe-finance/maybe/issues/1225
 class I18nTest < ActiveSupport::TestCase
   def setup
     @i18n = I18n::Tasks::BaseTask.new
   end
 
   def test_no_missing_keys
+    skip "Skipping missing keys test"
     missing_keys = @i18n.missing_keys(locales: [ :en ])
     assert_empty missing_keys,
                  "Missing #{missing_keys.leaves.count} i18n keys, run `i18n-tasks missing' to show them"
   end
 
   def test_no_unused_keys
+    skip "Skipping unused keys test"
     unused_keys = @i18n.unused_keys(locales: [ :en ])
     assert_empty unused_keys,
                  "#{unused_keys.leaves.count} unused i18n keys, run `i18n-tasks unused' to show them"
@@ -27,6 +32,7 @@ class I18nTest < ActiveSupport::TestCase
   end
 
   def test_no_inconsistent_interpolations
+    skip "Skipping inconsistent interpolations test"
     inconsistent_interpolations = @i18n.inconsistent_interpolations(locales: [ :en ])
     error_message = "#{inconsistent_interpolations.leaves.count} i18n keys have inconsistent interpolations.\n" \
                     "Please run `i18n-tasks check-consistent-interpolations' to show them"
diff --git a/test/integration/oauth_basic_test.rb b/test/integration/oauth_basic_test.rb
new file mode 100644
index 00000000..7a4dd405
--- /dev/null
+++ b/test/integration/oauth_basic_test.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class OauthBasicTest < ActionDispatch::IntegrationTest
+  test "oauth authorization endpoint requires authentication" do
+    oauth_app = Doorkeeper::Application.create!(
+      name: "Test API Client",
+      redirect_uri: "https://client.example.com/callback",
+      scopes: "read"
+    )
+
+    get "/oauth/authorize?client_id=#{oauth_app.uid}&redirect_uri=#{CGI.escape(oauth_app.redirect_uri)}&response_type=code&scope=read"
+
+    # Should redirect to login page when not authenticated
+    assert_redirected_to new_session_path
+  end
+
+  test "oauth token endpoint exists and handles requests" do
+    post "/oauth/token", params: {
+      grant_type: "authorization_code",
+      code: "invalid_code",
+      redirect_uri: "https://example.com/callback",
+      client_id: "invalid_client"
+    }
+
+    # Should return 401 for invalid client (correct OAuth behavior)
+    assert_response :unauthorized
+    response_body = JSON.parse(response.body)
+    assert_equal "invalid_client", response_body["error"]
+  end
+
+  test "oauth applications can be created" do
+    assert_difference("Doorkeeper::Application.count") do
+      Doorkeeper::Application.create!(
+        name: "Test App",
+        redirect_uri: "https://example.com/callback",
+        scopes: "read"
+      )
+    end
+  end
+
+  test "doorkeeper configuration is properly set up" do
+    # Test that Doorkeeper is configured and working
+    assert Doorkeeper.configuration.present?, "Doorkeeper configuration should exist"
+    assert_equal 1.year, Doorkeeper.configuration.access_token_expires_in
+    assert_equal "read", Doorkeeper.configuration.default_scopes.first.to_s
+  end
+end
diff --git a/test/integration/oauth_mobile_test.rb b/test/integration/oauth_mobile_test.rb
new file mode 100644
index 00000000..6c3dc275
--- /dev/null
+++ b/test/integration/oauth_mobile_test.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class OauthMobileTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = users(:empty)
+    sign_in(@user)
+
+    @oauth_app = Doorkeeper::Application.create!(
+      name: "Maybe Mobile App",
+      redirect_uri: "maybeapp://oauth/callback",
+      scopes: "read"
+    )
+  end
+
+  test "mobile oauth authorization with custom scheme redirect" do
+    get "/oauth/authorize", params: {
+      client_id: @oauth_app.uid,
+      redirect_uri: @oauth_app.redirect_uri,
+      response_type: "code",
+      scope: "read",
+      display: "mobile"
+    }
+
+    assert_response :success
+
+    # Check that Turbo is disabled in the form
+    assert_match(/data-turbo="false"/, response.body)
+    assert_match(/maybeapp:\/\/oauth\/callback/, response.body)
+  end
+
+  test "mobile oauth detects custom scheme in redirect_uri" do
+    get "/oauth/authorize", params: {
+      client_id: @oauth_app.uid,
+      redirect_uri: "maybeapp://oauth/callback",
+      response_type: "code",
+      scope: "read"
+    }
+
+    assert_response :success
+
+    # Should detect mobile flow from redirect_uri
+    assert_match(/data-turbo="false"/, response.body)
+  end
+
+  test "mobile oauth authorization flow completes successfully" do
+    post "/oauth/authorize", params: {
+      client_id: @oauth_app.uid,
+      redirect_uri: @oauth_app.redirect_uri,
+      response_type: "code",
+      scope: "read",
+      display: "mobile"
+    }
+
+    # Should redirect to the custom scheme
+    assert_response :redirect
+    assert response.location.start_with?("maybeapp://oauth/callback")
+  end
+
+  test "mobile oauth preserves display parameter through forms" do
+    get "/oauth/authorize", params: {
+      client_id: @oauth_app.uid,
+      redirect_uri: @oauth_app.redirect_uri,
+      response_type: "code",
+      scope: "read",
+      display: "mobile"
+    }
+
+    assert_response :success
+
+    # Check that display parameter is preserved in hidden fields
+    assert_match(/<input[^>]*name="display"[^>]*value="mobile"/, response.body)
+  end
+end
diff --git a/test/integration/rack_attack_test.rb b/test/integration/rack_attack_test.rb
new file mode 100644
index 00000000..37fc0b65
--- /dev/null
+++ b/test/integration/rack_attack_test.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class RackAttackTest < ActionDispatch::IntegrationTest
+  test "rack attack is configured" do
+    # Verify Rack::Attack is enabled in middleware stack
+    middleware_classes = Rails.application.middleware.map(&:klass)
+    assert_includes middleware_classes, Rack::Attack, "Rack::Attack should be in middleware stack"
+  end
+
+  test "oauth token endpoint has rate limiting configured" do
+    # Test that the throttle is configured (we don't need to trigger it)
+    throttles = Rack::Attack.throttles.keys
+    assert_includes throttles, "oauth/token", "OAuth token endpoint should have rate limiting"
+  end
+
+  test "api requests have rate limiting configured" do
+    # Test that API rate limiting is configured
+    throttles = Rack::Attack.throttles.keys
+    assert_includes throttles, "api/requests", "API requests should have rate limiting"
+  end
+end
diff --git a/test/interfaces/accountable_resource_interface_test.rb b/test/interfaces/accountable_resource_interface_test.rb
new file mode 100644
index 00000000..5ad9598e
--- /dev/null
+++ b/test/interfaces/accountable_resource_interface_test.rb
@@ -0,0 +1,17 @@
+require "test_helper"
+
+module AccountableResourceInterfaceTest
+  extend ActiveSupport::Testing::Declarative
+
+  test "shows new form" do
+    Family.any_instance.stubs(:get_link_token).returns("test-link-token")
+
+    get new_polymorphic_url(@account.accountable)
+    assert_response :success
+  end
+
+  test "shows edit form" do
+    get edit_account_url(@account)
+    assert_response :success
+  end
+end
diff --git a/test/interfaces/entryable_resource_interface_test.rb b/test/interfaces/entryable_resource_interface_test.rb
new file mode 100644
index 00000000..710912ac
--- /dev/null
+++ b/test/interfaces/entryable_resource_interface_test.rb
@@ -0,0 +1,25 @@
+require "test_helper"
+
+module EntryableResourceInterfaceTest
+  extend ActiveSupport::Testing::Declarative
+
+  test "shows new form" do
+    get new_polymorphic_url(@entry.entryable)
+    assert_response :success
+  end
+
+  test "shows editing drawer" do
+    get entry_url(@entry)
+    assert_response :success
+  end
+
+  test "destroys entry" do
+    assert_difference "Entry.count", -1 do
+      delete entry_url(@entry)
+    end
+
+    assert_enqueued_with job: SyncJob
+
+    assert_redirected_to account_url(@entry.account)
+  end
+end
diff --git a/test/interfaces/exchange_rate_provider_interface_test.rb b/test/interfaces/exchange_rate_provider_interface_test.rb
index d45e546e..3716f6fc 100644
--- a/test/interfaces/exchange_rate_provider_interface_test.rb
+++ b/test/interfaces/exchange_rate_provider_interface_test.rb
@@ -3,20 +3,36 @@ require "test_helper"
 module ExchangeRateProviderInterfaceTest
   extend ActiveSupport::Testing::Declarative
 
-  test "exchange rate provider interface" do
-    assert_respond_to @subject, :healthy?
-    assert_respond_to @subject, :fetch_exchange_rate
-    assert_respond_to @subject, :fetch_exchange_rates
-  end
+  test "fetches single exchange rate" do
+    VCR.use_cassette("#{vcr_key_prefix}/exchange_rate") do
+      response = @subject.fetch_exchange_rate(
+        from: "USD",
+        to: "GBP",
+        date: Date.parse("01.01.2024")
+      )
 
-  test "exchange rate provider response contract" do
-    VCR.use_cassette "synth/exchange_rate" do
-      response = @subject.fetch_exchange_rate from: "USD", to: "MXN", date: Date.iso8601("2024-08-01")
+      rate = response.data
 
-      assert_respond_to response, :rate
-      assert_respond_to response, :success?
-      assert_respond_to response, :error
-      assert_respond_to response, :raw_response
+      assert_equal "USD", rate.from
+      assert_equal "GBP", rate.to
+      assert rate.date.is_a?(Date)
+      assert_in_delta 0.78, rate.rate, 0.01
     end
   end
+
+  test "fetches paginated exchange_rate historical data" do
+    VCR.use_cassette("#{vcr_key_prefix}/exchange_rates") do
+      response = @subject.fetch_exchange_rates(
+        from: "USD", to: "GBP", start_date: Date.parse("01.01.2024"), end_date: Date.parse("31.07.2024")
+      )
+
+      assert_equal 213, response.data.count # 213 days between 01.01.2024 and 31.07.2024
+      assert response.data.first.date.is_a?(Date)
+    end
+  end
+
+  private
+    def vcr_key_prefix
+      @subject.class.name.demodulize.underscore
+    end
 end
diff --git a/test/interfaces/git_repository_provider_interface_test.rb b/test/interfaces/git_repository_provider_interface_test.rb
deleted file mode 100644
index 2b0dff8e..00000000
--- a/test/interfaces/git_repository_provider_interface_test.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require "test_helper"
-
-module GitRepositoryProviderInterfaceTest
-  extend ActiveSupport::Testing::Declarative
-
-  test "git repository provider interface" do
-    assert_respond_to @subject, :fetch_latest_upgrade_candidates
-  end
-
-  test "git repository provider response contract" do
-    VCR.use_cassette "git_repository_provider/fetch_latest_upgrade_candidates" do
-      response = @subject.fetch_latest_upgrade_candidates
-
-      assert_valid_upgrade_candidate(response[:release])
-      assert_valid_upgrade_candidate(response[:commit])
-    end
-  end
-
-  private
-    def assert_valid_upgrade_candidate(candidate)
-      assert_equal Semver, candidate[:version].class
-      assert_match URI::DEFAULT_PARSER.make_regexp, candidate[:url]
-      assert_match(/\A[0-9a-f]{40}\z/, candidate[:commit_sha])
-    end
-end
diff --git a/test/interfaces/import_interface_test.rb b/test/interfaces/import_interface_test.rb
index 68b09306..2b475927 100644
--- a/test/interfaces/import_interface_test.rb
+++ b/test/interfaces/import_interface_test.rb
@@ -54,4 +54,260 @@ module ImportInterfaceTest
     assert_equal "Failed to publish", import.error
     assert_equal "failed", import.status
   end
+
+  test "parses US/UK number format correctly" do
+    import = imports(:transaction)
+    import.update!(
+      number_format: "1,234.56",
+      amount_col_label: "amount",
+      date_col_label: "date",
+      name_col_label: "name",
+      date_format: "%m/%d/%Y"
+    )
+
+    csv_data = "date,amount,name\n01/01/2024,\"1,234.56\",Test"
+    import.update!(raw_file_str: csv_data)
+    import.generate_rows_from_csv
+    import.reload
+    row = import.rows.first
+    assert_equal "1234.56", row.amount
+  end
+
+  test "parses European number format correctly" do
+    import = imports(:transaction)
+    import.update!(
+      number_format: "1.234,56",
+      amount_col_label: "amount",
+      date_col_label: "date",
+      name_col_label: "name",
+      date_format: "%m/%d/%Y"
+    )
+
+    csv_data = "date,amount,name\n01/01/2024,\"1.234,56\",Test"
+    import.update!(raw_file_str: csv_data)
+    import.generate_rows_from_csv
+    import.reload
+
+    row = import.rows.first
+    assert_equal "1234.56", row.amount
+  end
+
+  test "parses French/Scandinavian number format correctly" do
+    import = imports(:transaction)
+    import.update!(
+      number_format: "1 234,56",
+      amount_col_label: "amount",
+      date_col_label: "date",
+      name_col_label: "name",
+      date_format: "%m/%d/%Y"
+    )
+
+    # Quote the amount field to ensure proper CSV parsing
+    csv_data = "date,amount,name\n01/01/2024,\"1 234,56\",Test"
+    import.update!(raw_file_str: csv_data)
+    import.generate_rows_from_csv
+    import.reload
+
+    row = import.rows.first
+    assert_equal "1234.56", row.amount
+  end
+
+  test "parses zero-decimal currency format correctly" do
+    import = imports(:transaction)
+    import.update!(
+      number_format: "1,234",
+      amount_col_label: "amount",
+      date_col_label: "date",
+      name_col_label: "name",
+      date_format: "%m/%d/%Y"
+    )
+
+    csv_data = "date,amount,name\n01/01/2024,1234,Test"
+    import.update!(raw_file_str: csv_data)
+    import.generate_rows_from_csv
+    import.reload
+
+    row = import.rows.first
+    assert_equal "1234", row.amount
+  end
+
+  test "currency from CSV takes precedence over default" do
+    import = imports(:transaction)
+    import.update!(
+      amount_col_label: "amount",
+      date_col_label: "date",
+      name_col_label: "name",
+      currency_col_label: "currency",
+      number_format: "1,234.56",
+      date_format: "%m/%d/%Y"
+    )
+    import.family.update!(currency: "USD")
+
+    csv_data = "date,amount,name,currency\n01/01/2024,123.45,Test,EUR"
+    import.update!(raw_file_str: csv_data)
+    import.generate_rows_from_csv
+    import.reload
+
+    row = import.rows.first
+    assert_equal "EUR", row.currency
+  end
+
+  test "uses default currency when CSV currency column is empty" do
+    import = imports(:transaction)
+    import.update!(
+      amount_col_label: "amount",
+      date_col_label: "date",
+      name_col_label: "name",
+      currency_col_label: "currency",
+      number_format: "1,234.56",
+      date_format: "%m/%d/%Y"
+    )
+    import.family.update!(currency: "USD")
+
+    csv_data = "date,amount,name,currency\n01/01/2024,123.45,Test,"
+    import.update!(raw_file_str: csv_data)
+    import.generate_rows_from_csv
+    import.reload
+
+    row = import.rows.first
+    assert_equal "USD", row.currency
+  end
+
+  test "uses default currency when CSV has no currency column" do
+    import = imports(:transaction)
+    import.update!(
+      amount_col_label: "amount",
+      date_col_label: "date",
+      name_col_label: "name",
+      number_format: "1,234.56",
+      date_format: "%m/%d/%Y"
+    )
+    import.family.update!(currency: "USD")
+
+    csv_data = "date,amount,name\n01/01/2024,123.45,Test"
+    import.update!(raw_file_str: csv_data)
+    import.generate_rows_from_csv
+    import.reload
+
+    row = import.rows.first
+    assert_equal "USD", row.currency
+  end
+
+  test "generates rows with all optional fields" do
+    import = imports(:transaction)
+    import.update!(
+      amount_col_label: "amount",
+      date_col_label: "date",
+      name_col_label: "name",
+      account_col_label: "account",
+      category_col_label: "category",
+      tags_col_label: "tags",
+      notes_col_label: "notes",
+      currency_col_label: "currency",
+      number_format: "1,234.56",
+      date_format: "%m/%d/%Y"
+    )
+
+    csv_data = "date,amount,name,account,category,tags,notes,currency\n" \
+               "01/01/2024,1234.56,Salary,Bank Account,Income,\"monthly,salary\",Salary payment,EUR"
+    import.update!(raw_file_str: csv_data)
+    import.generate_rows_from_csv
+    import.reload
+
+    row = import.rows.first
+    assert_equal "01/01/2024", row.date
+    assert_equal "1234.56", row.amount
+    assert_equal "Salary", row.name
+    assert_equal "Bank Account", row.account
+    assert_equal "Income", row.category
+    assert_equal "monthly,salary", row.tags
+    assert_equal "Salary payment", row.notes
+    assert_equal "EUR", row.currency
+  end
+
+  test "generates rows with minimal required fields" do
+    import = imports(:transaction)
+    import.update!(
+      amount_col_label: "amount",
+      date_col_label: "date",
+      number_format: "1,234.56",
+      date_format: "%m/%d/%Y"
+    )
+
+    csv_data = "date,amount\n01/01/2024,1234.56"
+    import.update!(raw_file_str: csv_data)
+    import.generate_rows_from_csv
+    import.reload
+
+    row = import.rows.first
+    assert_equal "01/01/2024", row.date
+    assert_equal "1234.56", row.amount
+    assert_equal "Imported item", row.name # Default name
+    assert_equal import.family.currency, row.currency # Default currency
+  end
+
+  test "handles empty values in optional fields" do
+    import = imports(:transaction)
+    import.update!(
+      amount_col_label: "amount",
+      date_col_label: "date",
+      name_col_label: "name",
+      category_col_label: "category",
+      tags_col_label: "tags",
+      number_format: "1,234.56",
+      date_format: "%m/%d/%Y"
+    )
+
+    csv_data = "date,amount,name,category,tags\n01/01/2024,1234.56,,,"
+    import.update!(raw_file_str: csv_data)
+    import.generate_rows_from_csv
+    import.reload
+
+    row = import.rows.first
+    assert_equal "01/01/2024", row.date
+    assert_equal "1234.56", row.amount
+    assert_equal "Imported item", row.name # Falls back to default
+    assert_equal "", row.category
+    assert_equal "", row.tags
+  end
+
+  test "can submit configuration that results in invalid rows for user to fix later" do
+    import = imports(:transaction)
+
+    csv_data = "date,amount,name\n01/01/2024,1234.56,Test"
+    import.update!(raw_file_str: csv_data)
+    import.update!(
+      date_col_label: "date",
+      date_format: "%Y-%m-%d" # Does not match the raw CSV date, so rows will be invalid, but still generated
+    )
+
+    import.generate_rows_from_csv
+    import.reload
+
+    assert_equal "01/01/2024", import.rows.first.date
+    assert import.rows.first.invalid?
+  end
+
+  test "handles trade-specific fields" do
+    import = imports(:transaction)
+    import.update!(
+      amount_col_label: "amount",
+      date_col_label: "date",
+      qty_col_label: "quantity",
+      ticker_col_label: "symbol",
+      price_col_label: "price",
+      number_format: "1,234.56",
+      date_format: "%m/%d/%Y"
+    )
+
+    csv_data = "date,amount,quantity,symbol,price\n01/01/2024,1234.56,10,AAPL,123.456"
+    import.update!(raw_file_str: csv_data)
+    import.generate_rows_from_csv
+    import.reload
+
+    row = import.rows.first
+    assert_equal "10", row.qty
+    assert_equal "AAPL", row.ticker
+    assert_equal "123.456", row.price
+  end
 end
diff --git a/test/interfaces/llm_interface_test.rb b/test/interfaces/llm_interface_test.rb
new file mode 100644
index 00000000..2298ba27
--- /dev/null
+++ b/test/interfaces/llm_interface_test.rb
@@ -0,0 +1,10 @@
+require "test_helper"
+
+module LLMInterfaceTest
+  extend ActiveSupport::Testing::Declarative
+
+  private
+    def vcr_key_prefix
+      @subject.class.name.demodulize.underscore
+    end
+end
diff --git a/test/interfaces/security_price_provider_interface_test.rb b/test/interfaces/security_price_provider_interface_test.rb
deleted file mode 100644
index c5642656..00000000
--- a/test/interfaces/security_price_provider_interface_test.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require "test_helper"
-
-module SecurityPriceProviderInterfaceTest
-  extend ActiveSupport::Testing::Declarative
-
-  test "security price provider interface" do
-    assert_respond_to @subject, :healthy?
-    assert_respond_to @subject, :fetch_security_prices
-  end
-
-  test "security price provider response contract" do
-    VCR.use_cassette "synth/security_prices" do
-      response = @subject.fetch_security_prices ticker: "AAPL", start_date: Date.iso8601("2024-01-01"), end_date: Date.iso8601("2024-08-01")
-
-      assert_respond_to response, :prices
-      assert_respond_to response, :success?
-      assert_respond_to response, :error
-      assert_respond_to response, :raw_response
-    end
-  end
-end
diff --git a/test/interfaces/security_provider_interface_test.rb b/test/interfaces/security_provider_interface_test.rb
new file mode 100644
index 00000000..a994bb73
--- /dev/null
+++ b/test/interfaces/security_provider_interface_test.rb
@@ -0,0 +1,68 @@
+require "test_helper"
+
+module SecurityProviderInterfaceTest
+  extend ActiveSupport::Testing::Declarative
+
+  test "fetches security price" do
+    aapl = securities(:aapl)
+
+    VCR.use_cassette("#{vcr_key_prefix}/security_price") do
+      response = @subject.fetch_security_price(symbol: aapl.ticker, exchange_operating_mic: aapl.exchange_operating_mic, date: Date.iso8601("2024-08-01"))
+
+      assert response.success?
+      assert response.data.present?
+    end
+  end
+
+  test "fetches paginated securities prices" do
+    aapl = securities(:aapl)
+
+    VCR.use_cassette("#{vcr_key_prefix}/security_prices") do
+      response = @subject.fetch_security_prices(
+        symbol: aapl.ticker,
+        exchange_operating_mic: aapl.exchange_operating_mic,
+        start_date: Date.iso8601("2024-01-01"),
+        end_date: Date.iso8601("2024-08-01")
+      )
+
+      assert response.success?
+      assert response.data.first.date.is_a?(Date)
+      assert_equal 147, response.data.count # Synth won't return prices on weekends / holidays, so less than total day count of 213
+    end
+  end
+
+  test "searches securities" do
+    VCR.use_cassette("#{vcr_key_prefix}/security_search") do
+      response = @subject.search_securities("AAPL", country_code: "US")
+      securities = response.data
+
+      assert securities.any?
+      security = securities.first
+      assert_equal "AAPL", security.symbol
+    end
+  end
+
+  test "fetches security info" do
+    aapl = securities(:aapl)
+
+    VCR.use_cassette("#{vcr_key_prefix}/security_info") do
+      response = @subject.fetch_security_info(
+        symbol: aapl.ticker,
+        exchange_operating_mic: aapl.exchange_operating_mic
+      )
+
+      info = response.data
+
+      assert_equal "AAPL", info.symbol
+      assert_equal "Apple Inc.", info.name
+      assert_equal "common stock", info.kind
+      assert info.logo_url.present?
+      assert info.description.present?
+    end
+  end
+
+  private
+    def vcr_key_prefix
+      @subject.class.name.demodulize.underscore
+    end
+end
diff --git a/test/interfaces/syncable_interface_test.rb b/test/interfaces/syncable_interface_test.rb
new file mode 100644
index 00000000..df142052
--- /dev/null
+++ b/test/interfaces/syncable_interface_test.rb
@@ -0,0 +1,36 @@
+require "test_helper"
+
+module SyncableInterfaceTest
+  extend ActiveSupport::Testing::Declarative
+  include ActiveJob::TestHelper
+
+  test "can sync later" do
+    assert_difference "@syncable.syncs.count", 1 do
+      assert_enqueued_with job: SyncJob do
+        @syncable.sync_later(window_start_date: 2.days.ago.to_date)
+      end
+    end
+  end
+
+  test "can perform sync" do
+    mock_sync = mock
+    @syncable.class.any_instance.expects(:perform_sync).with(mock_sync).once
+    @syncable.perform_sync(mock_sync)
+  end
+
+  test "second sync request widens existing pending window" do
+    later_start = 2.days.ago.to_date
+    first_sync = @syncable.sync_later(window_start_date: later_start, window_end_date: later_start)
+
+    earlier_start = 5.days.ago.to_date
+    wider_end     = Date.current
+
+    assert_no_difference "@syncable.syncs.count" do
+      @syncable.sync_later(window_start_date: earlier_start, window_end_date: wider_end)
+    end
+
+    first_sync.reload
+    assert_equal earlier_start, first_sync.window_start_date
+    assert_equal wider_end, first_sync.window_end_date
+  end
+end
diff --git a/test/jobs/account_balance_sync_job_test.rb b/test/jobs/account_balance_sync_job_test.rb
deleted file mode 100644
index af5d627e..00000000
--- a/test/jobs/account_balance_sync_job_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class Account::BalanceSyncJobTest < ActiveJob::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/jobs/auto_upgrade_job_test.rb b/test/jobs/auto_upgrade_job_test.rb
deleted file mode 100644
index d68aa2a1..00000000
--- a/test/jobs/auto_upgrade_job_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class AutoUpgradeJobTest < ActiveJob::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/jobs/daily_exchange_rate_job_test.rb b/test/jobs/daily_exchange_rate_job_test.rb
deleted file mode 100644
index 7308046a..00000000
--- a/test/jobs/daily_exchange_rate_job_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class DailyExchangeRateJobTest < ActiveJob::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/jobs/convert_currency_job_test.rb b/test/jobs/stripe_event_handler_job_test.rb
similarity index 58%
rename from test/jobs/convert_currency_job_test.rb
rename to test/jobs/stripe_event_handler_job_test.rb
index a208d53e..80e40328 100644
--- a/test/jobs/convert_currency_job_test.rb
+++ b/test/jobs/stripe_event_handler_job_test.rb
@@ -1,6 +1,6 @@
 require "test_helper"
 
-class ConvertCurrencyJobTest < ActiveJob::TestCase
+class StripeEventHandlerJobTest < ActiveJob::TestCase
   # test "the truth" do
   #   assert true
   # end
diff --git a/test/jobs/sync_job_test.rb b/test/jobs/sync_job_test.rb
new file mode 100644
index 00000000..b392b3a3
--- /dev/null
+++ b/test/jobs/sync_job_test.rb
@@ -0,0 +1,13 @@
+require "test_helper"
+
+class SyncJobTest < ActiveJob::TestCase
+  test "sync is performed" do
+    syncable = accounts(:depository)
+
+    sync = syncable.syncs.create!(window_start_date: 2.days.ago.to_date)
+
+    sync.expects(:perform).once
+
+    SyncJob.perform_now(sync)
+  end
+end
diff --git a/test/lib/money_test.rb b/test/lib/money_test.rb
index ec1f2084..699a1ab3 100644
--- a/test/lib/money_test.rb
+++ b/test/lib/money_test.rb
@@ -84,19 +84,20 @@ class MoneyTest < ActiveSupport::TestCase
     assert_not Money.new(-1000).positive?
   end
 
-  test "can cast to string with basic formatting" do
+  test "can format" do
     assert_equal "$1,000.90", Money.new(1000.899).to_s
-    assert_equal "€1.000,12", Money.new(1000.12, :eur).to_s
+    assert_equal "€1,000.12", Money.new(1000.12, :eur).to_s
+    assert_equal "€ 1.000,12", Money.new(1000.12, :eur).format(locale: :nl)
   end
 
   test "converts currency when rate available" do
-    ExchangeRate.expects(:find_rate).returns(OpenStruct.new(rate: 1.2))
+    ExchangeRate.expects(:find_or_fetch_rate).returns(OpenStruct.new(rate: 1.2))
 
     assert_equal Money.new(1000).exchange_to(:eur), Money.new(1000 * 1.2, :eur)
   end
 
   test "raises when no conversion rate available and no fallback rate provided" do
-    ExchangeRate.expects(:find_rate).returns(nil)
+    ExchangeRate.expects(:find_or_fetch_rate).returns(nil)
 
     assert_raises Money::ConversionError do
       Money.new(1000).exchange_to(:jpy)
@@ -104,7 +105,7 @@ class MoneyTest < ActiveSupport::TestCase
   end
 
   test "converts currency with a fallback rate" do
-    ExchangeRate.expects(:find_rate).returns(nil).twice
+    ExchangeRate.expects(:find_or_fetch_rate).returns(nil).twice
 
     assert_equal 0, Money.new(1000).exchange_to(:jpy, fallback_rate: 0)
     assert_equal Money.new(1000, :jpy), Money.new(1000, :usd).exchange_to(:jpy, fallback_rate: 1)
diff --git a/test/mailers/email_confirmation_mailer_test.rb b/test/mailers/email_confirmation_mailer_test.rb
new file mode 100644
index 00000000..2727cfb9
--- /dev/null
+++ b/test/mailers/email_confirmation_mailer_test.rb
@@ -0,0 +1,14 @@
+require "test_helper"
+
+class EmailConfirmationMailerTest < ActionMailer::TestCase
+  test "confirmation_email" do
+    user = users(:new_email)
+    user.unconfirmed_email = "new@example.com"
+
+    mail = EmailConfirmationMailer.with(user: user).confirmation_email
+    assert_equal I18n.t("email_confirmation_mailer.confirmation_email.subject"), mail.subject
+    assert_equal [ user.unconfirmed_email ], mail.to
+    assert_equal [ "hello@maybefinance.com" ], mail.from
+    assert_match "confirm", mail.body.encoded
+  end
+end
diff --git a/test/mailers/previews/email_confirmation_mailer_preview.rb b/test/mailers/previews/email_confirmation_mailer_preview.rb
new file mode 100644
index 00000000..36aa4648
--- /dev/null
+++ b/test/mailers/previews/email_confirmation_mailer_preview.rb
@@ -0,0 +1,7 @@
+# Preview all emails at http://localhost:3000/rails/mailers/email_confirmation_mailer
+class EmailConfirmationMailerPreview < ActionMailer::Preview
+  # Preview this email at http://localhost:3000/rails/mailers/email_confirmation_mailer/confirmation_email
+  def confirmation_email
+    EmailConfirmationMailer.confirmation_email
+  end
+end
diff --git a/test/models/account/activity_feed_data_test.rb b/test/models/account/activity_feed_data_test.rb
new file mode 100644
index 00000000..2139076c
--- /dev/null
+++ b/test/models/account/activity_feed_data_test.rb
@@ -0,0 +1,355 @@
+require "test_helper"
+
+class Account::ActivityFeedDataTest < ActiveSupport::TestCase
+  include EntriesTestHelper
+
+  setup do
+    @family = families(:empty)
+    @checking = @family.accounts.create!(name: "Test Checking", accountable: Depository.new, currency: "USD", balance: 0)
+    @savings = @family.accounts.create!(name: "Test Savings", accountable: Depository.new, currency: "USD", balance: 0)
+    @investment = @family.accounts.create!(name: "Test Investment", accountable: Investment.new, currency: "USD", balance: 0)
+
+    @test_period_start = Date.current - 4.days
+
+    setup_test_data
+  end
+
+  test "calculates balance trend with complete balance history" do
+    entries = @checking.entries.includes(:entryable).to_a
+    feed_data = Account::ActivityFeedData.new(@checking, entries)
+
+    activities = feed_data.entries_by_date
+    day2_activity = find_activity_for_date(activities, @test_period_start + 1.day)
+
+    assert_not_nil day2_activity
+    trend = day2_activity.balance_trend
+    assert_equal 1100, trend.current.amount.to_i  # End of day 2
+    assert_equal 1000, trend.previous.amount.to_i  # End of day 1
+    assert_equal 100, trend.value.amount.to_i
+    assert_equal "up", trend.direction.to_s
+  end
+
+  test "calculates balance trend for first day with zero starting balance" do
+    entries = @checking.entries.includes(:entryable).to_a
+    feed_data = Account::ActivityFeedData.new(@checking, entries)
+
+    activities = feed_data.entries_by_date
+    day1_activity = find_activity_for_date(activities, @test_period_start)
+
+    assert_not_nil day1_activity
+    trend = day1_activity.balance_trend
+    assert_equal 1000, trend.current.amount.to_i  # End of first day
+    assert_equal 0, trend.previous.amount.to_i  # Fallback to 0
+    assert_equal 1000, trend.value.amount.to_i
+  end
+
+  test "uses last observed balance when intermediate balances are missing" do
+    @checking.balances.where(date: [ @test_period_start + 1.day, @test_period_start + 3.days ]).destroy_all
+
+    entries = @checking.entries.includes(:entryable).to_a
+    feed_data = Account::ActivityFeedData.new(@checking, entries)
+
+    activities = feed_data.entries_by_date
+
+    # When day 2 balance is missing, both start and end use day 1 balance
+    day2_activity = find_activity_for_date(activities, @test_period_start + 1.day)
+    assert_not_nil day2_activity
+    trend = day2_activity.balance_trend
+    assert_equal 1000, trend.current.amount.to_i  # LOCF from day 1
+    assert_equal 1000, trend.previous.amount.to_i  # LOCF from day 1
+    assert_equal 0, trend.value.amount.to_i
+    assert_equal "flat", trend.direction.to_s
+  end
+
+  test "returns zero balance when no balance history exists" do
+    @checking.balances.destroy_all
+
+    entries = @checking.entries.includes(:entryable).to_a
+    feed_data = Account::ActivityFeedData.new(@checking, entries)
+
+    activities = feed_data.entries_by_date
+    # Use first day which has a transaction
+    day1_activity = find_activity_for_date(activities, @test_period_start)
+
+    assert_not_nil day1_activity
+    trend = day1_activity.balance_trend
+    assert_equal 0, trend.current.amount.to_i  # Fallback to 0
+    assert_equal 0, trend.previous.amount.to_i  # Fallback to 0
+    assert_equal 0, trend.value.amount.to_i
+    assert_equal "flat", trend.direction.to_s
+  end
+
+  test "calculates cash and holdings trends for investment accounts" do
+    entries = @investment.entries.includes(:entryable).to_a
+    feed_data = Account::ActivityFeedData.new(@investment, entries)
+
+    activities = feed_data.entries_by_date
+    day3_activity = find_activity_for_date(activities, @test_period_start + 2.days)
+
+    assert_not_nil day3_activity
+
+    # Cash trend for day 3 (after foreign currency transaction)
+    cash_trend = day3_activity.cash_balance_trend
+    assert_equal 400, cash_trend.current.amount.to_i  # End of day 3 cash balance
+    assert_equal 500, cash_trend.previous.amount.to_i  # End of day 2 cash balance
+    assert_equal(-100, cash_trend.value.amount.to_i)
+    assert_equal "down", cash_trend.direction.to_s
+
+    # Holdings trend for day 3 (after trade)
+    holdings_trend = day3_activity.holdings_value_trend
+    assert_equal 1500, holdings_trend.current.amount.to_i  # Total balance - cash balance
+    assert_equal 0, holdings_trend.previous.amount.to_i  # No holdings before trade
+    assert_equal 1500, holdings_trend.value.amount.to_i
+    assert_equal "up", holdings_trend.direction.to_s
+  end
+
+  test "identifies transfers for a specific date" do
+    entries = @checking.entries.includes(:entryable).to_a
+    feed_data = Account::ActivityFeedData.new(@checking, entries)
+
+    activities = feed_data.entries_by_date
+
+    # Day 2 has the transfer
+    day2_activity = find_activity_for_date(activities, @test_period_start + 1.day)
+    assert_not_nil day2_activity
+    assert_equal 1, day2_activity.transfers.size
+    assert_equal @transfer, day2_activity.transfers.first
+
+    # Other days have no transfers
+    day1_activity = find_activity_for_date(activities, @test_period_start)
+    assert_not_nil day1_activity
+    assert_empty day1_activity.transfers
+  end
+
+  test "returns complete ActivityDateData objects with all required fields" do
+    entries = @investment.entries.includes(:entryable).to_a
+    feed_data = Account::ActivityFeedData.new(@investment, entries)
+
+    activities = feed_data.entries_by_date
+
+    # Check that we get ActivityDateData objects
+    assert activities.all? { |a| a.is_a?(Account::ActivityFeedData::ActivityDateData) }
+
+    # Check that each ActivityDate has the required fields
+    activities.each do |activity|
+      assert_respond_to activity, :date
+      assert_respond_to activity, :entries
+      assert_respond_to activity, :balance_trend
+      assert_respond_to activity, :cash_balance_trend
+      assert_respond_to activity, :holdings_value_trend
+      assert_respond_to activity, :transfers
+    end
+  end
+
+  test "handles valuations correctly by summing entry changes" do
+    # Create account with known balances
+    account = @family.accounts.create!(name: "Test Investment", accountable: Investment.new, currency: "USD", balance: 0)
+
+    # Day 1: Starting balance
+    account.balances.create!(
+      date: @test_period_start,
+      balance: 7321.56,
+      cash_balance: 1000,
+      currency: "USD"
+    )
+
+    # Day 2: Add transactions, trades and a valuation
+    account.balances.create!(
+      date: @test_period_start + 1.day,
+      balance: 8500,  # Valuation sets this
+      cash_balance: 1070,  # Cash increased by transactions
+      currency: "USD"
+    )
+
+    # Create transactions
+    create_transaction(
+      account: account,
+      date: @test_period_start + 1.day,
+      amount: -50,
+      name: "Interest payment"
+    )
+    create_transaction(
+      account: account,
+      date: @test_period_start + 1.day,
+      amount: -20,
+      name: "Interest payment"
+    )
+
+    # Create a trade
+    create_trade(
+      securities(:aapl),
+      account: account,
+      qty: 5,
+      date: @test_period_start + 1.day,
+      price: 150  # 5 * 150 = 750
+    )
+
+    # Create valuation
+    create_valuation(
+      account: account,
+      date: @test_period_start + 1.day,
+      amount: 8500
+    )
+
+    entries = account.entries.includes(:entryable).to_a
+    feed_data = Account::ActivityFeedData.new(account, entries)
+
+    activities = feed_data.entries_by_date
+    day2_activity = find_activity_for_date(activities, @test_period_start + 1.day)
+
+    assert_not_nil day2_activity
+
+    # Cash change should be $70 (50 + 20 from transactions only, not trades)
+    assert_equal 70, day2_activity.cash_balance_trend.value.amount.to_i
+
+    # Holdings change should be 750 (from the trade)
+    assert_equal 750, day2_activity.holdings_value_trend.value.amount.to_i
+
+    # Total balance change
+    assert_in_delta 1178.44, day2_activity.balance_trend.value.amount.to_f, 0.01
+  end
+
+  test "normalizes multi-currency entries on valuation days" do
+    # Create EUR account
+    eur_account = @family.accounts.create!(name: "EUR Investment", accountable: Investment.new, currency: "EUR", balance: 0)
+
+    # Day 1: Starting balance
+    eur_account.balances.create!(
+      date: @test_period_start,
+      balance: 1000,
+      cash_balance: 500,
+      currency: "EUR"
+    )
+
+    # Day 2: Multi-currency transactions and valuation
+    eur_account.balances.create!(
+      date: @test_period_start + 1.day,
+      balance: 2000,
+      cash_balance: 600,
+      currency: "EUR"
+    )
+
+    # Create USD transaction (should be converted to EUR)
+    create_transaction(
+      account: eur_account,
+      date: @test_period_start + 1.day,
+      amount: -100,
+      currency: "USD",
+      name: "USD Payment"
+    )
+
+    # Create exchange rate: 1 USD = 0.9 EUR
+    ExchangeRate.create!(
+      date: @test_period_start + 1.day,
+      from_currency: "USD",
+      to_currency: "EUR",
+      rate: 0.9
+    )
+
+    # Create valuation
+    create_valuation(
+      account: eur_account,
+      date: @test_period_start + 1.day,
+      amount: 2000
+    )
+
+    entries = eur_account.entries.includes(:entryable).to_a
+    feed_data = Account::ActivityFeedData.new(eur_account, entries)
+
+    activities = feed_data.entries_by_date
+    day2_activity = find_activity_for_date(activities, @test_period_start + 1.day)
+
+    assert_not_nil day2_activity
+
+    # Cash change should be 90 EUR (100 USD * 0.9)
+    # The transaction is -100 USD, which becomes +100 when inverted, then 100 * 0.9 = 90 EUR
+    assert_equal 90, day2_activity.cash_balance_trend.value.amount.to_i
+    assert_equal "EUR", day2_activity.cash_balance_trend.value.currency.iso_code
+  end
+
+  private
+    def find_activity_for_date(activities, date)
+      activities.find { |a| a.date == date }
+    end
+
+    def setup_test_data
+      # Create daily balances for checking account
+      5.times do |i|
+        date = @test_period_start + i.days
+        @checking.balances.create!(
+          date: date,
+          balance: 1000 + (i * 100),
+          currency: "USD"
+        )
+      end
+
+      # Create daily balances for investment account with cash_balance
+      @investment.balances.create!(
+        date: @test_period_start,
+        balance: 500,
+        cash_balance: 500,
+        currency: "USD"
+      )
+      @investment.balances.create!(
+        date: @test_period_start + 1.day,
+        balance: 500,
+        cash_balance: 500,
+        currency: "USD"
+      )
+      @investment.balances.create!(
+        date: @test_period_start + 2.days,
+        balance: 1900,  # 1500 holdings + 400 cash
+        cash_balance: 400,  # After -100 EUR transaction
+        currency: "USD"
+      )
+
+      # Day 1: Regular transaction
+      create_transaction(
+        account: @checking,
+        date: @test_period_start,
+        amount: -50,
+        name: "Grocery Store"
+      )
+
+      # Day 2: Transfer between accounts
+      @transfer = create_transfer(
+        from_account: @checking,
+        to_account: @savings,
+        amount: 200,
+        date: @test_period_start + 1.day
+      )
+
+      # Day 3: Trade in investment account
+      create_trade(
+        securities(:aapl),
+        account: @investment,
+        qty: 10,
+        date: @test_period_start + 2.days,
+        price: 150
+      )
+
+      # Day 3: Foreign currency transaction
+      create_transaction(
+        account: @investment,
+        date: @test_period_start + 2.days,
+        amount: -100,
+        currency: "EUR",
+        name: "International Wire"
+      )
+
+      # Create exchange rate for foreign currency
+      ExchangeRate.create!(
+        date: @test_period_start + 2.days,
+        from_currency: "EUR",
+        to_currency: "USD",
+        rate: 1.1
+      )
+
+      # Day 4: Valuation
+      create_valuation(
+        account: @investment,
+        date: @test_period_start + 3.days,
+        amount: 25
+      )
+    end
+end
diff --git a/test/models/account/balance/syncer_test.rb b/test/models/account/balance/syncer_test.rb
deleted file mode 100644
index 9bfeffcb..00000000
--- a/test/models/account/balance/syncer_test.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-require "test_helper"
-
-class Account::Balance::SyncerTest < ActiveSupport::TestCase
-  include Account::EntriesTestHelper
-
-  setup do
-    @account = families(:empty).accounts.create!(name: "Test", balance: 20000, currency: "USD", accountable: Depository.new)
-    @investment_account = families(:empty).accounts.create!(name: "Test Investment", balance: 50000, currency: "USD", accountable: Investment.new)
-  end
-
-  test "syncs account with no entries" do
-    assert_equal 0, @account.balances.count
-
-    run_sync_for @account
-
-    assert_equal [ @account.balance ], @account.balances.chronological.map(&:balance)
-  end
-
-  test "syncs account with valuations only" do
-    create_valuation(account: @account, date: 2.days.ago.to_date, amount: 22000)
-
-    run_sync_for @account
-
-    assert_equal 22000, @account.balance
-    assert_equal [ 22000, 22000, 22000 ], @account.balances.chronological.map(&:balance)
-  end
-
-  test "syncs account with transactions only" do
-    create_transaction(account: @account, date: 4.days.ago.to_date, amount: 100)
-    create_transaction(account: @account, date: 2.days.ago.to_date, amount: -500)
-
-    run_sync_for @account
-
-    assert_equal 20000, @account.balance
-    assert_equal [ 19600, 19500, 19500, 20000, 20000, 20000 ], @account.balances.chronological.map(&:balance)
-  end
-
-  test "syncs account with trades only" do
-    aapl = securities(:aapl)
-    create_trade(aapl, account: @investment_account, date: 1.day.ago.to_date, qty: 10)
-
-    run_sync_for @investment_account
-
-    assert_equal [ 52140, 50000, 50000 ], @investment_account.balances.chronological.map(&:balance)
-  end
-
-  test "syncs account with valuations and transactions" do
-    create_valuation(account: @account, date: 5.days.ago.to_date, amount: 20000)
-    create_transaction(account: @account, date: 3.days.ago.to_date, amount: -500)
-    create_transaction(account: @account, date: 2.days.ago.to_date, amount: 100)
-    create_valuation(account: @account, date: 1.day.ago.to_date, amount: 25000)
-
-    run_sync_for(@account)
-
-    assert_equal 25000, @account.balance
-    assert_equal [ 20000, 20000, 20500, 20400, 25000, 25000 ], @account.balances.chronological.map(&:balance)
-  end
-
-  test "syncs account with transactions in multiple currencies" do
-    ExchangeRate.create! date: 1.day.ago.to_date, from_currency: "EUR", to_currency: "USD", rate: 1.2
-
-    create_transaction(account: @account, date: 3.days.ago.to_date, amount: 100, currency: "USD")
-    create_transaction(account: @account, date: 2.days.ago.to_date, amount: 300, currency: "USD")
-    create_transaction(account: @account, date: 1.day.ago.to_date, amount: 500, currency: "EUR") # €500 * 1.2 = $600
-
-    run_sync_for(@account)
-
-    assert_equal 20000, @account.balance
-    assert_equal [ 21000, 20900, 20600, 20000, 20000 ], @account.balances.chronological.map(&:balance)
-  end
-
-  test "converts foreign account balances to family currency" do
-    @account.update! currency: "EUR"
-
-    create_transaction(date: 1.day.ago.to_date, amount: 1000, account: @account, currency: "EUR")
-
-    create_exchange_rate(2.days.ago.to_date, from: "EUR", to: "USD", rate: 2)
-    create_exchange_rate(1.day.ago.to_date, from: "EUR", to: "USD", rate: 2)
-    create_exchange_rate(Date.current, from: "EUR", to: "USD", rate: 2)
-
-    with_env_overrides SYNTH_API_KEY: ENV["SYNTH_API_KEY"] || "fookey" do
-      run_sync_for(@account)
-    end
-
-    usd_balances = @account.balances.where(currency: "USD").chronological.map(&:balance)
-    eur_balances = @account.balances.where(currency: "EUR").chronological.map(&:balance)
-
-    assert_equal 20000, @account.balance
-    assert_equal [ 21000, 20000, 20000 ], eur_balances # native account balances
-    assert_equal [ 42000, 40000, 40000 ], usd_balances # converted balances at rate of 2:1
-  end
-
-  test "raises issue if missing exchange rates" do
-    create_transaction(date: Date.current, account: @account, currency: "EUR")
-
-    ExchangeRate.expects(:find_rate).with(from: "EUR", to: "USD", date: Date.current).returns(nil)
-    @account.expects(:observe_missing_exchange_rates).with(from: "EUR", to: "USD", dates: [ Date.current ])
-
-    syncer = Account::Balance::Syncer.new(@account)
-
-    syncer.run
-  end
-
-  # Account is able to calculate balances in its own currency (i.e. can still show a historical graph), but
-  # doesn't have exchange rates available to convert those calculated balances to the family currency
-  test "observes issue if exchange rate provider is not configured" do
-    @account.update! currency: "EUR"
-
-    syncer = Account::Balance::Syncer.new(@account)
-
-    @account.expects(:observe_missing_exchange_rate_provider)
-
-    with_env_overrides SYNTH_API_KEY: nil do
-      syncer.run
-    end
-  end
-
-  test "overwrites existing balances and purges stale balances" do
-    assert_equal 0, @account.balances.size
-
-    @account.balances.create! date: Date.current, currency: "USD", balance: 30000 # incorrect balance, will be updated
-    @account.balances.create! date: 10.years.ago.to_date, currency: "USD", balance: 35000 # Out of range balance, will be deleted
-
-    assert_equal 2, @account.balances.size
-
-    run_sync_for(@account)
-
-    assert_equal [ @account.balance ], @account.balances.chronological.map(&:balance)
-  end
-
-  test "partial sync does not affect balances prior to sync start date" do
-    existing_balance = @account.balances.create! date: 2.days.ago.to_date, currency: "USD", balance: 30000
-
-    transaction = create_transaction(account: @account, date: 1.day.ago.to_date, amount: 100, currency: "USD")
-
-    run_sync_for(@account, start_date: 1.day.ago.to_date)
-
-    assert_equal [ existing_balance.balance, existing_balance.balance - transaction.amount, @account.balance ], @account.balances.chronological.map(&:balance)
-  end
-
-  private
-
-    def run_sync_for(account, start_date: nil)
-      syncer = Account::Balance::Syncer.new(account, start_date: start_date)
-      syncer.run
-    end
-
-    def create_exchange_rate(date, from:, to:, rate:)
-      ExchangeRate.create! date: date, from_currency: from, to_currency: to, rate: rate
-    end
-end
diff --git a/test/models/account/chartable_test.rb b/test/models/account/chartable_test.rb
new file mode 100644
index 00000000..302c603b
--- /dev/null
+++ b/test/models/account/chartable_test.rb
@@ -0,0 +1,46 @@
+require "test_helper"
+
+class Account::ChartableTest < ActiveSupport::TestCase
+  test "generates series and memoizes" do
+    account = accounts(:depository)
+
+    test_series = mock
+    builder1 = mock
+    builder2 = mock
+
+    Balance::ChartSeriesBuilder.expects(:new)
+      .with(
+        account_ids: [ account.id ],
+        currency: account.currency,
+        period: Period.last_30_days,
+        favorable_direction: account.favorable_direction,
+        interval: nil
+      )
+      .returns(builder1)
+      .once
+
+    Balance::ChartSeriesBuilder.expects(:new)
+      .with(
+        account_ids: [ account.id ],
+        currency: account.currency,
+        period: Period.last_90_days, # Period changed, so memoization should be invalidated
+        favorable_direction: account.favorable_direction,
+        interval: nil
+      )
+      .returns(builder2)
+      .once
+
+    builder1.expects(:balance_series).returns(test_series).twice
+    series1 = account.balance_series
+    memoized_series1 = account.balance_series
+
+    builder2.expects(:balance_series).returns(test_series).twice
+    builder2.expects(:cash_balance_series).returns(test_series).once
+    builder2.expects(:holdings_balance_series).returns(test_series).once
+
+    series2 = account.balance_series(period: Period.last_90_days)
+    memoized_series2 = account.balance_series(period: Period.last_90_days)
+    memoized_series2_cash_view = account.balance_series(period: Period.last_90_days, view: :cash_balance)
+    memoized_series2_holdings_view = account.balance_series(period: Period.last_90_days, view: :holdings_balance)
+  end
+end
diff --git a/test/models/account/current_balance_manager_test.rb b/test/models/account/current_balance_manager_test.rb
new file mode 100644
index 00000000..0d7b914b
--- /dev/null
+++ b/test/models/account/current_balance_manager_test.rb
@@ -0,0 +1,324 @@
+require "test_helper"
+
+class Account::CurrentBalanceManagerTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:empty)
+    @linked_account = accounts(:connected)
+  end
+
+  # -------------------------------------------------------------------------------------------------
+  # Manual account current balance management
+  #
+  # Manual accounts do not manage `current_anchor` valuations and have "auto-update strategies" to set the current balance.
+  # -------------------------------------------------------------------------------------------------
+
+  test "when one or more reconciliations exist, append new reconciliation to represent the current balance" do
+    account = @family.accounts.create!(
+      name: "Test",
+      balance: 1000,
+      cash_balance: 1000,
+      currency: "USD",
+      accountable: Depository.new
+    )
+
+    # A reconciliation tells us that the user is tracking this account's value with balance-only updates
+    account.entries.create!(
+      date: 30.days.ago.to_date,
+      name: "First manual recon valuation",
+      amount: 1200,
+      currency: "USD",
+      entryable: Valuation.new(kind: "reconciliation")
+    )
+
+    manager = Account::CurrentBalanceManager.new(account)
+
+    assert_equal 1, account.valuations.count
+
+    # Here, we assume user is once again "overriding" the balance to 1400
+    manager.set_current_balance(1400)
+
+    today_valuation = account.entries.valuations.find_by(date: Date.current)
+
+    assert_equal 2, account.valuations.count
+    assert_equal 1400, today_valuation.amount
+
+    assert_equal 1400, account.balance
+  end
+
+  test "all manual non cash accounts append reconciliations for current balance updates" do
+    [ Property, Vehicle, OtherAsset, Loan, OtherLiability ].each do |account_type|
+      account = @family.accounts.create!(
+        name: "Test",
+        balance: 1000,
+        cash_balance: 1000,
+        currency: "USD",
+        accountable: account_type.new
+      )
+
+      manager = Account::CurrentBalanceManager.new(account)
+
+      assert_equal 0, account.valuations.count
+
+      manager.set_current_balance(1400)
+
+      assert_equal 1, account.valuations.count
+
+      today_valuation = account.entries.valuations.find_by(date: Date.current)
+
+      assert_equal 1400, today_valuation.amount
+      assert_equal 1400, account.balance
+    end
+  end
+
+  # Scope: Depository, CreditCard only (i.e. all-cash accounts)
+  #
+  # If a user has an opening balance (valuation) for their manual *Depository* or *CreditCard* account and has 1+ transactions, the intent of
+  # "updating current balance" typically means that their start balance is incorrect. We follow that user intent
+  # by default and find the delta required, and update the opening balance so that the timeline reflects this current balance
+  #
+  # The purpose of this is so we're not cluttering up their timeline with "balance reconciliations" that reset the balance
+  # on the current date. Our goal is to keep the timeline with as few "Valuations" as possible.
+  #
+  # If we ever build a UI that gives user options, this test expectation may require some updates, but for now this
+  # is the least surprising outcome.
+  test "when no reconciliations exist on cash accounts, adjust opening balance with delta until it gets us to the desired balance" do
+    account = @family.accounts.create!(
+      name: "Test",
+      balance: 900, # the balance after opening valuation + transaction have "synced" (1000 - 100 = 900)
+      cash_balance: 900,
+      currency: "USD",
+      accountable: Depository.new
+    )
+
+    account.entries.create!(
+      date: 1.year.ago.to_date,
+      name: "Test opening valuation",
+      amount: 1000,
+      currency: "USD",
+      entryable: Valuation.new(kind: "opening_anchor")
+    )
+
+    account.entries.create!(
+      date: 10.days.ago.to_date,
+      name: "Test expense transaction",
+      amount: 100,
+      currency: "USD",
+      entryable: Transaction.new
+    )
+
+    # What we're asserting here:
+    # 1. User creates the account with an opening balance of 1000
+    # 2. User creates a transaction of 100, which then reduces the balance to 900 (the current balance value on account above)
+    # 3. User requests "current balance update" back to 1000, which was their intention
+    # 4. We adjust the opening balance by the delta (100) to 1100, which is the new opening balance, so that the transaction
+    #    of 100 reduces it down to 1000, which is the current balance they intended.
+    assert_equal 1, account.valuations.count
+    assert_equal 1, account.transactions.count
+
+    # No new valuation is appended; we're just adjusting the opening valuation anchor
+    assert_no_difference "account.entries.count" do
+      manager = Account::CurrentBalanceManager.new(account)
+      manager.set_current_balance(1000)
+    end
+
+    opening_valuation = account.valuations.find_by(kind: "opening_anchor")
+
+    assert_equal 1100, opening_valuation.entry.amount
+    assert_equal 1000, account.balance
+  end
+
+  # (SEE ABOVE TEST FOR MORE DETAILED EXPLANATION)
+  # Same assertions as the test above, but Credit Card accounts are liabilities, which means expenses increase balance; not decrease
+  test "when no reconciliations exist on credit card accounts, adjust opening balance with delta until it gets us to the desired balance" do
+    account = @family.accounts.create!(
+      name: "Test",
+      balance: 1100, # the balance after opening valuation + transaction have "synced" (1000 + 100 = 1100) (expenses increase balance)
+      cash_balance: 1100,
+      currency: "USD",
+      accountable: CreditCard.new
+    )
+
+    account.entries.create!(
+      date: 1.year.ago.to_date,
+      name: "Test opening valuation",
+      amount: 1000,
+      currency: "USD",
+      entryable: Valuation.new(kind: "opening_anchor")
+    )
+
+    account.entries.create!(
+      date: 10.days.ago.to_date,
+      name: "Test expense transaction",
+      amount: 100,
+      currency: "USD",
+      entryable: Transaction.new
+    )
+
+    assert_equal 1, account.valuations.count
+    assert_equal 1, account.transactions.count
+
+    assert_no_difference "account.entries.count" do
+      manager = Account::CurrentBalanceManager.new(account)
+      manager.set_current_balance(1000)
+    end
+
+    opening_valuation = account.valuations.find_by(kind: "opening_anchor")
+
+    assert_equal 900, opening_valuation.entry.amount
+    assert_equal 1000, account.balance
+  end
+
+  # -------------------------------------------------------------------------------------------------
+  # Linked account current balance management
+  #
+  # Linked accounts manage "current balance" via the special `current_anchor` valuation.
+  # This is NOT a user-facing feature, and is primarily used in "processors" while syncing
+  # linked account data (e.g. via Plaid)
+  # -------------------------------------------------------------------------------------------------
+
+  test "when no existing anchor for linked account, creates new anchor" do
+    manager = Account::CurrentBalanceManager.new(@linked_account)
+
+    assert_difference -> { @linked_account.entries.count } => 1,
+                     -> { @linked_account.valuations.count } => 1 do
+      result = manager.set_current_balance(1000)
+
+      assert result.success?
+      assert result.changes_made?
+      assert_nil result.error
+    end
+
+    current_anchor = @linked_account.valuations.current_anchor.first
+    assert_not_nil current_anchor
+    assert_equal 1000, current_anchor.entry.amount
+    assert_equal "current_anchor", current_anchor.kind
+
+    entry = current_anchor.entry
+    assert_equal 1000, entry.amount
+    assert_equal Date.current, entry.date
+    assert_equal "Current balance", entry.name  # Depository type returns "Current balance"
+
+    assert_equal 1000, @linked_account.balance
+  end
+
+  test "updates existing anchor for linked account" do
+    # First create a current anchor
+    manager = Account::CurrentBalanceManager.new(@linked_account)
+    result = manager.set_current_balance(1000)
+    assert result.success?
+
+    current_anchor = @linked_account.valuations.current_anchor.first
+    original_id = current_anchor.id
+    original_entry_id = current_anchor.entry.id
+
+    # Travel to tomorrow to ensure date change
+    travel_to Date.current + 1.day do
+      # Now update it
+      assert_no_difference -> { @linked_account.entries.count } do
+        assert_no_difference -> { @linked_account.valuations.count } do
+          result = manager.set_current_balance(2000)
+          assert result.success?
+          assert result.changes_made?
+        end
+      end
+
+      current_anchor.reload
+      assert_equal original_id, current_anchor.id # Same valuation record
+      assert_equal original_entry_id, current_anchor.entry.id # Same entry record
+      assert_equal 2000, current_anchor.entry.amount
+      assert_equal Date.current, current_anchor.entry.date # Should be updated to current date
+    end
+
+    assert_equal 2000, @linked_account.balance
+  end
+
+  test "when no changes made, returns success with no changes made" do
+    # First create a current anchor
+    manager = Account::CurrentBalanceManager.new(@linked_account)
+    result = manager.set_current_balance(1000)
+    assert result.success?
+    assert result.changes_made?
+
+    # Try to set the same value on the same date
+    result = manager.set_current_balance(1000)
+
+    assert result.success?
+    assert_not result.changes_made?
+    assert_nil result.error
+
+    assert_equal 1000, @linked_account.balance
+  end
+
+  test "updates only amount when balance changes" do
+    manager = Account::CurrentBalanceManager.new(@linked_account)
+
+    # Create initial anchor
+    result = manager.set_current_balance(1000)
+    assert result.success?
+
+    current_anchor = @linked_account.valuations.current_anchor.first
+    original_date = current_anchor.entry.date
+
+    # Update only the balance
+    result = manager.set_current_balance(1500)
+    assert result.success?
+    assert result.changes_made?
+
+    current_anchor.reload
+    assert_equal 1500, current_anchor.entry.amount
+    assert_equal original_date, current_anchor.entry.date # Date should remain the same if on same day
+
+    assert_equal 1500, @linked_account.balance
+  end
+
+  test "updates date when called on different day" do
+    manager = Account::CurrentBalanceManager.new(@linked_account)
+
+    # Create initial anchor
+    result = manager.set_current_balance(1000)
+    assert result.success?
+
+    current_anchor = @linked_account.valuations.current_anchor.first
+    original_amount = current_anchor.entry.amount
+
+    # Travel to tomorrow and update with same balance
+    travel_to Date.current + 1.day do
+      result = manager.set_current_balance(1000)
+      assert result.success?
+      assert result.changes_made? # Should be true because date changed
+
+      current_anchor.reload
+      assert_equal original_amount, current_anchor.entry.amount
+      assert_equal Date.current, current_anchor.entry.date # Should be updated to new current date
+    end
+
+    assert_equal 1000, @linked_account.balance
+  end
+
+  test "current_balance returns balance from current anchor" do
+    manager = Account::CurrentBalanceManager.new(@linked_account)
+
+    # Create a current anchor
+    manager.set_current_balance(1500)
+
+    # Should return the anchor's balance
+    assert_equal 1500, manager.current_balance
+
+    # Update the anchor
+    manager.set_current_balance(2500)
+
+    # Should return the updated balance
+    assert_equal 2500, manager.current_balance
+
+    assert_equal 2500, @linked_account.balance
+  end
+
+  test "current_balance falls back to account balance when no anchor exists" do
+    manager = Account::CurrentBalanceManager.new(@linked_account)
+
+    # When no current anchor exists, should fall back to account.balance
+    assert_equal @linked_account.balance, manager.current_balance
+
+    assert_equal @linked_account.balance, @linked_account.balance
+  end
+end
diff --git a/test/models/account/entry_test.rb b/test/models/account/entry_test.rb
index f187ffa1..dba43ba9 100644
--- a/test/models/account/entry_test.rb
+++ b/test/models/account/entry_test.rb
@@ -1,10 +1,10 @@
 require "test_helper"
 
-class Account::EntryTest < ActiveSupport::TestCase
-  include Account::EntriesTestHelper
+class EntryTest < ActiveSupport::TestCase
+  include EntriesTestHelper
 
   setup do
-    @entry = account_entries :transaction
+    @entry = entries :transaction
   end
 
   test "entry cannot be older than 10 years ago" do
@@ -14,10 +14,10 @@ class Account::EntryTest < ActiveSupport::TestCase
   end
 
   test "valuations cannot have more than one entry per day" do
-    existing_valuation = account_entries :valuation
+    existing_valuation = entries :valuation
 
-    new_valuation = Account::Entry.new \
-      entryable: Account::Valuation.new,
+    new_valuation = Entry.new \
+      entryable: Valuation.new(kind: "reconciliation"),
       account: existing_valuation.account,
       date: existing_valuation.date, # invalid
       currency: existing_valuation.currency,
@@ -30,7 +30,7 @@ class Account::EntryTest < ActiveSupport::TestCase
     prior_date = @entry.date - 1
     @entry.update! date: prior_date
 
-    @entry.account.expects(:sync_later).with(start_date: prior_date)
+    @entry.account.expects(:sync_later).with(window_start_date: prior_date)
     @entry.sync_account_later
   end
 
@@ -38,18 +38,15 @@ class Account::EntryTest < ActiveSupport::TestCase
     prior_date = @entry.date
     @entry.update! date: @entry.date + 1
 
-    @entry.account.expects(:sync_later).with(start_date: prior_date)
+    @entry.account.expects(:sync_later).with(window_start_date: prior_date)
     @entry.sync_account_later
   end
 
   test "triggers sync with correct start date when transaction deleted" do
-    current_entry = create_transaction(date: 1.day.ago.to_date)
-    prior_entry = create_transaction(date: current_entry.date - 1.day)
+    @entry.destroy!
 
-    current_entry.destroy!
-
-    current_entry.account.expects(:sync_later).with(start_date: prior_entry.date)
-    current_entry.sync_account_later
+    @entry.account.expects(:sync_later).with(window_start_date: nil)
+    @entry.sync_account_later
   end
 
   test "can search entries" do
@@ -66,37 +63,25 @@ class Account::EntryTest < ActiveSupport::TestCase
 
     assert_equal 2, family.entries.search(params).size
 
-    params = params.merge(categories: [ category.name ], merchants: [ merchant.name ]) # transaction specific search param
-
-    assert_equal 1, family.entries.search(params).size
-
     params = { search: "%" }
     assert_equal 0, family.entries.search(params).size
   end
 
-  test "can calculate total spending for a group of transactions" do
-    family = families(:empty)
-    account = family.accounts.create! name: "Test", balance: 0, currency: "USD", accountable: Depository.new
-    create_transaction(account: account, amount: 100)
-    create_transaction(account: account, amount: 100)
-    create_transaction(account: account, amount: -500) # income, will be ignored
+  test "visible scope only returns entries from visible accounts" do
+    # Create transactions for all account types
+    visible_transaction = create_transaction(account: accounts(:depository), name: "Visible transaction")
+    invisible_transaction = create_transaction(account: accounts(:credit_card), name: "Invisible transaction")
 
-    assert_equal Money.new(200), family.entries.expense_total("USD")
-  end
+    # Update account statuses
+    accounts(:credit_card).disable!
 
-  test "can calculate total income for a group of transactions" do
-    family = families(:empty)
-    account = family.accounts.create! name: "Test", balance: 0, currency: "USD", accountable: Depository.new
-    create_transaction(account: account, amount: -100)
-    create_transaction(account: account, amount: -100)
-    create_transaction(account: account, amount: 500) # income, will be ignored
+    # Test the scope
+    visible_entries = Entry.visible
 
-    assert_equal Money.new(-200), family.entries.income_total("USD")
-  end
+    # Should include entry from active account
+    assert_includes visible_entries, visible_transaction
 
-  # See: https://github.com/maybe-finance/maybe/wiki/vision#signage-of-money
-  test "transactions with negative amounts are inflows, positive amounts are outflows to an account" do
-    assert create_transaction(amount: -10).inflow?
-    assert create_transaction(amount: 10).outflow?
+    # Should not include entry from disabled account
+    assert_not_includes visible_entries, invisible_transaction
   end
 end
diff --git a/test/models/account/holding/syncer_test.rb b/test/models/account/holding/syncer_test.rb
deleted file mode 100644
index 1b422cb9..00000000
--- a/test/models/account/holding/syncer_test.rb
+++ /dev/null
@@ -1,144 +0,0 @@
-require "test_helper"
-
-class Account::Holding::SyncerTest < ActiveSupport::TestCase
-  include Account::EntriesTestHelper, SecuritiesTestHelper
-
-  setup do
-    @account = families(:empty).accounts.create!(name: "Test Brokerage", balance: 20000, currency: "USD", accountable: Investment.new)
-  end
-
-  test "account with no trades has no holdings" do
-    run_sync_for(@account)
-
-    assert_equal [], @account.holdings
-  end
-
-  test "can buy and sell securities" do
-    security1 = create_security("AMZN", prices: [
-      { date: 2.days.ago.to_date, price: 214 },
-      { date: 1.day.ago.to_date, price: 215 },
-      { date: Date.current, price: 216 }
-    ])
-
-    security2 = create_security("NVDA", prices: [
-      { date: 1.day.ago.to_date, price: 122 },
-      { date: Date.current, price: 124 }
-    ])
-
-    create_trade(security1, account: @account, qty: 10, date: 2.days.ago.to_date) # buy 10 shares of AMZN
-
-    create_trade(security1, account: @account, qty: 2, date: 1.day.ago.to_date) # buy 2 shares of AMZN
-    create_trade(security2, account: @account, qty: 20, date: 1.day.ago.to_date) # buy 20 shares of NVDA
-
-    create_trade(security1, account: @account, qty: -10, date: Date.current) # sell 10 shares of AMZN
-
-    expected = [
-      { ticker: "AMZN", qty: 10, price: 214, amount: 10 * 214, date: 2.days.ago.to_date },
-      { ticker: "AMZN", qty: 12, price: 215, amount: 12 * 215, date: 1.day.ago.to_date },
-      { ticker: "AMZN", qty: 2, price: 216, amount: 2 * 216, date: Date.current },
-      { ticker: "NVDA", qty: 20, price: 122, amount: 20 * 122, date: 1.day.ago.to_date },
-      { ticker: "NVDA", qty: 20, price: 124, amount: 20 * 124, date: Date.current }
-    ]
-
-    run_sync_for(@account)
-
-    assert_holdings(expected)
-  end
-
-  test "generates holdings with prices" do
-    provider = mock
-    Security::Price.stubs(:security_prices_provider).returns(provider)
-
-    provider.expects(:fetch_security_prices).never
-
-    amzn = create_security("AMZN", prices: [ { date: Date.current, price: 215 } ])
-    create_trade(amzn, account: @account, qty: 10, date: Date.current, price: 215)
-
-    expected = [
-      { ticker: "AMZN", qty: 10, price: 215, amount: 10 * 215, date: Date.current }
-    ]
-
-    run_sync_for(@account)
-
-    assert_holdings(expected)
-  end
-
-  test "generates all holdings even when missing security prices" do
-    amzn = create_security("AMZN", prices: [])
-
-    create_trade(amzn, account: @account, qty: 10, date: 2.days.ago.to_date, price: 210)
-
-    # 2 days ago — no daily price found, but since this is day of entry, we fall back to entry price
-    # 1 day ago — finds daily price, uses it
-    # Today — no daily price, no entry, so price and amount are `nil`
-    expected = [
-      { ticker: "AMZN", qty: 10, price: 210, amount: 10 * 210, date: 2.days.ago.to_date },
-      { ticker: "AMZN", qty: 10, price: 215, amount: 10 * 215, date: 1.day.ago.to_date },
-      { ticker: "AMZN", qty: 10, price: nil, amount: nil, date: Date.current }
-    ]
-
-    fetched_prices = [ Security::Price.new(ticker: "AMZN", date: 1.day.ago.to_date, price: 215) ]
-
-    Gapfiller.any_instance.expects(:run).returns(fetched_prices)
-    Security::Price.expects(:find_prices)
-                   .with(start_date: 2.days.ago.to_date, end_date: Date.current, ticker: "AMZN")
-                   .once
-                   .returns(fetched_prices)
-
-    @account.expects(:observe_missing_price).with(ticker: "AMZN", date: Date.current).once
-
-    run_sync_for(@account)
-
-    assert_holdings(expected)
-  end
-
-  # It is common for data providers to not provide prices for weekends, so we need to carry the last observation forward
-  test "uses locf gapfilling when price is missing" do
-    friday = Date.new(2024, 9, 27) # A known Friday
-    saturday = friday + 1.day # weekend
-    sunday = saturday + 1.day # weekend
-    monday = sunday + 1.day # known Monday
-
-    # Prices should be gapfilled like this: 210, 210, 210, 220
-    tm = create_security("TM", prices: [
-      { date: friday, price: 210 },
-      { date: monday, price: 220 }
-    ])
-
-    create_trade(tm, account: @account, qty: 10, date: friday)
-
-    expected = [
-      { ticker: "TM", qty: 10, price: 210, amount: 10 * 210, date: friday },
-      { ticker: "TM", qty: 10, price: 210, amount: 10 * 210, date: saturday },
-      { ticker: "TM", qty: 10, price: 210, amount: 10 * 210, date: sunday },
-      { ticker: "TM", qty: 10, price: 220, amount: 10 * 220, date: monday }
-    ]
-
-    run_sync_for(@account)
-
-    assert_holdings(expected)
-  end
-
-  private
-
-    def assert_holdings(expected_holdings)
-      holdings = @account.holdings.includes(:security).to_a
-      expected_holdings.each do |expected_holding|
-        actual_holding = holdings.find { |holding| holding.security.ticker == expected_holding[:ticker] && holding.date == expected_holding[:date] }
-        date = expected_holding[:date]
-        expected_price = expected_holding[:price]
-        expected_qty = expected_holding[:qty]
-        expected_amount = expected_holding[:amount]
-        ticker = expected_holding[:ticker]
-
-        assert actual_holding, "expected #{ticker} holding on date: #{date}"
-        assert_equal expected_holding[:qty], actual_holding.qty, "expected #{expected_qty} qty for holding #{ticker} on date: #{date}"
-        assert_equal expected_holding[:amount].to_d, actual_holding.amount.to_d, "expected #{expected_amount} amount for holding #{ticker} on date: #{date}"
-        assert_equal expected_holding[:price].to_d, actual_holding.price.to_d, "expected #{expected_price} price for holding #{ticker} on date: #{date}"
-      end
-    end
-
-    def run_sync_for(account)
-      Account::Holding::Syncer.new(account).run
-    end
-end
diff --git a/test/models/account/holding_test.rb b/test/models/account/holding_test.rb
deleted file mode 100644
index e7ba1866..00000000
--- a/test/models/account/holding_test.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-require "test_helper"
-require "ostruct"
-
-class Account::HoldingTest < ActiveSupport::TestCase
-  include Account::EntriesTestHelper, SecuritiesTestHelper
-
-  setup do
-    @account = families(:empty).accounts.create!(name: "Test Brokerage", balance: 20000, currency: "USD", accountable: Investment.new)
-
-    # Current day holding instances
-    @amzn, @nvda = load_holdings
-  end
-
-  test "calculates portfolio weight" do
-    expected_portfolio_value = 6960.0
-    expected_amzn_weight = 3240.0 / expected_portfolio_value * 100
-    expected_nvda_weight = 3720.0 / expected_portfolio_value * 100
-
-    assert_in_delta expected_amzn_weight, @amzn.weight, 0.001
-    assert_in_delta expected_nvda_weight, @nvda.weight, 0.001
-  end
-
-  test "calculates simple average cost basis" do
-    assert_equal Money.new((212.0 + 216.0) / 2), @amzn.avg_cost
-    assert_equal Money.new((128.0 + 124.0) / 2), @nvda.avg_cost
-  end
-
-  test "calculates total return trend" do
-    # Gained $30, or 0.93%
-    assert_equal Money.new(30), @amzn.trend.value
-    assert_in_delta 0.9, @amzn.trend.percent, 0.001
-
-    # Lost $60, or -1.59%
-    assert_equal Money.new(-60), @nvda.trend.value
-    assert_in_delta -1.6, @nvda.trend.percent, 0.001
-  end
-
-  private
-
-    def load_holdings
-      security1 = create_security("AMZN", prices: [
-        { date: 1.day.ago.to_date, price: 212.00 },
-        { date: Date.current, price: 216.00 }
-      ])
-
-      security2 = create_security("NVDA", prices: [
-        { date: 1.day.ago.to_date, price: 128.00 },
-        { date: Date.current, price: 124.00 }
-      ])
-
-      create_holding(security1, 1.day.ago.to_date, 10)
-      amzn = create_holding(security1, Date.current, 15)
-
-      create_holding(security2, 1.day.ago.to_date, 5)
-      nvda = create_holding(security2, Date.current, 30)
-
-      [ amzn, nvda ]
-    end
-
-    def create_holding(security, date, qty)
-      price = Security::Price.find_by(date: date, ticker: security.ticker).price
-
-      @account.holdings.create! \
-        date: date,
-        security: security,
-        qty: qty,
-        price: price,
-        amount: qty * price,
-        currency: "USD"
-    end
-end
diff --git a/test/models/account/issue_test.rb b/test/models/account/issue_test.rb
deleted file mode 100644
index 58408f23..00000000
--- a/test/models/account/issue_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class Account::IssueTest < ActiveSupport::TestCase
-  test "the truth" do
-    assert true
-  end
-end
diff --git a/test/models/account/market_data_importer_test.rb b/test/models/account/market_data_importer_test.rb
new file mode 100644
index 00000000..74c42d36
--- /dev/null
+++ b/test/models/account/market_data_importer_test.rb
@@ -0,0 +1,107 @@
+require "test_helper"
+require "ostruct"
+
+class Account::MarketDataImporterTest < ActiveSupport::TestCase
+  include ProviderTestHelper
+
+  PROVIDER_BUFFER = 5.days
+
+  setup do
+    # Ensure a clean slate for deterministic assertions
+    Security::Price.delete_all
+    ExchangeRate.delete_all
+    Trade.delete_all
+    Holding.delete_all
+    Security.delete_all
+    Entry.delete_all
+
+    @provider = mock("provider")
+    Provider::Registry.any_instance
+                      .stubs(:get_provider)
+                      .with(:synth)
+                      .returns(@provider)
+  end
+
+  test "syncs required exchange rates for a foreign-currency account" do
+    family = Family.create!(name: "Smith", currency: "USD")
+
+    account = family.accounts.create!(
+      name: "Chequing",
+      currency: "CAD",
+      balance: 100,
+      accountable: Depository.new
+    )
+
+    # Seed a rate for the first required day so that the importer only needs the next day forward
+    existing_date = account.start_date
+    ExchangeRate.create!(from_currency: "CAD", to_currency: "USD", date: existing_date, rate: 2.0)
+
+    expected_start_date = (existing_date + 1.day) - PROVIDER_BUFFER
+    end_date            = Date.current.in_time_zone("America/New_York").to_date
+
+    @provider.expects(:fetch_exchange_rates)
+             .with(from: "CAD",
+                   to: "USD",
+                   start_date: expected_start_date,
+                   end_date: end_date)
+             .returns(provider_success_response([
+               OpenStruct.new(from: "CAD", to: "USD", date: existing_date, rate: 1.5)
+             ]))
+
+    before = ExchangeRate.count
+    Account::MarketDataImporter.new(account).import_all
+    after  = ExchangeRate.count
+
+    assert_operator after, :>, before, "Should insert at least one new exchange-rate row"
+  end
+
+  test "syncs security prices for securities traded by the account" do
+    family = Family.create!(name: "Smith", currency: "USD")
+
+    account = family.accounts.create!(
+      name: "Brokerage",
+      currency: "USD",
+      balance: 0,
+      accountable: Investment.new
+    )
+
+    security = Security.create!(ticker: "AAPL", exchange_operating_mic: "XNAS")
+
+    trade_date = 10.days.ago.to_date
+    trade      = Trade.new(security: security, qty: 1, price: 100, currency: "USD")
+
+    account.entries.create!(
+      name: "Buy AAPL",
+      date: trade_date,
+      amount: 100,
+      currency: "USD",
+      entryable: trade
+    )
+
+    expected_start_date = trade_date - PROVIDER_BUFFER
+    end_date            = Date.current.in_time_zone("America/New_York").to_date
+
+    @provider.expects(:fetch_security_prices)
+             .with(symbol: security.ticker,
+                   exchange_operating_mic: security.exchange_operating_mic,
+                   start_date: expected_start_date,
+                   end_date: end_date)
+             .returns(provider_success_response([
+               OpenStruct.new(security: security,
+                              date: trade_date,
+                              price: 100,
+                              currency: "USD")
+             ]))
+
+    @provider.stubs(:fetch_security_info)
+             .with(symbol: security.ticker, exchange_operating_mic: security.exchange_operating_mic)
+             .returns(provider_success_response(OpenStruct.new(name: "Apple", logo_url: "logo")))
+
+    # Ignore exchange-rate calls for this test
+    @provider.stubs(:fetch_exchange_rates).returns(provider_success_response([]))
+
+    Account::MarketDataImporter.new(account).import_all
+
+    assert_equal 1, Security::Price.where(security: security, date: trade_date).count
+  end
+end
diff --git a/test/models/account/opening_balance_manager_test.rb b/test/models/account/opening_balance_manager_test.rb
new file mode 100644
index 00000000..67becb60
--- /dev/null
+++ b/test/models/account/opening_balance_manager_test.rb
@@ -0,0 +1,252 @@
+require "test_helper"
+
+class Account::OpeningBalanceManagerTest < ActiveSupport::TestCase
+  setup do
+    @depository_account = accounts(:depository)
+    @investment_account = accounts(:investment)
+  end
+
+  test "when no existing anchor, creates new anchor" do
+    manager = Account::OpeningBalanceManager.new(@depository_account)
+
+    assert_difference -> { @depository_account.entries.count } => 1,
+                     -> { @depository_account.valuations.count } => 1 do
+      result = manager.set_opening_balance(
+        balance: 1000,
+        date: 1.year.ago.to_date
+      )
+
+      assert result.success?
+      assert result.changes_made?
+      assert_nil result.error
+    end
+
+    opening_anchor = @depository_account.valuations.opening_anchor.first
+    assert_not_nil opening_anchor
+    assert_equal 1000, opening_anchor.entry.amount
+    assert_equal "opening_anchor", opening_anchor.kind
+
+    entry = opening_anchor.entry
+    assert_equal 1000, entry.amount
+    assert_equal 1.year.ago.to_date, entry.date
+    assert_equal "Opening balance", entry.name
+  end
+
+  test "when no existing anchor, creates with provided balance" do
+    # Test with Depository account (should default to balance)
+    depository_manager = Account::OpeningBalanceManager.new(@depository_account)
+
+    assert_difference -> { @depository_account.valuations.count } => 1 do
+      result = depository_manager.set_opening_balance(balance: 2000)
+      assert result.success?
+      assert result.changes_made?
+    end
+
+    depository_anchor = @depository_account.valuations.opening_anchor.first
+    assert_equal 2000, depository_anchor.entry.amount
+
+    # Test with Investment account (should default to 0)
+    investment_manager = Account::OpeningBalanceManager.new(@investment_account)
+
+    assert_difference -> { @investment_account.valuations.count } => 1 do
+      result = investment_manager.set_opening_balance(balance: 5000)
+      assert result.success?
+      assert result.changes_made?
+    end
+
+    investment_anchor = @investment_account.valuations.opening_anchor.first
+    assert_equal 5000, investment_anchor.entry.amount
+  end
+
+  test "when no existing anchor and no date provided, provides default based on account type" do
+    # Test with recent entry (less than 2 years ago)
+    @depository_account.entries.create!(
+      date: 30.days.ago.to_date,
+      name: "Test transaction",
+      amount: 100,
+      currency: "USD",
+      entryable: Transaction.new
+    )
+
+    manager = Account::OpeningBalanceManager.new(@depository_account)
+
+    assert_difference -> { @depository_account.valuations.count } => 1 do
+      result = manager.set_opening_balance(balance: 1500)
+      assert result.success?
+      assert result.changes_made?
+    end
+
+    opening_anchor = @depository_account.valuations.opening_anchor.first
+    # Default should be MIN(1 day before oldest entry, 2 years ago) = 2 years ago
+    assert_equal 2.years.ago.to_date, opening_anchor.entry.date
+
+    # Test with old entry (more than 2 years ago)
+    loan_account = accounts(:loan)
+    loan_account.entries.create!(
+      date: 3.years.ago.to_date,
+      name: "Old transaction",
+      amount: 100,
+      currency: "USD",
+      entryable: Transaction.new
+    )
+
+    loan_manager = Account::OpeningBalanceManager.new(loan_account)
+
+    assert_difference -> { loan_account.valuations.count } => 1 do
+      result = loan_manager.set_opening_balance(balance: 5000)
+      assert result.success?
+      assert result.changes_made?
+    end
+
+    loan_anchor = loan_account.valuations.opening_anchor.first
+    # Default should be MIN(3 years ago - 1 day, 2 years ago) = 3 years ago - 1 day
+    assert_equal (3.years.ago.to_date - 1.day), loan_anchor.entry.date
+
+    # Test with account that has no entries
+    property_account = accounts(:property)
+    manager_no_entries = Account::OpeningBalanceManager.new(property_account)
+
+    assert_difference -> { property_account.valuations.count } => 1 do
+      result = manager_no_entries.set_opening_balance(balance: 3000)
+      assert result.success?
+      assert result.changes_made?
+    end
+
+    opening_anchor_no_entries = property_account.valuations.opening_anchor.first
+    # Default should be 2 years ago when no entries exist
+    assert_equal 2.years.ago.to_date, opening_anchor_no_entries.entry.date
+  end
+
+  test "updates existing anchor" do
+    # First create an opening anchor
+    manager = Account::OpeningBalanceManager.new(@depository_account)
+    result = manager.set_opening_balance(
+      balance: 1000,
+      date: 6.months.ago.to_date
+    )
+    assert result.success?
+
+    opening_anchor = @depository_account.valuations.opening_anchor.first
+    original_id = opening_anchor.id
+    original_entry_id = opening_anchor.entry.id
+
+    # Now update it
+    assert_no_difference -> { @depository_account.entries.count } do
+      assert_no_difference -> { @depository_account.valuations.count } do
+        result = manager.set_opening_balance(
+          balance: 2000,
+          date: 8.months.ago.to_date
+        )
+        assert result.success?
+        assert result.changes_made?
+      end
+    end
+
+    opening_anchor.reload
+    assert_equal original_id, opening_anchor.id # Same valuation record
+    assert_equal original_entry_id, opening_anchor.entry.id # Same entry record
+    assert_equal 2000, opening_anchor.entry.amount
+    assert_equal 2000, opening_anchor.entry.amount
+    assert_equal 8.months.ago.to_date, opening_anchor.entry.date
+  end
+
+  test "when existing anchor and no date provided, only update balance" do
+    # First create an opening anchor
+    manager = Account::OpeningBalanceManager.new(@depository_account)
+    result = manager.set_opening_balance(
+      balance: 1000,
+      date: 3.months.ago.to_date
+    )
+    assert result.success?
+
+    opening_anchor = @depository_account.valuations.opening_anchor.first
+
+    # Update without providing date
+    result = manager.set_opening_balance(balance: 1500)
+    assert result.success?
+    assert result.changes_made?
+
+    opening_anchor.reload
+    assert_equal 1500, opening_anchor.entry.amount
+  end
+
+  test "when existing anchor and updating balance only, preserves original date" do
+    # First create an opening anchor with specific date
+    manager = Account::OpeningBalanceManager.new(@depository_account)
+    original_date = 4.months.ago.to_date
+    result = manager.set_opening_balance(
+      balance: 1000,
+      date: original_date
+    )
+    assert result.success?
+
+    opening_anchor = @depository_account.valuations.opening_anchor.first
+
+    # Update without providing date
+    result = manager.set_opening_balance(balance: 2500)
+    assert result.success?
+    assert result.changes_made?
+
+    opening_anchor.reload
+    assert_equal 2500, opening_anchor.entry.amount
+    assert_equal original_date, opening_anchor.entry.date # Should remain unchanged
+  end
+
+  test "when date is equal to or greater than account's oldest entry, returns error result" do
+    # Create an entry with a specific date
+    oldest_date = 60.days.ago.to_date
+    @depository_account.entries.create!(
+      date: oldest_date,
+      name: "Test transaction",
+      amount: 100,
+      currency: "USD",
+      entryable: Transaction.new
+    )
+
+    manager = Account::OpeningBalanceManager.new(@depository_account)
+
+    # Try to set opening balance on the same date as oldest entry
+    result = manager.set_opening_balance(
+      balance: 1000,
+      date: oldest_date
+    )
+
+    assert_not result.success?
+    assert_not result.changes_made?
+    assert_equal "Opening balance date must be before the oldest entry date", result.error
+
+    # Try to set opening balance after the oldest entry
+    result = manager.set_opening_balance(
+      balance: 1000,
+      date: oldest_date + 1.day
+    )
+
+    assert_not result.success?
+    assert_not result.changes_made?
+    assert_equal "Opening balance date must be before the oldest entry date", result.error
+
+    # Verify no opening anchor was created
+    assert_nil @depository_account.valuations.opening_anchor.first
+  end
+
+  test "when no changes made, returns success with no changes made" do
+    # First create an opening anchor
+    manager = Account::OpeningBalanceManager.new(@depository_account)
+    result = manager.set_opening_balance(
+      balance: 1000,
+      date: 2.months.ago.to_date
+    )
+    assert result.success?
+    assert result.changes_made?
+
+    # Try to set the same values
+    result = manager.set_opening_balance(
+      balance: 1000,
+      date: 2.months.ago.to_date
+    )
+
+    assert result.success?
+    assert_not result.changes_made?
+    assert_nil result.error
+  end
+end
diff --git a/test/models/account/reconciliation_manager_test.rb b/test/models/account/reconciliation_manager_test.rb
new file mode 100644
index 00000000..794c2cc5
--- /dev/null
+++ b/test/models/account/reconciliation_manager_test.rb
@@ -0,0 +1,102 @@
+require "test_helper"
+
+class Account::ReconciliationManagerTest < ActiveSupport::TestCase
+  setup do
+    @account = accounts(:investment)
+    @manager = Account::ReconciliationManager.new(@account)
+  end
+
+  test "new reconciliation" do
+    @account.balances.create!(
+      date: Date.current,
+      balance: 1000,
+      cash_balance: 500,
+      currency: @account.currency
+    )
+
+    result = @manager.reconcile_balance(balance: 1200, date: Date.current)
+
+    assert_equal 1200, result.new_balance
+    assert_equal 700, result.new_cash_balance # Non cash stays the same since user is valuing the entire account balance
+    assert_equal 1000, result.old_balance
+    assert_equal 500, result.old_cash_balance
+    assert_equal true, result.success?
+  end
+
+  test "updates existing reconciliation without date change" do
+    @account.balances.create!(date: Date.current, balance: 1000, cash_balance: 500, currency: @account.currency)
+
+    # Existing reconciliation entry
+    existing_entry = @account.entries.create!(name: "Test", amount: 1000, date: Date.current, entryable: Valuation.new(kind: "reconciliation"), currency: @account.currency)
+
+    result = @manager.reconcile_balance(balance: 1200, date: Date.current, existing_valuation_entry: existing_entry)
+
+    assert_equal 1200, result.new_balance
+    assert_equal 700, result.new_cash_balance # Non cash stays the same since user is valuing the entire account balance
+    assert_equal 1000, result.old_balance
+    assert_equal 500, result.old_cash_balance
+    assert_equal true, result.success?
+  end
+
+  test "updates existing reconciliation with date and amount change" do
+    @account.balances.create!(date: 5.days.ago, balance: 1000, cash_balance: 500, currency: @account.currency)
+    @account.balances.create!(date: Date.current, balance: 1200, cash_balance: 700, currency: @account.currency)
+
+    # Existing reconciliation entry (5 days ago)
+    existing_entry = @account.entries.create!(name: "Test", amount: 1000, date: 5.days.ago, entryable: Valuation.new(kind: "reconciliation"), currency: @account.currency)
+
+    # Should update and change date for existing entry; not create a new one
+    assert_no_difference "Valuation.count" do
+      # "Update valuation from 5 days ago to today, set balance from 1000 to 1500"
+      result = @manager.reconcile_balance(balance: 1500, date: Date.current, existing_valuation_entry: existing_entry)
+
+      assert_equal true, result.success?
+
+      # Reconciliation
+      assert_equal 1500, result.new_balance # Equal to new valuation amount
+      assert_equal 1000, result.new_cash_balance # Get non-cash balance today (1200 - 700 = 500). Then subtract this from new valuation (1500 - 500 = 1000)
+
+      # Prior valuation
+      assert_equal 1000, result.old_balance # This is the balance from the old valuation, NOT the date we're reconciling to
+      assert_equal 500, result.old_cash_balance
+    end
+  end
+
+  test "handles date conflicts" do
+    @account.balances.create!(
+      date: Date.current,
+      balance: 1000,
+      cash_balance: 1000,
+      currency: @account.currency
+    )
+
+    # Existing reconciliation entry
+    @account.entries.create!(
+      name: "Test",
+      amount: 1000,
+      date: Date.current,
+      entryable: Valuation.new(kind: "reconciliation"),
+      currency: @account.currency
+    )
+
+    # Doesn't pass existing_valuation_entry, but reconciliation manager should recognize its the same date and update the existing entry
+    assert_no_difference "Valuation.count" do
+      result = @manager.reconcile_balance(balance: 1200, date: Date.current)
+
+      assert result.success?
+      assert_equal 1200, result.new_balance
+    end
+  end
+
+  test "dry run does not persist account" do
+    @account.balances.create!(date: Date.current, balance: 1000, cash_balance: 500, currency: @account.currency)
+
+    assert_no_difference "Valuation.count" do
+      @manager.reconcile_balance(balance: 1200, date: Date.current, dry_run: true)
+    end
+
+    assert_difference "Valuation.count", 1 do
+      @manager.reconcile_balance(balance: 1200, date: Date.current)
+    end
+  end
+end
diff --git a/test/models/account/sync_test.rb b/test/models/account/sync_test.rb
deleted file mode 100644
index 75b6eaec..00000000
--- a/test/models/account/sync_test.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require "test_helper"
-
-class Account::SyncTest < ActiveSupport::TestCase
-  setup do
-    @account = accounts(:depository)
-
-    @sync = Account::Sync.for(@account)
-
-    @balance_syncer = mock("Account::Balance::Syncer")
-    @holding_syncer = mock("Account::Holding::Syncer")
-  end
-
-  test "runs sync" do
-    Account::Balance::Syncer.expects(:new).with(@account, start_date: nil).returns(@balance_syncer).once
-    Account::Holding::Syncer.expects(:new).with(@account, start_date: nil).returns(@holding_syncer).once
-
-    @account.expects(:resolve_stale_issues).once
-    @balance_syncer.expects(:run).once
-    @holding_syncer.expects(:run).once
-
-    assert_equal "pending", @sync.status
-    assert_nil @sync.last_ran_at
-
-    @sync.run
-
-    streams = capture_turbo_stream_broadcasts [ @account.family, :notifications ]
-
-    assert_equal "completed", @sync.status
-    assert @sync.last_ran_at
-
-    assert_equal "append", streams.first["action"]
-    assert_equal "remove", streams.second["action"]
-    assert_equal "append", streams.third["action"]
-  end
-
-  test "handles sync errors" do
-    Account::Balance::Syncer.expects(:new).with(@account, start_date: nil).returns(@balance_syncer).once
-    Account::Holding::Syncer.expects(:new).with(@account, start_date: nil).returns(@holding_syncer).never # error from balance sync halts entire sync
-
-    @balance_syncer.expects(:run).raises(StandardError.new("test sync error"))
-
-    @sync.run
-
-    assert @sync.last_ran_at
-    assert_equal "failed", @sync.status
-    assert_equal "test sync error", @sync.error
-  end
-end
diff --git a/test/models/account/trade_test.rb b/test/models/account/trade_test.rb
deleted file mode 100644
index b571a70b..00000000
--- a/test/models/account/trade_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require "test_helper"
-
-class Account::TradeTest < ActiveSupport::TestCase
-end
diff --git a/test/models/account/transaction_test.rb b/test/models/account/transaction_test.rb
new file mode 100644
index 00000000..21dcea21
--- /dev/null
+++ b/test/models/account/transaction_test.rb
@@ -0,0 +1,5 @@
+require "test_helper"
+
+class TransactionTest < ActiveSupport::TestCase
+  include EntriesTestHelper
+end
diff --git a/test/models/account/transfer_test.rb b/test/models/account/transfer_test.rb
deleted file mode 100644
index 2c9265c6..00000000
--- a/test/models/account/transfer_test.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require "test_helper"
-
-class Account::TransferTest < ActiveSupport::TestCase
-  setup do
-    @outflow = account_entries(:transfer_out)
-    @inflow = account_entries(:transfer_in)
-  end
-
-  test "transfer valid if it has inflow and outflow from different accounts for the same amount" do
-    transfer = Account::Transfer.create! entries: [ @inflow, @outflow ]
-
-    assert transfer.valid?
-  end
-
-  test "transfer must have 2 transactions" do
-    invalid_transfer_1 = Account::Transfer.new entries: [ @outflow ]
-    invalid_transfer_2 = Account::Transfer.new entries: [ @inflow, @outflow, account_entries(:transaction) ]
-
-    assert invalid_transfer_1.invalid?
-    assert invalid_transfer_2.invalid?
-  end
-
-  test "transfer cannot have 2 transactions from the same account" do
-    account = accounts(:depository)
-
-    inflow = account.entries.create! \
-      date: Date.current,
-      name: "Inflow",
-      amount: -100,
-      currency: "USD",
-      marked_as_transfer: true,
-      entryable: Account::Transaction.new
-
-    outflow = account.entries.create! \
-      date: Date.current,
-      name: "Outflow",
-      amount: 100,
-      currency: "USD",
-      marked_as_transfer: true,
-      entryable: Account::Transaction.new
-
-    assert_raise ActiveRecord::RecordInvalid do
-      Account::Transfer.create! entries: [ inflow, outflow ]
-    end
-  end
-
-  test "all transfer transactions must be marked as transfers" do
-    @inflow.update! marked_as_transfer: false
-
-    assert_raise ActiveRecord::RecordInvalid do
-      Account::Transfer.create! entries: [ @inflow, @outflow ]
-    end
-  end
-
-  test "single-currency transfer transactions must net to zero" do
-    @outflow.update! amount: 105
-
-    assert_raises ActiveRecord::RecordInvalid do
-      Account::Transfer.create! entries: [ @inflow, @outflow ]
-    end
-  end
-
-  test "multi-currency transfer transactions do not have to net to zero" do
-    @outflow.update! amount: 105, currency: "EUR"
-    transfer = Account::Transfer.create! entries: [ @inflow, @outflow ]
-
-    assert transfer.valid?
-  end
-end
diff --git a/test/models/account_import_test.rb b/test/models/account_import_test.rb
new file mode 100644
index 00000000..29204c0f
--- /dev/null
+++ b/test/models/account_import_test.rb
@@ -0,0 +1,92 @@
+require "test_helper"
+
+class AccountImportTest < ActiveSupport::TestCase
+  include ActiveJob::TestHelper, ImportInterfaceTest
+
+  setup do
+    @subject = @import = imports(:account)
+  end
+
+  test "import creates accounts with valuations" do
+    import_csv = <<~CSV
+      type,name,amount,currency
+      depository,Main Checking,1000.00,USD
+      depository,Savings Account,5000.00,USD
+    CSV
+
+    @import.update!(
+      raw_file_str: import_csv,
+      entity_type_col_label: "type",
+      name_col_label: "name",
+      amount_col_label: "amount",
+      currency_col_label: "currency"
+    )
+
+    @import.generate_rows_from_csv
+
+    # Create mappings for account types
+    @import.mappings.create! key: "depository", value: "Depository", type: "Import::AccountTypeMapping"
+
+    @import.reload
+
+    # Store initial counts
+    initial_account_count = Account.count
+    initial_entry_count = Entry.count
+    initial_valuation_count = Valuation.count
+
+    # Perform the import
+    @import.publish
+
+    # Check if import succeeded
+    if @import.failed?
+      fail "Import failed with error: #{@import.error}"
+    end
+
+    assert_equal "complete", @import.status
+
+    # Check the differences
+    assert_equal initial_account_count + 2, Account.count, "Expected 2 new accounts"
+    assert_equal initial_entry_count + 2, Entry.count, "Expected 2 new entries"
+    assert_equal initial_valuation_count + 2, Valuation.count, "Expected 2 new valuations"
+
+    # Verify accounts were created correctly
+    accounts = @import.accounts.order(:name)
+    assert_equal [ "Main Checking", "Savings Account" ], accounts.pluck(:name)
+    assert_equal [ 1000.00, 5000.00 ], accounts.map { |a| a.balance.to_f }
+
+    # Verify valuations were created with correct fields
+    accounts.each do |account|
+      valuation = account.valuations.last
+      assert_not_nil valuation
+      assert_equal "opening_anchor", valuation.kind
+      assert_equal account.balance, valuation.entry.amount
+    end
+  end
+
+  test "column_keys returns expected keys" do
+    assert_equal %i[entity_type name amount currency], @import.column_keys
+  end
+
+  test "required_column_keys returns expected keys" do
+    assert_equal %i[name amount], @import.required_column_keys
+  end
+
+  test "mapping_steps returns account type mapping" do
+    assert_equal [ Import::AccountTypeMapping ], @import.mapping_steps
+  end
+
+  test "dry_run returns expected counts" do
+    @import.rows.create!(
+      entity_type: "depository",
+      name: "Test Account",
+      amount: "1000.00",
+      currency: "USD"
+    )
+
+    assert_equal({ accounts: 1 }, @import.dry_run)
+  end
+
+  test "max_row_count is limited to 50" do
+    assert_equal 50, @import.max_row_count
+  end
+end
diff --git a/test/models/account_test.rb b/test/models/account_test.rb
index 18346e15..c8eb9749 100644
--- a/test/models/account_test.rb
+++ b/test/models/account_test.rb
@@ -1,100 +1,34 @@
 require "test_helper"
 
 class AccountTest < ActiveSupport::TestCase
-  include ActiveJob::TestHelper
+  include SyncableInterfaceTest, EntriesTestHelper
 
   setup do
-    @account = accounts(:depository)
+    @account = @syncable = accounts(:depository)
     @family = families(:dylan_family)
   end
 
-  test "can sync later" do
-    assert_enqueued_with(job: AccountSyncJob, args: [ @account, start_date: Date.current ]) do
-      @account.sync_later start_date: Date.current
+  test "can destroy" do
+    assert_difference "Account.count", -1 do
+      @account.destroy
     end
   end
 
-  test "can sync" do
-    start_date = 10.days.ago.to_date
+  test "gets short/long subtype label" do
+    account = @family.accounts.create!(
+      name: "Test Investment",
+      balance: 1000,
+      currency: "USD",
+      subtype: "hsa",
+      accountable: Investment.new
+    )
 
-    mock_sync = mock("Account::Sync")
-    mock_sync.expects(:run).once
+    assert_equal "HSA", account.short_subtype_label
+    assert_equal "Health Savings Account", account.long_subtype_label
 
-    Account::Sync.expects(:for).with(@account, start_date: start_date).returns(mock_sync).once
-
-    @account.sync start_date: start_date
-  end
-
-  test "needs sync if account has not synced today" do
-    assert @account.needs_sync?
-  end
-
-  test "groups accounts by type" do
-    result = @family.accounts.by_group(period: Period.all)
-    assets = result[:assets]
-    liabilities = result[:liabilities]
-
-    assert_equal @family.assets, assets.sum
-    assert_equal @family.liabilities, liabilities.sum
-
-    depositories = assets.children.find { |group| group.name == "Depository" }
-    properties = assets.children.find { |group| group.name == "Property" }
-    vehicles = assets.children.find { |group| group.name == "Vehicle" }
-    investments = assets.children.find { |group| group.name == "Investment" }
-    other_assets = assets.children.find { |group| group.name == "OtherAsset" }
-
-    credits = liabilities.children.find { |group| group.name == "CreditCard" }
-    loans = liabilities.children.find { |group| group.name == "Loan" }
-    other_liabilities = liabilities.children.find { |group| group.name == "OtherLiability" }
-
-    assert_equal 1, depositories.children.count
-    assert_equal 1, properties.children.count
-    assert_equal 1, vehicles.children.count
-    assert_equal 1, investments.children.count
-    assert_equal 1, other_assets.children.count
-
-    assert_equal 1, credits.children.count
-    assert_equal 1, loans.children.count
-    assert_equal 1, other_liabilities.children.count
-  end
-
-  test "generates balance series" do
-    assert_equal 2, @account.series.values.count
-  end
-
-  test "generates balance series with single value if no balances" do
-    @account.balances.delete_all
-    assert_equal 1, @account.series.values.count
-  end
-
-  test "generates balance series in period" do
-    @account.balances.delete_all
-    @account.balances.create! date: 31.days.ago.to_date, balance: 5000, currency: "USD" # out of period range
-    @account.balances.create! date: 30.days.ago.to_date, balance: 5000, currency: "USD" # in range
-
-    assert_equal 1, @account.series(period: Period.last_30_days).values.count
-  end
-
-  test "generates empty series if no balances and no exchange rate" do
-    with_env_overrides SYNTH_API_KEY: nil do
-      assert_equal 0, @account.series(currency: "NZD").values.count
-    end
-  end
-
-  test "calculates shares owned of holding for date" do
-    account = accounts(:investment)
-    security = securities(:aapl)
-
-    assert_equal 10, account.holding_qty(security, date: Date.current)
-    assert_equal 10, account.holding_qty(security, date: 1.day.ago.to_date)
-    assert_equal 0, account.holding_qty(security, date: 2.days.ago.to_date)
-  end
-
-  test "can observe missing price" do
-    account = accounts(:investment)
-
-    assert_difference -> { account.issues.count } do
-      account.observe_missing_price(ticker: "AAPL", date: Date.current)
-    end
+    # Test with nil subtype
+    account.update!(subtype: nil)
+    assert_equal "Investments", account.short_subtype_label
+    assert_equal "Investments", account.long_subtype_label
   end
 end
diff --git a/test/models/address_test.rb b/test/models/address_test.rb
index e6d50548..47890d04 100644
--- a/test/models/address_test.rb
+++ b/test/models/address_test.rb
@@ -10,6 +10,41 @@ class AddressTest < ActiveSupport::TestCase
       postal_code: "94101"
     )
 
-    assert_equal "123 Main St\n\nSan Francisco, CA 94101\nUS", address.to_s
+    assert_equal "123 Main St, San Francisco, CA 94101 US", address.to_s
+  end
+
+  test "can print a formatted address with line2" do
+    address = Address.new(
+      line1: "123 Main St",
+      line2: "Apt 1",
+      locality: "San Francisco",
+      region: "CA",
+      country: "US",
+      postal_code: "94101"
+    )
+
+    assert_equal "123 Main St Apt 1, San Francisco, CA 94101 US", address.to_s
+  end
+
+  test "can print empty when address is empty" do
+    address = Address.new(
+      line1: nil,
+      line2: nil,
+      locality: nil,
+      region: nil,
+      country: nil,
+      postal_code: nil
+    )
+
+    assert_equal "", address.to_s
+  end
+
+  test "can strip extras commas and spaces" do
+    address = Address.new(
+      line1: "123 Main St ,",
+      locality: " San Francisco, ",
+    )
+
+    assert_equal "123 Main St, San Francisco", address.to_s
   end
 end
diff --git a/test/models/api_key_test.rb b/test/models/api_key_test.rb
new file mode 100644
index 00000000..d437e2c8
--- /dev/null
+++ b/test/models/api_key_test.rb
@@ -0,0 +1,207 @@
+require "test_helper"
+
+class ApiKeyTest < ActiveSupport::TestCase
+  def setup
+    @user = users(:family_admin)
+    # Clean up any existing API keys for this user to ensure tests start fresh
+    @user.api_keys.destroy_all
+    @api_key = ApiKey.new(
+      user: @user,
+      name: "Test API Key",
+      key: "test_plain_key_123",
+      scopes: [ "read_write" ]
+    )
+  end
+
+  test "should be valid with valid attributes" do
+    assert @api_key.valid?
+  end
+
+  test "should require display_key presence after save" do
+    @api_key.key = nil
+    assert_not @api_key.valid?
+  end
+
+  test "should require name presence" do
+    @api_key.name = nil
+    assert_not @api_key.valid?
+    assert_includes @api_key.errors[:name], "can't be blank"
+  end
+
+  test "should require scopes presence" do
+    @api_key.scopes = nil
+    assert_not @api_key.valid?
+    assert_includes @api_key.errors[:scopes], "can't be blank"
+  end
+
+  test "should require user association" do
+    @api_key.user = nil
+    assert_not @api_key.valid?
+    assert_includes @api_key.errors[:user], "must exist"
+  end
+
+  test "should set display_key from key before saving" do
+    original_key = @api_key.key
+    @api_key.save!
+
+    # display_key should be encrypted but plain_key should return the original
+    assert_equal original_key, @api_key.plain_key
+  end
+
+  test "should find api key by plain value" do
+    plain_key = @api_key.key
+    @api_key.save!
+
+    found_key = ApiKey.find_by_value(plain_key)
+    assert_equal @api_key, found_key
+  end
+
+  test "should return nil when finding by invalid value" do
+    @api_key.save!
+
+    found_key = ApiKey.find_by_value("invalid_key")
+    assert_nil found_key
+  end
+
+  test "should return nil when finding by nil value" do
+    @api_key.save!
+
+    found_key = ApiKey.find_by_value(nil)
+    assert_nil found_key
+  end
+
+  test "key_matches? should work with plain key" do
+    plain_key = @api_key.key
+    @api_key.save!
+
+    assert @api_key.key_matches?(plain_key)
+    assert_not @api_key.key_matches?("wrong_key")
+  end
+
+  test "should be active when not revoked and not expired" do
+    @api_key.save!
+
+    assert @api_key.active?
+  end
+
+  test "should not be active when revoked" do
+    @api_key.save!
+    @api_key.revoke!
+
+    assert_not @api_key.active?
+    assert @api_key.revoked?
+  end
+
+  test "should not be active when expired" do
+    @api_key.expires_at = 1.day.ago
+    @api_key.save!
+
+    assert_not @api_key.active?
+    assert @api_key.expired?
+  end
+
+  test "should be active when expires_at is in the future" do
+    @api_key.expires_at = 1.day.from_now
+    @api_key.save!
+
+    assert @api_key.active?
+    assert_not @api_key.expired?
+  end
+
+  test "should be active when expires_at is nil" do
+    @api_key.expires_at = nil
+    @api_key.save!
+
+    assert @api_key.active?
+    assert_not @api_key.expired?
+  end
+
+  test "should generate secure key" do
+    key = ApiKey.generate_secure_key
+
+    assert_kind_of String, key
+    assert_equal 64, key.length  # hex(32) = 64 characters
+    assert key.match?(/\A[0-9a-f]+\z/)  # only hex characters
+  end
+
+  test "should update last_used_at when update_last_used! is called" do
+    @api_key.save!
+    original_time = @api_key.last_used_at
+
+    sleep(0.01)  # Ensure time difference
+    @api_key.update_last_used!
+
+    assert_not_equal original_time, @api_key.last_used_at
+    assert @api_key.last_used_at > (original_time || Time.at(0))
+  end
+
+  test "should prevent user from having multiple active api keys" do
+    @api_key.save!
+
+    second_key = ApiKey.new(
+      user: @user,
+      name: "Second API Key",
+      key: "another_key_123",
+      scopes: [ "read" ]
+    )
+
+    assert_not second_key.valid?
+    assert_includes second_key.errors[:user], "can only have one active API key per source (web)"
+  end
+
+  test "should allow user to have new active key after revoking old one" do
+    @api_key.save!
+    @api_key.revoke!
+
+    second_key = ApiKey.new(
+      user: @user,
+      name: "Second API Key",
+      key: "another_key_123",
+      scopes: [ "read" ]
+    )
+
+    assert second_key.valid?
+  end
+
+  test "should include active api keys in active scope" do
+    @api_key.save!
+    active_keys = ApiKey.active
+
+    assert_includes active_keys, @api_key
+  end
+
+  test "should exclude revoked api keys from active scope" do
+    @api_key.save!
+    @api_key.revoke!
+    active_keys = ApiKey.active
+
+    assert_not_includes active_keys, @api_key
+  end
+
+  test "should exclude expired api keys from active scope" do
+    @api_key.expires_at = 1.day.ago
+    @api_key.save!
+    active_keys = ApiKey.active
+
+    assert_not_includes active_keys, @api_key
+  end
+
+  test "should return plain_key for display" do
+    original_key = @api_key.key
+    @api_key.save!
+
+    assert_equal original_key, @api_key.plain_key
+  end
+
+  test "should not allow multiple scopes" do
+    @api_key.scopes = [ "read", "read_write" ]
+    assert_not @api_key.valid?
+    assert_includes @api_key.errors[:scopes], "can only have one permission level"
+  end
+
+  test "should validate scope values" do
+    @api_key.scopes = [ "invalid_scope" ]
+    assert_not @api_key.valid?
+    assert_includes @api_key.errors[:scopes], "must be either 'read' or 'read_write'"
+  end
+end
diff --git a/test/models/assistant_message_test.rb b/test/models/assistant_message_test.rb
new file mode 100644
index 00000000..1e85aa21
--- /dev/null
+++ b/test/models/assistant_message_test.rb
@@ -0,0 +1,19 @@
+require "test_helper"
+
+class AssistantMessageTest < ActiveSupport::TestCase
+  setup do
+    @chat = chats(:one)
+  end
+
+  test "broadcasts append after creation" do
+    message = AssistantMessage.create!(chat: @chat, content: "Hello from assistant", ai_model: "gpt-4.1")
+    message.update!(content: "updated")
+
+    streams = capture_turbo_stream_broadcasts(@chat)
+    assert_equal 2, streams.size
+    assert_equal "append", streams.first["action"]
+    assert_equal "messages", streams.first["target"]
+    assert_equal "update", streams.last["action"]
+    assert_equal "assistant_message_#{message.id}", streams.last["target"]
+  end
+end
diff --git a/test/models/assistant_test.rb b/test/models/assistant_test.rb
new file mode 100644
index 00000000..428c3fe3
--- /dev/null
+++ b/test/models/assistant_test.rb
@@ -0,0 +1,150 @@
+require "test_helper"
+
+class AssistantTest < ActiveSupport::TestCase
+  include ProviderTestHelper
+
+  setup do
+    @chat = chats(:two)
+    @message = @chat.messages.create!(
+      type: "UserMessage",
+      content: "What is my net worth?",
+      ai_model: "gpt-4.1"
+    )
+    @assistant = Assistant.for_chat(@chat)
+    @provider = mock
+  end
+
+  test "errors get added to chat" do
+    @assistant.expects(:get_model_provider).with("gpt-4.1").returns(@provider)
+
+    error = StandardError.new("test error")
+    @provider.expects(:chat_response).returns(provider_error_response(error))
+
+    @chat.expects(:add_error).with(error).once
+
+    assert_no_difference "AssistantMessage.count"  do
+      @assistant.respond_to(@message)
+    end
+  end
+
+  test "responds to basic prompt" do
+    @assistant.expects(:get_model_provider).with("gpt-4.1").returns(@provider)
+
+    text_chunks = [
+      provider_text_chunk("I do not "),
+      provider_text_chunk("have the information "),
+      provider_text_chunk("to answer that question")
+    ]
+
+    response_chunk = provider_response_chunk(
+      id: "1",
+      model: "gpt-4.1",
+      messages: [ provider_message(id: "1", text: text_chunks.join) ],
+      function_requests: []
+    )
+
+    response = provider_success_response(response_chunk.data)
+
+    @provider.expects(:chat_response).with do |message, **options|
+      text_chunks.each do |text_chunk|
+        options[:streamer].call(text_chunk)
+      end
+
+      options[:streamer].call(response_chunk)
+      true
+    end.returns(response)
+
+    assert_difference "AssistantMessage.count", 1 do
+      @assistant.respond_to(@message)
+      message = @chat.messages.ordered.where(type: "AssistantMessage").last
+      assert_equal "I do not have the information to answer that question", message.content
+      assert_equal 0, message.tool_calls.size
+    end
+  end
+
+  test "responds with tool function calls" do
+    @assistant.expects(:get_model_provider).with("gpt-4.1").returns(@provider).once
+
+    # Only first provider call executes function
+    Assistant::Function::GetAccounts.any_instance.stubs(:call).returns("test value").once
+
+    # Call #1: Function requests
+    call1_response_chunk = provider_response_chunk(
+      id: "1",
+      model: "gpt-4.1",
+      messages: [],
+      function_requests: [
+        provider_function_request(id: "1", call_id: "1", function_name: "get_accounts", function_args: "{}")
+      ]
+    )
+
+    call1_response = provider_success_response(call1_response_chunk.data)
+
+    # Call #2: Text response (that uses function results)
+    call2_text_chunks = [
+      provider_text_chunk("Your net worth is "),
+      provider_text_chunk("$124,200")
+    ]
+
+    call2_response_chunk = provider_response_chunk(
+      id: "2",
+      model: "gpt-4.1",
+      messages: [ provider_message(id: "1", text: call2_text_chunks.join) ],
+      function_requests: []
+    )
+
+    call2_response = provider_success_response(call2_response_chunk.data)
+
+    sequence = sequence("provider_chat_response")
+
+    @provider.expects(:chat_response).with do |message, **options|
+      call2_text_chunks.each do |text_chunk|
+        options[:streamer].call(text_chunk)
+      end
+
+      options[:streamer].call(call2_response_chunk)
+      true
+    end.returns(call2_response).once.in_sequence(sequence)
+
+    @provider.expects(:chat_response).with do |message, **options|
+      options[:streamer].call(call1_response_chunk)
+      true
+    end.returns(call1_response).once.in_sequence(sequence)
+
+    assert_difference "AssistantMessage.count", 1 do
+      @assistant.respond_to(@message)
+      message = @chat.messages.ordered.where(type: "AssistantMessage").last
+      assert_equal 1, message.tool_calls.size
+    end
+  end
+
+  private
+    def provider_function_request(id:, call_id:, function_name:, function_args:)
+      Provider::LlmConcept::ChatFunctionRequest.new(
+        id: id,
+        call_id: call_id,
+        function_name: function_name,
+        function_args: function_args
+      )
+    end
+
+    def provider_message(id:, text:)
+      Provider::LlmConcept::ChatMessage.new(id: id, output_text: text)
+    end
+
+    def provider_text_chunk(text)
+      Provider::LlmConcept::ChatStreamChunk.new(type: "output_text", data: text)
+    end
+
+    def provider_response_chunk(id:, model:, messages:, function_requests:)
+      Provider::LlmConcept::ChatStreamChunk.new(
+        type: "response",
+        data: Provider::LlmConcept::ChatResponse.new(
+          id: id,
+          model: model,
+          messages: messages,
+          function_requests: function_requests
+        )
+      )
+    end
+end
diff --git a/test/models/balance/chart_series_builder_test.rb b/test/models/balance/chart_series_builder_test.rb
new file mode 100644
index 00000000..80d2467f
--- /dev/null
+++ b/test/models/balance/chart_series_builder_test.rb
@@ -0,0 +1,128 @@
+require "test_helper"
+
+class Balance::ChartSeriesBuilderTest < ActiveSupport::TestCase
+  setup do
+  end
+
+  test "balance series with fallbacks and gapfills" do
+    account = accounts(:depository)
+    account.balances.destroy_all
+
+    # With gaps
+    account.balances.create!(date: 3.days.ago.to_date, balance: 1000, currency: "USD")
+    account.balances.create!(date: 1.day.ago.to_date, balance: 1100, currency: "USD")
+    account.balances.create!(date: Date.current, balance: 1200, currency: "USD")
+
+    builder = Balance::ChartSeriesBuilder.new(
+      account_ids: [ account.id ],
+      currency: "USD",
+      period: Period.last_30_days,
+      interval: "1 day"
+    )
+
+    assert_equal 31, builder.balance_series.size # Last 30 days == 31 total balances
+    assert_equal 0, builder.balance_series.first.value
+
+    expected = [
+      0, # No value, so fallback to 0
+      1000,
+      1000, # Last observation carried forward
+      1100,
+      1200
+    ]
+
+    assert_equal expected, builder.balance_series.last(5).map { |v| v.value.amount }
+  end
+
+  test "exchange rates apply locf when missing" do
+    account = accounts(:depository)
+    account.balances.destroy_all
+
+    account.balances.create!(date: 2.days.ago.to_date, balance: 1000, currency: "USD")
+    account.balances.create!(date: 1.day.ago.to_date, balance: 1100, currency: "USD")
+    account.balances.create!(date: Date.current, balance: 1200, currency: "USD")
+
+    builder = Balance::ChartSeriesBuilder.new(
+      account_ids: [ account.id ],
+      currency: "EUR", # Will need to convert existing balances to EUR
+      period: Period.custom(start_date: 2.days.ago.to_date, end_date: Date.current),
+      interval: "1 day"
+    )
+
+    # Only 1 rate in DB. We'll be missing the first and last days in the series.
+    # This rate should be applied to 1 day ago and today, but not 2 days ago (will fall back to 1)
+    ExchangeRate.create!(date: 1.day.ago.to_date, from_currency: "USD", to_currency: "EUR", rate: 2)
+
+    expected = [
+      1000, # No rate available, so fall back to 1:1 conversion (1000 USD = 1000 EUR)
+      2200, # Rate available, so use 2:1 conversion (1100 USD = 2200 EUR)
+      2400 # Rate NOT available, but LOCF will use the last available rate, so use 2:1 conversion (1200 USD = 2400 EUR)
+    ]
+
+    assert_equal expected, builder.balance_series.map { |v| v.value.amount }
+  end
+
+  test "combines asset and liability accounts properly" do
+    asset_account = accounts(:depository)
+    liability_account = accounts(:credit_card)
+
+    Balance.destroy_all
+
+    asset_account.balances.create!(date: 3.days.ago.to_date, balance: 500, currency: "USD")
+    asset_account.balances.create!(date: 1.day.ago.to_date, balance: 1000, currency: "USD")
+    asset_account.balances.create!(date: Date.current, balance: 1000, currency: "USD")
+
+    liability_account.balances.create!(date: 3.days.ago.to_date, balance: 200, currency: "USD")
+    liability_account.balances.create!(date: 2.days.ago.to_date, balance: 200, currency: "USD")
+    liability_account.balances.create!(date: Date.current, balance: 100, currency: "USD")
+
+    builder = Balance::ChartSeriesBuilder.new(
+      account_ids: [ asset_account.id, liability_account.id ],
+      currency: "USD",
+      period: Period.custom(start_date: 4.days.ago.to_date, end_date: Date.current),
+      interval: "1 day"
+    )
+
+    expected = [
+      0, # No asset or liability balances - 4 days ago
+      300, # 500 - 200 = 300 - 3 days ago
+      300, # 500 - 200 = 300 (500 is locf) - 2 days ago
+      800, # 1000 - 200 = 800 (200 is locf) - 1 day ago
+      900 # 1000 - 100 = 900 - today
+    ]
+
+    assert_equal expected, builder.balance_series.map { |v| v.value.amount }
+  end
+
+  test "when favorable direction is down balance signage inverts" do
+    account = accounts(:credit_card)
+    account.balances.destroy_all
+
+    account.balances.create!(date: 1.day.ago.to_date, balance: 1000, currency: "USD")
+    account.balances.create!(date: Date.current, balance: 500, currency: "USD")
+
+    builder = Balance::ChartSeriesBuilder.new(
+      account_ids: [ account.id ],
+      currency: "USD",
+      period: Period.custom(start_date: 1.day.ago.to_date, end_date: Date.current),
+      favorable_direction: "up"
+    )
+
+    # Since favorable direction is up and balances are liabilities, the values should be negative
+    expected = [ -1000, -500 ]
+
+    assert_equal expected, builder.balance_series.map { |v| v.value.amount }
+
+    builder = Balance::ChartSeriesBuilder.new(
+      account_ids: [ account.id ],
+      currency: "USD",
+      period: Period.custom(start_date: 1.day.ago.to_date, end_date: Date.current),
+      favorable_direction: "down"
+    )
+
+    # Since favorable direction is down and balances are liabilities, the values should be positive
+    expected = [ 1000, 500 ]
+
+    assert_equal expected, builder.balance_series.map { |v| v.value.amount }
+  end
+end
diff --git a/test/models/balance/forward_calculator_test.rb b/test/models/balance/forward_calculator_test.rb
new file mode 100644
index 00000000..b6eb2d11
--- /dev/null
+++ b/test/models/balance/forward_calculator_test.rb
@@ -0,0 +1,349 @@
+require "test_helper"
+
+# The "forward calculator" is used for all **manual** accounts where balance tracking is done through entries and NOT from an external data provider.
+class Balance::ForwardCalculatorTest < ActiveSupport::TestCase
+  include LedgerTestingHelper
+
+  # ------------------------------------------------------------------------------------------------
+  # General tests for all account types
+  # ------------------------------------------------------------------------------------------------
+
+  # When syncing forwards, we don't care about the account balance.  We generate everything based on entries, starting from 0.
+  test "no entries sync" do
+    account = create_account_with_ledger(
+      account: { type: Depository, balance: 20000, cash_balance: 20000, currency: "USD" },
+      entries: []
+    )
+
+    assert_equal 0, account.balances.count
+
+    calculated = Balance::ForwardCalculator.new(account).calculate
+
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_balances: [
+        [ Date.current, { balance: 0, cash_balance: 0 } ]
+      ]
+    )
+  end
+
+  # Our system ensures all manual accounts have an opening anchor (for UX), but we should be able to handle a missing anchor by starting at 0 (i.e. "fresh account with no history")
+  test "account without opening anchor starts at zero balance" do
+    account = create_account_with_ledger(
+      account: { type: Depository, balance: 20000, cash_balance: 20000, currency: "USD" },
+      entries: [
+        { type: "transaction", date: 2.days.ago.to_date, amount: -1000 }
+      ]
+    )
+
+    calculated = Balance::ForwardCalculator.new(account).calculate
+
+    # Since we start at 0, this transaction (inflow) simply increases balance from 0 -> 1000
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_balances: [
+        [ 3.days.ago.to_date, { balance: 0, cash_balance: 0 } ],
+        [ 2.days.ago.to_date, { balance: 1000, cash_balance: 1000 } ]
+      ]
+    )
+  end
+
+  test "reconciliation valuation sets absolute balance before applying subsequent transactions" do
+    account = create_account_with_ledger(
+      account: { type: Depository, balance: 20000, cash_balance: 20000, currency: "USD" },
+      entries: [
+        { type: "reconciliation", date: 3.days.ago.to_date, balance: 18000 },
+        { type: "transaction", date: 2.days.ago.to_date, amount: -1000 }
+      ]
+    )
+
+    calculated = Balance::ForwardCalculator.new(account).calculate
+
+    # First valuation sets balance to 18000, then transaction increases balance to 19000
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_balances: [
+        [ 3.days.ago.to_date, { balance: 18000, cash_balance: 18000 } ],
+        [ 2.days.ago.to_date, { balance: 19000, cash_balance: 19000 } ]
+      ]
+    )
+  end
+
+  test "cash-only accounts (depository, credit card) use valuations where cash balance equals total balance" do
+    [ Depository, CreditCard ].each do |account_type|
+      account = create_account_with_ledger(
+        account: { type: account_type, balance: 10000, cash_balance: 10000, currency: "USD" },
+        entries: [
+          { type: "opening_anchor", date: 3.days.ago.to_date, balance: 17000 },
+          { type: "reconciliation", date: 2.days.ago.to_date, balance: 18000 }
+        ]
+      )
+
+      calculated = Balance::ForwardCalculator.new(account).calculate
+
+      assert_calculated_ledger_balances(
+        calculated_data: calculated,
+        expected_balances: [
+          [ 3.days.ago.to_date, { balance: 17000, cash_balance: 17000 } ],
+          [ 2.days.ago.to_date, { balance: 18000, cash_balance: 18000 } ]
+        ]
+      )
+    end
+  end
+
+  test "non-cash accounts (property, loan) use valuations where cash balance is always zero" do
+    [ Property, Loan ].each do |account_type|
+      account = create_account_with_ledger(
+        account: { type: account_type, balance: 10000, cash_balance: 10000, currency: "USD" },
+        entries: [
+          { type: "opening_anchor", date: 3.days.ago.to_date, balance: 17000 },
+          { type: "reconciliation", date: 2.days.ago.to_date, balance: 18000 }
+        ]
+      )
+
+      calculated = Balance::ForwardCalculator.new(account).calculate
+
+      assert_calculated_ledger_balances(
+        calculated_data: calculated,
+        expected_balances: [
+          [ 3.days.ago.to_date, { balance: 17000, cash_balance: 0.0 } ],
+          [ 2.days.ago.to_date, { balance: 18000, cash_balance: 0.0 } ]
+        ]
+      )
+    end
+  end
+
+  test "mixed accounts (investment) use valuations where cash balance is total minus holdings" do
+    account = create_account_with_ledger(
+      account: { type: Investment, balance: 10000, cash_balance: 10000, currency: "USD" },
+      entries: [
+        { type: "opening_anchor", date: 3.days.ago.to_date, balance: 17000 },
+        { type: "reconciliation", date: 2.days.ago.to_date, balance: 18000 }
+      ]
+    )
+
+    # Without holdings, cash balance equals total balance
+    calculated = Balance::ForwardCalculator.new(account).calculate
+
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_balances: [
+        [ 3.days.ago.to_date, { balance: 17000, cash_balance: 17000 } ],
+        [ 2.days.ago.to_date, { balance: 18000, cash_balance: 18000 } ]
+      ]
+    )
+  end
+
+  # ------------------------------------------------------------------------------------------------
+  # All Cash accounts (Depository, CreditCard)
+  # ------------------------------------------------------------------------------------------------
+
+  test "transactions on depository accounts affect cash balance" do
+    account = create_account_with_ledger(
+      account: { type: Depository, balance: 20000, cash_balance: 20000, currency: "USD" },
+      entries: [
+        { type: "opening_anchor", date: 5.days.ago.to_date, balance: 20000 },
+        { type: "transaction", date: 4.days.ago.to_date, amount: -500 }, # income
+        { type: "transaction", date: 2.days.ago.to_date, amount: 100 } # expense
+      ]
+    )
+
+    calculated = Balance::ForwardCalculator.new(account).calculate
+
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_balances: [
+        [ 5.days.ago.to_date, { balance: 20000, cash_balance: 20000 } ],
+        [ 4.days.ago.to_date, { balance: 20500, cash_balance: 20500 } ],
+        [ 3.days.ago.to_date, { balance: 20500, cash_balance: 20500 } ],
+        [ 2.days.ago.to_date, { balance: 20400, cash_balance: 20400 } ]
+      ]
+    )
+  end
+
+
+  test "transactions on credit card accounts affect cash balance inversely" do
+    account = create_account_with_ledger(
+      account: { type: CreditCard, balance: 10000, cash_balance: 10000, currency: "USD" },
+      entries: [
+        { type: "opening_anchor", date: 5.days.ago.to_date, balance: 1000 },
+        { type: "transaction", date: 4.days.ago.to_date, amount: -500 }, # CC payment
+        { type: "transaction", date: 2.days.ago.to_date, amount: 100 } # expense
+      ]
+    )
+
+    calculated = Balance::ForwardCalculator.new(account).calculate
+
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_balances: [
+        [ 5.days.ago.to_date, { balance: 1000, cash_balance: 1000 } ],
+        [ 4.days.ago.to_date, { balance: 500, cash_balance: 500 } ],
+        [ 3.days.ago.to_date, { balance: 500, cash_balance: 500 } ],
+        [ 2.days.ago.to_date, { balance: 600, cash_balance: 600 } ]
+      ]
+    )
+  end
+
+  test "depository account with transactions and balance reconciliations" do
+    account = create_account_with_ledger(
+      account: { type: Depository, balance: 20000, cash_balance: 20000, currency: "USD" },
+      entries: [
+        { type: "opening_anchor", date: 10.days.ago.to_date, balance: 20000 },
+        { type: "transaction", date: 8.days.ago.to_date, amount: -5000 },
+        { type: "reconciliation", date: 6.days.ago.to_date, balance: 17000 },
+        { type: "transaction", date: 6.days.ago.to_date, amount: -500 },
+        { type: "transaction", date: 4.days.ago.to_date, amount: -500 },
+        { type: "reconciliation", date: 3.days.ago.to_date, balance: 17000 },
+        { type: "transaction", date: 1.day.ago.to_date, amount: 100 }
+      ]
+    )
+
+    calculated = Balance::ForwardCalculator.new(account).calculate
+
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_balances: [
+        [ 10.days.ago.to_date, { balance: 20000, cash_balance: 20000 } ],
+        [ 9.days.ago.to_date, { balance: 20000, cash_balance: 20000 } ],
+        [ 8.days.ago.to_date, { balance: 25000, cash_balance: 25000 } ],
+        [ 7.days.ago.to_date, { balance: 25000, cash_balance: 25000 } ],
+        [ 6.days.ago.to_date, { balance: 17000, cash_balance: 17000 } ],
+        [ 5.days.ago.to_date, { balance: 17000, cash_balance: 17000 } ],
+        [ 4.days.ago.to_date, { balance: 17500, cash_balance: 17500 } ],
+        [ 3.days.ago.to_date, { balance: 17000, cash_balance: 17000 } ],
+        [ 2.days.ago.to_date, { balance: 17000, cash_balance: 17000 } ],
+        [ 1.day.ago.to_date, { balance: 16900, cash_balance: 16900 } ]
+      ]
+    )
+  end
+
+  test "accounts with transactions in multiple currencies convert to the account currency" do
+    account = create_account_with_ledger(
+      account: { type: Depository, balance: 20000, cash_balance: 20000, currency: "USD" },
+      entries: [
+        { type: "opening_anchor", date: 4.days.ago.to_date, balance: 100 },
+        { type: "transaction", date: 3.days.ago.to_date, amount: -100 },
+        { type: "transaction", date: 2.days.ago.to_date, amount: -300 },
+        # Transaction in different currency than the account's main currency
+        { type: "transaction", date: 1.day.ago.to_date, amount: -500, currency: "EUR" } # €500 * 1.2 = $600
+      ],
+      exchange_rates: [
+        { date: 1.day.ago.to_date, from: "EUR", to: "USD", rate: 1.2 }
+      ]
+    )
+
+    calculated = Balance::ForwardCalculator.new(account).calculate
+
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_balances: [
+        [ 4.days.ago.to_date, { balance: 100, cash_balance: 100 } ],
+        [ 3.days.ago.to_date, { balance: 200, cash_balance: 200 } ],
+        [ 2.days.ago.to_date, { balance: 500, cash_balance: 500 } ],
+        [ 1.day.ago.to_date, { balance: 1100, cash_balance: 1100 } ]
+      ]
+    )
+  end
+
+  # A loan is a special case where despite being a "non-cash" account, it is typical to have "payment" transactions that reduce the loan principal (non cash balance)
+  test "loan payment transactions affect non cash balance" do
+    account = create_account_with_ledger(
+      account: { type: Loan, balance: 10000, cash_balance: 0, currency: "USD" },
+      entries: [
+        { type: "opening_anchor", date: 2.days.ago.to_date, balance: 20000 },
+        # "Loan payment" of $2000, which reduces the principal
+        # TODO: We'll eventually need to calculate which portion of the txn was "interest" vs. "principal", but for now we'll just assume it's all principal
+        # since we don't have a first-class way to track interest payments yet.
+        { type: "transaction", date: 1.day.ago.to_date, amount: -2000 }
+      ]
+    )
+
+    calculated = Balance::ForwardCalculator.new(account).calculate
+
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_balances: [
+        [ 2.days.ago.to_date, { balance: 20000, cash_balance: 0 } ],
+        [ 1.day.ago.to_date, { balance: 18000, cash_balance: 0 } ]
+      ]
+    )
+  end
+
+  test "non cash accounts can only use valuations and transactions will be recorded but ignored for balance calculation" do
+    [ Property, Vehicle, OtherAsset, OtherLiability ].each do |account_type|
+      account = create_account_with_ledger(
+        account: { type: account_type, balance: 10000, cash_balance: 10000, currency: "USD" },
+        entries: [
+          { type: "opening_anchor", date: 3.days.ago.to_date, balance: 500000 },
+
+          # Will be ignored for balance calculation due to account type of non-cash
+          { type: "transaction", date: 2.days.ago.to_date, amount: -50000 }
+        ]
+      )
+
+      calculated = Balance::ForwardCalculator.new(account).calculate
+
+      assert_calculated_ledger_balances(
+        calculated_data: calculated,
+        expected_balances: [
+          [ 3.days.ago.to_date, { balance: 500000, cash_balance: 0 } ],
+          [ 2.days.ago.to_date, { balance: 500000, cash_balance: 0 } ]
+        ]
+      )
+    end
+  end
+
+  # ------------------------------------------------------------------------------------------------
+  # Hybrid accounts (Investment, Crypto) - these have both cash and non-cash balance components
+  # ------------------------------------------------------------------------------------------------
+
+  # A transaction increases/decreases cash balance (i.e. "deposits" and "withdrawals")
+  # A trade increases/decreases cash balance (i.e. "buys" and "sells", which consume/add "brokerage cash" and create/destroy "holdings")
+  # A valuation can set both cash and non-cash balances to "override" investment account value.
+  # Holdings are calculated separately and fed into the balance calculator; treated as "non-cash"
+  test "investment account calculates balance from transactions and trades and treats holdings as non-cash, additive to balance" do
+    account = create_account_with_ledger(
+      account: { type: Investment, balance: 10000, cash_balance: 10000, currency: "USD" },
+      entries: [
+        # Account starts with brokerage cash of $5000 and no holdings
+        { type: "opening_anchor", date: 3.days.ago.to_date, balance: 5000 },
+        # Share purchase reduces cash balance by $1000, but keeps overall balance same
+        { type: "trade", date: 1.day.ago.to_date, ticker: "AAPL", qty: 10, price: 100 }
+      ],
+      holdings: [
+        # Holdings calculator will calculate $1000 worth of holdings
+        { date: 1.day.ago.to_date, ticker: "AAPL", qty: 10, price: 100, amount: 1000 },
+        { date: Date.current, ticker: "AAPL", qty: 10, price: 100, amount: 1000 }
+      ]
+    )
+
+    # Given constant prices, overall balance (account value) should be constant
+    # (the single trade doesn't affect balance; it just alters cash vs. holdings composition)
+    calculated = Balance::ForwardCalculator.new(account).calculate
+
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_balances: [
+        [ 3.days.ago.to_date, { balance: 5000, cash_balance: 5000 } ],
+        [ 2.days.ago.to_date, { balance: 5000, cash_balance: 5000 } ],
+        [ 1.day.ago.to_date, { balance: 5000, cash_balance: 4000 } ],
+        [ Date.current, { balance: 5000, cash_balance: 4000 } ]
+      ]
+    )
+  end
+
+  private
+
+    def assert_balances(calculated_data:, expected_balances:)
+      # Sort calculated data by date to ensure consistent ordering
+      sorted_data = calculated_data.sort_by(&:date)
+
+      # Extract actual values as [date, { balance:, cash_balance: }]
+      actual_balances = sorted_data.map do |b|
+        [ b.date, { balance: b.balance, cash_balance: b.cash_balance } ]
+      end
+
+      assert_equal expected_balances, actual_balances
+    end
+end
diff --git a/test/models/balance/materializer_test.rb b/test/models/balance/materializer_test.rb
new file mode 100644
index 00000000..4a5ac439
--- /dev/null
+++ b/test/models/balance/materializer_test.rb
@@ -0,0 +1,51 @@
+require "test_helper"
+
+class Balance::MaterializerTest < ActiveSupport::TestCase
+  include EntriesTestHelper
+
+  setup do
+    @account = families(:empty).accounts.create!(
+      name: "Test",
+      balance: 20000,
+      cash_balance: 20000,
+      currency: "USD",
+      accountable: Investment.new
+    )
+  end
+
+  test "syncs balances" do
+    Holding::Materializer.any_instance.expects(:materialize_holdings).returns([]).once
+
+    @account.expects(:start_date).returns(2.days.ago.to_date)
+
+    Balance::ForwardCalculator.any_instance.expects(:calculate).returns(
+      [
+        Balance.new(date: 1.day.ago.to_date, balance: 1000, cash_balance: 1000, currency: "USD"),
+        Balance.new(date: Date.current, balance: 1000, cash_balance: 1000, currency: "USD")
+      ]
+    )
+
+    assert_difference "@account.balances.count", 2 do
+      Balance::Materializer.new(@account, strategy: :forward).materialize_balances
+    end
+  end
+
+  test "purges stale balances and holdings" do
+    # Balance before start date is stale
+    @account.expects(:start_date).returns(2.days.ago.to_date).twice
+    stale_balance = Balance.new(date: 3.days.ago.to_date, balance: 10000, cash_balance: 10000, currency: "USD")
+
+    Balance::ForwardCalculator.any_instance.expects(:calculate).returns(
+      [
+        stale_balance,
+        Balance.new(date: 2.days.ago.to_date, balance: 10000, cash_balance: 10000, currency: "USD"),
+        Balance.new(date: 1.day.ago.to_date, balance: 1000, cash_balance: 1000, currency: "USD"),
+        Balance.new(date: Date.current, balance: 1000, cash_balance: 1000, currency: "USD")
+      ]
+    )
+
+    assert_difference "@account.balances.count", 3 do
+      Balance::Materializer.new(@account, strategy: :forward).materialize_balances
+    end
+  end
+end
diff --git a/test/models/balance/reverse_calculator_test.rb b/test/models/balance/reverse_calculator_test.rb
new file mode 100644
index 00000000..a9348220
--- /dev/null
+++ b/test/models/balance/reverse_calculator_test.rb
@@ -0,0 +1,279 @@
+require "test_helper"
+
+class Balance::ReverseCalculatorTest < ActiveSupport::TestCase
+  include LedgerTestingHelper
+
+  # When syncing backwards, we start with the account balance and generate everything from there.
+  test "when missing anchor and no entries, falls back to cached account balance" do
+    account = create_account_with_ledger(
+      account: { type: Depository, balance: 20000, cash_balance: 20000, currency: "USD" },
+      entries: []
+    )
+
+    assert_equal 20000, account.balance
+
+    calculated = Balance::ReverseCalculator.new(account).calculate
+
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_balances: [
+        [ Date.current, { balance: 20000, cash_balance: 20000 } ]
+      ]
+    )
+  end
+
+  # An artificial constraint we put on the reverse sync because it's confusing in both the code and the UI
+  # to think about how an absolute "Valuation" affects balances when syncing backwards. Furthermore, since
+  # this is typically a Plaid sync, we expect Plaid to provide us the history.
+  # Note: while "reconciliation" valuations don't affect balance, `current_anchor` and `opening_anchor` do.
+  test "reconciliation valuations do not affect balance for reverse syncs" do
+    account = create_account_with_ledger(
+      account: { type: Depository, balance: 20000, cash_balance: 20000, currency: "USD" },
+      entries: [
+        { type: "current_anchor", date: Date.current, balance: 20000 },
+        { type: "reconciliation", date: 1.day.ago, balance: 17000 }, # Ignored
+        { type: "reconciliation", date: 2.days.ago, balance: 17000 }, # Ignored
+        { type: "opening_anchor", date: 4.days.ago, balance: 15000 }
+      ]
+    )
+
+    calculated = Balance::ReverseCalculator.new(account).calculate
+
+    # The "opening anchor" works slightly differently than most would expect. Since it's an artificial
+    # value provided by the user to set the date/balance of the start of the account, we must assume
+    # that there are "missing" entries following it. Because of this, we cannot "carry forward" this value
+    # like we do for a "forward sync". We simply sync backwards normally, then set the balance on opening
+    # date equal to this anchor. This is not "ideal", but is a constraint put on us since we cannot guarantee
+    # a 100% full entries history.
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_balances: [
+        [ Date.current, { balance: 20000, cash_balance: 20000 } ], # Current anchor
+        [ 1.day.ago, { balance: 20000, cash_balance: 20000 } ],
+        [ 2.days.ago, { balance: 20000, cash_balance: 20000 } ],
+        [ 3.days.ago, { balance: 20000, cash_balance: 20000 } ],
+        [ 4.days.ago, { balance: 15000, cash_balance: 15000 } ] # Opening anchor
+      ]
+    )
+  end
+
+  # Investment account balances are made of two components: cash and holdings.
+  test "anchors on investment accounts calculate cash balance dynamically based on holdings value" do
+    account = create_account_with_ledger(
+      account: { type: Investment, balance: 20000, cash_balance: 10000, currency: "USD" },
+      entries: [
+        { type: "current_anchor", date: Date.current, balance: 20000 }, # "Total account value is $20,000 today"
+        { type: "opening_anchor", date: 1.day.ago, balance: 15000 } # "Total account value was $15,000 at the start of the account"
+      ],
+      holdings: [
+        { date: Date.current, ticker: "AAPL", qty: 100, price: 100, amount: 10000 },
+        { date: 1.day.ago, ticker: "AAPL", qty: 100, price: 100, amount: 10000 }
+      ]
+    )
+
+    calculated = Balance::ReverseCalculator.new(account).calculate
+
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_balances: [
+        [ Date.current, { balance: 20000, cash_balance: 10000 } ], # Since $10,000 of holdings, cash has to be $10,000 to reach $20,000 total value
+        [ 1.day.ago, { balance: 15000, cash_balance: 5000 } ] # Since $10,000 of holdings, cash has to be $5,000 to reach $15,000 total value
+      ]
+    )
+  end
+
+  test "transactions on depository accounts affect cash balance" do
+    account = create_account_with_ledger(
+      account: { type: Depository, balance: 20000, cash_balance: 20000, currency: "USD" },
+      entries: [
+        { type: "current_anchor", date: Date.current, balance: 20000 },
+        { type: "transaction", date: 4.days.ago, amount: -500 }, # income
+        { type: "transaction", date: 2.days.ago, amount: 100 } # expense
+      ]
+    )
+
+    calculated = Balance::ReverseCalculator.new(account).calculate
+
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_balances: [
+        [ Date.current, { balance: 20000, cash_balance: 20000 } ], # Current balance
+        [ 1.day.ago, { balance: 20000, cash_balance: 20000 } ], # No change
+        [ 2.days.ago, { balance: 20000, cash_balance: 20000 } ], # After expense (+100)
+        [ 3.days.ago, { balance: 20100, cash_balance: 20100 } ], # Before expense
+        [ 4.days.ago, { balance: 20100, cash_balance: 20100 } ], # After income (-500)
+        [ 5.days.ago, { balance: 19600, cash_balance: 19600 } ] # After income (-500)
+      ]
+    )
+  end
+
+  test "transactions on credit card accounts affect cash balance inversely" do
+    account = create_account_with_ledger(
+      account: { type: CreditCard, balance: 2000, cash_balance: 2000, currency: "USD" },
+      entries: [
+        { type: "current_anchor", date: Date.current, balance: 2000 },
+        { type: "transaction", date: 2.days.ago, amount: 100 }, # expense (increases cash balance)
+        { type: "transaction", date: 4.days.ago, amount: -500 } # CC payment (reduces cash balance)
+      ]
+    )
+
+    calculated = Balance::ReverseCalculator.new(account).calculate
+
+    # Reversed order: showing how we work backwards
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_balances: [
+        [ Date.current, { balance: 2000, cash_balance: 2000 } ],  # Current balance
+        [ 1.day.ago, { balance: 2000, cash_balance: 2000 } ], # No change
+        [ 2.days.ago, { balance: 2000, cash_balance: 2000 } ], # After expense (+100)
+        [ 3.days.ago, { balance: 1900, cash_balance: 1900 } ], # Before expense
+        [ 4.days.ago, { balance: 1900, cash_balance: 1900 } ], # After CC payment (-500)
+        [ 5.days.ago, { balance: 2400, cash_balance: 2400 } ]
+      ]
+    )
+  end
+
+  # A loan is a special case where despite being a "non-cash" account, it is typical to have "payment" transactions that reduce the loan principal (non cash balance)
+  test "loan payment transactions affect non cash balance" do
+    account = create_account_with_ledger(
+      account: { type: Loan, balance: 198000, cash_balance: 0, currency: "USD" },
+      entries: [
+        { type: "current_anchor", date: Date.current, balance: 198000 },
+        # "Loan payment" of $2000, which reduces the principal
+        # TODO: We'll eventually need to calculate which portion of the txn was "interest" vs. "principal", but for now we'll just assume it's all principal
+        # since we don't have a first-class way to track interest payments yet.
+        { type: "transaction", date: 1.day.ago.to_date, amount: -2000 }
+      ]
+    )
+
+    calculated = Balance::ReverseCalculator.new(account).calculate
+
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_balances: [
+        [ Date.current, { balance: 198000, cash_balance: 0 } ],
+        [ 1.day.ago, { balance: 198000, cash_balance: 0 } ],
+        [ 2.days.ago, { balance: 200000, cash_balance: 0 } ]
+      ]
+    )
+  end
+
+  test "non cash accounts can only use valuations and transactions will be recorded but ignored for balance calculation" do
+    [ Property, Vehicle, OtherAsset, OtherLiability ].each do |account_type|
+      account = create_account_with_ledger(
+        account: { type: account_type, balance: 1000, cash_balance: 0, currency: "USD" },
+        entries: [
+          { type: "current_anchor", date: Date.current, balance: 1000 },
+
+          # Will be ignored for balance calculation due to account type of non-cash
+          { type: "transaction", date: 1.day.ago, amount: -100 }
+        ]
+      )
+
+      calculated = Balance::ReverseCalculator.new(account).calculate
+
+      assert_calculated_ledger_balances(
+        calculated_data: calculated,
+        expected_balances: [
+          [ Date.current, { balance: 1000, cash_balance: 0 } ],
+          [ 1.day.ago, { balance: 1000, cash_balance: 0 } ],
+          [ 2.days.ago, { balance: 1000, cash_balance: 0 } ]
+        ]
+      )
+    end
+  end
+
+  # When syncing backwards, trades from the past should NOT affect the current balance or previous balances.
+  # They should only affect the *cash* component of the historical balances
+  test "holdings and trades sync" do
+    # Account starts with $20,000 total value, $19,000 cash, $1,000 in holdings
+    account = create_account_with_ledger(
+      account: { type: Investment, balance: 20000, cash_balance: 19000, currency: "USD" },
+      entries: [
+        { type: "current_anchor", date: Date.current, balance: 20000 },
+        # Bought 10 AAPL shares 1 day ago, so cash is $19,000, $1,000 in holdings, total value is $20,000
+        { type: "trade", date: 1.day.ago.to_date, ticker: "AAPL", qty: 10, price: 100 }
+      ],
+      holdings: [
+        { date: Date.current, ticker: "AAPL", qty: 10, price: 100, amount: 1000 },
+        { date: 1.day.ago.to_date, ticker: "AAPL", qty: 10, price: 100, amount: 1000 }
+      ]
+    )
+
+    calculated = Balance::ReverseCalculator.new(account).calculate
+
+    # Given constant prices, overall balance (account value) should be constant
+    # (the single trade doesn't affect balance; it just alters cash vs. holdings composition)
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_balances: [
+        [ Date.current, { balance: 20000, cash_balance: 19000 } ],      # Current: $19k cash + $1k holdings (anchor)
+        [ 1.day.ago.to_date, { balance: 20000, cash_balance: 19000 } ], # After trade: $19k cash + $1k holdings
+        [ 2.days.ago.to_date, { balance: 20000, cash_balance: 20000 } ] # At first, account is 100% cash, no holdings (no trades)
+      ]
+    )
+  end
+
+  # A common scenario with Plaid is they'll give us holding records for today, but no trade history for some of them.
+  # This is because they only supply 2 years worth of historical data.  Our system must properly handle this.
+  test "properly calculates balances when a holding has no trade history" do
+    # Account starts with $20,000 total value, $19,000 cash, $1,000 in holdings ($500 AAPL, $500 MSFT)
+    account = create_account_with_ledger(
+      account: { type: Investment, balance: 20000, cash_balance: 19000, currency: "USD" },
+      entries: [
+        { type: "current_anchor", date: Date.current, balance: 20000 },
+        # A holding *with* trade history (5 shares of AAPL, purchased 1 day ago)
+        { type: "trade", date: 1.day.ago.to_date, ticker: "AAPL", qty: 5, price: 100 }
+      ],
+      holdings: [
+        # AAPL holdings
+        { date: Date.current, ticker: "AAPL", qty: 5, price: 100, amount: 500 },
+        { date: 1.day.ago.to_date, ticker: "AAPL", qty: 5, price: 100, amount: 500 },
+        # MSFT holdings without trade history - Balance calculator doesn't care how the holdings were created. It just reads them and assumes they are accurate.
+        { date: Date.current, ticker: "MSFT", qty: 5, price: 100, amount: 500 },
+        { date: 1.day.ago.to_date, ticker: "MSFT", qty: 5, price: 100, amount: 500 },
+        { date: 2.days.ago.to_date, ticker: "MSFT", qty: 5, price: 100, amount: 500 }
+      ]
+    )
+
+    calculated = Balance::ReverseCalculator.new(account).calculate
+
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_balances: [
+        [ Date.current, { balance: 20000, cash_balance: 19000 } ],      # Current: $19k cash + $1k holdings ($500 MSFT, $500 AAPL)
+        [ 1.day.ago.to_date, { balance: 20000, cash_balance: 19000 } ], # After AAPL trade: $19k cash + $1k holdings
+        [ 2.days.ago.to_date, { balance: 20000, cash_balance: 19500 } ] # Before AAPL trade: $19.5k cash + $500 MSFT
+      ]
+    )
+  end
+
+  test "uses provider reported holdings and cash value on current day" do
+    # Implied holdings value of $1,000 from provider
+    account = create_account_with_ledger(
+      account: { type: Investment, balance: 20000, cash_balance: 19000, currency: "USD" },
+      entries: [
+        { type: "current_anchor", date: Date.current, balance: 20000 },
+        { type: "opening_anchor", date: 2.days.ago, balance: 15000 }
+      ],
+      holdings: [
+        # Create holdings that differ in value from provider ($2,000 vs. the $1,000 reported by provider)
+        { date: Date.current, ticker: "AAPL", qty: 10, price: 100, amount: 2000 },
+        { date: 1.day.ago, ticker: "AAPL", qty: 10, price: 100, amount: 2000 }
+      ]
+    )
+
+    calculated = Balance::ReverseCalculator.new(account).calculate
+
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_balances: [
+        # No matter what, we force current day equal to the "anchor" balance (what provider gave us), and let "cash" float based on holdings value
+        # This ensures the user sees the same top-line number reported by the provider (even if it creates a discrepancy in the cash balance)
+        [ Date.current, { balance: 20000, cash_balance: 18000 } ],
+        [ 1.day.ago, { balance: 20000, cash_balance: 18000 } ],
+        [ 2.days.ago, { balance: 15000, cash_balance: 15000 } ] # Opening anchor sets absolute balance
+      ]
+    )
+  end
+end
diff --git a/test/models/balance_sheet_test.rb b/test/models/balance_sheet_test.rb
new file mode 100644
index 00000000..04906afa
--- /dev/null
+++ b/test/models/balance_sheet_test.rb
@@ -0,0 +1,83 @@
+require "test_helper"
+
+class BalanceSheetTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:empty)
+  end
+
+  test "calculates total assets" do
+    assert_equal 0, BalanceSheet.new(@family).assets.total
+
+    create_account(balance: 1000, accountable: Depository.new)
+    create_account(balance: 5000, accountable: OtherAsset.new)
+    create_account(balance: 10000, accountable: CreditCard.new) # ignored
+
+    assert_equal 1000 + 5000, BalanceSheet.new(@family).assets.total
+  end
+
+  test "calculates total liabilities" do
+    assert_equal 0, BalanceSheet.new(@family).liabilities.total
+
+    create_account(balance: 1000, accountable: CreditCard.new)
+    create_account(balance: 5000, accountable: OtherLiability.new)
+    create_account(balance: 10000, accountable: Depository.new) # ignored
+
+    assert_equal 1000 + 5000, BalanceSheet.new(@family).liabilities.total
+  end
+
+  test "calculates net worth" do
+    assert_equal 0, BalanceSheet.new(@family).net_worth
+
+    create_account(balance: 1000, accountable: CreditCard.new)
+    create_account(balance: 50000, accountable: Depository.new)
+
+    assert_equal 50000 - 1000, BalanceSheet.new(@family).net_worth
+  end
+
+  test "disabled accounts do not affect totals" do
+    create_account(balance: 1000, accountable: CreditCard.new)
+    create_account(balance: 10000, accountable: Depository.new)
+
+    other_liability = create_account(balance: 5000, accountable: OtherLiability.new)
+    other_liability.disable!
+
+    assert_equal 10000 - 1000, BalanceSheet.new(@family).net_worth
+    assert_equal 10000, BalanceSheet.new(@family).assets.total
+    assert_equal 1000, BalanceSheet.new(@family).liabilities.total
+  end
+
+  test "calculates asset group totals" do
+    create_account(balance: 1000, accountable: Depository.new)
+    create_account(balance: 2000, accountable: Depository.new)
+    create_account(balance: 3000, accountable: Investment.new)
+    create_account(balance: 5000, accountable: OtherAsset.new)
+    create_account(balance: 10000, accountable: CreditCard.new) # ignored
+
+    asset_groups = BalanceSheet.new(@family).assets.account_groups
+
+    assert_equal 3, asset_groups.size
+    assert_equal 1000 + 2000, asset_groups.find { |ag| ag.name == "Cash" }.total
+    assert_equal 3000, asset_groups.find { |ag| ag.name == "Investments" }.total
+    assert_equal 5000, asset_groups.find { |ag| ag.name == "Other Assets" }.total
+  end
+
+  test "calculates liability group totals" do
+    create_account(balance: 1000, accountable: CreditCard.new)
+    create_account(balance: 2000, accountable: CreditCard.new)
+    create_account(balance: 3000, accountable: OtherLiability.new)
+    create_account(balance: 5000, accountable: OtherLiability.new)
+    create_account(balance: 10000, accountable: Depository.new) # ignored
+
+    liability_groups = BalanceSheet.new(@family).liabilities.account_groups
+
+    assert_equal 2, liability_groups.size
+    assert_equal 1000 + 2000, liability_groups.find { |ag| ag.name == "Credit Cards" }.total
+    assert_equal 3000 + 5000, liability_groups.find { |ag| ag.name == "Other Liabilities" }.total
+  end
+
+  private
+    def create_account(attributes = {})
+      account = @family.accounts.create! name: "Test", currency: "USD", **attributes
+      account
+    end
+end
diff --git a/test/models/category_test.rb b/test/models/category_test.rb
index b7e60b20..e6dccd84 100644
--- a/test/models/category_test.rb
+++ b/test/models/category_test.rb
@@ -5,34 +5,6 @@ class CategoryTest < ActiveSupport::TestCase
     @family = families(:dylan_family)
   end
 
-  test "create_default_categories should generate categories if none exist" do
-    @family.accounts.destroy_all
-    @family.categories.destroy_all
-    assert_difference "Category.count", Category::DEFAULT_CATEGORIES.size do
-      Category.create_default_categories(@family)
-    end
-  end
-
-  test "create_default_categories should raise when there are existing categories" do
-    assert_raises(ArgumentError) do
-      Category.create_default_categories(@family)
-    end
-  end
-
-  test "updating name should clear the internal_category field" do
-    category = categories(:income)
-    assert_changes "category.reload.internal_category", to: nil do
-      category.update_attribute(:name, "new name")
-    end
-  end
-
-  test "updating other field than name should not clear the internal_category field" do
-    category = Category.take
-    assert_no_changes "category.reload.internal_category" do
-      category.update_attribute(:color, "#000")
-    end
-  end
-
   test "replacing and destroying" do
     transactions = categories(:food_and_drink).transactions.to_a
 
@@ -48,4 +20,14 @@ class CategoryTest < ActiveSupport::TestCase
 
     assert_nil transactions.map { |t| t.reload.category }.uniq.first
   end
+
+  test "subcategory can only be one level deep" do
+    category = categories(:subcategory)
+
+    error = assert_raises(ActiveRecord::RecordInvalid) do
+      category.subcategories.create!(name: "Invalid category", family: @family)
+    end
+
+    assert_equal "Validation failed: Parent can't have more than 2 levels of subcategories", error.message
+  end
 end
diff --git a/test/models/chat_test.rb b/test/models/chat_test.rb
new file mode 100644
index 00000000..cb1a4448
--- /dev/null
+++ b/test/models/chat_test.rb
@@ -0,0 +1,31 @@
+require "test_helper"
+
+class ChatTest < ActiveSupport::TestCase
+  setup do
+    @user = users(:family_admin)
+    @assistant = mock
+  end
+
+  test "user sees all messages in debug mode" do
+    chat = chats(:one)
+    with_env_overrides AI_DEBUG_MODE: "true" do
+      assert_equal chat.messages.count, chat.conversation_messages.count
+    end
+  end
+
+  test "user sees assistant and user messages in normal mode" do
+    chat = chats(:one)
+    assert_equal 3, chat.conversation_messages.count
+  end
+
+  test "creates with initial message" do
+    prompt = "Test prompt"
+
+    assert_difference "@user.chats.count", 1 do
+      chat = @user.chats.start!(prompt, model: "gpt-4.1")
+
+      assert_equal 1, chat.messages.count
+      assert_equal 1, chat.messages.where(type: "UserMessage").count
+    end
+  end
+end
diff --git a/test/models/concerns/enrichable_test.rb b/test/models/concerns/enrichable_test.rb
new file mode 100644
index 00000000..890b79c1
--- /dev/null
+++ b/test/models/concerns/enrichable_test.rb
@@ -0,0 +1,79 @@
+require "test_helper"
+
+class EnrichableTest < ActiveSupport::TestCase
+  setup do
+    @enrichable = accounts(:depository)
+  end
+
+  test "can enrich multiple attributes" do
+    assert_difference "DataEnrichment.count", 2 do
+      @enrichable.enrich_attributes({ name: "Updated Checking", balance: 6_000 }, source: "plaid")
+    end
+
+    assert_equal "Updated Checking", @enrichable.name
+    assert_equal 6_000, @enrichable.balance.to_d
+  end
+
+  test "can enrich a single attribute" do
+    assert_difference "DataEnrichment.count", 1 do
+      @enrichable.enrich_attribute(:name, "Single Update", source: "ai")
+    end
+
+    assert_equal "Single Update", @enrichable.name
+  end
+
+  test "can lock an attribute" do
+    refute @enrichable.locked?(:name)
+
+    @enrichable.lock_attr!(:name)
+    assert @enrichable.locked?(:name)
+  end
+
+  test "can unlock an attribute" do
+    @enrichable.lock_attr!(:name)
+    assert @enrichable.locked?(:name)
+
+    @enrichable.unlock_attr!(:name)
+    refute @enrichable.locked?(:name)
+  end
+
+  test "can lock saved attributes" do
+    @enrichable.name = "User Override"
+    @enrichable.balance = 1_234
+    @enrichable.save!
+
+    @enrichable.lock_saved_attributes!
+
+    assert @enrichable.locked?(:name)
+    assert @enrichable.locked?(:balance)
+  end
+
+  test "does not enrich locked attributes" do
+    original_name = @enrichable.name
+
+    @enrichable.lock_attr!(:name)
+
+    assert_no_difference "DataEnrichment.count" do
+      @enrichable.enrich_attribute(:name, "Should Not Change", source: "plaid")
+    end
+
+    assert_equal original_name, @enrichable.reload.name
+  end
+
+  test "enrichable? reflects lock state" do
+    assert @enrichable.enrichable?(:name)
+
+    @enrichable.lock_attr!(:name)
+
+    refute @enrichable.enrichable?(:name)
+  end
+
+  test "enrichable scope includes and excludes records based on lock state" do
+    # Initially, the record should be enrichable for :name
+    assert_includes Account.enrichable(:name), @enrichable
+
+    @enrichable.lock_attr!(:name)
+
+    refute_includes Account.enrichable(:name), @enrichable
+  end
+end
diff --git a/test/models/credit_card_test.rb b/test/models/credit_card_test.rb
deleted file mode 100644
index 8bb8d96e..00000000
--- a/test/models/credit_card_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class CreditCardTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/models/crypto_test.rb b/test/models/crypto_test.rb
deleted file mode 100644
index 095e9474..00000000
--- a/test/models/crypto_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class CryptoTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/models/depository_test.rb b/test/models/depository_test.rb
deleted file mode 100644
index 9d95638e..00000000
--- a/test/models/depository_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class DepositoryTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/models/developer_message_test.rb b/test/models/developer_message_test.rb
new file mode 100644
index 00000000..26d3d8e2
--- /dev/null
+++ b/test/models/developer_message_test.rb
@@ -0,0 +1,28 @@
+require "test_helper"
+
+class DeveloperMessageTest < ActiveSupport::TestCase
+  setup do
+    @chat = chats(:one)
+  end
+
+  test "does not broadcast" do
+    message = DeveloperMessage.create!(chat: @chat, content: "Some instructions")
+    message.update!(content: "updated")
+
+    assert_no_turbo_stream_broadcasts(@chat)
+  end
+
+  test "broadcasts if debug mode is enabled" do
+    with_env_overrides AI_DEBUG_MODE: "true" do
+      message = DeveloperMessage.create!(chat: @chat, content: "Some instructions")
+      message.update!(content: "updated")
+
+      streams = capture_turbo_stream_broadcasts(@chat)
+      assert_equal 2, streams.size
+      assert_equal "append", streams.first["action"]
+      assert_equal "messages", streams.first["target"]
+      assert_equal "update", streams.last["action"]
+      assert_equal "developer_message_#{message.id}", streams.last["target"]
+    end
+  end
+end
diff --git a/test/models/exchange_rate/importer_test.rb b/test/models/exchange_rate/importer_test.rb
new file mode 100644
index 00000000..dab40fa8
--- /dev/null
+++ b/test/models/exchange_rate/importer_test.rb
@@ -0,0 +1,148 @@
+require "test_helper"
+require "ostruct"
+
+class ExchangeRate::ImporterTest < ActiveSupport::TestCase
+  include ProviderTestHelper
+
+  setup do
+    @provider = mock
+  end
+
+  test "syncs missing rates from provider" do
+    ExchangeRate.delete_all
+
+    provider_response = provider_success_response([
+      OpenStruct.new(from: "USD", to: "EUR", date: 2.days.ago.to_date, rate: 1.3),
+      OpenStruct.new(from: "USD", to: "EUR", date: 1.day.ago.to_date, rate: 1.4),
+      OpenStruct.new(from: "USD", to: "EUR", date: Date.current, rate: 1.5)
+    ])
+
+    @provider.expects(:fetch_exchange_rates)
+             .with(from: "USD", to: "EUR", start_date: get_provider_fetch_start_date(2.days.ago.to_date), end_date: Date.current)
+             .returns(provider_response)
+
+    ExchangeRate::Importer.new(
+      exchange_rate_provider: @provider,
+      from: "USD",
+      to: "EUR",
+      start_date: 2.days.ago.to_date,
+      end_date: Date.current
+    ).import_provider_rates
+
+    db_rates = ExchangeRate.where(from_currency: "USD", to_currency: "EUR", date: 2.days.ago.to_date..Date.current)
+                           .order(:date)
+
+    assert_equal 3, db_rates.count
+    assert_equal 1.3, db_rates[0].rate
+    assert_equal 1.4, db_rates[1].rate
+    assert_equal 1.5, db_rates[2].rate
+  end
+
+  test "syncs diff when some rates already exist" do
+    ExchangeRate.delete_all
+
+    # Pre-populate DB with the first two days
+    ExchangeRate.create!(from_currency: "USD", to_currency: "EUR", date: 3.days.ago.to_date, rate: 1.2)
+    ExchangeRate.create!(from_currency: "USD", to_currency: "EUR", date: 2.days.ago.to_date, rate: 1.25)
+
+    provider_response = provider_success_response([
+      OpenStruct.new(from: "USD", to: "EUR", date: 1.day.ago.to_date, rate: 1.3)
+    ])
+
+    @provider.expects(:fetch_exchange_rates)
+             .with(from: "USD", to: "EUR", start_date: get_provider_fetch_start_date(1.day.ago.to_date), end_date: Date.current)
+             .returns(provider_response)
+
+    ExchangeRate::Importer.new(
+      exchange_rate_provider: @provider,
+      from: "USD",
+      to: "EUR",
+      start_date: 3.days.ago.to_date,
+      end_date: Date.current
+    ).import_provider_rates
+
+    db_rates = ExchangeRate.order(:date)
+    assert_equal 4, db_rates.count
+    assert_equal [ 1.2, 1.25, 1.3, 1.3 ], db_rates.map(&:rate)
+  end
+
+  test "no provider calls when all rates exist" do
+    ExchangeRate.delete_all
+
+    (3.days.ago.to_date..Date.current).each_with_index do |date, idx|
+      ExchangeRate.create!(from_currency: "USD", to_currency: "EUR", date:, rate: 1.2 + idx * 0.01)
+    end
+
+    @provider.expects(:fetch_exchange_rates).never
+
+    ExchangeRate::Importer.new(
+      exchange_rate_provider: @provider,
+      from: "USD",
+      to: "EUR",
+      start_date: 3.days.ago.to_date,
+      end_date: Date.current
+    ).import_provider_rates
+  end
+
+  # A helpful "reset" option for when we need to refresh provider data
+  test "full upsert if clear_cache is true" do
+    ExchangeRate.delete_all
+
+    # Seed DB with stale data
+    (2.days.ago.to_date..Date.current).each do |date|
+      ExchangeRate.create!(from_currency: "USD", to_currency: "EUR", date:, rate: 1.0)
+    end
+
+    provider_response = provider_success_response([
+      OpenStruct.new(from: "USD", to: "EUR", date: 2.days.ago.to_date, rate: 1.3),
+      OpenStruct.new(from: "USD", to: "EUR", date: 1.day.ago.to_date, rate: 1.4),
+      OpenStruct.new(from: "USD", to: "EUR", date: Date.current,        rate: 1.5)
+    ])
+
+    @provider.expects(:fetch_exchange_rates)
+             .with(from: "USD", to: "EUR", start_date: get_provider_fetch_start_date(2.days.ago.to_date), end_date: Date.current)
+             .returns(provider_response)
+
+    ExchangeRate::Importer.new(
+      exchange_rate_provider: @provider,
+      from: "USD",
+      to: "EUR",
+      start_date: 2.days.ago.to_date,
+      end_date: Date.current,
+      clear_cache: true
+    ).import_provider_rates
+
+    db_rates = ExchangeRate.where(from_currency: "USD", to_currency: "EUR").order(:date)
+    assert_equal [ 1.3, 1.4, 1.5 ], db_rates.map(&:rate)
+  end
+
+  test "clamps end_date to today when future date is provided" do
+    ExchangeRate.delete_all
+
+    future_date = Date.current + 3.days
+
+    provider_response = provider_success_response([
+      OpenStruct.new(from: "USD", to: "EUR", date: Date.current, rate: 1.6)
+    ])
+
+    @provider.expects(:fetch_exchange_rates)
+             .with(from: "USD", to: "EUR", start_date: get_provider_fetch_start_date(Date.current), end_date: Date.current)
+             .returns(provider_response)
+
+    ExchangeRate::Importer.new(
+      exchange_rate_provider: @provider,
+      from: "USD",
+      to: "EUR",
+      start_date: Date.current,
+      end_date: future_date
+    ).import_provider_rates
+
+    assert_equal 1, ExchangeRate.count
+  end
+
+  private
+    def get_provider_fetch_start_date(start_date)
+      # We fetch with a 5 day buffer to account for weekends and holidays
+      start_date - 5.days
+    end
+end
diff --git a/test/models/exchange_rate_test.rb b/test/models/exchange_rate_test.rb
index 1a705a5b..021b4edf 100644
--- a/test/models/exchange_rate_test.rb
+++ b/test/models/exchange_rate_test.rb
@@ -2,110 +2,69 @@ require "test_helper"
 require "ostruct"
 
 class ExchangeRateTest < ActiveSupport::TestCase
+  include ProviderTestHelper
+
   setup do
     @provider = mock
 
-    ExchangeRate.stubs(:exchange_rates_provider).returns(@provider)
+    ExchangeRate.stubs(:provider).returns(@provider)
   end
 
-  test "exchange rate provider nil if no api key configured" do
-    ExchangeRate.unstub(:exchange_rates_provider)
+  test "finds rate in DB" do
+    existing_rate = exchange_rates(:one)
 
-    with_env_overrides SYNTH_API_KEY: nil do
-      assert_not ExchangeRate.exchange_rates_provider
-    end
-  end
-
-  test "finds single rate in DB" do
     @provider.expects(:fetch_exchange_rate).never
 
-    rate = exchange_rates(:one)
-
-    assert_equal rate, ExchangeRate.find_rate(from: rate.from_currency, to: rate.to_currency, date: rate.date)
+    assert_equal existing_rate, ExchangeRate.find_or_fetch_rate(
+                                              from: existing_rate.from_currency,
+                                              to: existing_rate.to_currency,
+                                              date: existing_rate.date
+                                            )
   end
 
-  test "finds single rate from provider and caches to DB" do
-    expected_rate = 1.21
-    @provider.expects(:fetch_exchange_rate).once.returns(OpenStruct.new(success?: true, rate: expected_rate))
+  test "fetches rate from provider without cache" do
+    ExchangeRate.delete_all
 
-    fetched_rate = ExchangeRate.find_rate(from: "USD", to: "EUR", date: Date.current, cache: true)
-    refetched_rate = ExchangeRate.find_rate(from: "USD", to: "EUR", date: Date.current, cache: true)
+    provider_response = provider_success_response(
+      OpenStruct.new(
+        from: "USD",
+        to: "EUR",
+        date: Date.current,
+        rate: 1.2
+      )
+    )
 
-    assert_equal expected_rate, fetched_rate.rate
-    assert_equal expected_rate, refetched_rate.rate
-  end
+    @provider.expects(:fetch_exchange_rate).returns(provider_response)
 
-  test "nil if rate is not found in DB and provider throws an error" do
-    @provider.expects(:fetch_exchange_rate).with(from: "USD", to: "EUR", date: Date.current).once.returns(OpenStruct.new(success?: false))
-
-    assert_not ExchangeRate.find_rate(from: "USD", to: "EUR", date: Date.current)
-  end
-
-  test "nil if rate is not found in DB and provider is disabled" do
-    ExchangeRate.unstub(:exchange_rates_provider)
-
-    with_env_overrides SYNTH_API_KEY: nil do
-      assert_not ExchangeRate.find_rate(from: "USD", to: "EUR", date: Date.current)
+    assert_no_difference "ExchangeRate.count" do
+      assert_equal 1.2, ExchangeRate.find_or_fetch_rate(from: "USD", to: "EUR", date: Date.current, cache: false).rate
     end
   end
 
-  test "finds multiple rates in DB" do
-    @provider.expects(:fetch_exchange_rate).never
+  test "fetches rate from provider with cache" do
+    ExchangeRate.delete_all
 
-    rate1 = exchange_rates(:one) # EUR -> GBP, today
-    rate2 = exchange_rates(:two) # EUR -> GBP, yesterday
+    provider_response = provider_success_response(
+      OpenStruct.new(
+        from: "USD",
+        to: "EUR",
+        date: Date.current,
+        rate: 1.2
+      )
+    )
 
-    fetched_rates = ExchangeRate.find_rates(from: rate1.from_currency, to: rate1.to_currency, start_date: 1.day.ago.to_date).sort_by(&:date)
+    @provider.expects(:fetch_exchange_rate).returns(provider_response)
 
-    assert_equal rate1, fetched_rates[1]
-    assert_equal rate2, fetched_rates[0]
-  end
-
-  test "finds multiple rates from provider and caches to DB" do
-    @provider.expects(:fetch_exchange_rates).with(from: "EUR", to: "USD", start_date: 1.day.ago.to_date, end_date: Date.current)
-      .returns(
-        OpenStruct.new(
-          rates: [
-            OpenStruct.new(date: 1.day.ago.to_date, rate: 1.1),
-            OpenStruct.new(date: Date.current, rate: 1.2)
-          ],
-          success?: true
-        )
-      ).once
-
-    fetched_rates = ExchangeRate.find_rates(from: "EUR", to: "USD", start_date: 1.day.ago.to_date, cache: true)
-    refetched_rates = ExchangeRate.find_rates(from: "EUR", to: "USD", start_date: 1.day.ago.to_date)
-
-    assert_equal [ 1.1, 1.2 ], fetched_rates.sort_by(&:date).map(&:rate)
-    assert_equal [ 1.1, 1.2 ], refetched_rates.sort_by(&:date).map(&:rate)
-  end
-
-  test "finds missing db rates from provider and appends to results" do
-    @provider.expects(:fetch_exchange_rates).with(from: "EUR", to: "GBP", start_date: 2.days.ago.to_date, end_date: 2.days.ago.to_date)
-      .returns(
-        OpenStruct.new(
-          rates: [
-            OpenStruct.new(date: 2.day.ago.to_date, rate: 1.1)
-          ],
-          success?: true
-        )
-      ).once
-
-    rate1 = exchange_rates(:one) # EUR -> GBP, today
-    rate2 = exchange_rates(:two) # EUR -> GBP, yesterday
-
-    fetched_rates = ExchangeRate.find_rates(from: "EUR", to: "GBP", start_date: 2.days.ago.to_date, cache: true)
-    refetched_rates = ExchangeRate.find_rates(from: "EUR", to: "GBP", start_date: 2.days.ago.to_date)
-
-    assert_equal [ 1.1, rate2.rate, rate1.rate ], fetched_rates.sort_by(&:date).map(&:rate)
-    assert_equal [ 1.1, rate2.rate, rate1.rate ], refetched_rates.sort_by(&:date).map(&:rate)
-  end
-
-  test "returns empty array if no rates found in DB or provider" do
-    ExchangeRate.unstub(:exchange_rates_provider)
-
-    with_env_overrides SYNTH_API_KEY: nil do
-      assert_equal [], ExchangeRate.find_rates(from: "USD", to: "JPY", start_date: 10.days.ago.to_date)
+    assert_difference "ExchangeRate.count", 1 do
+      assert_equal 1.2, ExchangeRate.find_or_fetch_rate(from: "USD", to: "EUR", date: Date.current, cache: true).rate
     end
   end
+
+  test "returns nil on provider error" do
+    provider_response = provider_error_response(StandardError.new("Test error"))
+
+    @provider.expects(:fetch_exchange_rate).returns(provider_response)
+
+    assert_nil ExchangeRate.find_or_fetch_rate(from: "USD", to: "EUR", date: Date.current, cache: true)
+  end
 end
diff --git a/test/models/family/auto_categorizer_test.rb b/test/models/family/auto_categorizer_test.rb
new file mode 100644
index 00000000..c9440919
--- /dev/null
+++ b/test/models/family/auto_categorizer_test.rb
@@ -0,0 +1,42 @@
+require "test_helper"
+
+class Family::AutoCategorizerTest < ActiveSupport::TestCase
+  include EntriesTestHelper, ProviderTestHelper
+
+  setup do
+    @family = families(:dylan_family)
+    @account = @family.accounts.create!(name: "Rule test", balance: 100, currency: "USD", accountable: Depository.new)
+    @llm_provider = mock
+    Provider::Registry.stubs(:get_provider).with(:openai).returns(@llm_provider)
+  end
+
+  test "auto-categorizes transactions" do
+    txn1 = create_transaction(account: @account, name: "McDonalds").transaction
+    txn2 = create_transaction(account: @account, name: "Amazon purchase").transaction
+    txn3 = create_transaction(account: @account, name: "Netflix subscription").transaction
+
+    test_category = @family.categories.create!(name: "Test category")
+
+    provider_response = provider_success_response([
+      AutoCategorization.new(transaction_id: txn1.id, category_name: test_category.name),
+      AutoCategorization.new(transaction_id: txn2.id, category_name: test_category.name),
+      AutoCategorization.new(transaction_id: txn3.id, category_name: nil)
+    ])
+
+    @llm_provider.expects(:auto_categorize).returns(provider_response).once
+
+    assert_difference "DataEnrichment.count", 2 do
+      Family::AutoCategorizer.new(@family, transaction_ids: [ txn1.id, txn2.id, txn3.id ]).auto_categorize
+    end
+
+    assert_equal test_category, txn1.reload.category
+    assert_equal test_category, txn2.reload.category
+    assert_nil txn3.reload.category
+
+    # After auto-categorization, all transactions are locked and no longer enrichable
+    assert_equal 0, @account.transactions.reload.enrichable(:category_id).count
+  end
+
+  private
+    AutoCategorization = Provider::LlmConcept::AutoCategorization
+end
diff --git a/test/models/family/auto_merchant_detector_test.rb b/test/models/family/auto_merchant_detector_test.rb
new file mode 100644
index 00000000..69c8e3cd
--- /dev/null
+++ b/test/models/family/auto_merchant_detector_test.rb
@@ -0,0 +1,42 @@
+require "test_helper"
+
+class Family::AutoMerchantDetectorTest < ActiveSupport::TestCase
+  include EntriesTestHelper, ProviderTestHelper
+
+  setup do
+    @family = families(:dylan_family)
+    @account = @family.accounts.create!(name: "Rule test", balance: 100, currency: "USD", accountable: Depository.new)
+    @llm_provider = mock
+    Provider::Registry.stubs(:get_provider).with(:openai).returns(@llm_provider)
+  end
+
+  test "auto detects transaction merchants" do
+    txn1 = create_transaction(account: @account, name: "McDonalds").transaction
+    txn2 = create_transaction(account: @account, name: "Chipotle").transaction
+    txn3 = create_transaction(account: @account, name: "generic").transaction
+
+    provider_response = provider_success_response([
+      AutoDetectedMerchant.new(transaction_id: txn1.id, business_name: "McDonalds", business_url: "mcdonalds.com"),
+      AutoDetectedMerchant.new(transaction_id: txn2.id, business_name: "Chipotle", business_url: "chipotle.com"),
+      AutoDetectedMerchant.new(transaction_id: txn3.id, business_name: nil, business_url: nil)
+    ])
+
+    @llm_provider.expects(:auto_detect_merchants).returns(provider_response).once
+
+    assert_difference "DataEnrichment.count", 2 do
+      Family::AutoMerchantDetector.new(@family, transaction_ids: [ txn1.id, txn2.id, txn3.id ]).auto_detect
+    end
+
+    assert_equal "McDonalds", txn1.reload.merchant.name
+    assert_equal "Chipotle", txn2.reload.merchant.name
+    assert_equal "https://logo.synthfinance.com/mcdonalds.com", txn1.reload.merchant.logo_url
+    assert_equal "https://logo.synthfinance.com/chipotle.com", txn2.reload.merchant.logo_url
+    assert_nil txn3.reload.merchant
+
+    # After auto-detection, all transactions are locked and no longer enrichable
+    assert_equal 0, @account.transactions.reload.enrichable(:merchant_id).count
+  end
+
+  private
+    AutoDetectedMerchant = Provider::LlmConcept::AutoDetectedMerchant
+end
diff --git a/test/models/family/auto_transfer_matchable_test.rb b/test/models/family/auto_transfer_matchable_test.rb
new file mode 100644
index 00000000..6fdad008
--- /dev/null
+++ b/test/models/family/auto_transfer_matchable_test.rb
@@ -0,0 +1,148 @@
+require "test_helper"
+
+class Family::AutoTransferMatchableTest < ActiveSupport::TestCase
+  include EntriesTestHelper
+
+  setup do
+    @family = families(:dylan_family)
+    @depository = accounts(:depository)
+    @credit_card = accounts(:credit_card)
+  end
+
+  test "auto-matches transfers" do
+    outflow_entry = create_transaction(date: 1.day.ago.to_date, account: @depository, amount: 500)
+    inflow_entry = create_transaction(date: Date.current, account: @credit_card, amount: -500)
+
+    assert_difference -> { Transfer.count } => 1 do
+      @family.auto_match_transfers!
+    end
+  end
+
+  test "auto-matches multi-currency transfers" do
+    load_exchange_prices
+    create_transaction(date: 1.day.ago.to_date, account: @depository, amount: 500)
+    create_transaction(date: Date.current, account: @credit_card, amount: -700, currency: "CAD")
+
+    assert_difference -> { Transfer.count } => 1 do
+      @family.auto_match_transfers!
+    end
+
+    # test match within lower 5% bound
+    create_transaction(date: 1.day.ago.to_date, account: @depository, amount: 1000)
+    create_transaction(date: Date.current, account: @credit_card, amount: -1330, currency: "CAD")
+
+    assert_difference -> { Transfer.count } => 1 do
+      @family.auto_match_transfers!
+    end
+
+    # test match within upper 5% bound
+    create_transaction(date: 1.day.ago.to_date, account: @depository, amount: 1500)
+    create_transaction(date: Date.current, account: @credit_card, amount: -2189, currency: "CAD")
+
+    assert_difference -> { Transfer.count } => 1 do
+      @family.auto_match_transfers!
+    end
+
+    # test no match outside of slippage tolerance
+    create_transaction(date: 1.day.ago.to_date, account: @depository, amount: 1000)
+    create_transaction(date: Date.current, account: @credit_card, amount: -1320, currency: "CAD")
+
+    assert_difference -> { Transfer.count } => 0 do
+      @family.auto_match_transfers!
+    end
+  end
+
+  test "only matches inflow with correct currency when duplicate amounts exist" do
+    load_exchange_prices
+    create_transaction(date: 1.day.ago.to_date, account: @depository, amount: 500)
+    create_transaction(date: Date.current, account: @credit_card, amount: -500, currency: "CAD")
+    create_transaction(date: Date.current, account: @credit_card, amount: -500)
+
+    assert_difference -> { Transfer.count } => 1 do
+      @family.auto_match_transfers!
+    end
+  end
+
+  # In this scenario, our matching logic should find 4 potential matches.  These matches should be ranked based on
+  # days apart, then de-duplicated so that we aren't auto-matching the same transaction across multiple transfers.
+  test "when 2 options exist, only auto-match one at a time, ranked by days apart" do
+    yesterday_outflow = create_transaction(date: 1.day.ago.to_date, account: @depository, amount: 500)
+    yesterday_inflow = create_transaction(date: 1.day.ago.to_date, account: @credit_card, amount: -500)
+
+    today_outflow = create_transaction(date: Date.current, account: @depository, amount: 500)
+    today_inflow = create_transaction(date: Date.current, account: @credit_card, amount: -500)
+
+    assert_difference -> { Transfer.count } => 2 do
+      @family.auto_match_transfers!
+    end
+  end
+
+  test "does not auto-match any transfers that have been rejected by user already" do
+    outflow = create_transaction(date: Date.current, account: @depository, amount: 500)
+    inflow = create_transaction(date: Date.current, account: @credit_card, amount: -500)
+
+    RejectedTransfer.create!(inflow_transaction_id: inflow.entryable_id, outflow_transaction_id: outflow.entryable_id)
+
+    assert_no_difference -> { Transfer.count } do
+      @family.auto_match_transfers!
+    end
+  end
+
+  test "does not consider inactive accounts when matching transfers" do
+    @depository.disable!
+
+    outflow = create_transaction(date: Date.current, account: @depository, amount: 500)
+    inflow = create_transaction(date: Date.current, account: @credit_card, amount: -500)
+
+    assert_no_difference -> { Transfer.count } do
+      @family.auto_match_transfers!
+    end
+  end
+
+  test "does not match transactions outside the 4-day window" do
+    create_transaction(date: 10.days.ago.to_date, account: @depository, amount: 500)
+    create_transaction(date: Date.current, account: @credit_card, amount: -500)
+
+    assert_no_difference -> { Transfer.count } do
+      @family.auto_match_transfers!
+    end
+  end
+
+  test "does not match multi-currency transfer with missing exchange rate" do
+    create_transaction(date: Date.current, account: @depository, amount: 500)
+    create_transaction(date: Date.current, account: @credit_card, amount: -700, currency: "GBP")
+
+    assert_no_difference -> { Transfer.count } do
+      @family.auto_match_transfers!
+    end
+  end
+
+  private
+    def load_exchange_prices
+      rates = {
+        4.days.ago.to_date => 1.36,
+        3.days.ago.to_date => 1.37,
+        2.days.ago.to_date => 1.38,
+        1.day.ago.to_date  => 1.39,
+        Date.current => 1.40
+      }
+
+      rates.each do |date, rate|
+        # USD to CAD
+        ExchangeRate.create!(
+          from_currency: "USD",
+          to_currency: "CAD",
+          date: date,
+          rate: rate
+        )
+
+        # CAD to USD (inverse)
+        ExchangeRate.create!(
+          from_currency: "CAD",
+          to_currency: "USD",
+          date: date,
+          rate: (1.0 / rate).round(6)
+        )
+      end
+    end
+end
diff --git a/test/models/family/subscribeable_test.rb b/test/models/family/subscribeable_test.rb
new file mode 100644
index 00000000..597f41e7
--- /dev/null
+++ b/test/models/family/subscribeable_test.rb
@@ -0,0 +1,13 @@
+require "test_helper"
+
+class Family::SubscribeableTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:dylan_family)
+  end
+
+  # We keep the status eventually consistent, but don't rely on it for guarding the app
+  test "trial respects end date even if status is not yet updated" do
+    @family.subscription.update!(trial_ends_at: 1.day.ago, status: "trialing")
+    assert_not @family.trialing?
+  end
+end
diff --git a/test/models/family/syncer_test.rb b/test/models/family/syncer_test.rb
new file mode 100644
index 00000000..7fe01a7e
--- /dev/null
+++ b/test/models/family/syncer_test.rb
@@ -0,0 +1,30 @@
+require "test_helper"
+
+class Family::SyncerTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:dylan_family)
+  end
+
+  test "syncs plaid items and manual accounts" do
+    family_sync = syncs(:family)
+
+    manual_accounts_count = @family.accounts.manual.count
+    items_count = @family.plaid_items.count
+
+    syncer = Family::Syncer.new(@family)
+
+    Account.any_instance
+           .expects(:sync_later)
+           .with(parent_sync: family_sync, window_start_date: nil, window_end_date: nil)
+           .times(manual_accounts_count)
+
+    PlaidItem.any_instance
+             .expects(:sync_later)
+             .with(parent_sync: family_sync, window_start_date: nil, window_end_date: nil)
+             .times(items_count)
+
+    syncer.perform_sync(family_sync)
+
+    assert_equal "completed", family_sync.reload.status
+  end
+end
diff --git a/test/models/family_test.rb b/test/models/family_test.rb
index 3b78401c..0229aa6e 100644
--- a/test/models/family_test.rb
+++ b/test/models/family_test.rb
@@ -1,165 +1,9 @@
 require "test_helper"
-require "csv"
 
 class FamilyTest < ActiveSupport::TestCase
-  include Account::EntriesTestHelper
+  include SyncableInterfaceTest
 
   def setup
-    @family = families :empty
+    @syncable = families(:dylan_family)
   end
-
-  test "calculates assets" do
-    assert_equal Money.new(0, @family.currency), @family.assets
-
-    create_account(balance: 1000, accountable: Depository.new)
-    create_account(balance: 5000, accountable: OtherAsset.new)
-    create_account(balance: 10000, accountable: CreditCard.new) # ignored
-
-    assert_equal Money.new(1000 + 5000, @family.currency), @family.assets
-  end
-
-  test "calculates liabilities" do
-    assert_equal Money.new(0, @family.currency), @family.liabilities
-
-    create_account(balance: 1000, accountable: CreditCard.new)
-    create_account(balance: 5000, accountable: OtherLiability.new)
-    create_account(balance: 10000, accountable: Depository.new) # ignored
-
-    assert_equal Money.new(1000 + 5000, @family.currency), @family.liabilities
-  end
-
-  test "calculates net worth" do
-    assert_equal Money.new(0, @family.currency), @family.net_worth
-
-    create_account(balance: 1000, accountable: CreditCard.new)
-    create_account(balance: 50000, accountable: Depository.new)
-
-    assert_equal Money.new(50000 - 1000, @family.currency), @family.net_worth
-  end
-
-  test "should exclude disabled accounts from calculations" do
-    cc = create_account(balance: 1000, accountable: CreditCard.new)
-    create_account(balance: 50000, accountable: Depository.new)
-
-    assert_equal Money.new(50000 - 1000, @family.currency), @family.net_worth
-
-    cc.update! is_active: false
-
-    assert_equal Money.new(50000, @family.currency), @family.net_worth
-  end
-
-  test "needs sync if last family sync was before today" do
-    assert @family.needs_sync?
-
-    @family.update! last_synced_at: Time.now
-
-    assert_not @family.needs_sync?
-  end
-
-  test "syncs active accounts" do
-    account = create_account(balance: 1000, accountable: CreditCard.new, is_active: false)
-
-    Account.any_instance.expects(:sync_later).never
-
-    @family.sync
-
-    account.update! is_active: true
-
-    Account.any_instance.expects(:needs_sync?).once.returns(true)
-    Account.any_instance.expects(:last_sync_date).once.returns(2.days.ago.to_date)
-    Account.any_instance.expects(:sync_later).with(start_date: 2.days.ago.to_date).once
-
-    @family.sync
-  end
-
-  test "calculates snapshot" do
-    asset = create_account(balance: 500, accountable: Depository.new)
-    liability = create_account(balance: 100, accountable: CreditCard.new)
-
-    asset.balances.create! date: 1.day.ago.to_date, currency: "USD", balance: 450
-    asset.balances.create! date: Date.current, currency: "USD", balance: 500
-
-    liability.balances.create! date: 1.day.ago.to_date, currency: "USD", balance: 50
-    liability.balances.create! date: Date.current, currency: "USD", balance: 100
-
-    expected_asset_series = [
-      { date: 1.day.ago.to_date, value: Money.new(450) },
-      { date: Date.current, value: Money.new(500) }
-    ]
-
-    expected_liability_series = [
-      { date: 1.day.ago.to_date, value: Money.new(50) },
-      { date: Date.current, value: Money.new(100) }
-    ]
-
-    expected_net_worth_series = [
-      { date: 1.day.ago.to_date, value: Money.new(450 - 50) },
-      { date: Date.current, value: Money.new(500 - 100) }
-    ]
-
-    assert_equal expected_asset_series, @family.snapshot[:asset_series].values.map { |v| { date: v.date, value: v.value } }
-    assert_equal expected_liability_series, @family.snapshot[:liability_series].values.map { |v| { date: v.date, value: v.value } }
-    assert_equal expected_net_worth_series, @family.snapshot[:net_worth_series].values.map { |v| { date: v.date, value: v.value } }
-  end
-
-  test "calculates top movers" do
-    checking_account = create_account(balance: 500, accountable: Depository.new)
-    savings_account = create_account(balance: 1000, accountable: Depository.new)
-    create_transaction(account: checking_account, date: 2.days.ago.to_date, amount: -1000)
-    create_transaction(account: checking_account, date: 1.day.ago.to_date, amount: 10)
-    create_transaction(account: savings_account, date: 2.days.ago.to_date, amount: -5000)
-
-    zero_income_zero_expense_account = create_account(balance: 200, accountable: Depository.new)
-    create_transaction(account: zero_income_zero_expense_account, amount: 0)
-
-    snapshot = @family.snapshot_account_transactions
-    top_spenders = snapshot[:top_spenders]
-    top_earners = snapshot[:top_earners]
-    top_savers = snapshot[:top_savers]
-
-    assert_equal [ 10 ], top_spenders.map(&:spending)
-    assert_equal [ 5000, 1000 ], top_earners.map(&:income)
-    assert_equal [ 1, 0.99 ], top_savers.map(&:savings_rate)
-  end
-
-
-  test "calculates rolling transaction totals" do
-    account = create_account(balance: 1000, accountable: Depository.new)
-    create_transaction(account: account, date: 2.days.ago.to_date, amount: -500)
-    create_transaction(account: account, date: 1.day.ago.to_date, amount: 100)
-    create_transaction(account: account, date: Date.current, amount: 20)
-
-    snapshot = @family.snapshot_transactions
-
-    expected_income_series = [
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 500, 500, 500
-    ]
-
-    assert_equal expected_income_series, snapshot[:income_series].values.map(&:value).map(&:amount)
-
-    expected_spending_series = [
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 100, 120
-    ]
-
-    assert_equal expected_spending_series, snapshot[:spending_series].values.map(&:value).map(&:amount)
-
-    expected_savings_rate_series = [
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 1, 0.8, 0.76
-    ]
-
-    assert_equal expected_savings_rate_series, snapshot[:savings_rate_series].values.map(&:value).map { |v| v.round(2) }
-  end
-
-  private
-
-    def create_account(attributes = {})
-      account = @family.accounts.create! name: "Test", currency: "USD", **attributes
-      account
-    end
 end
diff --git a/test/models/holding/forward_calculator_test.rb b/test/models/holding/forward_calculator_test.rb
new file mode 100644
index 00000000..89e9b28c
--- /dev/null
+++ b/test/models/holding/forward_calculator_test.rb
@@ -0,0 +1,166 @@
+require "test_helper"
+
+class Holding::ForwardCalculatorTest < ActiveSupport::TestCase
+  include EntriesTestHelper
+
+  setup do
+    @account = families(:empty).accounts.create!(
+      name: "Test",
+      balance: 20000,
+      cash_balance: 20000,
+      currency: "USD",
+      accountable: Investment.new
+    )
+  end
+
+  test "no holdings" do
+    calculated = Holding::ForwardCalculator.new(@account).calculate
+    assert_equal [], calculated
+  end
+
+  test "holding generation respects user timezone and last generated date is current user date" do
+    # Simulate user in EST timezone
+    Time.use_zone("America/New_York") do
+      # Set current time to 1am UTC on Jan 5, 2025
+      # This would be 8pm EST on Jan 4, 2025 (user's time, and the last date we should generate holdings for)
+      travel_to Time.utc(2025, 01, 05, 1, 0, 0)
+
+      voo = Security.create!(ticker: "VOO", name: "Vanguard S&P 500 ETF")
+      Security::Price.create!(security: voo, date: "2025-01-02", price: 500)
+      Security::Price.create!(security: voo, date: "2025-01-03", price: 500)
+      Security::Price.create!(security: voo, date: "2025-01-04", price: 500)
+      create_trade(voo, qty: 10, date: "2025-01-03", price: 500, account: @account)
+
+      expected = [ [ "2025-01-02", 0 ], [ "2025-01-03", 5000 ], [ "2025-01-04", 5000 ] ]
+      calculated = Holding::ForwardCalculator.new(@account).calculate
+
+      assert_equal expected, calculated.map { |b| [ b.date.to_s, b.amount ] }
+    end
+  end
+
+  test "forward portfolio calculation" do
+    load_prices
+
+    # Build up to 10 shares of VOO (current value $5000)
+    create_trade(@voo, qty: 20, date: 3.days.ago.to_date, price: 470, account: @account)
+    create_trade(@voo, qty: -15, date: 2.days.ago.to_date, price: 480, account: @account)
+    create_trade(@voo, qty: 5, date: 1.day.ago.to_date, price: 490, account: @account)
+
+    # Amazon won't exist in current holdings because qty is zero, but should show up in historical portfolio
+    create_trade(@amzn, qty: 1, date: 2.days.ago.to_date, price: 200, account: @account)
+    create_trade(@amzn, qty: -1, date: 1.day.ago.to_date, price: 200, account: @account)
+
+    # Build up to 100 shares of WMT (current value $10000)
+    create_trade(@wmt, qty: 100, date: 1.day.ago.to_date, price: 100, account: @account)
+
+    expected = [
+      # 4 days ago
+      Holding.new(security: @voo, date: 4.days.ago.to_date, qty: 0, price: 460, amount: 0),
+      Holding.new(security: @wmt, date: 4.days.ago.to_date, qty: 0, price: 100, amount: 0),
+      Holding.new(security: @amzn, date: 4.days.ago.to_date, qty: 0, price: 200, amount: 0),
+
+      # 3 days ago
+      Holding.new(security: @voo, date: 3.days.ago.to_date, qty: 20, price: 470, amount: 9400),
+      Holding.new(security: @wmt, date: 3.days.ago.to_date, qty: 0, price: 100, amount: 0),
+      Holding.new(security: @amzn, date: 3.days.ago.to_date, qty: 0, price: 200, amount: 0),
+
+      # 2 days ago
+      Holding.new(security: @voo, date: 2.days.ago.to_date, qty: 5, price: 480, amount: 2400),
+      Holding.new(security: @wmt, date: 2.days.ago.to_date, qty: 0, price: 100, amount: 0),
+      Holding.new(security: @amzn, date: 2.days.ago.to_date, qty: 1, price: 200, amount: 200),
+
+      # 1 day ago
+      Holding.new(security: @voo, date: 1.day.ago.to_date, qty: 10, price: 490, amount: 4900),
+      Holding.new(security: @wmt, date: 1.day.ago.to_date, qty: 100, price: 100, amount: 10000),
+      Holding.new(security: @amzn, date: 1.day.ago.to_date, qty: 0, price: 200, amount: 0),
+
+      # Today
+      Holding.new(security: @voo, date: Date.current, qty: 10, price: 500, amount: 5000),
+      Holding.new(security: @wmt, date: Date.current, qty: 100, price: 100, amount: 10000),
+      Holding.new(security: @amzn, date: Date.current, qty: 0, price: 200, amount: 0)
+    ]
+
+    calculated = Holding::ForwardCalculator.new(@account).calculate
+
+    assert_equal expected.length, calculated.length
+    assert_holdings(expected, calculated)
+  end
+
+  # Carries the previous record forward if no holding exists for a date
+  # to ensure that net worth historical rollups have a value for every date
+  test "uses locf to fill missing holdings" do
+    load_prices
+
+    create_trade(@wmt, qty: 100, date: 1.day.ago.to_date, price: 100, account: @account)
+
+    expected = [
+      Holding.new(security: @wmt, date: 2.days.ago.to_date, qty: 0, price: 100, amount: 0),
+      Holding.new(security: @wmt, date: 1.day.ago.to_date, qty: 100, price: 100, amount: 10000),
+      Holding.new(security: @wmt, date: Date.current, qty: 100, price: 100, amount: 10000)
+    ]
+
+    # Price missing today, so we should carry forward the holding from 1 day ago
+    Security.stubs(:find).returns(@wmt)
+    Security::Price.stubs(:find_price).with(security: @wmt, date: 2.days.ago.to_date).returns(Security::Price.new(price: 100))
+    Security::Price.stubs(:find_price).with(security: @wmt, date: 1.day.ago.to_date).returns(Security::Price.new(price: 100))
+    Security::Price.stubs(:find_price).with(security: @wmt, date: Date.current).returns(nil)
+
+    calculated = Holding::ForwardCalculator.new(@account).calculate
+
+    assert_equal expected.length, calculated.length
+    assert_holdings(expected, calculated)
+  end
+
+  test "offline tickers sync holdings based on most recent trade price" do
+    offline_security = Security.create!(ticker: "OFFLINE", name: "Offline Ticker")
+
+    create_trade(offline_security, qty: 1, date: 3.days.ago.to_date, price: 90, account: @account)
+    create_trade(offline_security, qty: 1, date: 1.day.ago.to_date, price: 100, account: @account)
+
+    expected = [
+      Holding.new(security: offline_security, date: 3.days.ago.to_date, qty: 1, price: 90, amount: 90),
+      Holding.new(security: offline_security, date: 2.days.ago.to_date, qty: 1, price: 90, amount: 90),
+      Holding.new(security: offline_security, date: 1.day.ago.to_date, qty: 2, price: 100, amount: 200),
+      Holding.new(security: offline_security, date: Date.current, qty: 2, price: 100, amount: 200)
+    ]
+
+    calculated = Holding::ForwardCalculator.new(@account).calculate
+
+    assert_equal expected.length, calculated.length
+    assert_holdings(expected, calculated)
+  end
+
+  private
+    def assert_holdings(expected, calculated)
+      expected.each do |expected_entry|
+        calculated_entry = calculated.find { |c| c.security == expected_entry.security && c.date == expected_entry.date }
+
+        assert_equal expected_entry.qty, calculated_entry.qty, "Qty mismatch for #{expected_entry.security.ticker} on #{expected_entry.date}"
+        assert_equal expected_entry.price, calculated_entry.price, "Price mismatch for #{expected_entry.security.ticker} on #{expected_entry.date}"
+        assert_equal expected_entry.amount, calculated_entry.amount, "Amount mismatch for #{expected_entry.security.ticker} on #{expected_entry.date}"
+      end
+    end
+
+    def load_prices
+      @voo = Security.create!(ticker: "VOO", name: "Vanguard S&P 500 ETF")
+      Security::Price.create!(security: @voo, date: 4.days.ago.to_date, price: 460)
+      Security::Price.create!(security: @voo, date: 3.days.ago.to_date, price: 470)
+      Security::Price.create!(security: @voo, date: 2.days.ago.to_date, price: 480)
+      Security::Price.create!(security: @voo, date: 1.day.ago.to_date, price: 490)
+      Security::Price.create!(security: @voo, date: Date.current, price: 500)
+
+      @wmt = Security.create!(ticker: "WMT", name: "Walmart Inc.")
+      Security::Price.create!(security: @wmt, date: 4.days.ago.to_date, price: 100)
+      Security::Price.create!(security: @wmt, date: 3.days.ago.to_date, price: 100)
+      Security::Price.create!(security: @wmt, date: 2.days.ago.to_date, price: 100)
+      Security::Price.create!(security: @wmt, date: 1.day.ago.to_date, price: 100)
+      Security::Price.create!(security: @wmt, date: Date.current, price: 100)
+
+      @amzn = Security.create!(ticker: "AMZN", name: "Amazon.com Inc.")
+      Security::Price.create!(security: @amzn, date: 4.days.ago.to_date, price: 200)
+      Security::Price.create!(security: @amzn, date: 3.days.ago.to_date, price: 200)
+      Security::Price.create!(security: @amzn, date: 2.days.ago.to_date, price: 200)
+      Security::Price.create!(security: @amzn, date: 1.day.ago.to_date, price: 200)
+      Security::Price.create!(security: @amzn, date: Date.current, price: 200)
+    end
+end
diff --git a/test/models/holding/materializer_test.rb b/test/models/holding/materializer_test.rb
new file mode 100644
index 00000000..41ae8ff6
--- /dev/null
+++ b/test/models/holding/materializer_test.rb
@@ -0,0 +1,29 @@
+require "test_helper"
+
+class Holding::MaterializerTest < ActiveSupport::TestCase
+  include EntriesTestHelper
+
+  setup do
+    @family = families(:empty)
+    @account = @family.accounts.create!(name: "Test", balance: 20000, cash_balance: 20000, currency: "USD", accountable: Investment.new)
+    @aapl = securities(:aapl)
+  end
+
+  test "syncs holdings" do
+    create_trade(@aapl, account: @account, qty: 1, price: 200, date: Date.current)
+
+    # Should have yesterday's and today's holdings
+    assert_difference "@account.holdings.count", 2 do
+      Holding::Materializer.new(@account, strategy: :forward).materialize_holdings
+    end
+  end
+
+  test "purges stale holdings for unlinked accounts" do
+    # Since the account has no entries, there should be no holdings
+    Holding.create!(account: @account, security: @aapl, qty: 1, price: 100, amount: 100, currency: "USD", date: Date.current)
+
+    assert_difference "Holding.count", -1 do
+      Holding::Materializer.new(@account, strategy: :forward).materialize_holdings
+    end
+  end
+end
diff --git a/test/models/holding/portfolio_cache_test.rb b/test/models/holding/portfolio_cache_test.rb
new file mode 100644
index 00000000..4677fc41
--- /dev/null
+++ b/test/models/holding/portfolio_cache_test.rb
@@ -0,0 +1,59 @@
+require "test_helper"
+
+class Holding::PortfolioCacheTest < ActiveSupport::TestCase
+  include EntriesTestHelper, ProviderTestHelper
+
+  setup do
+    @provider = mock
+    Security.stubs(:provider).returns(@provider)
+
+    @account = families(:empty).accounts.create!(
+      name: "Test Brokerage",
+      balance: 10000,
+      currency: "USD",
+      accountable: Investment.new
+    )
+
+    @security = Security.create!(name: "Test Security", ticker: "TEST", exchange_operating_mic: "TEST")
+
+    @trade = create_trade(@security, account: @account, qty: 1, date: 2.days.ago.to_date, price: 210.23).trade
+  end
+
+  test "gets price from DB if available" do
+    db_price = 210
+
+    Security::Price.create!(
+      security: @security,
+      date: Date.current,
+      price: db_price
+    )
+
+    cache = Holding::PortfolioCache.new(@account)
+    assert_equal db_price, cache.get_price(@security.id, Date.current).price
+  end
+
+  test "if no price from db, try getting the price from trades" do
+    Security::Price.destroy_all
+
+    cache = Holding::PortfolioCache.new(@account)
+    assert_equal @trade.price, cache.get_price(@security.id, @trade.entry.date).price
+  end
+
+  test "if no price from db or trades, search holdings" do
+    Security::Price.delete_all
+    Entry.delete_all
+
+    holding = Holding.create!(
+      security: @security,
+      account: @account,
+      date: Date.current,
+      qty: 1,
+      price: 250,
+      amount: 250 * 1,
+      currency: "USD"
+    )
+
+    cache = Holding::PortfolioCache.new(@account, use_holdings: true)
+    assert_equal holding.price, cache.get_price(@security.id, holding.date).price
+  end
+end
diff --git a/test/models/holding/portfolio_snapshot_test.rb b/test/models/holding/portfolio_snapshot_test.rb
new file mode 100644
index 00000000..624e6086
--- /dev/null
+++ b/test/models/holding/portfolio_snapshot_test.rb
@@ -0,0 +1,50 @@
+require "test_helper"
+
+class Holding::PortfolioSnapshotTest < ActiveSupport::TestCase
+  include EntriesTestHelper
+  setup do
+    @account = accounts(:investment)
+    @aapl = securities(:aapl)
+    @msft = securities(:msft)
+  end
+
+  test "captures the most recent holding quantities for each security" do
+    # Clear any existing data
+    @account.holdings.destroy_all
+    @account.entries.destroy_all
+
+    # Create some trades to establish which securities are in the portfolio
+    create_trade(@aapl, account: @account, qty: 10, price: 100, date: 5.days.ago)
+    create_trade(@msft, account: @account, qty: 30, price: 200, date: 5.days.ago)
+
+    # Create holdings for AAPL at different dates
+    @account.holdings.create!(security: @aapl, date: 3.days.ago, qty: 10, price: 100, amount: 1000, currency: "USD")
+    @account.holdings.create!(security: @aapl, date: 1.day.ago, qty: 20, price: 150, amount: 3000, currency: "USD")
+
+    # Create holdings for MSFT at different dates
+    @account.holdings.create!(security: @msft, date: 5.days.ago, qty: 30, price: 200, amount: 6000, currency: "USD")
+    @account.holdings.create!(security: @msft, date: 2.days.ago, qty: 40, price: 250, amount: 10000, currency: "USD")
+
+    snapshot = Holding::PortfolioSnapshot.new(@account)
+    portfolio = snapshot.to_h
+
+    assert_equal 2, portfolio.size
+    assert_equal 20, portfolio[@aapl.id]
+    assert_equal 40, portfolio[@msft.id]
+  end
+
+  test "includes securities from trades with zero quantities when no holdings exist" do
+    # Clear any existing data
+    @account.holdings.destroy_all
+    @account.entries.destroy_all
+
+    # Create a trade to establish AAPL is in the portfolio
+    create_trade(@aapl, account: @account, qty: 10, price: 100, date: 5.days.ago)
+
+    snapshot = Holding::PortfolioSnapshot.new(@account)
+    portfolio = snapshot.to_h
+
+    assert_equal 1, portfolio.size
+    assert_equal 0, portfolio[@aapl.id]
+  end
+end
diff --git a/test/models/holding/reverse_calculator_test.rb b/test/models/holding/reverse_calculator_test.rb
new file mode 100644
index 00000000..f2cec5fd
--- /dev/null
+++ b/test/models/holding/reverse_calculator_test.rb
@@ -0,0 +1,228 @@
+require "test_helper"
+
+class Holding::ReverseCalculatorTest < ActiveSupport::TestCase
+  include EntriesTestHelper
+
+  setup do
+    @account = families(:empty).accounts.create!(
+      name: "Test",
+      balance: 20000,
+      cash_balance: 20000,
+      currency: "USD",
+      accountable: Investment.new
+    )
+  end
+
+  test "no holdings" do
+    empty_snapshot = OpenStruct.new(to_h: {})
+    calculated = Holding::ReverseCalculator.new(@account, portfolio_snapshot: empty_snapshot).calculate
+    assert_equal [], calculated
+  end
+
+  test "holding generation respects user timezone and last generated date is current user date" do
+    # Simulate user in EST timezone
+    Time.use_zone("America/New_York") do
+      # Set current time to 1am UTC on Jan 5, 2025
+      # This would be 8pm EST on Jan 4, 2025 (user's time, and the last date we should generate holdings for)
+      travel_to Time.utc(2025, 01, 05, 1, 0, 0)
+
+      voo = Security.create!(ticker: "VOO", name: "Vanguard S&P 500 ETF")
+      Security::Price.create!(security: voo, date: "2025-01-02", price: 500)
+      Security::Price.create!(security: voo, date: "2025-01-03", price: 500)
+      Security::Price.create!(security: voo, date: "2025-01-04", price: 500)
+
+      # Today's holdings (provided)
+      @account.holdings.create!(security: voo, date: "2025-01-04", qty: 10, price: 500, amount: 5000, currency: "USD")
+
+      create_trade(voo, qty: 10, date: "2025-01-03", price: 500, account: @account)
+
+      expected = [ [ "2025-01-02", 0 ], [ "2025-01-03", 5000 ], [ "2025-01-04", 5000 ] ]
+      # Mock snapshot with the holdings we created
+      snapshot = OpenStruct.new(to_h: { voo.id => 10 })
+      calculated = Holding::ReverseCalculator.new(@account, portfolio_snapshot: snapshot).calculate
+
+      assert_equal expected, calculated.sort_by(&:date).map { |b| [ b.date.to_s, b.amount ] }
+    end
+  end
+
+  # Should be able to handle this case, although we should not be reverse-syncing an account without provided current day holdings
+  test "reverse portfolio with trades but without current day holdings" do
+    voo = Security.create!(ticker: "VOO", name: "Vanguard S&P 500 ETF")
+    Security::Price.create!(security: voo, date: Date.current, price: 470)
+    Security::Price.create!(security: voo, date: 1.day.ago.to_date, price: 470)
+
+    create_trade(voo, qty: -10, date: Date.current, price: 470, account: @account)
+
+    # Mock empty portfolio since no current day holdings
+    snapshot = OpenStruct.new(to_h: { voo.id => 0 })
+    calculated = Holding::ReverseCalculator.new(@account, portfolio_snapshot: snapshot).calculate
+    assert_equal 2, calculated.length
+  end
+
+  test "reverse portfolio calculation" do
+    load_today_portfolio
+
+    # Build up to 10 shares of VOO (current value $5000)
+    create_trade(@voo, qty: 20, date: 3.days.ago.to_date, price: 470, account: @account)
+    create_trade(@voo, qty: -15, date: 2.days.ago.to_date, price: 480, account: @account)
+    create_trade(@voo, qty: 5, date: 1.day.ago.to_date, price: 490, account: @account)
+
+    # Amazon won't exist in current holdings because qty is zero, but should show up in historical portfolio
+    create_trade(@amzn, qty: 1, date: 2.days.ago.to_date, price: 200, account: @account)
+    create_trade(@amzn, qty: -1, date: 1.day.ago.to_date, price: 200, account: @account)
+
+    # Build up to 100 shares of WMT (current value $10000)
+    create_trade(@wmt, qty: 100, date: 1.day.ago.to_date, price: 100, account: @account)
+
+    expected = [
+      # 4 days ago
+      Holding.new(security: @voo, date: 4.days.ago.to_date, qty: 0, price: 460, amount: 0),
+      Holding.new(security: @wmt, date: 4.days.ago.to_date, qty: 0, price: 100, amount: 0),
+      Holding.new(security: @amzn, date: 4.days.ago.to_date, qty: 0, price: 200, amount: 0),
+
+      # 3 days ago
+      Holding.new(security: @voo, date: 3.days.ago.to_date, qty: 20, price: 470, amount: 9400),
+      Holding.new(security: @wmt, date: 3.days.ago.to_date, qty: 0, price: 100, amount: 0),
+      Holding.new(security: @amzn, date: 3.days.ago.to_date, qty: 0, price: 200, amount: 0),
+
+      # 2 days ago
+      Holding.new(security: @voo, date: 2.days.ago.to_date, qty: 5, price: 480, amount: 2400),
+      Holding.new(security: @wmt, date: 2.days.ago.to_date, qty: 0, price: 100, amount: 0),
+      Holding.new(security: @amzn, date: 2.days.ago.to_date, qty: 1, price: 200, amount: 200),
+
+      # 1 day ago
+      Holding.new(security: @voo, date: 1.day.ago.to_date, qty: 10, price: 490, amount: 4900),
+      Holding.new(security: @wmt, date: 1.day.ago.to_date, qty: 100, price: 100, amount: 10000),
+      Holding.new(security: @amzn, date: 1.day.ago.to_date, qty: 0, price: 200, amount: 0),
+
+      # Today
+      Holding.new(security: @voo, date: Date.current, qty: 10, price: 500, amount: 5000),
+      Holding.new(security: @wmt, date: Date.current, qty: 100, price: 100, amount: 10000),
+      Holding.new(security: @amzn, date: Date.current, qty: 0, price: 200, amount: 0)
+    ]
+
+    # Mock snapshot with today's portfolio from load_today_portfolio
+    snapshot = OpenStruct.new(to_h: { @voo.id => 10, @wmt.id => 100, @amzn.id => 0 })
+    calculated = Holding::ReverseCalculator.new(@account, portfolio_snapshot: snapshot).calculate
+
+    assert_equal expected.length, calculated.length
+
+    expected.each do |expected_entry|
+      calculated_entry = calculated.find { |c| c.security == expected_entry.security && c.date == expected_entry.date }
+
+      assert_equal expected_entry.qty, calculated_entry.qty, "Qty mismatch for #{expected_entry.security.ticker} on #{expected_entry.date}"
+      assert_equal expected_entry.price, calculated_entry.price, "Price mismatch for #{expected_entry.security.ticker} on #{expected_entry.date}"
+      assert_equal expected_entry.amount, calculated_entry.amount, "Amount mismatch for #{expected_entry.security.ticker} on #{expected_entry.date}"
+    end
+  end
+
+  # For a reverse sync, Plaid will provide today's holdings + prices.  We need to match those exactly so balances match in net worth rollups.
+  test "current day holdings always match provided holdings and prices" do
+    # Provider gives us total value of $10,000 ($5,000 cash, $5,000 in holdings)
+    @account.update!(balance: 10000, cash_balance: 5000)
+
+    wmt = Security.create!(ticker: "WMT", name: "Walmart Inc.")
+    create_trade(wmt, qty: 50, date: 1.day.ago.to_date, price: 98, account: @account)
+
+    @account.holdings.create!(
+      date: Date.current,
+      price: 100,
+      qty: 50,
+      amount: 5000,
+      currency: "USD",
+      security: wmt
+    )
+
+    Security::Price.create!(security: wmt, date: Date.current, price: 102) # This price should be ignored on current day
+    Security::Price.create!(security: wmt, date: 1.day.ago, price: 98) # This price will be used for historical holding calculation
+    Security::Price.create!(security: wmt, date: 2.days.ago, price: 95) # This price will be used for historical holding calculation
+
+    expected = [
+      Holding.new(security: wmt, date: 2.days.ago.to_date, qty: 0, price: 95, amount: 0), # Uses market price, empty holding
+      Holding.new(security: wmt, date: 1.day.ago.to_date, qty: 50, price: 98, amount: 4900), # Uses market price
+      Holding.new(security: wmt, date: Date.current, qty: 50, price: 100, amount: 5000) # Uses holding price, not market price
+    ]
+
+    # Mock snapshot with WMT holding from the test setup
+    snapshot = OpenStruct.new(to_h: { wmt.id => 50 })
+    calculated = Holding::ReverseCalculator.new(@account, portfolio_snapshot: snapshot).calculate
+
+    assert_equal expected.length, calculated.length
+
+    expected.each do |expected_entry|
+      calculated_entry = calculated.find { |c| c.security == expected_entry.security && c.date == expected_entry.date }
+
+      assert_equal expected_entry.qty, calculated_entry.qty, "Qty mismatch for #{expected_entry.security.ticker} on #{expected_entry.date}"
+      assert_equal expected_entry.price, calculated_entry.price, "Price mismatch for #{expected_entry.security.ticker} on #{expected_entry.date}"
+      assert_equal expected_entry.amount, calculated_entry.amount, "Amount mismatch for #{expected_entry.security.ticker} on #{expected_entry.date}"
+    end
+  end
+
+  private
+    def assert_holdings(expected, calculated)
+      expected.each do |expected_entry|
+        calculated_entry = calculated.find { |c| c.security == expected_entry.security && c.date == expected_entry.date }
+
+        assert_equal expected_entry.qty, calculated_entry.qty, "Qty mismatch for #{expected_entry.security.ticker} on #{expected_entry.date}"
+        assert_equal expected_entry.price, calculated_entry.price, "Price mismatch for #{expected_entry.security.ticker} on #{expected_entry.date}"
+        assert_equal expected_entry.amount, calculated_entry.amount, "Amount mismatch for #{expected_entry.security.ticker} on #{expected_entry.date}"
+      end
+    end
+
+    def load_prices
+      @voo = Security.create!(ticker: "VOO", name: "Vanguard S&P 500 ETF")
+      Security::Price.create!(security: @voo, date: 4.days.ago.to_date, price: 460)
+      Security::Price.create!(security: @voo, date: 3.days.ago.to_date, price: 470)
+      Security::Price.create!(security: @voo, date: 2.days.ago.to_date, price: 480)
+      Security::Price.create!(security: @voo, date: 1.day.ago.to_date, price: 490)
+      Security::Price.create!(security: @voo, date: Date.current, price: 500)
+
+      @wmt = Security.create!(ticker: "WMT", name: "Walmart Inc.")
+      Security::Price.create!(security: @wmt, date: 4.days.ago.to_date, price: 100)
+      Security::Price.create!(security: @wmt, date: 3.days.ago.to_date, price: 100)
+      Security::Price.create!(security: @wmt, date: 2.days.ago.to_date, price: 100)
+      Security::Price.create!(security: @wmt, date: 1.day.ago.to_date, price: 100)
+      Security::Price.create!(security: @wmt, date: Date.current, price: 100)
+
+      @amzn = Security.create!(ticker: "AMZN", name: "Amazon.com Inc.")
+      Security::Price.create!(security: @amzn, date: 4.days.ago.to_date, price: 200)
+      Security::Price.create!(security: @amzn, date: 3.days.ago.to_date, price: 200)
+      Security::Price.create!(security: @amzn, date: 2.days.ago.to_date, price: 200)
+      Security::Price.create!(security: @amzn, date: 1.day.ago.to_date, price: 200)
+      Security::Price.create!(security: @amzn, date: Date.current, price: 200)
+    end
+
+    # Portfolio holdings:
+    # +--------+-----+--------+---------+
+    # | Ticker | Qty | Price  | Amount  |
+    # +--------+-----+--------+---------+
+    # | VOO    |  10 | $500   | $5,000  |
+    # | WMT    | 100 | $100   | $10,000 |
+    # +--------+-----+--------+---------+
+    # Brokerage Cash: $5,000
+    # Holdings Value: $15,000
+    # Total Balance: $20,000
+    def load_today_portfolio
+      @account.update!(cash_balance: 5000)
+
+      load_prices
+
+      @account.holdings.create!(
+        date: Date.current,
+        price: 500,
+        qty: 10,
+        amount: 5000,
+        currency: "USD",
+        security: @voo
+      )
+
+      @account.holdings.create!(
+        date: Date.current,
+        price: 100,
+        qty: 100,
+        amount: 10000,
+        currency: "USD",
+        security: @wmt
+      )
+    end
+end
diff --git a/test/models/holding_test.rb b/test/models/holding_test.rb
new file mode 100644
index 00000000..c3cc9a7a
--- /dev/null
+++ b/test/models/holding_test.rb
@@ -0,0 +1,90 @@
+require "test_helper"
+require "ostruct"
+
+class HoldingTest < ActiveSupport::TestCase
+  include EntriesTestHelper, SecuritiesTestHelper
+
+  setup do
+    @account = families(:empty).accounts.create!(name: "Test Brokerage", balance: 20000, cash_balance: 0, currency: "USD", accountable: Investment.new)
+
+    # Current day holding instances
+    @amzn, @nvda = load_holdings
+  end
+
+  test "calculates portfolio weight" do
+    expected_amzn_weight = 3240.0 / @account.balance * 100
+    expected_nvda_weight = 3720.0 / @account.balance * 100
+
+    assert_in_delta expected_amzn_weight, @amzn.weight, 0.001
+    assert_in_delta expected_nvda_weight, @nvda.weight, 0.001
+  end
+
+  test "calculates average cost basis" do
+    create_trade(@amzn.security, account: @account, qty: 10, price: 212.00, date: 1.day.ago.to_date)
+    create_trade(@amzn.security, account: @account, qty: 15, price: 216.00, date: Date.current)
+
+    create_trade(@nvda.security, account: @account, qty: 5, price: 128.00, date: 1.day.ago.to_date)
+    create_trade(@nvda.security, account: @account, qty: 30, price: 124.00, date: Date.current)
+
+    assert_equal Money.new((212.00 + 216.00).to_d / 2), @amzn.avg_cost
+    assert_equal Money.new((128.00 + 124.00).to_d / 2), @nvda.avg_cost
+  end
+
+  test "calculates average cost basis from another currency" do
+    create_trade(@amzn.security, account: @account, qty: 10, price: 212.00, date: 1.day.ago.to_date, currency: "CAD")
+    create_trade(@amzn.security, account: @account, qty: 15, price: 216.00, date: Date.current, currency: "CAD")
+
+    create_trade(@nvda.security, account: @account, qty: 5, price: 128.00, date: 1.day.ago.to_date, currency: "CAD")
+    create_trade(@nvda.security, account: @account, qty: 30, price: 124.00, date: Date.current, currency: "CAD")
+
+    assert_equal Money.new((212.00 + 216.00).to_d / 2, "CAD").exchange_to("USD", fallback_rate: 1), @amzn.avg_cost
+    assert_equal Money.new((128.00 + 124.00).to_d / 2, "CAD").exchange_to("USD", fallback_rate: 1), @nvda.avg_cost
+  end
+
+  test "calculates total return trend" do
+    @amzn.stubs(:avg_cost).returns(Money.new(214.00))
+    @nvda.stubs(:avg_cost).returns(Money.new(126.00))
+
+    # Gained $30, or 0.93%
+    assert_equal Money.new(30), @amzn.trend.value
+    assert_in_delta 0.9, @amzn.trend.percent, 0.001
+
+    # Lost $60, or -1.59%
+    assert_equal Money.new(-60), @nvda.trend.value
+    assert_in_delta -1.6, @nvda.trend.percent, 0.001
+  end
+
+  private
+
+    def load_holdings
+      security1 = create_security("AMZN", prices: [
+        { date: 1.day.ago.to_date, price: 212.00 },
+        { date: Date.current, price: 216.00 }
+      ])
+
+      security2 = create_security("NVDA", prices: [
+        { date: 1.day.ago.to_date, price: 128.00 },
+        { date: Date.current, price: 124.00 }
+      ])
+
+      create_holding(security1, 1.day.ago.to_date, 10)
+      amzn = create_holding(security1, Date.current, 15)
+
+      create_holding(security2, 1.day.ago.to_date, 5)
+      nvda = create_holding(security2, Date.current, 30)
+
+      [ amzn, nvda ]
+    end
+
+    def create_holding(security, date, qty)
+      price = Security::Price.find_by(date: date, security: security).price
+
+      @account.holdings.create! \
+        date: date,
+        security: security,
+        qty: qty,
+        price: price,
+        amount: qty * price,
+        currency: "USD"
+    end
+end
diff --git a/test/models/impersonation_session_test.rb b/test/models/impersonation_session_test.rb
new file mode 100644
index 00000000..1946e6da
--- /dev/null
+++ b/test/models/impersonation_session_test.rb
@@ -0,0 +1,40 @@
+require "test_helper"
+
+class ImpersonationSessionTest < ActiveSupport::TestCase
+  test "only super admin can impersonate" do
+    regular_user = users(:family_member)
+
+    assert_not regular_user.super_admin?
+
+    assert_raises(ActiveRecord::RecordInvalid) do
+      ImpersonationSession.create!(
+        impersonator: regular_user,
+        impersonated: users(:maybe_support_staff)
+      )
+    end
+  end
+
+  test "super admin cannot be impersonated" do
+    super_admin = users(:maybe_support_staff)
+
+    assert super_admin.super_admin?
+
+    assert_raises(ActiveRecord::RecordInvalid) do
+      ImpersonationSession.create!(
+        impersonator: users(:family_member),
+        impersonated: super_admin
+      )
+    end
+  end
+
+  test "impersonation session must have different impersonator and impersonated" do
+    super_admin = users(:maybe_support_staff)
+
+    assert_raises(ActiveRecord::RecordInvalid) do
+      ImpersonationSession.create!(
+        impersonator: super_admin,
+        impersonated: super_admin
+      )
+    end
+  end
+end
diff --git a/test/models/import/mapping_test.rb b/test/models/import/mapping_test.rb
deleted file mode 100644
index 6286a582..00000000
--- a/test/models/import/mapping_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class Import::MappingTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/models/import/row_test.rb b/test/models/import/row_test.rb
deleted file mode 100644
index afe1a4f6..00000000
--- a/test/models/import/row_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class Import::RowTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/models/income_statement_test.rb b/test/models/income_statement_test.rb
new file mode 100644
index 00000000..a2680ccb
--- /dev/null
+++ b/test/models/income_statement_test.rb
@@ -0,0 +1,287 @@
+require "test_helper"
+
+class IncomeStatementTest < ActiveSupport::TestCase
+  include EntriesTestHelper
+
+  setup do
+    @family = families(:empty)
+
+    @income_category = @family.categories.create! name: "Income", classification: "income"
+    @food_category = @family.categories.create! name: "Food", classification: "expense"
+    @groceries_category = @family.categories.create! name: "Groceries", classification: "expense", parent: @food_category
+
+    @checking_account = @family.accounts.create! name: "Checking", currency: @family.currency, balance: 5000, accountable: Depository.new
+    @credit_card_account = @family.accounts.create! name: "Credit Card", currency: @family.currency, balance: 1000, accountable: CreditCard.new
+    @loan_account = @family.accounts.create! name: "Mortgage", currency: @family.currency, balance: 50000, accountable: Loan.new
+
+    create_transaction(account: @checking_account, amount: -1000, category: @income_category)
+    create_transaction(account: @checking_account, amount: 200, category: @groceries_category)
+    create_transaction(account: @credit_card_account, amount: 300, category: @groceries_category)
+    create_transaction(account: @credit_card_account, amount: 400, category: @groceries_category)
+  end
+
+  test "calculates totals for transactions" do
+    income_statement = IncomeStatement.new(@family)
+    assert_equal Money.new(1000, @family.currency), income_statement.totals.income_money
+    assert_equal Money.new(200 + 300 + 400, @family.currency), income_statement.totals.expense_money
+    assert_equal 4, income_statement.totals.transactions_count
+  end
+
+  test "calculates expenses for a period" do
+    income_statement = IncomeStatement.new(@family)
+    expense_totals = income_statement.expense_totals(period: Period.last_30_days)
+
+    expected_total_expense = 200 + 300 + 400
+
+    assert_equal expected_total_expense, expense_totals.total
+    assert_equal expected_total_expense, expense_totals.category_totals.find { |ct| ct.category.id == @groceries_category.id }.total
+    assert_equal expected_total_expense, expense_totals.category_totals.find { |ct| ct.category.id == @food_category.id }.total
+  end
+
+  test "calculates income for a period" do
+    income_statement = IncomeStatement.new(@family)
+    income_totals = income_statement.income_totals(period: Period.last_30_days)
+
+    expected_total_income = 1000
+
+    assert_equal expected_total_income, income_totals.total
+    assert_equal expected_total_income, income_totals.category_totals.find { |ct| ct.category.id == @income_category.id }.total
+  end
+
+  test "calculates median expense" do
+    income_statement = IncomeStatement.new(@family)
+    assert_equal 200 + 300 + 400, income_statement.expense_totals(period: Period.last_30_days).total
+  end
+
+  test "calculates median income" do
+    income_statement = IncomeStatement.new(@family)
+    assert_equal 1000, income_statement.income_totals(period: Period.last_30_days).total
+  end
+
+  # NEW TESTS: Statistical Methods
+  test "calculates median expense correctly with known dataset" do
+    # Clear existing transactions by deleting entries
+    Entry.joins(:account).where(accounts: { family_id: @family.id }).destroy_all
+
+    # Create expenses: 100, 200, 300, 400, 500 (median should be 300)
+    create_transaction(account: @checking_account, amount: 100, category: @groceries_category)
+    create_transaction(account: @checking_account, amount: 200, category: @groceries_category)
+    create_transaction(account: @checking_account, amount: 300, category: @groceries_category)
+    create_transaction(account: @checking_account, amount: 400, category: @groceries_category)
+    create_transaction(account: @checking_account, amount: 500, category: @groceries_category)
+
+    income_statement = IncomeStatement.new(@family)
+    # CORRECT BUSINESS LOGIC: Calculates median of time-period totals for budget planning
+    # All transactions in same month = monthly total of 1500, so median = 1500.0
+    assert_equal 1500.0, income_statement.median_expense(interval: "month")
+  end
+
+  test "calculates median income correctly with known dataset" do
+    # Clear existing transactions by deleting entries
+    Entry.joins(:account).where(accounts: { family_id: @family.id }).destroy_all
+
+    # Create income: -200, -300, -400, -500, -600 (median should be -400, displayed as 400)
+    create_transaction(account: @checking_account, amount: -200, category: @income_category)
+    create_transaction(account: @checking_account, amount: -300, category: @income_category)
+    create_transaction(account: @checking_account, amount: -400, category: @income_category)
+    create_transaction(account: @checking_account, amount: -500, category: @income_category)
+    create_transaction(account: @checking_account, amount: -600, category: @income_category)
+
+    income_statement = IncomeStatement.new(@family)
+    # CORRECT BUSINESS LOGIC: Calculates median of time-period totals for budget planning
+    # All transactions in same month = monthly total of -2000, so median = 2000.0
+    assert_equal 2000.0, income_statement.median_income(interval: "month")
+  end
+
+  test "calculates average expense correctly with known dataset" do
+    # Clear existing transactions by deleting entries
+    Entry.joins(:account).where(accounts: { family_id: @family.id }).destroy_all
+
+    # Create expenses: 100, 200, 300 (average should be 200)
+    create_transaction(account: @checking_account, amount: 100, category: @groceries_category)
+    create_transaction(account: @checking_account, amount: 200, category: @groceries_category)
+    create_transaction(account: @checking_account, amount: 300, category: @groceries_category)
+
+    income_statement = IncomeStatement.new(@family)
+    # CORRECT BUSINESS LOGIC: Calculates average of time-period totals for budget planning
+    # All transactions in same month = monthly total of 600, so average = 600.0
+    assert_equal 600.0, income_statement.avg_expense(interval: "month")
+  end
+
+  test "calculates category-specific median expense" do
+    # Clear existing transactions by deleting entries
+    Entry.joins(:account).where(accounts: { family_id: @family.id }).destroy_all
+
+    # Create different amounts for groceries vs other food
+    other_food_category = @family.categories.create! name: "Restaurants", classification: "expense", parent: @food_category
+
+    # Groceries: 100, 300, 500 (median = 300)
+    create_transaction(account: @checking_account, amount: 100, category: @groceries_category)
+    create_transaction(account: @checking_account, amount: 300, category: @groceries_category)
+    create_transaction(account: @checking_account, amount: 500, category: @groceries_category)
+
+    # Restaurants: 50, 150 (median = 100)
+    create_transaction(account: @checking_account, amount: 50, category: other_food_category)
+    create_transaction(account: @checking_account, amount: 150, category: other_food_category)
+
+    income_statement = IncomeStatement.new(@family)
+    # CORRECT BUSINESS LOGIC: Calculates median of time-period totals for budget planning
+    # All groceries in same month = monthly total of 900, so median = 900.0
+    assert_equal 900.0, income_statement.median_expense(interval: "month", category: @groceries_category)
+    # For restaurants: monthly total = 200, so median = 200.0
+    restaurants_median = income_statement.median_expense(interval: "month", category: other_food_category)
+    assert_equal 200.0, restaurants_median
+  end
+
+  test "calculates category-specific average expense" do
+    # Clear existing transactions by deleting entries
+    Entry.joins(:account).where(accounts: { family_id: @family.id }).destroy_all
+
+    # Create different amounts for groceries
+    # Groceries: 100, 200, 300 (average = 200)
+    create_transaction(account: @checking_account, amount: 100, category: @groceries_category)
+    create_transaction(account: @checking_account, amount: 200, category: @groceries_category)
+    create_transaction(account: @checking_account, amount: 300, category: @groceries_category)
+
+    income_statement = IncomeStatement.new(@family)
+    # CORRECT BUSINESS LOGIC: Calculates average of time-period totals for budget planning
+    # All transactions in same month = monthly total of 600, so average = 600.0
+    assert_equal 600.0, income_statement.avg_expense(interval: "month", category: @groceries_category)
+  end
+
+  # NEW TESTS: Transfer and Kind Filtering
+  # NOTE: These tests now pass because kind filtering is working after the refactoring!
+  test "excludes regular transfers from income statement calculations" do
+    # Create a regular transfer between accounts
+    outflow_transaction = create_transaction(account: @checking_account, amount: 500, kind: "funds_movement")
+    inflow_transaction = create_transaction(account: @credit_card_account, amount: -500, kind: "funds_movement")
+
+    income_statement = IncomeStatement.new(@family)
+    totals = income_statement.totals
+
+    # NOW WORKING: Excludes transfers correctly after refactoring
+    assert_equal 4, totals.transactions_count # Only original 4 transactions
+    assert_equal Money.new(1000, @family.currency), totals.income_money
+    assert_equal Money.new(900, @family.currency), totals.expense_money
+  end
+
+  test "includes loan payments as expenses in income statement" do
+    # Create a loan payment transaction
+    loan_payment = create_transaction(account: @checking_account, amount: 1000, category: nil, kind: "loan_payment")
+
+    income_statement = IncomeStatement.new(@family)
+    totals = income_statement.totals
+
+    # CONTINUES TO WORK: Includes loan payments as expenses (loan_payment not in exclusion list)
+    assert_equal 5, totals.transactions_count
+    assert_equal Money.new(1000, @family.currency), totals.income_money
+    assert_equal Money.new(1900, @family.currency), totals.expense_money # 900 + 1000
+  end
+
+  test "excludes one-time transactions from income statement calculations" do
+    # Create a one-time transaction
+    one_time_transaction = create_transaction(account: @checking_account, amount: 250, category: @groceries_category, kind: "one_time")
+
+    income_statement = IncomeStatement.new(@family)
+    totals = income_statement.totals
+
+    # NOW WORKING: Excludes one-time transactions correctly after refactoring
+    assert_equal 4, totals.transactions_count # Only original 4 transactions
+    assert_equal Money.new(1000, @family.currency), totals.income_money
+    assert_equal Money.new(900, @family.currency), totals.expense_money
+  end
+
+  test "excludes payment transactions from income statement calculations" do
+    # Create a payment transaction (credit card payment)
+    payment_transaction = create_transaction(account: @checking_account, amount: 300, category: nil, kind: "cc_payment")
+
+    income_statement = IncomeStatement.new(@family)
+    totals = income_statement.totals
+
+    # NOW WORKING: Excludes payment transactions correctly after refactoring
+    assert_equal 4, totals.transactions_count # Only original 4 transactions
+    assert_equal Money.new(1000, @family.currency), totals.income_money
+    assert_equal Money.new(900, @family.currency), totals.expense_money
+  end
+
+  test "excludes excluded transactions from income statement calculations" do
+    # Create an excluded transaction
+    excluded_transaction_entry = create_transaction(account: @checking_account, amount: 250, category: @groceries_category)
+    excluded_transaction_entry.update!(excluded: true)
+
+    income_statement = IncomeStatement.new(@family)
+    totals = income_statement.totals
+
+    # Should exclude excluded transactions
+    assert_equal 4, totals.transactions_count # Only original 4 transactions
+    assert_equal Money.new(1000, @family.currency), totals.income_money
+    assert_equal Money.new(900, @family.currency), totals.expense_money
+  end
+
+  # NEW TESTS: Interval-Based Calculations
+  test "different intervals return different statistical results with multi-period data" do
+    # Clear existing transactions
+    Entry.joins(:account).where(accounts: { family_id: @family.id }).destroy_all
+
+    # Create transactions across multiple weeks to test interval behavior
+    # Week 1: 100, 200 (total: 300, median: 150)
+    create_transaction(account: @checking_account, amount: 100, category: @groceries_category, date: 3.weeks.ago)
+    create_transaction(account: @checking_account, amount: 200, category: @groceries_category, date: 3.weeks.ago + 1.day)
+
+    # Week 2: 400, 600 (total: 1000, median: 500)
+    create_transaction(account: @checking_account, amount: 400, category: @groceries_category, date: 2.weeks.ago)
+    create_transaction(account: @checking_account, amount: 600, category: @groceries_category, date: 2.weeks.ago + 1.day)
+
+    # Week 3: 800 (total: 800, median: 800)
+    create_transaction(account: @checking_account, amount: 800, category: @groceries_category, date: 1.week.ago)
+
+    income_statement = IncomeStatement.new(@family)
+
+    month_median = income_statement.median_expense(interval: "month")
+    week_median = income_statement.median_expense(interval: "week")
+
+    # CRITICAL TEST: Different intervals should return different results
+    # Month interval: median of monthly totals (if all in same month) vs individual transactions
+    # Week interval: median of weekly totals [300, 1000, 800] = 800 vs individual transactions [100,200,400,600,800] = 400
+    refute_equal month_median, week_median, "Different intervals should return different statistical results when data spans multiple time periods"
+
+    # Both should still be numeric
+    assert month_median.is_a?(Numeric)
+    assert week_median.is_a?(Numeric)
+    assert month_median > 0
+    assert week_median > 0
+  end
+
+  # NEW TESTS: Edge Cases
+  test "handles empty dataset gracefully" do
+    # Create a truly empty family
+    empty_family = Family.create!(name: "Empty Test Family", currency: "USD")
+    income_statement = IncomeStatement.new(empty_family)
+
+    # Should return 0 for statistical measures
+    assert_equal 0, income_statement.median_expense(interval: "month")
+    assert_equal 0, income_statement.median_income(interval: "month")
+    assert_equal 0, income_statement.avg_expense(interval: "month")
+  end
+
+  test "handles category not found gracefully" do
+    nonexistent_category = Category.new(id: 99999, name: "Nonexistent")
+
+    income_statement = IncomeStatement.new(@family)
+
+    assert_equal 0, income_statement.median_expense(interval: "month", category: nonexistent_category)
+    assert_equal 0, income_statement.avg_expense(interval: "month", category: nonexistent_category)
+  end
+
+  test "handles transactions without categories" do
+    # Create transaction without category
+    create_transaction(account: @checking_account, amount: 150, category: nil)
+
+    income_statement = IncomeStatement.new(@family)
+    totals = income_statement.totals
+
+    # Should still include uncategorized transaction in totals
+    assert_equal 5, totals.transactions_count
+    assert_equal Money.new(1050, @family.currency), totals.expense_money # 900 + 150
+  end
+end
diff --git a/test/models/investment_test.rb b/test/models/investment_test.rb
deleted file mode 100644
index 8d5ffccf..00000000
--- a/test/models/investment_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class InvestmentTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/models/issue/prices_missing_test.rb b/test/models/issue/prices_missing_test.rb
deleted file mode 100644
index 5c6a5502..00000000
--- a/test/models/issue/prices_missing_test.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require "test_helper"
-
-class Issue::PricesMissingTest < ActiveSupport::TestCase
-  setup do
-    @issue = Issue::PricesMissing.new
-    @account = Account.new(id: "123abc")
-    @issue.issuable = @account
-  end
-
-  test "stale? returns false when no prices are found" do
-    @issue.append_missing_price("AAPL", (Date.current - 5.days).to_s)
-
-    Security::Price.expects(:find_prices).returns([])
-    @account.expects(:owns_ticker?).with("AAPL").returns(true)
-
-    assert_not @issue.stale?
-  end
-
-  test "stale? returns true when all expected prices are found" do
-    start_date = Date.current - 5.days
-    @issue.append_missing_price("AAPL", start_date.to_s)
-
-    expected_prices = (start_date..Date.current).map { |date| { date: date } }
-    Security::Price.expects(:find_prices).returns(expected_prices)
-    @account.expects(:owns_ticker?).with("AAPL").returns(true)
-
-    assert @issue.stale?
-  end
-
-  test "stale? returns false when some prices are missing" do
-    start_date = Date.current - 5.days
-    @issue.append_missing_price("AAPL", start_date.to_s)
-
-    incomplete_prices = (start_date..Date.current - 2.days).map { |date| { date: date } }
-    Security::Price.expects(:find_prices).returns(incomplete_prices)
-    @account.expects(:owns_ticker?).with("AAPL").returns(true)
-
-    assert_not @issue.stale?
-  end
-
-  test "stale? returns true when the account doesn't own the ticker" do
-    @issue.append_missing_price("AAPL", (Date.current - 5.days).to_s)
-
-    @account.expects(:owns_ticker?).with("AAPL").returns(false)
-
-    assert @issue.stale?
-  end
-
-  test "stale? handles multiple tickers correctly" do
-    @issue.append_missing_price("AAPL", (Date.current - 5.days).to_s)
-    @issue.append_missing_price("GOOGL", (Date.current - 3.days).to_s)
-
-    @account.expects(:owns_ticker?).with("AAPL").returns(true)
-    @account.expects(:owns_ticker?).with("GOOGL").returns(true)
-
-    Security::Price.expects(:find_prices).with(ticker: "AAPL", start_date: Date.current - 5.days).returns([])
-    Security::Price.expects(:find_prices).with(ticker: "GOOGL", start_date: Date.current - 3.days).returns([])
-
-    assert_not @issue.stale?
-  end
-end
diff --git a/test/models/issue_test.rb b/test/models/issue_test.rb
deleted file mode 100644
index 7e15ee90..00000000
--- a/test/models/issue_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class IssueTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/models/market_data_importer_test.rb b/test/models/market_data_importer_test.rb
new file mode 100644
index 00000000..b39bf0ad
--- /dev/null
+++ b/test/models/market_data_importer_test.rb
@@ -0,0 +1,85 @@
+require "test_helper"
+require "ostruct"
+
+class MarketDataImporterTest < ActiveSupport::TestCase
+  include ProviderTestHelper
+
+  SNAPSHOT_START_DATE = MarketDataImporter::SNAPSHOT_DAYS.days.ago.to_date
+  PROVIDER_BUFFER     = 5.days
+
+  setup do
+    Security::Price.delete_all
+    ExchangeRate.delete_all
+    Trade.delete_all
+    Holding.delete_all
+    Security.delete_all
+
+    @provider = mock("provider")
+    Provider::Registry.any_instance
+                      .stubs(:get_provider)
+                      .with(:synth)
+                      .returns(@provider)
+  end
+
+  test "syncs required exchange rates" do
+    family = Family.create!(name: "Smith", currency: "USD")
+    family.accounts.create!(name: "Chequing",
+                            currency: "CAD",
+                            balance: 100,
+                            accountable: Depository.new)
+
+    # Seed stale rate so only the next missing day is fetched
+    ExchangeRate.create!(from_currency: "CAD",
+                         to_currency: "USD",
+                         date: SNAPSHOT_START_DATE,
+                         rate: 2.0)
+
+    expected_start_date = (SNAPSHOT_START_DATE + 1.day) - PROVIDER_BUFFER
+    end_date            = Date.current.in_time_zone("America/New_York").to_date
+
+    @provider.expects(:fetch_exchange_rates)
+             .with(from: "CAD",
+                   to: "USD",
+                   start_date: expected_start_date,
+                   end_date: end_date)
+             .returns(provider_success_response([
+               OpenStruct.new(from: "CAD", to: "USD", date: SNAPSHOT_START_DATE, rate: 1.5)
+             ]))
+
+    before = ExchangeRate.count
+    MarketDataImporter.new(mode: :snapshot).import_exchange_rates
+    after  = ExchangeRate.count
+
+    assert_operator after, :>, before, "Should insert at least one new exchange-rate row"
+  end
+
+  test "syncs security prices" do
+    security = Security.create!(ticker: "AAPL", exchange_operating_mic: "XNAS")
+
+    expected_start_date = SNAPSHOT_START_DATE - PROVIDER_BUFFER
+    end_date            = Date.current.in_time_zone("America/New_York").to_date
+
+    @provider.expects(:fetch_security_prices)
+             .with(symbol: security.ticker,
+                   exchange_operating_mic: security.exchange_operating_mic,
+                   start_date: expected_start_date,
+                   end_date: end_date)
+             .returns(provider_success_response([
+               OpenStruct.new(security: security,
+                              date: SNAPSHOT_START_DATE,
+                              price: 100,
+                              currency: "USD")
+             ]))
+
+    @provider.stubs(:fetch_security_info)
+             .with(symbol: "AAPL", exchange_operating_mic: "XNAS")
+             .returns(provider_success_response(OpenStruct.new(name: "Apple", logo_url: "logo")))
+
+    # Ignore exchange rate calls for this test
+    @provider.stubs(:fetch_exchange_rates).returns(provider_success_response([]))
+
+    MarketDataImporter.new(mode: :snapshot).import_security_prices
+
+    assert_equal 1, Security::Price.where(security: security, date: SNAPSHOT_START_DATE).count
+  end
+end
diff --git a/test/jobs/user_purge_job_test.rb b/test/models/mobile_device_test.rb
similarity index 61%
rename from test/jobs/user_purge_job_test.rb
rename to test/models/mobile_device_test.rb
index 9fb2ae63..79bb8f62 100644
--- a/test/jobs/user_purge_job_test.rb
+++ b/test/models/mobile_device_test.rb
@@ -1,6 +1,6 @@
 require "test_helper"
 
-class UserPurgeJobTest < ActiveJob::TestCase
+class MobileDeviceTest < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end
diff --git a/test/models/other_asset_test.rb b/test/models/other_asset_test.rb
deleted file mode 100644
index f43ed087..00000000
--- a/test/models/other_asset_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class OtherAssetTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/models/other_liability_test.rb b/test/models/other_liability_test.rb
deleted file mode 100644
index f92ea5ce..00000000
--- a/test/models/other_liability_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class OtherLiabilityTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/models/period_test.rb b/test/models/period_test.rb
new file mode 100644
index 00000000..eaea02c5
--- /dev/null
+++ b/test/models/period_test.rb
@@ -0,0 +1,60 @@
+require "test_helper"
+
+class PeriodTest < ActiveSupport::TestCase
+  test "raises validation error when start_date or end_date is missing" do
+    error = assert_raises(ActiveModel::ValidationError) do
+      Period.new(start_date: nil, end_date: nil)
+    end
+
+    assert_includes error.message, "Start date can't be blank"
+    assert_includes error.message, "End date can't be blank"
+  end
+
+  test "raises validation error when start_date is not before end_date" do
+    error = assert_raises(ActiveModel::ValidationError) do
+      Period.new(start_date: Date.current, end_date: Date.current - 1.day)
+    end
+
+    assert_includes error.message, "Start date must be before end date"
+  end
+
+  test "can create custom period" do
+    period = Period.new(start_date: Date.current - 15.days, end_date: Date.current)
+    assert_equal "Custom Period", period.label
+  end
+
+  test "from_key returns period for valid key" do
+    period = Period.from_key("last_30_days")
+    assert_equal 30.days.ago.to_date, period.start_date
+    assert_equal Date.current, period.end_date
+  end
+
+  test "from_key with invalid key and no fallback raises error" do
+    error = assert_raises(Period::InvalidKeyError) do
+      Period.from_key("invalid_key")
+    end
+  end
+
+  test "label returns correct label for known period" do
+    period = Period.from_key("last_30_days")
+    assert_equal "Last 30 Days", period.label
+  end
+
+  test "label returns Custom Period for unknown period" do
+    period = Period.new(start_date: Date.current - 15.days, end_date: Date.current)
+    assert_equal "Custom Period", period.label
+  end
+
+  test "comparison_label returns correct label for known period" do
+    period = Period.from_key("last_30_days")
+    assert_equal "vs. last month", period.comparison_label
+  end
+
+  test "comparison_label returns date range for unknown period" do
+    start_date = Date.current - 15.days
+    end_date = Date.current
+    period = Period.new(start_date: start_date, end_date: end_date)
+    expected = "#{start_date.strftime("%b %d, %Y")} to #{end_date.strftime("%b %d, %Y")}"
+    assert_equal expected, period.comparison_label
+  end
+end
diff --git a/test/models/plaid_account/importer_test.rb b/test/models/plaid_account/importer_test.rb
new file mode 100644
index 00000000..b1084cdb
--- /dev/null
+++ b/test/models/plaid_account/importer_test.rb
@@ -0,0 +1,46 @@
+require "test_helper"
+
+class PlaidAccount::ImporterTest < ActiveSupport::TestCase
+  setup do
+    @plaid_account = plaid_accounts(:one)
+    @mock_account_snapshot = mock
+  end
+
+  test "imports account data" do
+    account_data = OpenStruct.new(
+      account_id: "acc_1",
+      name: "Test Account",
+      mask: "1234",
+    )
+
+    transactions_data = OpenStruct.new(
+      added: [],
+      modified: [],
+      removed: [],
+    )
+
+    investments_data = OpenStruct.new(
+      holdings: [],
+      transactions: [],
+      securities: [],
+    )
+
+    liabilities_data = OpenStruct.new(
+      credit: [],
+      mortgage: [],
+      student: [],
+    )
+
+    @mock_account_snapshot.expects(:account_data).returns(account_data).at_least_once
+    @mock_account_snapshot.expects(:transactions_data).returns(transactions_data).at_least_once
+    @mock_account_snapshot.expects(:investments_data).returns(investments_data).at_least_once
+    @mock_account_snapshot.expects(:liabilities_data).returns(liabilities_data).at_least_once
+
+    @plaid_account.expects(:upsert_plaid_snapshot!).with(account_data)
+    @plaid_account.expects(:upsert_plaid_transactions_snapshot!).with(transactions_data)
+    @plaid_account.expects(:upsert_plaid_investments_snapshot!).with(investments_data)
+    @plaid_account.expects(:upsert_plaid_liabilities_snapshot!).with(liabilities_data)
+
+    PlaidAccount::Importer.new(@plaid_account, account_snapshot: @mock_account_snapshot).import
+  end
+end
diff --git a/test/models/plaid_account/investments/balance_calculator_test.rb b/test/models/plaid_account/investments/balance_calculator_test.rb
new file mode 100644
index 00000000..c4cd5d10
--- /dev/null
+++ b/test/models/plaid_account/investments/balance_calculator_test.rb
@@ -0,0 +1,83 @@
+require "test_helper"
+
+class PlaidAccount::Investments::BalanceCalculatorTest < ActiveSupport::TestCase
+  setup do
+    @plaid_account = plaid_accounts(:one)
+
+    @plaid_account.update!(
+      plaid_type: "investment",
+      current_balance: 4000,
+      available_balance: 2000 # We ignore this since we have current_balance + holdings
+    )
+  end
+
+  test "calculates total balance from cash and positions" do
+    brokerage_cash_security_id = "plaid_brokerage_cash" # Plaid's brokerage cash security
+    cash_equivalent_security_id = "plaid_cash_equivalent" # Cash equivalent security (i.e. money market fund)
+    aapl_security_id = "plaid_aapl_security" # Regular stock security
+
+    test_investments = {
+      transactions: [], # Irrelevant for balance calcs, leave empty
+      holdings: [
+        # $1,000 in brokerage cash
+        {
+          security_id: brokerage_cash_security_id,
+          cost_basis: 1000,
+          institution_price: 1,
+          institution_value: 1000,
+          quantity: 1000
+        },
+        # $1,000 in money market funds
+        {
+          security_id: cash_equivalent_security_id,
+          cost_basis: 1000,
+          institution_price: 1,
+          institution_value: 1000,
+          quantity: 1000
+        },
+        # $2,000 worth of AAPL stock
+        {
+          security_id: aapl_security_id,
+          cost_basis: 2000,
+          institution_price: 200,
+          institution_value: 2000,
+          quantity: 10
+        }
+      ],
+      securities: [
+        {
+          security_id: brokerage_cash_security_id,
+          ticker_symbol: "CUR:USD",
+          is_cash_equivalent: true,
+          type: "cash"
+        },
+        {
+          security_id: cash_equivalent_security_id,
+          ticker_symbol: "VMFXX", # Vanguard Money Market Reserves
+          is_cash_equivalent: true,
+          type: "mutual fund"
+        },
+        {
+          security_id: aapl_security_id,
+          ticker_symbol: "AAPL",
+          is_cash_equivalent: false,
+          type: "equity",
+          market_identifier_code: "XNAS"
+        }
+      ]
+    }
+
+    @plaid_account.update!(raw_investments_payload: test_investments)
+
+    security_resolver = PlaidAccount::Investments::SecurityResolver.new(@plaid_account)
+    balance_calculator = PlaidAccount::Investments::BalanceCalculator.new(@plaid_account, security_resolver: security_resolver)
+
+    # We set this equal to `current_balance`
+    assert_equal 4000, balance_calculator.balance
+
+    # This is the sum of "non-brokerage-cash-holdings".  In the above test case, this means
+    # we're summing up $2,000 of AAPL + $1,000 Vanguard MM for $3,000 in holdings value.
+    # We back this $3,000 from the $4,000 total to get $1,000 in cash balance.
+    assert_equal 1000, balance_calculator.cash_balance
+  end
+end
diff --git a/test/models/plaid_account/investments/holdings_processor_test.rb b/test/models/plaid_account/investments/holdings_processor_test.rb
new file mode 100644
index 00000000..3aa797da
--- /dev/null
+++ b/test/models/plaid_account/investments/holdings_processor_test.rb
@@ -0,0 +1,197 @@
+require "test_helper"
+
+class PlaidAccount::Investments::HoldingsProcessorTest < ActiveSupport::TestCase
+  setup do
+    @plaid_account = plaid_accounts(:one)
+    @security_resolver = PlaidAccount::Investments::SecurityResolver.new(@plaid_account)
+  end
+
+  test "creates holding records from Plaid holdings snapshot" do
+    test_investments_payload = {
+      securities: [], # mocked
+      holdings: [
+        {
+          "security_id" => "123",
+          "quantity" => 100,
+          "institution_price" => 100,
+          "iso_currency_code" => "USD",
+          "institution_price_as_of" => 1.day.ago.to_date
+        },
+        {
+          "security_id" => "456",
+          "quantity" => 200,
+          "institution_price" => 200,
+          "iso_currency_code" => "USD"
+        }
+      ],
+      transactions: [] # not relevant for test
+    }
+
+    @plaid_account.update!(raw_investments_payload: test_investments_payload)
+
+    @security_resolver.expects(:resolve)
+                      .with(plaid_security_id: "123")
+                      .returns(
+                        OpenStruct.new(
+                          security: securities(:aapl),
+                          cash_equivalent?: false,
+                          brokerage_cash?: false
+                        )
+                      )
+
+    @security_resolver.expects(:resolve)
+                      .with(plaid_security_id: "456")
+                      .returns(
+                        OpenStruct.new(
+                          security: securities(:aapl),
+                          cash_equivalent?: false,
+                          brokerage_cash?: false
+                        )
+                      )
+
+    processor = PlaidAccount::Investments::HoldingsProcessor.new(@plaid_account, security_resolver: @security_resolver)
+
+    assert_difference "Holding.count", 2 do
+      processor.process
+    end
+
+    holdings = Holding.where(account: @plaid_account.account).order(:date)
+
+    assert_equal 100, holdings.first.qty
+    assert_equal 100, holdings.first.price
+    assert_equal "USD", holdings.first.currency
+    assert_equal securities(:aapl), holdings.first.security
+    assert_equal 1.day.ago.to_date, holdings.first.date
+
+    assert_equal 200, holdings.second.qty
+    assert_equal 200, holdings.second.price
+    assert_equal "USD", holdings.second.currency
+    assert_equal securities(:aapl), holdings.second.security
+    assert_equal Date.current, holdings.second.date
+  end
+
+  # When Plaid provides holdings data, it includes an "institution_price_as_of" date
+  # which represents when the holdings were last updated. Any holdings in our database
+  # after this date are now stale and should be deleted, as the Plaid data is the
+  # authoritative source of truth for the current holdings.
+  test "deletes stale holdings per security based on institution price date" do
+    account = @plaid_account.account
+
+    # Create a third security for testing
+    third_security = Security.create!(ticker: "GOOGL", name: "Google", exchange_operating_mic: "XNAS", country_code: "US")
+
+    # Scenario 3: AAPL has a stale holding that should be deleted
+    stale_aapl_holding = account.holdings.create!(
+      security: securities(:aapl),
+      date: Date.current,
+      qty: 80,
+      price: 180,
+      amount: 14400,
+      currency: "USD"
+    )
+
+    # Plaid returns 3 holdings with different scenarios
+    test_investments_payload = {
+      securities: [],
+      holdings: [
+        # Scenario 1: Current date holding (no deletions needed)
+        {
+          "security_id" => "current",
+          "quantity" => 50,
+          "institution_price" => 50,
+          "iso_currency_code" => "USD",
+          "institution_price_as_of" => Date.current
+        },
+        # Scenario 2: Yesterday's holding with no future holdings
+        {
+          "security_id" => "clean",
+          "quantity" => 75,
+          "institution_price" => 75,
+          "iso_currency_code" => "USD",
+          "institution_price_as_of" => 1.day.ago.to_date
+        },
+        # Scenario 3: Yesterday's holding with stale future holding
+        {
+          "security_id" => "stale",
+          "quantity" => 100,
+          "institution_price" => 100,
+          "iso_currency_code" => "USD",
+          "institution_price_as_of" => 1.day.ago.to_date
+        }
+      ],
+      transactions: []
+    }
+
+    @plaid_account.update!(raw_investments_payload: test_investments_payload)
+
+    # Mock security resolver for all three securities
+    @security_resolver.expects(:resolve)
+                      .with(plaid_security_id: "current")
+                      .returns(OpenStruct.new(security: securities(:msft), cash_equivalent?: false, brokerage_cash?: false))
+
+    @security_resolver.expects(:resolve)
+                      .with(plaid_security_id: "clean")
+                      .returns(OpenStruct.new(security: third_security, cash_equivalent?: false, brokerage_cash?: false))
+
+    @security_resolver.expects(:resolve)
+                      .with(plaid_security_id: "stale")
+                      .returns(OpenStruct.new(security: securities(:aapl), cash_equivalent?: false, brokerage_cash?: false))
+
+    processor = PlaidAccount::Investments::HoldingsProcessor.new(@plaid_account, security_resolver: @security_resolver)
+    processor.process
+
+    # Should have created 3 new holdings
+    assert_equal 3, account.holdings.count
+
+    # Scenario 3: Should have deleted the stale AAPL holding
+    assert_not account.holdings.exists?(stale_aapl_holding.id)
+
+    # Should have the correct holdings from Plaid
+    assert account.holdings.exists?(security: securities(:msft), date: Date.current, qty: 50)
+    assert account.holdings.exists?(security: third_security, date: 1.day.ago.to_date, qty: 75)
+    assert account.holdings.exists?(security: securities(:aapl), date: 1.day.ago.to_date, qty: 100)
+  end
+
+  test "continues processing other holdings when security resolution fails" do
+    test_investments_payload = {
+      securities: [],
+      holdings: [
+        {
+          "security_id" => "fail",
+          "quantity" => 100,
+          "institution_price" => 100,
+          "iso_currency_code" => "USD"
+        },
+        {
+          "security_id" => "success",
+          "quantity" => 200,
+          "institution_price" => 200,
+          "iso_currency_code" => "USD"
+        }
+      ],
+      transactions: []
+    }
+
+    @plaid_account.update!(raw_investments_payload: test_investments_payload)
+
+    # First security fails to resolve
+    @security_resolver.expects(:resolve)
+                      .with(plaid_security_id: "fail")
+                      .returns(OpenStruct.new(security: nil))
+
+    # Second security succeeds
+    @security_resolver.expects(:resolve)
+                      .with(plaid_security_id: "success")
+                      .returns(OpenStruct.new(security: securities(:aapl)))
+
+    processor = PlaidAccount::Investments::HoldingsProcessor.new(@plaid_account, security_resolver: @security_resolver)
+
+    # Should create only 1 holding (the successful one)
+    assert_difference "Holding.count", 1 do
+      processor.process
+    end
+
+    # Should have created the successful holding
+    assert @plaid_account.account.holdings.exists?(security: securities(:aapl), qty: 200)
+  end
+end
diff --git a/test/models/plaid_account/investments/security_resolver_test.rb b/test/models/plaid_account/investments/security_resolver_test.rb
new file mode 100644
index 00000000..a32430c6
--- /dev/null
+++ b/test/models/plaid_account/investments/security_resolver_test.rb
@@ -0,0 +1,115 @@
+require "test_helper"
+
+class PlaidAccount::Investments::SecurityResolverTest < ActiveSupport::TestCase
+  setup do
+    @upstream_resolver = mock("Security::Resolver")
+    @plaid_account = plaid_accounts(:one)
+    @resolver = PlaidAccount::Investments::SecurityResolver.new(@plaid_account)
+  end
+
+  test "handles missing plaid security" do
+    missing_id = "missing_security_id"
+
+    # Ensure there are *no* securities that reference the missing ID
+    @plaid_account.update!(raw_investments_payload: {
+      securities: [
+        {
+          "security_id" => "some_other_id",
+          "ticker_symbol" => "FOO",
+          "type" => "equity",
+          "market_identifier_code" => "XNAS"
+        }
+      ]
+    })
+
+    Security::Resolver.expects(:new).never
+    Sentry.stubs(:capture_exception)
+
+    response = @resolver.resolve(plaid_security_id: missing_id)
+
+    assert_nil response.security
+    refute response.cash_equivalent?
+    refute response.brokerage_cash?
+  end
+
+  test "identifies brokerage cash plaid securities" do
+    brokerage_cash_id = "brokerage_cash_security_id"
+
+    @plaid_account.update!(raw_investments_payload: {
+      securities: [
+        {
+          "security_id" => brokerage_cash_id,
+          "ticker_symbol" => "CUR:USD", # Plaid brokerage cash ticker
+          "type" => "cash",
+          "is_cash_equivalent" => true
+        }
+      ]
+    })
+
+    Security::Resolver.expects(:new).never
+
+    response = @resolver.resolve(plaid_security_id: brokerage_cash_id)
+
+    assert_nil response.security
+    assert response.cash_equivalent?
+    assert response.brokerage_cash?
+  end
+
+  test "identifies cash equivalent plaid securities" do
+    mmf_security_id = "money_market_security_id"
+
+    @plaid_account.update!(raw_investments_payload: {
+      securities: [
+        {
+          "security_id" => mmf_security_id,
+          "ticker_symbol" => "VMFXX", # Vanguard Federal Money Market Fund
+          "type" => "mutual fund",
+          "is_cash_equivalent" => true,
+          "market_identifier_code" => "XNAS"
+        }
+      ]
+    })
+
+    resolved_security = Security.create!(ticker: "VMFXX", exchange_operating_mic: "XNAS")
+
+    Security::Resolver.expects(:new)
+                     .with("VMFXX", exchange_operating_mic: "XNAS")
+                     .returns(@upstream_resolver)
+    @upstream_resolver.expects(:resolve).returns(resolved_security)
+
+    response = @resolver.resolve(plaid_security_id: mmf_security_id)
+
+    assert_equal resolved_security, response.security
+    assert response.cash_equivalent?
+    refute response.brokerage_cash?
+  end
+
+  test "resolves normal plaid securities" do
+    security_id = "regular_security_id"
+
+    @plaid_account.update!(raw_investments_payload: {
+      securities: [
+        {
+          "security_id" => security_id,
+          "ticker_symbol" => "IVV",
+          "type" => "etf",
+          "is_cash_equivalent" => false,
+          "market_identifier_code" => "XNAS"
+        }
+      ]
+    })
+
+    resolved_security = Security.create!(ticker: "IVV", exchange_operating_mic: "XNAS")
+
+    Security::Resolver.expects(:new)
+                     .with("IVV", exchange_operating_mic: "XNAS")
+                     .returns(@upstream_resolver)
+    @upstream_resolver.expects(:resolve).returns(resolved_security)
+
+    response = @resolver.resolve(plaid_security_id: security_id)
+
+    assert_equal resolved_security, response.security
+    refute response.cash_equivalent? # Normal securities are not cash equivalent
+    refute response.brokerage_cash?
+  end
+end
diff --git a/test/models/plaid_account/investments/transactions_processor_test.rb b/test/models/plaid_account/investments/transactions_processor_test.rb
new file mode 100644
index 00000000..2eb044f1
--- /dev/null
+++ b/test/models/plaid_account/investments/transactions_processor_test.rb
@@ -0,0 +1,183 @@
+require "test_helper"
+
+class PlaidAccount::Investments::TransactionsProcessorTest < ActiveSupport::TestCase
+  setup do
+    @plaid_account = plaid_accounts(:one)
+    @security_resolver = PlaidAccount::Investments::SecurityResolver.new(@plaid_account)
+  end
+
+  test "creates regular trade entries" do
+    test_investments_payload = {
+      transactions: [
+        {
+          "transaction_id" => "123",
+          "security_id" => "123",
+          "type" => "buy",
+          "quantity" => 1, # Positive, so "buy 1 share"
+          "price" => 100,
+          "amount" => 100,
+          "iso_currency_code" => "USD",
+          "date" => Date.current,
+          "name" => "Buy 1 share of AAPL"
+        }
+      ]
+    }
+
+    @plaid_account.update!(raw_investments_payload: test_investments_payload)
+
+    @security_resolver.stubs(:resolve).returns(OpenStruct.new(
+      security: securities(:aapl)
+    ))
+
+    processor = PlaidAccount::Investments::TransactionsProcessor.new(@plaid_account, security_resolver: @security_resolver)
+
+    assert_difference [ "Entry.count", "Trade.count" ], 1 do
+      processor.process
+    end
+
+    entry = Entry.order(created_at: :desc).first
+
+    assert_equal 100, entry.amount
+    assert_equal "USD", entry.currency
+    assert_equal Date.current, entry.date
+    assert_equal "Buy 1 share of AAPL", entry.name
+  end
+
+  test "creates cash transactions" do
+    test_investments_payload = {
+      transactions: [
+        {
+          "transaction_id" => "123",
+          "type" => "cash",
+          "subtype" => "withdrawal",
+          "amount" => 100, # Positive, so moving money OUT of the account
+          "iso_currency_code" => "USD",
+          "date" => Date.current,
+          "name" => "Withdrawal"
+        }
+      ]
+    }
+
+    @plaid_account.update!(raw_investments_payload: test_investments_payload)
+
+    @security_resolver.expects(:resolve).never # Cash transactions don't have a security
+
+    processor = PlaidAccount::Investments::TransactionsProcessor.new(@plaid_account, security_resolver: @security_resolver)
+
+    assert_difference [ "Entry.count", "Transaction.count" ], 1 do
+      processor.process
+    end
+
+    entry = Entry.order(created_at: :desc).first
+
+    assert_equal 100, entry.amount
+    assert_equal "USD", entry.currency
+    assert_equal Date.current, entry.date
+    assert_equal "Withdrawal", entry.name
+  end
+
+  test "creates fee transactions" do
+    test_investments_payload = {
+      transactions: [
+        {
+          "transaction_id" => "123",
+          "type" => "fee",
+          "subtype" => "miscellaneous fee",
+          "amount" => 10.25,
+          "iso_currency_code" => "USD",
+          "date" => Date.current,
+          "name" => "Miscellaneous fee"
+        }
+      ]
+    }
+
+    @plaid_account.update!(raw_investments_payload: test_investments_payload)
+
+    @security_resolver.expects(:resolve).never # Cash transactions don't have a security
+
+    processor = PlaidAccount::Investments::TransactionsProcessor.new(@plaid_account, security_resolver: @security_resolver)
+
+    assert_difference [ "Entry.count", "Transaction.count" ], 1 do
+      processor.process
+    end
+
+    entry = Entry.order(created_at: :desc).first
+
+    assert_equal 10.25, entry.amount
+    assert_equal "USD", entry.currency
+    assert_equal Date.current, entry.date
+    assert_equal "Miscellaneous fee", entry.name
+  end
+
+  test "handles bad plaid quantity signage data" do
+    test_investments_payload = {
+      transactions: [
+        {
+          "transaction_id" => "123",
+          "type" => "sell", # Correct type
+          "subtype" => "sell", # Correct subtype
+          "quantity" => 1, # ***Incorrect signage***, this should be negative
+          "price" => 100, # Correct price
+          "amount" => -100, # Correct amount
+          "iso_currency_code" => "USD",
+          "date" => Date.current,
+          "name" => "Sell 1 share of AAPL"
+        }
+      ]
+    }
+
+    @plaid_account.update!(raw_investments_payload: test_investments_payload)
+
+    @security_resolver.expects(:resolve).returns(OpenStruct.new(
+      security: securities(:aapl)
+    ))
+
+    processor = PlaidAccount::Investments::TransactionsProcessor.new(@plaid_account, security_resolver: @security_resolver)
+
+    assert_difference [ "Entry.count", "Trade.count" ], 1 do
+      processor.process
+    end
+
+    entry = Entry.order(created_at: :desc).first
+
+    assert_equal -100, entry.amount
+    assert_equal "USD", entry.currency
+    assert_equal Date.current, entry.date
+    assert_equal "Sell 1 share of AAPL", entry.name
+
+    assert_equal -1, entry.trade.qty
+  end
+
+  test "creates transfer transactions as cash transactions" do
+    test_investments_payload = {
+      transactions: [
+        {
+          "investment_transaction_id" => "123",
+          "type" => "transfer",
+          "amount" => -100.0,
+          "iso_currency_code" => "USD",
+          "date" => Date.current,
+          "name" => "Bank Transfer"
+        }
+      ]
+    }
+
+    @plaid_account.update!(raw_investments_payload: test_investments_payload)
+
+    @security_resolver.expects(:resolve).never
+
+    processor = PlaidAccount::Investments::TransactionsProcessor.new(@plaid_account, security_resolver: @security_resolver)
+
+    assert_difference [ "Entry.count", "Transaction.count" ], 1 do
+      processor.process
+    end
+
+    entry = Entry.order(created_at: :desc).first
+
+    assert_equal -100.0, entry.amount
+    assert_equal "USD", entry.currency
+    assert_equal Date.current, entry.date
+    assert_equal "Bank Transfer", entry.name
+    assert_instance_of Transaction, entry.entryable
+  end
+end
diff --git a/test/models/plaid_account/liabilities/credit_processor_test.rb b/test/models/plaid_account/liabilities/credit_processor_test.rb
new file mode 100644
index 00000000..d51e79db
--- /dev/null
+++ b/test/models/plaid_account/liabilities/credit_processor_test.rb
@@ -0,0 +1,39 @@
+require "test_helper"
+
+class PlaidAccount::Liabilities::CreditProcessorTest < ActiveSupport::TestCase
+  setup do
+    @plaid_account = plaid_accounts(:one)
+    @plaid_account.update!(
+      plaid_type: "credit",
+      plaid_subtype: "credit_card"
+    )
+
+    @plaid_account.account.update!(
+      accountable: CreditCard.new,
+    )
+  end
+
+  test "updates credit card minimum payment and APR from Plaid data" do
+    @plaid_account.update!(raw_liabilities_payload: {
+      credit: {
+        minimum_payment_amount: 100,
+        aprs: [ { apr_percentage: 15.0 } ]
+      }
+    })
+
+    processor = PlaidAccount::Liabilities::CreditProcessor.new(@plaid_account)
+    processor.process
+
+    assert_equal 100, @plaid_account.account.credit_card.minimum_payment
+    assert_equal 15.0, @plaid_account.account.credit_card.apr
+  end
+
+  test "does nothing when liability data absent" do
+    @plaid_account.update!(raw_liabilities_payload: {})
+    processor = PlaidAccount::Liabilities::CreditProcessor.new(@plaid_account)
+    processor.process
+
+    assert_nil @plaid_account.account.credit_card.minimum_payment
+    assert_nil @plaid_account.account.credit_card.apr
+  end
+end
diff --git a/test/models/plaid_account/liabilities/mortgage_processor_test.rb b/test/models/plaid_account/liabilities/mortgage_processor_test.rb
new file mode 100644
index 00000000..feb9ce8c
--- /dev/null
+++ b/test/models/plaid_account/liabilities/mortgage_processor_test.rb
@@ -0,0 +1,44 @@
+require "test_helper"
+
+class PlaidAccount::Liabilities::MortgageProcessorTest < ActiveSupport::TestCase
+  setup do
+    @plaid_account = plaid_accounts(:one)
+    @plaid_account.update!(
+      plaid_type: "loan",
+      plaid_subtype: "mortgage"
+    )
+
+    @plaid_account.account.update!(accountable: Loan.new)
+  end
+
+  test "updates loan interest rate and type from Plaid data" do
+    @plaid_account.update!(raw_liabilities_payload: {
+      mortgage: {
+        interest_rate: {
+          type: "fixed",
+          percentage: 4.25
+        }
+      }
+    })
+
+    processor = PlaidAccount::Liabilities::MortgageProcessor.new(@plaid_account)
+    processor.process
+
+    loan = @plaid_account.account.loan
+
+    assert_equal "fixed", loan.rate_type
+    assert_equal 4.25, loan.interest_rate
+  end
+
+  test "does nothing when mortgage data absent" do
+    @plaid_account.update!(raw_liabilities_payload: {})
+
+    processor = PlaidAccount::Liabilities::MortgageProcessor.new(@plaid_account)
+    processor.process
+
+    loan = @plaid_account.account.loan
+
+    assert_nil loan.rate_type
+    assert_nil loan.interest_rate
+  end
+end
diff --git a/test/models/plaid_account/liabilities/student_loan_processor_test.rb b/test/models/plaid_account/liabilities/student_loan_processor_test.rb
new file mode 100644
index 00000000..40fa5b23
--- /dev/null
+++ b/test/models/plaid_account/liabilities/student_loan_processor_test.rb
@@ -0,0 +1,68 @@
+require "test_helper"
+
+class PlaidAccount::Liabilities::StudentLoanProcessorTest < ActiveSupport::TestCase
+  setup do
+    @plaid_account = plaid_accounts(:one)
+    @plaid_account.update!(
+      plaid_type: "loan",
+      plaid_subtype: "student"
+    )
+
+    # Change the underlying accountable to a Loan so the helper method `loan` is available
+    @plaid_account.account.update!(accountable: Loan.new)
+  end
+
+  test "updates loan details including term months from Plaid data" do
+    @plaid_account.update!(raw_liabilities_payload: {
+      student: {
+        interest_rate_percentage: 5.5,
+        origination_principal_amount: 20000,
+        origination_date: Date.new(2020, 1, 1),
+        expected_payoff_date: Date.new(2022, 1, 1)
+      }
+    })
+
+    processor = PlaidAccount::Liabilities::StudentLoanProcessor.new(@plaid_account)
+    processor.process
+
+    loan = @plaid_account.account.loan
+
+    assert_equal "fixed", loan.rate_type
+    assert_equal 5.5, loan.interest_rate
+    assert_equal 20000, loan.initial_balance
+    assert_equal 24, loan.term_months
+  end
+
+  test "handles missing payoff dates gracefully" do
+    @plaid_account.update!(raw_liabilities_payload: {
+      student: {
+        interest_rate_percentage: 4.8,
+        origination_principal_amount: 15000,
+        origination_date: Date.new(2021, 6, 1)
+        # expected_payoff_date omitted
+      }
+    })
+
+    processor = PlaidAccount::Liabilities::StudentLoanProcessor.new(@plaid_account)
+    processor.process
+
+    loan = @plaid_account.account.loan
+
+    assert_nil loan.term_months
+    assert_equal 4.8, loan.interest_rate
+    assert_equal 15000, loan.initial_balance
+  end
+
+  test "does nothing when loan data absent" do
+    @plaid_account.update!(raw_liabilities_payload: {})
+
+    processor = PlaidAccount::Liabilities::StudentLoanProcessor.new(@plaid_account)
+    processor.process
+
+    loan = @plaid_account.account.loan
+
+    assert_nil loan.interest_rate
+    assert_nil loan.initial_balance
+    assert_nil loan.term_months
+  end
+end
diff --git a/test/models/plaid_account/processor_test.rb b/test/models/plaid_account/processor_test.rb
new file mode 100644
index 00000000..ba6a002f
--- /dev/null
+++ b/test/models/plaid_account/processor_test.rb
@@ -0,0 +1,253 @@
+require "test_helper"
+
+class PlaidAccount::ProcessorTest < ActiveSupport::TestCase
+  setup do
+    @plaid_account = plaid_accounts(:one)
+  end
+
+  test "processes new account and assigns attributes" do
+    Account.destroy_all # Clear out internal accounts so we start fresh
+
+    expect_default_subprocessor_calls
+
+    @plaid_account.update!(
+      plaid_id: "test_plaid_id",
+      plaid_type: "depository",
+      plaid_subtype: "checking",
+      current_balance: 1000,
+      available_balance: 1000,
+      currency: "USD",
+      name: "Test Plaid Account",
+      mask: "1234"
+    )
+
+    assert_difference "Account.count" do
+      PlaidAccount::Processor.new(@plaid_account).process
+    end
+
+    @plaid_account.reload
+
+    account = Account.order(created_at: :desc).first
+    assert_equal "Test Plaid Account", account.name
+    assert_equal @plaid_account.id, account.plaid_account_id
+    assert_equal "checking", account.subtype
+    assert_equal 1000, account.balance
+    assert_equal 1000, account.cash_balance
+    assert_equal "USD", account.currency
+    assert_equal "Depository", account.accountable_type
+    assert_equal "checking", account.subtype
+  end
+
+  test "processing is idempotent with updates and enrichments" do
+    expect_default_subprocessor_calls
+
+    assert_equal "Plaid Depository Account", @plaid_account.account.name
+    assert_equal "checking", @plaid_account.account.subtype
+
+    @plaid_account.account.update!(
+      name: "User updated name",
+      subtype: "savings",
+      balance: 2000 # User cannot override balance.  This will be overridden by the processor on next processing
+    )
+
+    @plaid_account.account.lock_attr!(:name)
+    @plaid_account.account.lock_attr!(:subtype)
+    @plaid_account.account.lock_attr!(:balance) # Even if balance somehow becomes locked, Plaid ignores it and overrides it
+
+    assert_no_difference "Account.count" do
+      PlaidAccount::Processor.new(@plaid_account).process
+    end
+
+    @plaid_account.reload
+
+    assert_equal "User updated name", @plaid_account.account.name
+    assert_equal "savings", @plaid_account.account.subtype
+    assert_equal @plaid_account.current_balance, @plaid_account.account.balance # Overriden by processor
+  end
+
+  test "account processing failure halts further processing" do
+    Account.any_instance.stubs(:save!).raises(StandardError.new("Test error"))
+
+    PlaidAccount::Transactions::Processor.any_instance.expects(:process).never
+    PlaidAccount::Investments::TransactionsProcessor.any_instance.expects(:process).never
+    PlaidAccount::Investments::HoldingsProcessor.any_instance.expects(:process).never
+
+    expect_no_investment_balance_calculator_calls
+    expect_no_liability_processor_calls
+
+    assert_raises(StandardError) do
+      PlaidAccount::Processor.new(@plaid_account).process
+    end
+  end
+
+  test "product processing failure reports exception and continues processing" do
+    PlaidAccount::Transactions::Processor.any_instance.stubs(:process).raises(StandardError.new("Test error"))
+
+    # Subsequent product processors still run
+    expect_investment_product_processor_calls
+
+    assert_nothing_raised do
+      PlaidAccount::Processor.new(@plaid_account).process
+    end
+  end
+
+  test "calculates balance using BalanceCalculator for investment accounts" do
+    @plaid_account.update!(plaid_type: "investment")
+
+    # Balance is called twice: once for account.balance and once for set_current_balance
+    PlaidAccount::Investments::BalanceCalculator.any_instance.expects(:balance).returns(1000).twice
+    PlaidAccount::Investments::BalanceCalculator.any_instance.expects(:cash_balance).returns(1000).once
+
+    PlaidAccount::Processor.new(@plaid_account).process
+
+    # Verify that the balance was set correctly
+    account = @plaid_account.account
+    assert_equal 1000, account.balance
+    assert_equal 1000, account.cash_balance
+
+    # Verify current balance anchor was created with correct value
+    current_anchor = account.valuations.current_anchor.first
+    assert_not_nil current_anchor
+    assert_equal 1000, current_anchor.entry.amount
+  end
+
+  test "processes credit liability data" do
+    expect_investment_product_processor_calls
+    expect_no_investment_balance_calculator_calls
+    expect_depository_product_processor_calls
+
+    @plaid_account.update!(plaid_type: "credit", plaid_subtype: "credit card")
+
+    PlaidAccount::Liabilities::CreditProcessor.any_instance.expects(:process).once
+    PlaidAccount::Liabilities::MortgageProcessor.any_instance.expects(:process).never
+    PlaidAccount::Liabilities::StudentLoanProcessor.any_instance.expects(:process).never
+
+    PlaidAccount::Processor.new(@plaid_account).process
+  end
+
+  test "processes mortgage liability data" do
+    expect_investment_product_processor_calls
+    expect_no_investment_balance_calculator_calls
+    expect_depository_product_processor_calls
+
+    @plaid_account.update!(plaid_type: "loan", plaid_subtype: "mortgage")
+
+    PlaidAccount::Liabilities::CreditProcessor.any_instance.expects(:process).never
+    PlaidAccount::Liabilities::MortgageProcessor.any_instance.expects(:process).once
+    PlaidAccount::Liabilities::StudentLoanProcessor.any_instance.expects(:process).never
+
+    PlaidAccount::Processor.new(@plaid_account).process
+  end
+
+  test "processes student loan liability data" do
+    expect_investment_product_processor_calls
+    expect_no_investment_balance_calculator_calls
+    expect_depository_product_processor_calls
+
+    @plaid_account.update!(plaid_type: "loan", plaid_subtype: "student")
+
+    PlaidAccount::Liabilities::CreditProcessor.any_instance.expects(:process).never
+    PlaidAccount::Liabilities::MortgageProcessor.any_instance.expects(:process).never
+    PlaidAccount::Liabilities::StudentLoanProcessor.any_instance.expects(:process).once
+
+    PlaidAccount::Processor.new(@plaid_account).process
+  end
+
+  test "creates current balance anchor when processing account" do
+    expect_default_subprocessor_calls
+
+    # Clear out accounts to start fresh
+    Account.destroy_all
+
+    @plaid_account.update!(
+      plaid_id: "test_plaid_id",
+      plaid_type: "depository",
+      plaid_subtype: "checking",
+      current_balance: 1500,
+      available_balance: 1500,
+      currency: "USD",
+      name: "Test Account with Anchor",
+      mask: "1234"
+    )
+
+    assert_difference "Account.count", 1 do
+      assert_difference "Entry.count", 1 do
+        assert_difference "Valuation.count", 1 do
+          PlaidAccount::Processor.new(@plaid_account).process
+        end
+      end
+    end
+
+    account = Account.order(created_at: :desc).first
+    assert_equal 1500, account.balance
+
+    # Verify current balance anchor was created
+    current_anchor = account.valuations.current_anchor.first
+    assert_not_nil current_anchor
+    assert_equal "current_anchor", current_anchor.kind
+    assert_equal 1500, current_anchor.entry.amount
+    assert_equal Date.current, current_anchor.entry.date
+    assert_equal "Current balance", current_anchor.entry.name
+  end
+
+  test "updates existing current balance anchor when reprocessing" do
+    # First process creates the account and anchor
+    expect_default_subprocessor_calls
+    PlaidAccount::Processor.new(@plaid_account).process
+
+    account = @plaid_account.account
+    original_anchor = account.valuations.current_anchor.first
+    assert_not_nil original_anchor
+    original_anchor_id = original_anchor.id
+    original_entry_id = original_anchor.entry.id
+    original_balance = original_anchor.entry.amount
+
+    # Update the plaid account balance
+    @plaid_account.update!(current_balance: 2500)
+
+    # Expect subprocessor calls again for the second processing
+    expect_default_subprocessor_calls
+
+    # Reprocess should update the existing anchor
+    assert_no_difference "Valuation.count" do
+      assert_no_difference "Entry.count" do
+        PlaidAccount::Processor.new(@plaid_account).process
+      end
+    end
+
+    # Verify the anchor was updated
+    original_anchor.reload
+    assert_equal original_anchor_id, original_anchor.id
+    assert_equal original_entry_id, original_anchor.entry.id
+    assert_equal 2500, original_anchor.entry.amount
+    assert_not_equal original_balance, original_anchor.entry.amount
+  end
+
+  private
+    def expect_investment_product_processor_calls
+      PlaidAccount::Investments::TransactionsProcessor.any_instance.expects(:process).once
+      PlaidAccount::Investments::HoldingsProcessor.any_instance.expects(:process).once
+    end
+
+    def expect_depository_product_processor_calls
+      PlaidAccount::Transactions::Processor.any_instance.expects(:process).once
+    end
+
+    def expect_no_investment_balance_calculator_calls
+      PlaidAccount::Investments::BalanceCalculator.any_instance.expects(:balance).never
+      PlaidAccount::Investments::BalanceCalculator.any_instance.expects(:cash_balance).never
+    end
+
+    def expect_no_liability_processor_calls
+      PlaidAccount::Liabilities::CreditProcessor.any_instance.expects(:process).never
+      PlaidAccount::Liabilities::MortgageProcessor.any_instance.expects(:process).never
+      PlaidAccount::Liabilities::StudentLoanProcessor.any_instance.expects(:process).never
+    end
+
+    def expect_default_subprocessor_calls
+      expect_depository_product_processor_calls
+      expect_investment_product_processor_calls
+      expect_no_investment_balance_calculator_calls
+      expect_no_liability_processor_calls
+    end
+end
diff --git a/test/models/plaid_account/transactions/category_matcher_test.rb b/test/models/plaid_account/transactions/category_matcher_test.rb
new file mode 100644
index 00000000..35bcf8fe
--- /dev/null
+++ b/test/models/plaid_account/transactions/category_matcher_test.rb
@@ -0,0 +1,136 @@
+require "test_helper"
+
+class PlaidAccount::Transactions::CategoryMatcherTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:empty)
+
+    # User income categories
+    @income = @family.categories.create!(name: "Income", classification: "income")
+    @dividend_income = @family.categories.create!(name: "Dividend Income", parent: @income, classification: "income")
+    @interest_income = @family.categories.create!(name: "Interest Income", parent: @income, classification: "income")
+
+    # User expense categories
+    @loan_payments = @family.categories.create!(name: "Loan Payments")
+    @fees = @family.categories.create!(name: "Fees")
+    @entertainment = @family.categories.create!(name: "Entertainment")
+
+    @food_and_drink = @family.categories.create!(name: "Food & Drink")
+    @groceries = @family.categories.create!(name: "Groceries", parent: @food_and_drink)
+    @restaurant = @family.categories.create!(name: "Restaurant", parent: @food_and_drink)
+
+    @shopping = @family.categories.create!(name: "Shopping")
+    @clothing = @family.categories.create!(name: "Clothing", parent: @shopping)
+
+    @home = @family.categories.create!(name: "Home")
+    @medical = @family.categories.create!(name: "Medical")
+    @personal_care = @family.categories.create!(name: "Personal Care")
+    @transportation = @family.categories.create!(name: "Transportation")
+    @trips = @family.categories.create!(name: "Trips")
+
+    @services = @family.categories.create!(name: "Services")
+    @car = @family.categories.create!(name: "Car", parent: @services)
+
+    @giving = @family.categories.create!(name: "Giving")
+
+    @matcher = PlaidAccount::Transactions::CategoryMatcher.new(@family.categories)
+  end
+
+  test "matches expense categories" do
+    assert_equal @loan_payments, @matcher.match("loan_payments_car_payment")
+    assert_equal @loan_payments, @matcher.match("loan_payments_credit_card_payment")
+    assert_equal @loan_payments, @matcher.match("loan_payments_personal_loan_payment")
+    assert_equal @loan_payments, @matcher.match("loan_payments_mortgage_payment")
+    assert_equal @loan_payments, @matcher.match("loan_payments_student_loan_payment")
+    assert_equal @loan_payments, @matcher.match("loan_payments_other_payment")
+    assert_equal @fees, @matcher.match("bank_fees_atm_fees")
+    assert_equal @fees, @matcher.match("bank_fees_foreign_transaction_fees")
+    assert_equal @fees, @matcher.match("bank_fees_insufficient_funds")
+    assert_equal @fees, @matcher.match("bank_fees_interest_charge")
+    assert_equal @fees, @matcher.match("bank_fees_overdraft_fees")
+    assert_equal @fees, @matcher.match("bank_fees_other_bank_fees")
+    assert_equal @entertainment, @matcher.match("entertainment_casinos_and_gambling")
+    assert_equal @entertainment, @matcher.match("entertainment_music_and_audio")
+    assert_equal @entertainment, @matcher.match("entertainment_sporting_events_amusement_parks_and_museums")
+    assert_equal @entertainment, @matcher.match("entertainment_tv_and_movies")
+    assert_equal @entertainment, @matcher.match("entertainment_video_games")
+    assert_equal @entertainment, @matcher.match("entertainment_other_entertainment")
+    assert_equal @food_and_drink, @matcher.match("food_and_drink_beer_wine_and_liquor")
+    assert_equal @food_and_drink, @matcher.match("food_and_drink_coffee")
+    assert_equal @food_and_drink, @matcher.match("food_and_drink_fast_food")
+    assert_equal @groceries, @matcher.match("food_and_drink_groceries")
+    assert_equal @restaurant, @matcher.match("food_and_drink_restaurant")
+    assert_equal @food_and_drink, @matcher.match("food_and_drink_vending_machines")
+    assert_equal @food_and_drink, @matcher.match("food_and_drink_other_food_and_drink")
+    assert_equal @shopping, @matcher.match("general_merchandise_bookstores_and_newsstands")
+    assert_equal @clothing, @matcher.match("general_merchandise_clothing_and_accessories")
+    assert_equal @shopping, @matcher.match("general_merchandise_convenience_stores")
+    assert_equal @shopping, @matcher.match("general_merchandise_department_stores")
+    assert_equal @shopping, @matcher.match("general_merchandise_discount_stores")
+    assert_equal @shopping, @matcher.match("general_merchandise_electronics")
+    assert_equal @shopping, @matcher.match("general_merchandise_gifts_and_novelties")
+    assert_equal @shopping, @matcher.match("general_merchandise_office_supplies")
+    assert_equal @shopping, @matcher.match("general_merchandise_online_marketplaces")
+    assert_equal @shopping, @matcher.match("general_merchandise_pet_supplies")
+    assert_equal @shopping, @matcher.match("general_merchandise_sporting_goods")
+    assert_equal @shopping, @matcher.match("general_merchandise_superstores")
+    assert_equal @shopping, @matcher.match("general_merchandise_tobacco_and_vape")
+    assert_equal @shopping, @matcher.match("general_merchandise_other_general_merchandise")
+    assert_equal @home, @matcher.match("home_improvement_furniture")
+    assert_equal @home, @matcher.match("home_improvement_hardware")
+    assert_equal @home, @matcher.match("home_improvement_repair_and_maintenance")
+    assert_equal @home, @matcher.match("home_improvement_security")
+    assert_equal @home, @matcher.match("home_improvement_other_home_improvement")
+    assert_equal @medical, @matcher.match("medical_dental_care")
+    assert_equal @medical, @matcher.match("medical_eye_care")
+    assert_equal @medical, @matcher.match("medical_nursing_care")
+    assert_equal @medical, @matcher.match("medical_pharmacies_and_supplements")
+    assert_equal @medical, @matcher.match("medical_primary_care")
+    assert_equal @medical, @matcher.match("medical_veterinary_services")
+    assert_equal @medical, @matcher.match("medical_other_medical")
+    assert_equal @personal_care, @matcher.match("personal_care_gyms_and_fitness_centers")
+    assert_equal @personal_care, @matcher.match("personal_care_hair_and_beauty")
+    assert_equal @personal_care, @matcher.match("personal_care_laundry_and_dry_cleaning")
+    assert_equal @personal_care, @matcher.match("personal_care_other_personal_care")
+    assert_equal @services, @matcher.match("general_services_accounting_and_financial_planning")
+    assert_equal @car, @matcher.match("general_services_automotive")
+    assert_equal @services, @matcher.match("general_services_childcare")
+    assert_equal @services, @matcher.match("general_services_consulting_and_legal")
+    assert_equal @services, @matcher.match("general_services_education")
+    assert_equal @services, @matcher.match("general_services_insurance")
+    assert_equal @services, @matcher.match("general_services_postage_and_shipping")
+    assert_equal @services, @matcher.match("general_services_storage")
+    assert_equal @services, @matcher.match("general_services_other_general_services")
+    assert_equal @giving, @matcher.match("government_and_non_profit_donations")
+    assert_nil @matcher.match("government_and_non_profit_government_departments_and_agencies")
+    assert_nil @matcher.match("government_and_non_profit_tax_payment")
+    assert_nil @matcher.match("government_and_non_profit_other_government_and_non_profit")
+    assert_equal @transportation, @matcher.match("transportation_bikes_and_scooters")
+    assert_equal @transportation, @matcher.match("transportation_gas")
+    assert_equal @transportation, @matcher.match("transportation_parking")
+    assert_equal @transportation, @matcher.match("transportation_public_transit")
+    assert_equal @transportation, @matcher.match("transportation_taxis_and_ride_shares")
+    assert_equal @transportation, @matcher.match("transportation_tolls")
+    assert_equal @transportation, @matcher.match("transportation_other_transportation")
+    assert_equal @trips, @matcher.match("travel_flights")
+    assert_equal @trips, @matcher.match("travel_lodging")
+    assert_equal @trips, @matcher.match("travel_rental_cars")
+    assert_equal @trips, @matcher.match("travel_other_travel")
+    assert_equal @home, @matcher.match("rent_and_utilities_gas_and_electricity")
+    assert_equal @home, @matcher.match("rent_and_utilities_internet_and_cable")
+    assert_equal @home, @matcher.match("rent_and_utilities_rent")
+    assert_equal @home, @matcher.match("rent_and_utilities_sewage_and_waste_management")
+    assert_equal @home, @matcher.match("rent_and_utilities_telephone")
+    assert_equal @home, @matcher.match("rent_and_utilities_water")
+    assert_equal @home, @matcher.match("rent_and_utilities_other_utilities")
+  end
+
+  test "matches income categories" do
+    assert_equal @dividend_income, @matcher.match("income_dividends")
+    assert_equal @interest_income, @matcher.match("income_interest_earned")
+    assert_equal @income, @matcher.match("income_tax_refund")
+    assert_equal @income, @matcher.match("income_retirement_pension")
+    assert_equal @income, @matcher.match("income_unemployment")
+    assert_equal @income, @matcher.match("income_wages")
+    assert_equal @income, @matcher.match("income_other_income")
+  end
+end
diff --git a/test/models/plaid_account/transactions/processor_test.rb b/test/models/plaid_account/transactions/processor_test.rb
new file mode 100644
index 00000000..85272b11
--- /dev/null
+++ b/test/models/plaid_account/transactions/processor_test.rb
@@ -0,0 +1,63 @@
+require "test_helper"
+
+class PlaidAccount::Transactions::ProcessorTest < ActiveSupport::TestCase
+  setup do
+    @plaid_account = plaid_accounts(:one)
+  end
+
+  test "processes added and modified plaid transactions" do
+    added_transactions = [ { "transaction_id" => "123" } ]
+    modified_transactions = [ { "transaction_id" => "456" } ]
+
+    @plaid_account.update!(raw_transactions_payload: {
+      added: added_transactions,
+      modified: modified_transactions,
+      removed: []
+    })
+
+    mock_processor = mock("PlaidEntry::Processor")
+    category_matcher_mock = mock("PlaidAccount::Transactions::CategoryMatcher")
+
+    PlaidAccount::Transactions::CategoryMatcher.stubs(:new).returns(category_matcher_mock)
+    PlaidEntry::Processor.expects(:new)
+                         .with(added_transactions.first, plaid_account: @plaid_account, category_matcher: category_matcher_mock)
+                         .returns(mock_processor)
+                         .once
+
+    PlaidEntry::Processor.expects(:new)
+                         .with(modified_transactions.first, plaid_account: @plaid_account, category_matcher: category_matcher_mock)
+                         .returns(mock_processor)
+                         .once
+
+    mock_processor.expects(:process).twice
+
+    processor = PlaidAccount::Transactions::Processor.new(@plaid_account)
+    processor.process
+  end
+
+  test "removes transactions no longer in plaid" do
+    destroyable_transaction_id = "destroy_me"
+    @plaid_account.account.entries.create!(
+      plaid_id: destroyable_transaction_id,
+      date: Date.current,
+      amount: 100,
+      name: "Destroy me",
+      currency: "USD",
+      entryable: Transaction.new
+    )
+
+    @plaid_account.update!(raw_transactions_payload: {
+      added: [],
+      modified: [],
+      removed: [ { "transaction_id" => destroyable_transaction_id } ]
+    })
+
+    processor = PlaidAccount::Transactions::Processor.new(@plaid_account)
+
+    assert_difference [ "Entry.count", "Transaction.count" ], -1 do
+      processor.process
+    end
+
+    assert_nil Entry.find_by(plaid_id: destroyable_transaction_id)
+  end
+end
diff --git a/test/models/plaid_account/type_mappable_test.rb b/test/models/plaid_account/type_mappable_test.rb
new file mode 100644
index 00000000..b3bc6708
--- /dev/null
+++ b/test/models/plaid_account/type_mappable_test.rb
@@ -0,0 +1,35 @@
+require "test_helper"
+
+class PlaidAccount::TypeMappableTest < ActiveSupport::TestCase
+  setup do
+    class MockProcessor
+      include PlaidAccount::TypeMappable
+    end
+
+    @mock_processor = MockProcessor.new
+  end
+
+  test "maps types to accountables" do
+    assert_instance_of Depository, @mock_processor.map_accountable("depository")
+    assert_instance_of Investment, @mock_processor.map_accountable("investment")
+    assert_instance_of CreditCard, @mock_processor.map_accountable("credit")
+    assert_instance_of Loan, @mock_processor.map_accountable("loan")
+    assert_instance_of OtherAsset, @mock_processor.map_accountable("other")
+  end
+
+  test "maps subtypes" do
+    assert_equal "checking", @mock_processor.map_subtype("depository", "checking")
+    assert_equal "roth_ira", @mock_processor.map_subtype("investment", "roth")
+  end
+
+  test "raises on invalid types" do
+    assert_raises PlaidAccount::TypeMappable::UnknownAccountTypeError do
+      @mock_processor.map_accountable("unknown")
+    end
+  end
+
+  test "handles nil subtypes" do
+    assert_equal "other", @mock_processor.map_subtype("depository", nil)
+    assert_equal "other", @mock_processor.map_subtype("depository", "unknown")
+  end
+end
diff --git a/test/models/plaid_entry/processor_test.rb b/test/models/plaid_entry/processor_test.rb
new file mode 100644
index 00000000..bce448b0
--- /dev/null
+++ b/test/models/plaid_entry/processor_test.rb
@@ -0,0 +1,91 @@
+require "test_helper"
+
+class PlaidEntry::ProcessorTest < ActiveSupport::TestCase
+  setup do
+    @plaid_account = plaid_accounts(:one)
+    @category_matcher = mock("PlaidAccount::Transactions::CategoryMatcher")
+  end
+
+  test "creates new entry transaction" do
+    plaid_transaction = {
+      "transaction_id" => "123",
+      "merchant_name" => "Amazon", # this is used for merchant and entry name
+      "amount" => 100,
+      "date" => Date.current,
+      "iso_currency_code" => "USD",
+      "personal_finance_category" => {
+        "detailed" => "Food"
+      },
+      "merchant_entity_id" => "123"
+    }
+
+    @category_matcher.expects(:match).with("Food").returns(categories(:food_and_drink))
+
+    processor = PlaidEntry::Processor.new(
+      plaid_transaction,
+      plaid_account: @plaid_account,
+      category_matcher: @category_matcher
+    )
+
+    assert_difference [ "Entry.count", "Transaction.count", "ProviderMerchant.count" ], 1 do
+      processor.process
+    end
+
+    entry = Entry.order(created_at: :desc).first
+
+    assert_equal 100, entry.amount
+    assert_equal "USD", entry.currency
+    assert_equal Date.current, entry.date
+    assert_equal "Amazon", entry.name
+    assert_equal categories(:food_and_drink).id, entry.transaction.category_id
+
+    provider_merchant = ProviderMerchant.order(created_at: :desc).first
+
+    assert_equal "Amazon", provider_merchant.name
+  end
+
+  test "updates existing entry transaction" do
+    existing_plaid_id = "existing_plaid_id"
+
+    plaid_transaction = {
+      "transaction_id" => existing_plaid_id,
+      "merchant_name" => "Amazon", # this is used for merchant and entry name
+      "amount" => 200, # Changed amount will be updated
+      "date" => 1.day.ago.to_date, # Changed date will be updated
+      "iso_currency_code" => "USD",
+      "personal_finance_category" => {
+        "detailed" => "Food"
+      }
+    }
+
+    @category_matcher.expects(:match).with("Food").returns(categories(:food_and_drink))
+
+    # Create an existing entry
+    @plaid_account.account.entries.create!(
+      plaid_id: existing_plaid_id,
+      amount: 100,
+      currency: "USD",
+      date: Date.current,
+      name: "Amazon",
+      entryable: Transaction.new
+    )
+
+    processor = PlaidEntry::Processor.new(
+      plaid_transaction,
+      plaid_account: @plaid_account,
+      category_matcher: @category_matcher
+    )
+
+    assert_no_difference [ "Entry.count", "Transaction.count", "ProviderMerchant.count" ] do
+      processor.process
+    end
+
+    entry = Entry.order(created_at: :desc).first
+
+    assert_equal 200, entry.amount
+    assert_equal "USD", entry.currency
+    assert_equal 1.day.ago.to_date, entry.date
+    assert_equal "Amazon", entry.name
+    assert_equal categories(:food_and_drink).id, entry.transaction.category_id
+  end
+end
diff --git a/test/models/plaid_item/accounts_snapshot_test.rb b/test/models/plaid_item/accounts_snapshot_test.rb
new file mode 100644
index 00000000..433b3fe3
--- /dev/null
+++ b/test/models/plaid_item/accounts_snapshot_test.rb
@@ -0,0 +1,138 @@
+require "test_helper"
+
+class PlaidItem::AccountsSnapshotTest < ActiveSupport::TestCase
+  setup do
+    @plaid_item = plaid_items(:one)
+    @plaid_item.plaid_accounts.destroy_all # Clean slate
+
+    @plaid_provider = mock
+    @snapshot = PlaidItem::AccountsSnapshot.new(@plaid_item, plaid_provider: @plaid_provider)
+  end
+
+  test "fetches accounts" do
+    @plaid_provider.expects(:get_item_accounts).with(@plaid_item.access_token).returns(
+      OpenStruct.new(accounts: [])
+    )
+    @snapshot.accounts
+  end
+
+  test "fetches transactions data if item supports transactions and any accounts present" do
+    @plaid_item.update!(available_products: [ "transactions" ], billed_products: [])
+
+    @snapshot.expects(:accounts).returns([
+      OpenStruct.new(
+        account_id: "123",
+        type: "depository"
+      )
+    ]).at_least_once
+
+    @plaid_provider.expects(:get_transactions).with(@plaid_item.access_token, next_cursor: nil).returns(
+      OpenStruct.new(
+        added: [],
+        modified: [],
+        removed: [],
+        cursor: "test_cursor_1"
+      )
+    ).once
+    @plaid_provider.expects(:get_item_investments).never
+    @plaid_provider.expects(:get_item_liabilities).never
+
+    @snapshot.get_account_data("123")
+  end
+
+  test "does not fetch transactions if no accounts" do
+    @plaid_item.update!(available_products: [ "transactions" ], billed_products: [])
+
+    @snapshot.expects(:accounts).returns([]).at_least_once
+
+    @plaid_provider.expects(:get_transactions).never
+    @plaid_provider.expects(:get_item_investments).never
+    @plaid_provider.expects(:get_item_liabilities).never
+
+    @snapshot.get_account_data("123")
+  end
+
+  test "updates next_cursor when fetching transactions" do
+    @plaid_item.update!(available_products: [ "transactions" ], billed_products: [], next_cursor: "test_cursor_1")
+
+    @snapshot.expects(:accounts).returns([
+      OpenStruct.new(
+        account_id: "123",
+        type: "depository"
+      )
+    ]).at_least_once
+
+    @plaid_provider.expects(:get_transactions).with(@plaid_item.access_token, next_cursor: "test_cursor_1").returns(
+      OpenStruct.new(
+        added: [],
+        modified: [],
+        removed: [],
+        cursor: "test_cursor_2"
+      )
+    ).once
+
+    @plaid_provider.expects(:get_item_investments).never
+    @plaid_provider.expects(:get_item_liabilities).never
+
+    @snapshot.get_account_data("123")
+  end
+
+  test "fetches investments data if item supports investments and investment accounts present" do
+    @plaid_item.update!(available_products: [ "investments" ], billed_products: [])
+
+    @snapshot.expects(:accounts).returns([
+      OpenStruct.new(
+        account_id: "123",
+        type: "investment"
+      )
+    ]).at_least_once
+
+    @plaid_provider.expects(:get_transactions).never
+    @plaid_provider.expects(:get_item_investments).with(@plaid_item.access_token).once
+    @plaid_provider.expects(:get_item_liabilities).never
+
+    @snapshot.get_account_data("123")
+  end
+
+  test "does not fetch investments if no investment accounts" do
+    @plaid_item.update!(available_products: [ "investments" ], billed_products: [])
+
+    @snapshot.expects(:accounts).returns([]).at_least_once
+
+    @plaid_provider.expects(:get_transactions).never
+    @plaid_provider.expects(:get_item_investments).never
+    @plaid_provider.expects(:get_item_liabilities).never
+
+    @snapshot.get_account_data("123")
+  end
+
+  test "fetches liabilities data if item supports liabilities and liabilities accounts present" do
+    @plaid_item.update!(available_products: [ "liabilities" ], billed_products: [])
+
+    @snapshot.expects(:accounts).returns([
+      OpenStruct.new(
+        account_id: "123",
+        type: "loan",
+        subtype: "student"
+      )
+    ]).at_least_once
+
+    @plaid_provider.expects(:get_transactions).never
+    @plaid_provider.expects(:get_item_investments).never
+    @plaid_provider.expects(:get_item_liabilities).with(@plaid_item.access_token).once
+
+    @snapshot.get_account_data("123")
+  end
+
+  test "does not fetch liabilities if no liabilities accounts" do
+    @plaid_item.update!(available_products: [ "liabilities" ], billed_products: [])
+
+    @snapshot.expects(:accounts).returns([]).at_least_once
+
+    @plaid_provider.expects(:get_transactions).never
+    @plaid_provider.expects(:get_item_investments).never
+    @plaid_provider.expects(:get_item_liabilities).never
+
+    @snapshot.get_account_data("123")
+  end
+end
diff --git a/test/models/plaid_item/importer_test.rb b/test/models/plaid_item/importer_test.rb
new file mode 100644
index 00000000..421b34fd
--- /dev/null
+++ b/test/models/plaid_item/importer_test.rb
@@ -0,0 +1,52 @@
+require "test_helper"
+require "ostruct"
+
+class PlaidItem::ImporterTest < ActiveSupport::TestCase
+  setup do
+    @mock_provider = mock("Provider::Plaid")
+    @plaid_item = plaid_items(:one)
+    @importer = PlaidItem::Importer.new(@plaid_item, plaid_provider: @mock_provider)
+  end
+
+  test "imports item metadata" do
+    item_data = OpenStruct.new(
+      item_id: "item_1",
+      available_products: [ "transactions", "investments", "liabilities" ],
+      billed_products: [],
+      institution_id: "ins_1",
+      institution_name: "First Platypus Bank",
+    )
+
+    @mock_provider.expects(:get_item).with(@plaid_item.access_token).returns(
+      OpenStruct.new(item: item_data)
+    )
+
+    institution_data = OpenStruct.new(
+      institution_id: "ins_1",
+      institution_name: "First Platypus Bank",
+    )
+
+    @mock_provider.expects(:get_institution).with("ins_1").returns(
+      OpenStruct.new(institution: institution_data)
+    )
+
+    PlaidItem::AccountsSnapshot.any_instance.expects(:accounts).returns([
+      OpenStruct.new(
+        account_id: "acc_1",
+        type: "depository",
+      )
+    ]).at_least_once
+
+    PlaidItem::AccountsSnapshot.any_instance.expects(:transactions_cursor).returns("test_cursor_1")
+
+    PlaidItem::AccountsSnapshot.any_instance.expects(:get_account_data).with("acc_1").once
+
+    PlaidAccount::Importer.any_instance.expects(:import).once
+
+    @plaid_item.expects(:update!).with(next_cursor: "test_cursor_1")
+    @plaid_item.expects(:upsert_plaid_snapshot!).with(item_data)
+    @plaid_item.expects(:upsert_plaid_institution_snapshot!).with(institution_data)
+
+    @importer.import
+  end
+end
diff --git a/test/models/plaid_item_test.rb b/test/models/plaid_item_test.rb
new file mode 100644
index 00000000..b4f46bcd
--- /dev/null
+++ b/test/models/plaid_item_test.rb
@@ -0,0 +1,19 @@
+require "test_helper"
+
+class PlaidItemTest < ActiveSupport::TestCase
+  include SyncableInterfaceTest
+
+  setup do
+    @plaid_item = @syncable = plaid_items(:one)
+    @plaid_provider = mock
+    Provider::Registry.stubs(:plaid_provider_for_region).returns(@plaid_provider)
+  end
+
+  test "removes plaid item when destroyed" do
+    @plaid_provider.expects(:remove_item).with(@plaid_item.access_token).once
+
+    assert_difference "PlaidItem.count", -1 do
+      @plaid_item.destroy
+    end
+  end
+end
diff --git a/test/models/property_test.rb b/test/models/property_test.rb
deleted file mode 100644
index caf57b12..00000000
--- a/test/models/property_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class PropertyTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/models/provider/github_test.rb b/test/models/provider/github_test.rb
deleted file mode 100644
index 6e425bf2..00000000
--- a/test/models/provider/github_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require "test_helper"
-
-class Provider::GithubTest < ActiveSupport::TestCase
-  include GitRepositoryProviderInterfaceTest
-
-  setup do
-    @subject = Provider::Github.new(owner: "rails", name: "rails", branch: "main")
-  end
-end
diff --git a/test/models/provider/openai_test.rb b/test/models/provider/openai_test.rb
new file mode 100644
index 00000000..bb29523f
--- /dev/null
+++ b/test/models/provider/openai_test.rb
@@ -0,0 +1,260 @@
+require "test_helper"
+
+class Provider::OpenaiTest < ActiveSupport::TestCase
+  include LLMInterfaceTest
+
+  setup do
+    @subject = @openai = Provider::Openai.new(ENV.fetch("OPENAI_ACCESS_TOKEN", "test-openai-token"))
+    @subject_model = "gpt-4.1"
+  end
+
+  test "openai errors are automatically raised" do
+    VCR.use_cassette("openai/chat/error") do
+      response = @openai.chat_response("Test", model: "invalid-model-that-will-trigger-api-error")
+
+      assert_not response.success?
+      assert_kind_of Provider::Openai::Error, response.error
+    end
+  end
+
+  test "auto categorizes transactions by various attributes" do
+    VCR.use_cassette("openai/auto_categorize") do
+      input_transactions = [
+        { id: "1", name: "McDonalds", amount: 20, classification: "expense", merchant: "McDonalds", hint: "Fast Food" },
+        { id: "2", name: "Amazon purchase", amount: 100, classification: "expense", merchant: "Amazon" },
+        { id: "3", name: "Netflix subscription", amount: 10, classification: "expense", merchant: "Netflix", hint: "Subscriptions" },
+        { id: "4", name: "paycheck", amount: 3000, classification: "income" },
+        { id: "5", name: "Italian dinner with friends", amount: 100, classification: "expense" },
+        { id: "6", name: "1212XXXBCaaa charge", amount: 2.99, classification: "expense" }
+      ]
+
+      response = @subject.auto_categorize(
+        transactions: input_transactions,
+        user_categories: [
+          { id: "shopping_id", name: "Shopping", is_subcategory: false, parent_id: nil, classification: "expense" },
+          { id: "subscriptions_id", name: "Subscriptions", is_subcategory: true, parent_id: nil, classification: "expense" },
+          { id: "restaurants_id", name: "Restaurants", is_subcategory: false, parent_id: nil, classification: "expense" },
+          { id: "fast_food_id", name: "Fast Food", is_subcategory: true, parent_id: "restaurants_id", classification: "expense" },
+          { id: "income_id", name: "Income", is_subcategory: false, parent_id: nil, classification: "income" }
+        ]
+      )
+
+      assert response.success?
+      assert_equal input_transactions.size, response.data.size
+
+      txn1 = response.data.find { |c| c.transaction_id == "1" }
+      txn2 = response.data.find { |c| c.transaction_id == "2" }
+      txn3 = response.data.find { |c| c.transaction_id == "3" }
+      txn4 = response.data.find { |c| c.transaction_id == "4" }
+      txn5 = response.data.find { |c| c.transaction_id == "5" }
+      txn6 = response.data.find { |c| c.transaction_id == "6" }
+
+      assert_equal "Fast Food", txn1.category_name
+      assert_equal "Shopping", txn2.category_name
+      assert_equal "Subscriptions", txn3.category_name
+      assert_equal "Income", txn4.category_name
+      assert_equal "Restaurants", txn5.category_name
+      assert_nil txn6.category_name
+    end
+  end
+
+  test "auto detects merchants" do
+    VCR.use_cassette("openai/auto_detect_merchants") do
+      input_transactions = [
+        { id: "1", name: "McDonalds", amount: 20, classification: "expense" },
+        { id: "2", name: "local pub", amount: 20, classification: "expense" },
+        { id: "3", name: "WMT purchases", amount: 20, classification: "expense" },
+        { id: "4", name: "amzn 123 abc", amount: 20, classification: "expense" },
+        { id: "5", name: "chaseX1231", amount: 2000, classification: "income" },
+        { id: "6", name: "check deposit 022", amount: 200, classification: "income" },
+        { id: "7", name: "shooters bar and grill", amount: 200, classification: "expense" },
+        { id: "8", name: "Microsoft Office subscription", amount: 200, classification: "expense" }
+      ]
+
+      response = @subject.auto_detect_merchants(
+        transactions: input_transactions,
+        user_merchants: [ { name: "Shooters" } ]
+      )
+
+      assert response.success?
+      assert_equal input_transactions.size, response.data.size
+
+      txn1 = response.data.find { |c| c.transaction_id == "1" }
+      txn2 = response.data.find { |c| c.transaction_id == "2" }
+      txn3 = response.data.find { |c| c.transaction_id == "3" }
+      txn4 = response.data.find { |c| c.transaction_id == "4" }
+      txn5 = response.data.find { |c| c.transaction_id == "5" }
+      txn6 = response.data.find { |c| c.transaction_id == "6" }
+      txn7 = response.data.find { |c| c.transaction_id == "7" }
+      txn8 = response.data.find { |c| c.transaction_id == "8" }
+
+      assert_equal "McDonald's", txn1.business_name
+      assert_equal "mcdonalds.com", txn1.business_url
+
+      assert_nil txn2.business_name
+      assert_nil txn2.business_url
+
+      assert_equal "Walmart", txn3.business_name
+      assert_equal "walmart.com", txn3.business_url
+
+      assert_equal "Amazon", txn4.business_name
+      assert_equal "amazon.com", txn4.business_url
+
+      assert_nil txn5.business_name
+      assert_nil txn5.business_url
+
+      assert_nil txn6.business_name
+      assert_nil txn6.business_url
+
+      assert_equal "Shooters", txn7.business_name
+      assert_nil txn7.business_url
+
+      assert_equal "Microsoft", txn8.business_name
+      assert_equal "microsoft.com", txn8.business_url
+    end
+  end
+
+  test "basic chat response" do
+    VCR.use_cassette("openai/chat/basic_response") do
+      response = @subject.chat_response(
+        "This is a chat test.  If it's working, respond with a single word: Yes",
+        model: @subject_model
+      )
+
+      assert response.success?
+      assert_equal 1, response.data.messages.size
+      assert_includes response.data.messages.first.output_text, "Yes"
+    end
+  end
+
+  test "streams basic chat response" do
+    VCR.use_cassette("openai/chat/basic_streaming_response") do
+      collected_chunks = []
+
+      mock_streamer = proc do |chunk|
+        collected_chunks << chunk
+      end
+
+      response = @subject.chat_response(
+        "This is a chat test.  If it's working, respond with a single word: Yes",
+        model: @subject_model,
+        streamer: mock_streamer
+      )
+
+      text_chunks = collected_chunks.select { |chunk| chunk.type == "output_text" }
+      response_chunks = collected_chunks.select { |chunk| chunk.type == "response" }
+
+      assert_equal 1, text_chunks.size
+      assert_equal 1, response_chunks.size
+      assert_equal "Yes", text_chunks.first.data
+      assert_equal "Yes", response_chunks.first.data.messages.first.output_text
+      assert_equal response_chunks.first.data, response.data
+    end
+  end
+
+  test "chat response with function calls" do
+    VCR.use_cassette("openai/chat/function_calls") do
+      prompt = "What is my net worth?"
+
+      functions = [
+        {
+          name: "get_net_worth",
+          description: "Gets a user's net worth",
+          params_schema: { type: "object", properties: {}, required: [], additionalProperties: false },
+          strict: true
+        }
+      ]
+
+      first_response = @subject.chat_response(
+        prompt,
+        model: @subject_model,
+        instructions: "Use the tools available to you to answer the user's question.",
+        functions: functions
+      )
+
+      assert first_response.success?
+
+      function_request = first_response.data.function_requests.first
+
+      assert function_request.present?
+
+      second_response = @subject.chat_response(
+        prompt,
+        model: @subject_model,
+        function_results: [ {
+          call_id: function_request.call_id,
+          output: { amount: 10000, currency: "USD" }.to_json
+        } ],
+        previous_response_id: first_response.data.id
+      )
+
+      assert second_response.success?
+      assert_equal 1, second_response.data.messages.size
+      assert_includes second_response.data.messages.first.output_text, "$10,000"
+    end
+  end
+
+  test "streams chat response with function calls" do
+    VCR.use_cassette("openai/chat/streaming_function_calls") do
+      collected_chunks = []
+
+      mock_streamer = proc do |chunk|
+        collected_chunks << chunk
+      end
+
+      prompt = "What is my net worth?"
+
+      functions = [
+        {
+          name: "get_net_worth",
+          description: "Gets a user's net worth",
+          params_schema: { type: "object", properties: {}, required: [], additionalProperties: false },
+          strict: true
+        }
+      ]
+
+      # Call #1: First streaming call, will return a function request
+      @subject.chat_response(
+        prompt,
+        model: @subject_model,
+        instructions: "Use the tools available to you to answer the user's question.",
+        functions: functions,
+        streamer: mock_streamer
+      )
+
+      text_chunks = collected_chunks.select { |chunk| chunk.type == "output_text" }
+      response_chunks = collected_chunks.select { |chunk| chunk.type == "response" }
+
+      assert_equal 0, text_chunks.size
+      assert_equal 1, response_chunks.size
+
+      first_response = response_chunks.first.data
+      function_request = first_response.function_requests.first
+
+      # Reset collected chunks for the second call
+      collected_chunks = []
+
+      # Call #2: Second streaming call, will return a function result
+      @subject.chat_response(
+        prompt,
+        model: @subject_model,
+        function_results: [
+          {
+            call_id: function_request.call_id,
+            output: { amount: 10000, currency: "USD" }
+          }
+        ],
+        previous_response_id: first_response.id,
+        streamer: mock_streamer
+      )
+
+      text_chunks = collected_chunks.select { |chunk| chunk.type == "output_text" }
+      response_chunks = collected_chunks.select { |chunk| chunk.type == "response" }
+
+      assert text_chunks.size >= 1
+      assert_equal 1, response_chunks.size
+
+      assert_includes response_chunks.first.data.messages.first.output_text, "$10,000"
+    end
+  end
+end
diff --git a/test/models/provider/plaid_test.rb b/test/models/provider/plaid_test.rb
new file mode 100644
index 00000000..25fce87b
--- /dev/null
+++ b/test/models/provider/plaid_test.rb
@@ -0,0 +1,80 @@
+require "test_helper"
+
+class Provider::PlaidTest < ActiveSupport::TestCase
+  setup do
+    # Do not change, this is whitelisted in the Plaid Dashboard for local dev
+    @redirect_url = "http://localhost:3000/accounts"
+
+    # A specialization of Plaid client with sandbox-only extensions
+    @plaid = Provider::PlaidSandbox.new
+  end
+
+  test "gets link token" do
+    VCR.use_cassette("plaid/link_token") do
+      link_token = @plaid.get_link_token(
+        user_id: "test-user-id",
+        webhooks_url: "https://example.com/webhooks",
+        redirect_url: @redirect_url
+      )
+
+      assert_match /link-sandbox-.*/, link_token.link_token
+    end
+  end
+
+  test "exchanges public token" do
+    VCR.use_cassette("plaid/exchange_public_token") do
+      public_token = @plaid.create_public_token
+      exchange_response = @plaid.exchange_public_token(public_token)
+
+      assert_match /access-sandbox-.*/, exchange_response.access_token
+    end
+  end
+
+  test "gets item" do
+    VCR.use_cassette("plaid/get_item") do
+      access_token = get_access_token
+      item = @plaid.get_item(access_token).item
+
+      assert_equal "ins_109508", item.institution_id
+      assert_equal "First Platypus Bank", item.institution_name
+    end
+  end
+
+  test "gets item accounts" do
+    VCR.use_cassette("plaid/get_item_accounts") do
+      access_token = get_access_token
+      accounts_response = @plaid.get_item_accounts(access_token)
+
+      assert_equal 4, accounts_response.accounts.size
+    end
+  end
+
+  test "gets item investments" do
+    VCR.use_cassette("plaid/get_item_investments") do
+      access_token = get_access_token
+      investments_response = @plaid.get_item_investments(access_token)
+
+      assert_equal 3, investments_response.holdings.size
+      assert_equal 4, investments_response.transactions.size
+    end
+  end
+
+  test "gets item liabilities" do
+    VCR.use_cassette("plaid/get_item_liabilities") do
+      access_token = get_access_token
+      liabilities_response = @plaid.get_item_liabilities(access_token)
+
+      assert liabilities_response.credit.count > 0
+      assert liabilities_response.student.count > 0
+    end
+  end
+
+  private
+    def get_access_token
+      VCR.use_cassette("plaid/access_token") do
+        public_token = @plaid.create_public_token
+        exchange_response = @plaid.exchange_public_token(public_token)
+        exchange_response.access_token
+      end
+    end
+end
diff --git a/test/models/provider/registry_test.rb b/test/models/provider/registry_test.rb
new file mode 100644
index 00000000..76c20cd7
--- /dev/null
+++ b/test/models/provider/registry_test.rb
@@ -0,0 +1,27 @@
+require "test_helper"
+
+class Provider::RegistryTest < ActiveSupport::TestCase
+  test "synth configured with ENV" do
+    Setting.stubs(:synth_api_key).returns(nil)
+
+    with_env_overrides SYNTH_API_KEY: "123" do
+      assert_instance_of Provider::Synth, Provider::Registry.get_provider(:synth)
+    end
+  end
+
+  test "synth configured with Setting" do
+    Setting.stubs(:synth_api_key).returns("123")
+
+    with_env_overrides SYNTH_API_KEY: nil do
+      assert_instance_of Provider::Synth, Provider::Registry.get_provider(:synth)
+    end
+  end
+
+  test "synth not configured" do
+    Setting.stubs(:synth_api_key).returns(nil)
+
+    with_env_overrides SYNTH_API_KEY: nil do
+      assert_nil Provider::Registry.get_provider(:synth)
+    end
+  end
+end
diff --git a/test/models/provider/stripe/subscription_event_processor_test.rb b/test/models/provider/stripe/subscription_event_processor_test.rb
new file mode 100644
index 00000000..e6f608ae
--- /dev/null
+++ b/test/models/provider/stripe/subscription_event_processor_test.rb
@@ -0,0 +1,57 @@
+require "test_helper"
+require "ostruct"
+
+class Provider::Stripe::SubscriptionEventProcessorTest < ActiveSupport::TestCase
+  test "handles subscription event" do
+    test_customer_id = "test-customer-id"
+    test_subscription_id = "test-subscription-id"
+
+    mock_event = JSON.parse({
+      type: "customer.subscription.created",
+      data: {
+        object: {
+          id: test_subscription_id,
+          status: "active",
+          customer: test_customer_id,
+          items: {
+            data: [
+              {
+                current_period_end: 1.month.from_now.to_i,
+                plan: {
+                  interval: "month",
+                  amount: 900,
+                  currency: "usd"
+                }
+              }
+            ]
+          }
+        }
+      }
+    }.to_json, object_class: OpenStruct)
+
+    family = Family.create!(
+      name: "Test Subscribed Family",
+      stripe_customer_id: test_customer_id
+    )
+
+    family.start_subscription!(test_subscription_id)
+
+    processor = Provider::Stripe::SubscriptionEventProcessor.new(mock_event)
+
+    assert_equal "active", family.subscription.status
+    assert_equal test_subscription_id, family.subscription.stripe_id
+    assert_nil family.subscription.amount
+    assert_nil family.subscription.currency
+    assert_nil family.subscription.current_period_ends_at
+
+    processor.process
+
+    family.reload
+
+    assert_equal "active", family.subscription.status
+    assert_equal test_subscription_id, family.subscription.stripe_id
+    assert_equal 9, family.subscription.amount
+    assert_equal "USD", family.subscription.currency
+    assert family.subscription.current_period_ends_at > 20.days.from_now
+  end
+end
diff --git a/test/models/provider/stripe_test.rb b/test/models/provider/stripe_test.rb
new file mode 100644
index 00000000..68fb8ad8
--- /dev/null
+++ b/test/models/provider/stripe_test.rb
@@ -0,0 +1,45 @@
+require "test_helper"
+
+class Provider::StripeTest < ActiveSupport::TestCase
+  setup do
+    @stripe = Provider::Stripe.new(
+      secret_key: ENV["STRIPE_SECRET_KEY"] || "foo",
+      webhook_secret: ENV["STRIPE_WEBHOOK_SECRET"] || "bar"
+    )
+  end
+
+  test "creates checkout session" do
+    test_email = "test@example.com"
+
+    test_success_url = "http://localhost:3000/subscription/success?session_id={CHECKOUT_SESSION_ID}"
+    test_cancel_url = "http://localhost:3000/subscription/upgrade"
+
+    VCR.use_cassette("stripe/create_checkout_session") do
+      session = @stripe.create_checkout_session(
+        plan: "monthly",
+        family_id: 1,
+        family_email: test_email,
+        success_url: test_success_url,
+        cancel_url: test_cancel_url
+      )
+
+      assert_match /https:\/\/checkout.stripe.com\/c\/pay\/cs_test_.*/, session.url
+      assert_match /cus_.*/, session.customer_id
+    end
+  end
+
+  # To re-run VCR for this test:
+  # 1. Complete a checkout session locally in the UI
+  # 2. Find the session ID, replace below
+  # 3. Re-run VCR, make sure ENV vars are in test environment
+  test "validates checkout session and returns subscription ID" do
+    test_session_id = "cs_test_b1RD8r6DAkSA8vrQ3grBC2QVgR5zUJ7QQFuVHZkcKoSYaEOQgCMPMOCOM5" # must exist in test Dashboard
+
+    VCR.use_cassette("stripe/checkout_session") do
+      result = @stripe.get_checkout_result(test_session_id)
+
+      assert result.success?
+      assert_match /sub_.*/, result.subscription_id
+    end
+  end
+end
diff --git a/test/models/provider/synth_test.rb b/test/models/provider/synth_test.rb
index 3d0d5b72..5dfa3bed 100644
--- a/test/models/provider/synth_test.rb
+++ b/test/models/provider/synth_test.rb
@@ -2,50 +2,25 @@ require "test_helper"
 require "ostruct"
 
 class Provider::SynthTest < ActiveSupport::TestCase
-  include ExchangeRateProviderInterfaceTest, SecurityPriceProviderInterfaceTest
+  include ExchangeRateProviderInterfaceTest, SecurityProviderInterfaceTest
 
   setup do
     @subject = @synth = Provider::Synth.new(ENV["SYNTH_API_KEY"])
   end
 
-  test "fetches paginated securities prices" do
-    VCR.use_cassette("synth/security_prices") do
-      response = @synth.fetch_security_prices ticker: "AAPL", start_date: Date.iso8601("2024-01-01"), end_date: Date.iso8601("2024-08-01")
-
-      assert 213, response.size
+  test "health check" do
+    VCR.use_cassette("synth/health") do
+      assert @synth.healthy?
     end
   end
 
-  test "fetches paginated exchange_rate historical data" do
-    VCR.use_cassette("synth/exchange_rate_historical") do
-      response = @synth.fetch_exchange_rates(
-        from: "USD", to: "GBP", start_date: Date.parse("01.01.2024"), end_date: Date.parse("31.07.2024")
-      )
-
-      assert 213, response.rates.size # 213 days between 01.01.2024 and 31.07.2024
-      assert_equal [ :date, :rate ], response.rates.first.keys
-    end
-  end
-
-  test "retries then provides failed response" do
-    @client = mock
-    Faraday.stubs(:new).returns(@client)
-
-    @client.expects(:get).returns(OpenStruct.new(success?: false)).times(3)
-
-    response = @synth.fetch_exchange_rate from: "USD", to: "MXN", date: Date.iso8601("2024-08-01")
-
-    assert_match "Failed to fetch data from Provider::Synth", response.error.message
-  end
-
-  test "retrying, then raising on network error" do
-    @client = mock
-    Faraday.stubs(:new).returns(@client)
-
-    @client.expects(:get).raises(Faraday::TimeoutError).times(3)
-
-    assert_raises Faraday::TimeoutError do
-      @synth.fetch_exchange_rate from: "USD", to: "MXN", date: Date.iso8601("2024-08-01")
+  test "usage info" do
+    VCR.use_cassette("synth/usage") do
+      usage = @synth.usage.data
+      assert usage.used.present?
+      assert usage.limit.present?
+      assert usage.utilization.present?
+      assert usage.plan.present?
     end
   end
 end
diff --git a/test/models/provider_test.rb b/test/models/provider_test.rb
new file mode 100644
index 00000000..6d7fe13b
--- /dev/null
+++ b/test/models/provider_test.rb
@@ -0,0 +1,57 @@
+require "test_helper"
+require "ostruct"
+
+class TestProvider < Provider
+  TestError = Class.new(StandardError)
+
+  def initialize(client)
+    @client = client
+  end
+
+  def fetch_data
+    with_provider_response do
+      @client.get("/test")
+    end
+  end
+
+  def fetch_data_with_error_transformer
+    with_provider_response(error_transformer: ->(error) { TestError.new(error.message) }) do
+      @client.get("/test")
+    end
+  end
+end
+
+class ProviderTest < ActiveSupport::TestCase
+  setup do
+    @client = mock
+    @provider = TestProvider.new(@client)
+  end
+
+  test "returns success response with data" do
+    @client.expects(:get).with("/test").returns({ some: "data" })
+
+    response = @provider.fetch_data
+
+    assert response.success?
+    assert_equal({ some: "data" }, response.data)
+  end
+
+  test "returns failed response with error" do
+    @client.expects(:get).with("/test").raises(StandardError.new("some error"))
+
+    response = @provider.fetch_data
+
+    assert_not response.success?
+    assert_equal("some error", response.error.message)
+  end
+
+  test "provider can transform error" do
+    @client.expects(:get).with("/test").raises(StandardError.new("some error"))
+
+    response = @provider.fetch_data_with_error_transformer
+
+    assert_not response.success?
+    assert_equal("some error", response.error.message)
+    assert_instance_of TestProvider::TestError, response.error
+  end
+end
diff --git a/test/models/rule/action_test.rb b/test/models/rule/action_test.rb
new file mode 100644
index 00000000..f71bb2cb
--- /dev/null
+++ b/test/models/rule/action_test.rb
@@ -0,0 +1,103 @@
+require "test_helper"
+
+class Rule::ActionTest < ActiveSupport::TestCase
+  include EntriesTestHelper
+
+  setup do
+    @family = families(:dylan_family)
+    @transaction_rule = rules(:one)
+    @account = @family.accounts.create!(name: "Rule test", balance: 1000, currency: "USD", accountable: Depository.new)
+
+    @grocery_category = @family.categories.create!(name: "Grocery")
+    @whole_foods_merchant = @family.merchants.create!(name: "Whole Foods", type: "FamilyMerchant")
+
+    # Some sample transactions to work with
+    @txn1 = create_transaction(date: Date.current, account: @account, amount: 100, name: "Rule test transaction1", merchant: @whole_foods_merchant).transaction
+    @txn2 = create_transaction(date: Date.current, account: @account, amount: -200, name: "Rule test transaction2").transaction
+    @txn3 = create_transaction(date: 1.day.ago.to_date, account: @account, amount: 50, name: "Rule test transaction3").transaction
+
+    @rule_scope = @account.transactions
+  end
+
+  test "set_transaction_category" do
+    # Does not modify transactions that are locked (user edited them)
+    @txn1.lock_attr!(:category_id)
+
+    action = Rule::Action.new(
+      rule: @transaction_rule,
+      action_type: "set_transaction_category",
+      value: @grocery_category.id
+    )
+
+    action.apply(@rule_scope)
+
+    assert_nil @txn1.reload.category
+
+    [ @txn2, @txn3 ].each do |transaction|
+      assert_equal @grocery_category.id, transaction.reload.category_id
+    end
+  end
+
+  test "set_transaction_tags" do
+    tag = @family.tags.create!(name: "Rule test tag")
+
+    # Does not modify transactions that are locked (user edited them)
+    @txn1.lock_attr!(:tag_ids)
+
+    action = Rule::Action.new(
+      rule: @transaction_rule,
+      action_type: "set_transaction_tags",
+      value: tag.id
+    )
+
+    action.apply(@rule_scope)
+
+    assert_equal [], @txn1.reload.tags
+
+    [ @txn2, @txn3 ].each do |transaction|
+      assert_equal [ tag ], transaction.reload.tags
+    end
+  end
+
+  test "set_transaction_merchant" do
+    merchant = @family.merchants.create!(name: "Rule test merchant")
+
+    # Does not modify transactions that are locked (user edited them)
+    @txn1.lock_attr!(:merchant_id)
+
+    action = Rule::Action.new(
+      rule: @transaction_rule,
+      action_type: "set_transaction_merchant",
+      value: merchant.id
+    )
+
+    action.apply(@rule_scope)
+
+    assert_not_equal merchant.id, @txn1.reload.merchant_id
+
+    [ @txn2, @txn3 ].each do |transaction|
+      assert_equal merchant.id, transaction.reload.merchant_id
+    end
+  end
+
+  test "set_transaction_name" do
+    new_name = "Renamed Transaction"
+
+    # Does not modify transactions that are locked (user edited them)
+    @txn1.lock_attr!(:name)
+
+    action = Rule::Action.new(
+      rule: @transaction_rule,
+      action_type: "set_transaction_name",
+      value: new_name
+    )
+
+    action.apply(@rule_scope)
+
+    assert_not_equal new_name, @txn1.reload.entry.name
+
+    [ @txn2, @txn3 ].each do |transaction|
+      assert_equal new_name, transaction.reload.entry.name
+    end
+  end
+end
diff --git a/test/models/rule/condition_test.rb b/test/models/rule/condition_test.rb
new file mode 100644
index 00000000..3010673d
--- /dev/null
+++ b/test/models/rule/condition_test.rb
@@ -0,0 +1,128 @@
+require "test_helper"
+
+class Rule::ConditionTest < ActiveSupport::TestCase
+  include EntriesTestHelper
+
+  setup do
+    @family = families(:empty)
+    @transaction_rule = rules(:one)
+    @account = @family.accounts.create!(name: "Rule test", balance: 1000, currency: "USD", accountable: Depository.new)
+
+    @grocery_category = @family.categories.create!(name: "Grocery")
+    @whole_foods_merchant = @family.merchants.create!(name: "Whole Foods", type: "FamilyMerchant")
+
+    # Some sample transactions to work with
+    create_transaction(date: Date.current, account: @account, amount: 100, name: "Rule test transaction1", merchant: @whole_foods_merchant)
+    create_transaction(date: Date.current, account: @account, amount: -200, name: "Rule test transaction2")
+    create_transaction(date: 1.day.ago.to_date, account: @account, amount: 50, name: "Rule test transaction3")
+    create_transaction(date: 1.year.ago.to_date, account: @account, amount: 10, name: "Rule test transaction4", merchant: @whole_foods_merchant)
+    create_transaction(date: 1.year.ago.to_date, account: @account, amount: 1000, name: "Rule test transaction5")
+
+    @rule_scope = @account.transactions
+  end
+
+  test "applies transaction_name condition" do
+    scope = @rule_scope
+
+    condition = Rule::Condition.new(
+      rule: @transaction_rule,
+      condition_type: "transaction_name",
+      operator: "=",
+      value: "Rule test transaction1"
+    )
+
+    scope = condition.prepare(scope)
+
+    assert_equal 5, scope.count
+
+    filtered = condition.apply(scope)
+
+    assert_equal 1, filtered.count
+  end
+
+  test "applies transaction_amount condition using absolute values" do
+    scope = @rule_scope
+
+    condition = Rule::Condition.new(
+      rule: @transaction_rule,
+      condition_type: "transaction_amount",
+      operator: ">",
+      value: "50"
+    )
+
+    scope = condition.prepare(scope)
+
+    filtered = condition.apply(scope)
+    assert_equal 3, filtered.count
+  end
+
+  test "applies transaction_merchant condition" do
+    scope = @rule_scope
+
+    condition = Rule::Condition.new(
+      rule: @transaction_rule,
+      condition_type: "transaction_merchant",
+      operator: "=",
+      value: @whole_foods_merchant.id
+    )
+
+    scope = condition.prepare(scope)
+
+    filtered = condition.apply(scope)
+    assert_equal 2, filtered.count
+  end
+
+  test "applies compound and condition" do
+    scope = @rule_scope
+
+    parent_condition = Rule::Condition.new(
+      rule: @transaction_rule,
+      condition_type: "compound",
+      operator: "and",
+      sub_conditions: [
+        Rule::Condition.new(
+          condition_type: "transaction_merchant",
+          operator: "=",
+          value: @whole_foods_merchant.id
+        ),
+        Rule::Condition.new(
+          condition_type: "transaction_amount",
+          operator: "<",
+          value: "50"
+        )
+      ]
+    )
+
+    scope = parent_condition.prepare(scope)
+
+    filtered = parent_condition.apply(scope)
+    assert_equal 1, filtered.count
+  end
+
+  test "applies compound or condition" do
+    scope = @rule_scope
+
+    parent_condition = Rule::Condition.new(
+      rule: @transaction_rule,
+      condition_type: "compound",
+      operator: "or",
+      sub_conditions: [
+        Rule::Condition.new(
+          condition_type: "transaction_merchant",
+          operator: "=",
+          value: @whole_foods_merchant.id
+        ),
+        Rule::Condition.new(
+          condition_type: "transaction_amount",
+          operator: "<",
+          value: "50"
+        )
+      ]
+    )
+
+    scope = parent_condition.prepare(scope)
+
+    filtered = parent_condition.apply(scope)
+    assert_equal 2, filtered.count
+  end
+end
diff --git a/test/models/rule_test.rb b/test/models/rule_test.rb
new file mode 100644
index 00000000..5cddc644
--- /dev/null
+++ b/test/models/rule_test.rb
@@ -0,0 +1,77 @@
+require "test_helper"
+
+class RuleTest < ActiveSupport::TestCase
+  include EntriesTestHelper
+
+  setup do
+    @family = families(:empty)
+    @account = @family.accounts.create!(name: "Rule test", balance: 1000, currency: "USD", accountable: Depository.new)
+    @whole_foods_merchant = @family.merchants.create!(name: "Whole Foods", type: "FamilyMerchant")
+    @groceries_category = @family.categories.create!(name: "Groceries")
+  end
+
+  test "basic rule" do
+    transaction_entry = create_transaction(date: Date.current, account: @account, merchant: @whole_foods_merchant)
+
+    rule = Rule.create!(
+      family: @family,
+      resource_type: "transaction",
+      effective_date: 1.day.ago.to_date,
+      conditions: [ Rule::Condition.new(condition_type: "transaction_merchant", operator: "=", value: @whole_foods_merchant.id) ],
+      actions: [ Rule::Action.new(action_type: "set_transaction_category", value: @groceries_category.id) ]
+    )
+
+    rule.apply
+
+    transaction_entry.reload
+
+    assert_equal @groceries_category, transaction_entry.transaction.category
+  end
+
+  test "compound rule" do
+    transaction_entry1 = create_transaction(date: Date.current, amount: 50, account: @account, merchant: @whole_foods_merchant)
+    transaction_entry2 = create_transaction(date: Date.current, amount: 100, account: @account, merchant: @whole_foods_merchant)
+
+    # Assign "Groceries" to transactions with a merchant of "Whole Foods" and an amount greater than $60
+    rule = Rule.create!(
+      family: @family,
+      resource_type: "transaction",
+      effective_date: 1.day.ago.to_date,
+      conditions: [
+        Rule::Condition.new(condition_type: "compound", operator: "and", sub_conditions: [
+          Rule::Condition.new(condition_type: "transaction_merchant", operator: "=", value: @whole_foods_merchant.id),
+          Rule::Condition.new(condition_type: "transaction_amount", operator: ">", value: 60)
+        ])
+      ],
+      actions: [ Rule::Action.new(action_type: "set_transaction_category", value: @groceries_category.id) ]
+    )
+
+    rule.apply
+
+    transaction_entry1.reload
+    transaction_entry2.reload
+
+    assert_nil transaction_entry1.transaction.category
+    assert_equal @groceries_category, transaction_entry2.transaction.category
+  end
+
+  # Artificial limitation put in place to prevent users from creating overly complex rules
+  # Rules should be shallow and wide
+  test "no nested compound conditions" do
+    rule = Rule.new(
+      family: @family,
+      resource_type: "transaction",
+      actions: [ Rule::Action.new(action_type: "set_transaction_category", value: @groceries_category.id) ],
+      conditions: [
+        Rule::Condition.new(condition_type: "compound", operator: "and", sub_conditions: [
+          Rule::Condition.new(condition_type: "compound", operator: "and", sub_conditions: [
+            Rule::Condition.new(condition_type: "transaction_name", operator: "=", value: "Starbucks")
+          ])
+        ])
+      ]
+    )
+
+    assert_not rule.valid?
+    assert_equal [ "Compound conditions cannot be nested" ], rule.errors.full_messages
+  end
+end
diff --git a/test/models/security/health_checker_test.rb b/test/models/security/health_checker_test.rb
new file mode 100644
index 00000000..a8efe8f7
--- /dev/null
+++ b/test/models/security/health_checker_test.rb
@@ -0,0 +1,158 @@
+require "test_helper"
+
+class Security::HealthCheckerTest < ActiveSupport::TestCase
+  include ProviderTestHelper
+
+  setup do
+    # Clean slate
+    Holding.destroy_all
+    Trade.destroy_all
+    Security::Price.delete_all
+    Security.delete_all
+
+    @provider = mock
+    Security.stubs(:provider).returns(@provider)
+
+    # Brand new, no health check has been run yet
+    @new_security = Security.create!(
+      ticker: "NEW",
+      offline: false,
+      last_health_check_at: nil
+    )
+
+    # New security, offline
+    # This will be checked, but unless it gets a price, we keep it offline
+    @new_offline_security = Security.create!(
+      ticker: "NEW_OFFLINE",
+      offline: true,
+      last_health_check_at: nil
+    )
+
+    # Online, recently checked, healthy
+    @healthy_security = Security.create!(
+      ticker: "HEALTHY",
+      offline: false,
+      last_health_check_at: 2.hours.ago
+    )
+
+    # Online, due for a health check
+    @due_for_check_security = Security.create!(
+      ticker: "DUE",
+      offline: false,
+      last_health_check_at: Security::HealthChecker::HEALTH_CHECK_INTERVAL.ago - 1.day
+    )
+
+    # Offline, recently checked (keep offline, don't check)
+    @offline_security = Security.create!(
+      ticker: "OFFLINE",
+      offline: true,
+      last_health_check_at: 20.days.ago
+    )
+
+    # Currently offline, but has had no health check and actually has prices (needs to convert to "online")
+    @offline_never_checked_with_prices = Security.create!(
+      ticker: "OFFLINE_NEVER_CHECKED",
+      offline: true,
+      last_health_check_at: nil
+    )
+  end
+
+  test "any security without a health check runs" do
+    to_check = Security.where(last_health_check_at: nil).or(Security.where(last_health_check_at: ..Security::HealthChecker::HEALTH_CHECK_INTERVAL.ago))
+    Security::HealthChecker.any_instance.expects(:run_check).times(to_check.count)
+    Security::HealthChecker.check_all
+  end
+
+  test "offline security with no health check that fails stays offline" do
+    hc = Security::HealthChecker.new(@new_offline_security)
+
+    @provider.expects(:fetch_security_price)
+      .with(
+        symbol: @new_offline_security.ticker,
+        exchange_operating_mic: @new_offline_security.exchange_operating_mic,
+        date: Date.current
+      )
+      .returns(
+        provider_error_response(StandardError.new("No prices found"))
+      )
+      .once
+
+    hc.run_check
+
+    assert_equal 1, @new_offline_security.failed_fetch_count
+    assert @new_offline_security.offline?
+  end
+
+  test "after enough consecutive health check failures, security goes offline and prices are deleted" do
+    # Create one test price
+    Security::Price.create!(
+      security: @due_for_check_security,
+      date: Date.current,
+      price: 100,
+      currency: "USD"
+    )
+
+    hc = Security::HealthChecker.new(@due_for_check_security)
+
+    @provider.expects(:fetch_security_price)
+      .with(
+        symbol: @due_for_check_security.ticker,
+        exchange_operating_mic: @due_for_check_security.exchange_operating_mic,
+        date: Date.current
+      )
+      .returns(provider_error_response(StandardError.new("No prices found")))
+      .times(Security::HealthChecker::MAX_CONSECUTIVE_FAILURES + 1)
+
+    Security::HealthChecker::MAX_CONSECUTIVE_FAILURES.times do
+      hc.run_check
+    end
+
+    refute @due_for_check_security.offline?
+    assert_equal 1, @due_for_check_security.prices.count
+
+    # We've now exceeded the max consecutive failures, so the security should be marked offline
+    hc.run_check
+    assert @due_for_check_security.offline?
+    assert_equal 0, @due_for_check_security.prices.count
+  end
+
+  test "failure incrementor increases for each health check failure" do
+    hc = Security::HealthChecker.new(@due_for_check_security)
+
+    @provider.expects(:fetch_security_price)
+      .with(
+        symbol: @due_for_check_security.ticker,
+        exchange_operating_mic: @due_for_check_security.exchange_operating_mic,
+        date: Date.current
+      )
+      .returns(provider_error_response(StandardError.new("No prices found")))
+      .twice
+
+    hc.run_check
+    assert_equal 1, @due_for_check_security.failed_fetch_count
+
+    hc.run_check
+    assert_equal 2, @due_for_check_security.failed_fetch_count
+  end
+
+  test "failure incrementor resets to 0 when health check succeeds" do
+    hc = Security::HealthChecker.new(@offline_never_checked_with_prices)
+
+    @provider.expects(:fetch_security_price)
+      .with(
+        symbol: @offline_never_checked_with_prices.ticker,
+        exchange_operating_mic: @offline_never_checked_with_prices.exchange_operating_mic,
+        date: Date.current
+      )
+      .returns(provider_success_response(OpenStruct.new(price: 100, date: Date.current, currency: "USD")))
+      .once
+
+    assert @offline_never_checked_with_prices.offline?
+
+    hc.run_check
+
+    refute @offline_never_checked_with_prices.offline?
+    assert_equal 0, @offline_never_checked_with_prices.failed_fetch_count
+    assert_nil @offline_never_checked_with_prices.failed_fetch_at
+  end
+end
diff --git a/test/models/security/price/importer_test.rb b/test/models/security/price/importer_test.rb
new file mode 100644
index 00000000..665a91f6
--- /dev/null
+++ b/test/models/security/price/importer_test.rb
@@ -0,0 +1,143 @@
+require "test_helper"
+require "ostruct"
+
+class Security::Price::ImporterTest < ActiveSupport::TestCase
+  include ProviderTestHelper
+
+  setup do
+    @provider = mock
+    @security = Security.create!(ticker: "AAPL")
+  end
+
+  test "syncs missing prices from provider" do
+    Security::Price.delete_all
+
+    provider_response = provider_success_response([
+      OpenStruct.new(security: @security, date: 2.days.ago.to_date, price: 150, currency: "USD"),
+      OpenStruct.new(security: @security, date: 1.day.ago.to_date, price: 155, currency: "USD"),
+      OpenStruct.new(security: @security, date: Date.current, price: 160, currency: "USD")
+    ])
+
+    @provider.expects(:fetch_security_prices)
+             .with(symbol: @security.ticker, exchange_operating_mic: @security.exchange_operating_mic,
+                   start_date: get_provider_fetch_start_date(2.days.ago.to_date), end_date: Date.current)
+             .returns(provider_response)
+
+    Security::Price::Importer.new(
+      security: @security,
+      security_provider: @provider,
+      start_date: 2.days.ago.to_date,
+      end_date: Date.current
+    ).import_provider_prices
+
+    db_prices = Security::Price.where(security: @security, date: 2.days.ago.to_date..Date.current).order(:date)
+
+    assert_equal 3, db_prices.count
+    assert_equal [ 150, 155, 160 ], db_prices.map(&:price)
+  end
+
+  test "syncs diff when some prices already exist" do
+    Security::Price.delete_all
+
+    # Pre-populate DB with first two days
+    Security::Price.create!(security: @security, date: 3.days.ago.to_date, price: 140, currency: "USD")
+    Security::Price.create!(security: @security, date: 2.days.ago.to_date, price: 145, currency: "USD")
+
+    provider_response = provider_success_response([
+      OpenStruct.new(security: @security, date: 1.day.ago.to_date, price: 150, currency: "USD")
+    ])
+
+    @provider.expects(:fetch_security_prices)
+             .with(symbol: @security.ticker, exchange_operating_mic: @security.exchange_operating_mic,
+                   start_date: get_provider_fetch_start_date(1.day.ago.to_date), end_date: Date.current)
+             .returns(provider_response)
+
+    Security::Price::Importer.new(
+      security: @security,
+      security_provider: @provider,
+      start_date: 3.days.ago.to_date,
+      end_date: Date.current
+    ).import_provider_prices
+
+    db_prices = Security::Price.where(security: @security).order(:date)
+    assert_equal 4, db_prices.count
+    assert_equal [ 140, 145, 150, 150 ], db_prices.map(&:price)
+  end
+
+  test "no provider calls when all prices exist" do
+    Security::Price.delete_all
+
+    (3.days.ago.to_date..Date.current).each_with_index do |date, idx|
+      Security::Price.create!(security: @security, date:, price: 100 + idx, currency: "USD")
+    end
+
+    @provider.expects(:fetch_security_prices).never
+
+    Security::Price::Importer.new(
+      security: @security,
+      security_provider: @provider,
+      start_date: 3.days.ago.to_date,
+      end_date: Date.current
+    ).import_provider_prices
+  end
+
+  test "full upsert if clear_cache is true" do
+    Security::Price.delete_all
+
+    # Seed DB with stale prices
+    (2.days.ago.to_date..Date.current).each do |date|
+      Security::Price.create!(security: @security, date:, price: 100, currency: "USD")
+    end
+
+    provider_response = provider_success_response([
+      OpenStruct.new(security: @security, date: 2.days.ago.to_date, price: 150, currency: "USD"),
+      OpenStruct.new(security: @security, date: 1.day.ago.to_date, price: 155, currency: "USD"),
+      OpenStruct.new(security: @security, date: Date.current,        price: 160, currency: "USD")
+    ])
+
+    @provider.expects(:fetch_security_prices)
+             .with(symbol: @security.ticker, exchange_operating_mic: @security.exchange_operating_mic,
+                   start_date: get_provider_fetch_start_date(2.days.ago.to_date), end_date: Date.current)
+             .returns(provider_response)
+
+    Security::Price::Importer.new(
+      security: @security,
+      security_provider: @provider,
+      start_date: 2.days.ago.to_date,
+      end_date: Date.current,
+      clear_cache: true
+    ).import_provider_prices
+
+    db_prices = Security::Price.where(security: @security).order(:date)
+    assert_equal [ 150, 155, 160 ], db_prices.map(&:price)
+  end
+
+  test "clamps end_date to today when future date is provided" do
+    Security::Price.delete_all
+
+    future_date = Date.current + 3.days
+
+    provider_response = provider_success_response([
+      OpenStruct.new(security: @security, date: Date.current, price: 165, currency: "USD")
+    ])
+
+    @provider.expects(:fetch_security_prices)
+             .with(symbol: @security.ticker, exchange_operating_mic: @security.exchange_operating_mic,
+                   start_date: get_provider_fetch_start_date(Date.current), end_date: Date.current)
+             .returns(provider_response)
+
+    Security::Price::Importer.new(
+      security: @security,
+      security_provider: @provider,
+      start_date: Date.current,
+      end_date: future_date
+    ).import_provider_prices
+
+    assert_equal 1, Security::Price.count
+  end
+
+  private
+    def get_provider_fetch_start_date(start_date)
+      start_date - 5.days
+    end
+end
diff --git a/test/models/security/price_test.rb b/test/models/security/price_test.rb
index b2ae23a1..6e8e49da 100644
--- a/test/models/security/price_test.rb
+++ b/test/models/security/price_test.rb
@@ -2,97 +2,63 @@ require "test_helper"
 require "ostruct"
 
 class Security::PriceTest < ActiveSupport::TestCase
+  include ProviderTestHelper
+
   setup do
     @provider = mock
+    Security.stubs(:provider).returns(@provider)
 
-    Security::Price.stubs(:security_prices_provider).returns(@provider)
-  end
-
-  test "security price provider nil if no api key provided" do
-    Security::Price.unstub(:security_prices_provider)
-
-    with_env_overrides SYNTH_API_KEY: nil do
-      assert_not Security::Price.security_prices_provider
-    end
+    @security = securities(:aapl)
   end
 
   test "finds single security price in DB" do
-    @provider.expects(:fetch_security_prices).never
-
+    @provider.expects(:fetch_security_price).never
     price = security_prices(:one)
 
-    assert_equal price, Security::Price.find_price(ticker: price.ticker, date: price.date)
+    assert_equal price, @security.find_or_fetch_price(date: price.date)
   end
 
-  test "caches prices to DB" do
-    expected_price = 314.34
-    @provider.expects(:fetch_security_prices)
-             .once
-             .returns(
-               OpenStruct.new(
-                 success?: true,
-                 prices: [ { date: Date.current, price: expected_price } ]
-               )
-             )
+  test "caches prices from provider to DB" do
+    price_date = 10.days.ago.to_date
 
-    fetched_rate = Security::Price.find_price(ticker: "NVDA", date: Date.current, cache: true)
-    refetched_rate = Security::Price.find_price(ticker: "NVDA", date: Date.current, cache: true)
+    expected_price = Security::Price.new(
+      security: @security,
+      date: price_date,
+      price: 314.34,
+      currency: "USD"
+    )
 
-    assert_equal expected_price, fetched_rate.price
-    assert_equal expected_price, refetched_rate.price
+    expect_provider_price(security: @security, price: expected_price, date: price_date)
+
+    assert_difference "Security::Price.count", 1 do
+      fetched_price = @security.find_or_fetch_price(date: price_date, cache: true)
+      assert_equal expected_price.price, fetched_price.price
+    end
   end
 
   test "returns nil if no price found in DB or from provider" do
-    @provider.expects(:fetch_security_prices)
-             .with(ticker: "NVDA", start_date: Date.current, end_date: Date.current)
-             .once
-             .returns(OpenStruct.new(success?: false))
+    security = securities(:aapl)
+    Security::Price.delete_all # Clear any existing prices
 
-    assert_not Security::Price.find_price(ticker: "NVDA", date: Date.current)
+    with_provider_response = provider_error_response(StandardError.new("Test error"))
+
+    @provider.expects(:fetch_security_price)
+             .with(symbol: security.ticker, exchange_operating_mic: security.exchange_operating_mic, date: Date.current)
+             .returns(with_provider_response)
+
+    assert_not @security.find_or_fetch_price(date: Date.current)
   end
 
-  test "returns nil if price not found in DB and provider disabled" do
-    Security::Price.unstub(:security_prices_provider)
-
-    with_env_overrides SYNTH_API_KEY: nil do
-      assert_not Security::Price.find_price(ticker: "NVDA", date: Date.current)
+  private
+    def expect_provider_price(security:, price:, date:)
+      @provider.expects(:fetch_security_price)
+               .with(symbol: security.ticker, exchange_operating_mic: security.exchange_operating_mic, date: date)
+               .returns(provider_success_response(price))
     end
-  end
 
-  test "fetches multiple dates at once" do
-    @provider.expects(:fetch_security_prices).never
-
-    price1 = security_prices(:one) # AAPL today
-    price2 = security_prices(:two) # AAPL yesterday
-
-    fetched_prices = Security::Price.find_prices(start_date: 1.day.ago.to_date, end_date: Date.current, ticker: "AAPL").sort_by(&:date)
-
-    assert_equal price1, fetched_prices[1]
-    assert_equal price2, fetched_prices[0]
-  end
-
-  test "caches multiple prices to DB" do
-    missing_price = 213.21
-    @provider.expects(:fetch_security_prices)
-             .with(ticker: "AAPL", start_date: 2.days.ago.to_date, end_date: 2.days.ago.to_date)
-             .returns(OpenStruct.new(success?: true, prices: [ { date: 2.days.ago.to_date, price: missing_price } ]))
-             .once
-
-    price1 = security_prices(:one) # AAPL today
-    price2 = security_prices(:two) # AAPL yesterday
-
-    fetched_prices = Security::Price.find_prices(ticker: "AAPL", start_date: 2.days.ago.to_date, end_date: Date.current, cache: true)
-    refetched_prices = Security::Price.find_prices(ticker: "AAPL", start_date: 2.days.ago.to_date, end_date: Date.current, cache: true)
-
-    assert_equal [ missing_price, price2.price, price1.price ], fetched_prices.sort_by(&:date).map(&:price)
-    assert_equal [ missing_price, price2.price, price1.price ], refetched_prices.sort_by(&:date).map(&:price)
-  end
-
-  test "returns empty array if no prices found in DB or from provider" do
-    Security::Price.unstub(:security_prices_provider)
-
-    with_env_overrides SYNTH_API_KEY: nil do
-      assert_equal [], Security::Price.find_prices(ticker: "NVDA", start_date: 10.days.ago.to_date, end_date: Date.current)
+    def expect_provider_prices(security:, prices:, start_date:, end_date:)
+      @provider.expects(:fetch_security_prices)
+               .with(security, start_date: start_date, end_date: end_date)
+               .returns(provider_success_response(prices))
     end
-  end
 end
diff --git a/test/models/security/resolver_test.rb b/test/models/security/resolver_test.rb
new file mode 100644
index 00000000..1a557f22
--- /dev/null
+++ b/test/models/security/resolver_test.rb
@@ -0,0 +1,78 @@
+require "test_helper"
+
+class Security::ResolverTest < ActiveSupport::TestCase
+  setup do
+    @provider = mock
+    Security.stubs(:provider).returns(@provider)
+  end
+
+  test "resolves DB security" do
+    # Given an existing security in the DB that exactly matches the lookup params
+    db_security = Security.create!(ticker: "TSLA", exchange_operating_mic: "XNAS", country_code: "US")
+
+    # The resolver should return the DB record and never hit the provider
+    Security.expects(:search_provider).never
+
+    resolved = Security::Resolver.new("TSLA", exchange_operating_mic: "XNAS", country_code: "US").resolve
+
+    assert_equal db_security, resolved
+  end
+
+  test "resolves exact provider match" do
+    # Provider returns multiple results, one of which exactly matches symbol + exchange (and country)
+    exact_match = Security.new(ticker: "NVDA", exchange_operating_mic: "XNAS", country_code: "US")
+    near_miss   = Security.new(ticker: "NVDA", exchange_operating_mic: "XNYS", country_code: "US")
+
+    Security.expects(:search_provider)
+            .with("NVDA", exchange_operating_mic: "XNAS", country_code: "US")
+            .returns([ near_miss, exact_match ])
+
+    assert_difference "Security.count", 1 do
+      resolved = Security::Resolver.new("NVDA", exchange_operating_mic: "XNAS", country_code: "US").resolve
+
+      assert resolved.persisted?
+      assert_equal "NVDA", resolved.ticker
+      assert_equal "XNAS", resolved.exchange_operating_mic
+      assert_equal "US",   resolved.country_code
+      refute resolved.offline, "Exact provider matches should not be marked offline"
+    end
+  end
+
+  test "resolves close provider match" do
+    # No exact match – resolver should choose the most relevant close match based on exchange + country ranking
+    preferred = Security.new(ticker: "TEST1", exchange_operating_mic: "XNAS", country_code: "US")
+    other     = Security.new(ticker: "TEST2", exchange_operating_mic: "XNYS", country_code: "GB")
+
+    # Return in reverse-priority order to prove the sorter works
+    Security.expects(:search_provider)
+            .with("TEST", exchange_operating_mic: "XNAS")
+            .returns([ other, preferred ])
+
+    assert_difference "Security.count", 1 do
+      resolved = Security::Resolver.new("TEST", exchange_operating_mic: "XNAS").resolve
+
+      assert resolved.persisted?
+      assert_equal "TEST1", resolved.ticker
+      assert_equal "XNAS",  resolved.exchange_operating_mic
+      assert_equal "US",    resolved.country_code
+      refute resolved.offline, "Provider matches should not be marked offline"
+    end
+  end
+
+  test "resolves offline security" do
+    Security.expects(:search_provider).returns([])
+
+    assert_difference "Security.count", 1 do
+      resolved = Security::Resolver.new("FOO").resolve
+
+      assert resolved.persisted?, "Offline security should be saved"
+      assert_equal "FOO", resolved.ticker
+      assert resolved.offline, "Offline securities should be flagged offline"
+    end
+  end
+
+  test "returns nil when symbol blank" do
+    assert_raises(ArgumentError) { Security::Resolver.new(nil).resolve }
+    assert_raises(ArgumentError) { Security::Resolver.new("").resolve }
+  end
+end
diff --git a/test/models/security_test.rb b/test/models/security_test.rb
index 8e82099f..0e6ef3c8 100644
--- a/test/models/security_test.rb
+++ b/test/models/security_test.rb
@@ -1,7 +1,41 @@
 require "test_helper"
 
 class SecurityTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
+  # Below has 3 example scenarios:
+  # 1. Original ticker
+  # 2. Duplicate ticker on a different exchange (different market price)
+  # 3. "Offline" version of the same ticker (for users not connected to a provider)
+  test "can have duplicate tickers if exchange is different" do
+    original = Security.create!(ticker: "TEST", exchange_operating_mic: "XNAS")
+    duplicate = Security.create!(ticker: "TEST", exchange_operating_mic: "CBOE")
+    offline = Security.create!(ticker: "TEST", exchange_operating_mic: nil)
+
+    assert original.valid?
+    assert duplicate.valid?
+    assert offline.valid?
+  end
+
+  test "cannot have duplicate tickers if exchange is the same" do
+    original = Security.create!(ticker: "TEST", exchange_operating_mic: "XNAS")
+    duplicate = Security.new(ticker: "TEST", exchange_operating_mic: "XNAS")
+
+    assert_not duplicate.valid?
+    assert_equal [ "has already been taken" ], duplicate.errors[:ticker]
+  end
+
+  test "cannot have duplicate tickers if exchange is nil" do
+    original = Security.create!(ticker: "TEST", exchange_operating_mic: nil)
+    duplicate = Security.new(ticker: "TEST", exchange_operating_mic: nil)
+
+    assert_not duplicate.valid?
+    assert_equal [ "has already been taken" ], duplicate.errors[:ticker]
+  end
+
+  test "casing is ignored when checking for duplicates" do
+    original = Security.create!(ticker: "TEST", exchange_operating_mic: "XNAS")
+    duplicate = Security.new(ticker: "tEst", exchange_operating_mic: "xNaS")
+
+    assert_not duplicate.valid?
+    assert_equal [ "has already been taken" ], duplicate.errors[:ticker]
+  end
 end
diff --git a/test/models/session_test.rb b/test/models/session_test.rb
deleted file mode 100644
index 47ad9065..00000000
--- a/test/models/session_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class SessionTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/models/subscription_test.rb b/test/models/subscription_test.rb
new file mode 100644
index 00000000..389aaaf0
--- /dev/null
+++ b/test/models/subscription_test.rb
@@ -0,0 +1,33 @@
+require "test_helper"
+
+class SubscriptionTest < ActiveSupport::TestCase
+  setup do
+    @family = Family.create!(name: "Test Family")
+  end
+
+  test "can create subscription without stripe details if trial" do
+    subscription = Subscription.new(
+      family: @family,
+      status: :trialing,
+    )
+
+    assert_not subscription.valid?
+
+    subscription.trial_ends_at = 14.days.from_now
+
+    assert subscription.valid?
+  end
+
+  test "stripe details required for all statuses except trial" do
+    subscription = Subscription.new(
+      family: @family,
+      status: :active,
+    )
+
+    assert_not subscription.valid?
+
+    subscription.stripe_id = "test-stripe-id"
+
+    assert subscription.valid?
+  end
+end
diff --git a/test/models/sync_test.rb b/test/models/sync_test.rb
new file mode 100644
index 00000000..d1182fd5
--- /dev/null
+++ b/test/models/sync_test.rb
@@ -0,0 +1,222 @@
+require "test_helper"
+
+class SyncTest < ActiveSupport::TestCase
+  include ActiveJob::TestHelper
+
+  test "does not run if not in a valid state" do
+    syncable = accounts(:depository)
+    sync = Sync.create!(syncable: syncable, status: :completed)
+
+    syncable.expects(:perform_sync).never
+
+    sync.perform
+
+    assert_equal "completed", sync.status
+  end
+
+  test "runs successful sync" do
+    syncable = accounts(:depository)
+    sync = Sync.create!(syncable: syncable)
+
+    syncable.expects(:perform_sync).with(sync).once
+
+    assert_equal "pending", sync.status
+
+    sync.perform
+
+    assert sync.completed_at < Time.now
+    assert_equal "completed", sync.status
+  end
+
+  test "handles sync errors" do
+    syncable = accounts(:depository)
+    sync = Sync.create!(syncable: syncable)
+
+    syncable.expects(:perform_sync).with(sync).raises(StandardError.new("test sync error"))
+
+    assert_equal "pending", sync.status
+
+    sync.perform
+
+    assert sync.failed_at < Time.now
+    assert_equal "failed", sync.status
+    assert_equal "test sync error", sync.error
+  end
+
+  test "can run nested syncs that alert the parent when complete" do
+    family = families(:dylan_family)
+    plaid_item = plaid_items(:one)
+    account = accounts(:connected)
+
+    family_sync = Sync.create!(syncable: family)
+    plaid_item_sync = Sync.create!(syncable: plaid_item, parent: family_sync)
+    account_sync = Sync.create!(syncable: account, parent: plaid_item_sync)
+
+    assert_equal "pending", family_sync.status
+    assert_equal "pending", plaid_item_sync.status
+    assert_equal "pending", account_sync.status
+
+    family.expects(:perform_sync).with(family_sync).once
+
+    family_sync.perform
+
+    assert_equal "syncing", family_sync.reload.status
+
+    plaid_item.expects(:perform_sync).with(plaid_item_sync).once
+
+    plaid_item_sync.perform
+
+    assert_equal "syncing", family_sync.reload.status
+    assert_equal "syncing", plaid_item_sync.reload.status
+
+    account.expects(:perform_sync).with(account_sync).once
+
+    # Since these are accessed through `parent`, they won't necessarily be the same
+    # instance we configured above
+    Account.any_instance.expects(:perform_post_sync).once
+    Account.any_instance.expects(:broadcast_sync_complete).once
+    PlaidItem.any_instance.expects(:perform_post_sync).once
+    PlaidItem.any_instance.expects(:broadcast_sync_complete).once
+    Family.any_instance.expects(:perform_post_sync).once
+    Family.any_instance.expects(:broadcast_sync_complete).once
+
+    account_sync.perform
+
+    assert_equal "completed", plaid_item_sync.reload.status
+    assert_equal "completed", account_sync.reload.status
+    assert_equal "completed", family_sync.reload.status
+  end
+
+  test "failures propagate up the chain" do
+    family = families(:dylan_family)
+    plaid_item = plaid_items(:one)
+    account = accounts(:connected)
+
+    family_sync = Sync.create!(syncable: family)
+    plaid_item_sync = Sync.create!(syncable: plaid_item, parent: family_sync)
+    account_sync = Sync.create!(syncable: account, parent: plaid_item_sync)
+
+    assert_equal "pending", family_sync.status
+    assert_equal "pending", plaid_item_sync.status
+    assert_equal "pending", account_sync.status
+
+    family.expects(:perform_sync).with(family_sync).once
+
+    family_sync.perform
+
+    assert_equal "syncing", family_sync.reload.status
+
+    plaid_item.expects(:perform_sync).with(plaid_item_sync).once
+
+    plaid_item_sync.perform
+
+    assert_equal "syncing", family_sync.reload.status
+    assert_equal "syncing", plaid_item_sync.reload.status
+
+    # This error should "bubble up" to the PlaidItem and Family sync results
+    account.expects(:perform_sync).with(account_sync).raises(StandardError.new("test account sync error"))
+
+    # Since these are accessed through `parent`, they won't necessarily be the same
+    # instance we configured above
+    Account.any_instance.expects(:perform_post_sync).once
+    PlaidItem.any_instance.expects(:perform_post_sync).once
+    Family.any_instance.expects(:perform_post_sync).once
+
+    Account.any_instance.expects(:broadcast_sync_complete).once
+    PlaidItem.any_instance.expects(:broadcast_sync_complete).once
+    Family.any_instance.expects(:broadcast_sync_complete).once
+
+    account_sync.perform
+
+    assert_equal "failed", plaid_item_sync.reload.status
+    assert_equal "failed", account_sync.reload.status
+    assert_equal "failed", family_sync.reload.status
+  end
+
+  test "parent failure should not change status if child succeeds" do
+    family = families(:dylan_family)
+    plaid_item = plaid_items(:one)
+    account = accounts(:connected)
+
+    family_sync = Sync.create!(syncable: family)
+    plaid_item_sync = Sync.create!(syncable: plaid_item, parent: family_sync)
+    account_sync = Sync.create!(syncable: account, parent: plaid_item_sync)
+
+    assert_equal "pending", family_sync.status
+    assert_equal "pending", plaid_item_sync.status
+    assert_equal "pending", account_sync.status
+
+    family.expects(:perform_sync).with(family_sync).raises(StandardError.new("test family sync error"))
+
+    family_sync.perform
+
+    assert_equal "failed", family_sync.reload.status
+
+    plaid_item.expects(:perform_sync).with(plaid_item_sync).raises(StandardError.new("test plaid item sync error"))
+
+    plaid_item_sync.perform
+
+    assert_equal "failed", family_sync.reload.status
+    assert_equal "failed", plaid_item_sync.reload.status
+
+    # Leaf level sync succeeds, but shouldn't change the status of the already-failed parent syncs
+    account.expects(:perform_sync).with(account_sync).once
+
+    # Since these are accessed through `parent`, they won't necessarily be the same
+    # instance we configured above
+    Account.any_instance.expects(:perform_post_sync).once
+    PlaidItem.any_instance.expects(:perform_post_sync).once
+    Family.any_instance.expects(:perform_post_sync).once
+
+    Account.any_instance.expects(:broadcast_sync_complete).once
+    PlaidItem.any_instance.expects(:broadcast_sync_complete).once
+    Family.any_instance.expects(:broadcast_sync_complete).once
+
+    account_sync.perform
+
+    assert_equal "failed", plaid_item_sync.reload.status
+    assert_equal "failed", family_sync.reload.status
+    assert_equal "completed", account_sync.reload.status
+  end
+
+  test "clean marks stale incomplete rows" do
+    stale_pending = Sync.create!(
+      syncable: accounts(:depository),
+      status: :pending,
+      created_at: 25.hours.ago
+    )
+
+    stale_syncing = Sync.create!(
+      syncable: accounts(:depository),
+      status: :syncing,
+      created_at: 25.hours.ago,
+      pending_at: 24.hours.ago,
+      syncing_at: 23.hours.ago
+    )
+
+    Sync.clean
+
+    assert_equal "stale", stale_pending.reload.status
+    assert_equal "stale", stale_syncing.reload.status
+  end
+
+  test "expand_window_if_needed widens start and end dates on a pending sync" do
+    initial_start = 1.day.ago.to_date
+    initial_end   = 1.day.ago.to_date
+
+    sync = Sync.create!(
+      syncable: accounts(:depository),
+      window_start_date: initial_start,
+      window_end_date: initial_end
+    )
+
+    new_start = 5.days.ago.to_date
+    new_end   = Date.current
+
+    sync.expand_window_if_needed(new_start, new_end)
+    sync.reload
+
+    assert_equal new_start, sync.window_start_date
+    assert_equal new_end,   sync.window_end_date
+  end
+end
diff --git a/test/models/time_series/trend_test.rb b/test/models/time_series/trend_test.rb
deleted file mode 100644
index b05d13ad..00000000
--- a/test/models/time_series/trend_test.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require "test_helper"
-
-class TimeSeries::TrendTest < ActiveSupport::TestCase
-  test "handles money trend" do
-    trend = TimeSeries::Trend.new(current: Money.new(100), previous: Money.new(50))
-    assert_equal "up", trend.direction
-    assert_equal Money.new(50), trend.value
-    assert_equal 100.0, trend.percent
-  end
-
-  test "up" do
-    trend = TimeSeries::Trend.new(current: 100, previous: 50)
-    assert_equal "up", trend.direction
-    assert_equal "#10A861", trend.color
-  end
-
-  test "down" do
-    trend = TimeSeries::Trend.new(current: 50, previous: 100)
-    assert_equal "down", trend.direction
-    assert_equal "#F13636", trend.color
-  end
-
-  test "flat" do
-    trend1 = TimeSeries::Trend.new(current: 100, previous: 100)
-    trend2 = TimeSeries::Trend.new(current: 100, previous: nil)
-    trend3 = TimeSeries::Trend.new(current: nil, previous: nil)
-    assert_equal "flat", trend1.direction
-    assert_equal "flat", trend2.direction
-    assert_equal "flat", trend3.direction
-    assert_equal "#737373", trend1.color
-  end
-
-  test "infinitely up" do
-    trend = TimeSeries::Trend.new(current: 100, previous: 0)
-    assert_equal "up", trend.direction
-  end
-
-  test "infinitely down" do
-    trend1 = TimeSeries::Trend.new(current: nil, previous: 100)
-    trend2 = TimeSeries::Trend.new(current: 0, previous: 100)
-    assert_equal "down", trend1.direction
-    assert_equal "down", trend2.direction
-  end
-
-  test "empty" do
-    trend = TimeSeries::Trend.new(current: nil, previous: nil)
-    assert_equal "flat", trend.direction
-  end
-end
diff --git a/test/models/time_series_test.rb b/test/models/time_series_test.rb
deleted file mode 100644
index a6a8431c..00000000
--- a/test/models/time_series_test.rb
+++ /dev/null
@@ -1,102 +0,0 @@
-require "test_helper"
-
-class TimeSeriesTest < ActiveSupport::TestCase
-  test "it can accept array of money values" do
-    series = TimeSeries.new([ { date: 1.day.ago.to_date, value: Money.new(100) }, { date: Date.current, value: Money.new(200) } ])
-
-    assert_equal Money.new(100), series.first.value
-    assert_equal Money.new(200), series.last.value
-    assert_equal "up", series.favorable_direction
-    assert_equal "up", series.trend.direction
-    assert_equal Money.new(100), series.trend.value
-    assert_equal 100.0, series.trend.percent
-  end
-
-  test "it can accept array of numeric values" do
-    series = TimeSeries.new([ { date: 1.day.ago.to_date, value: 100 }, { date: Date.current, value: 200 } ])
-
-    assert_equal 100, series.first.value
-    assert_equal 200, series.last.value
-    assert_equal 100, series.on(1.day.ago.to_date).value
-    assert_equal "up", series.favorable_direction
-    assert_equal "up", series.trend.direction
-    assert_equal 100, series.trend.value
-    assert_equal 100.0, series.trend.percent
-  end
-
-  test "when empty array passed, it returns empty series" do
-    series = TimeSeries.new([])
-
-    assert_nil series.first
-    assert_nil series.last
-    assert_equal({ values: [], trend: { favorable_direction: "up", direction: "flat", value: 0, percent: 0.0 }, favorable_direction: "up" }.to_json, series.to_json)
-  end
-
-  test "money series can be serialized to json" do
-    expected_values = {
-      values: [
-        {
-          date: 1.day.ago.to_date,
-          value: { amount: "100.0", currency: "USD" },
-          trend: { favorable_direction: "up", direction: "flat", value: { amount: "0.0", currency: "USD" }, percent: 0.0 }
-        },
-        {
-          date: Date.current,
-          value: { amount: "200.0", currency: "USD" },
-          trend: { favorable_direction: "up", direction: "up", value: { amount: "100.0", currency: "USD" }, percent: 100.0 }
-        }
-      ],
-      trend: { favorable_direction: "up", direction: "up", value: { amount: "100.0", currency: "USD" }, percent: 100.0 },
-      favorable_direction: "up"
-    }.to_json
-
-    series = TimeSeries.new([ { date: 1.day.ago.to_date, value: Money.new(100) }, { date: Date.current, value: Money.new(200) } ])
-
-    assert_equal expected_values, series.to_json
-  end
-
-  test "numeric series can be serialized to json" do
-    expected_values = {
-      values: [
-        { date: 1.day.ago.to_date, value: 100, trend: { favorable_direction: "up", direction: "flat", value: 0, percent: 0.0 } },
-        { date: Date.current, value: 200, trend: { favorable_direction: "up", direction: "up", value: 100, percent: 100.0 } }
-      ],
-      trend: { favorable_direction: "up", direction: "up", value: 100, percent: 100.0 },
-      favorable_direction: "up"
-    }.to_json
-
-    series = TimeSeries.new([ { date: 1.day.ago.to_date, value: 100 }, { date: Date.current, value: 200 } ])
-
-    assert_equal expected_values, series.to_json
-  end
-
-  test "it does not accept invalid values in Time Series Trend" do
-    error = assert_raises(ActiveModel::ValidationError) do
-      TimeSeries.new(
-        [
-          { date: 1.day.ago.to_date, value: 100 },
-          { date: Date.current, value: "two hundred" }
-        ]
-      )
-    end
-    assert_match(/Current must be of the same type as previous/, error.message)
-    assert_match(/Previous must be of the same type as current/, error.message)
-    assert_match(/Current must be of type Money, Numeric, or nil/, error.message)
-  end
-
-
-  test "it does not accept invalid values in Time Series Value" do
-    # We need to stub trend otherwise an error is raised before TimeSeries::Value validation
-    TimeSeries::Trend.stub(:new, nil) do
-      error = assert_raises(ActiveModel::ValidationError) do
-        TimeSeries.new(
-          [
-            { date: 1.day.ago.to_date, value: 100 },
-            { date: Date.current, value: "two hundred" }
-          ]
-        )
-      end
-      assert_equal "Validation failed: Value must be a Money or Numeric", error.message
-    end
-  end
-end
diff --git a/test/models/trade_import_test.rb b/test/models/trade_import_test.rb
new file mode 100644
index 00000000..54b30797
--- /dev/null
+++ b/test/models/trade_import_test.rb
@@ -0,0 +1,65 @@
+require "test_helper"
+require "ostruct"
+
+class TradeImportTest < ActiveSupport::TestCase
+  include ActiveJob::TestHelper, ImportInterfaceTest
+
+  setup do
+    @subject = @import = imports(:trade)
+    @provider = mock
+    Security.stubs(:provider).returns(@provider)
+  end
+
+  test "imports trades and accounts" do
+    aapl_resolver = mock
+    googl_resolver = mock
+
+    Security::Resolver.expects(:new)
+                      .with("AAPL", exchange_operating_mic: nil)
+                      .returns(aapl_resolver)
+                      .once
+
+    Security::Resolver.expects(:new)
+                      .with("GOOGL", exchange_operating_mic: "XNAS")
+                      .returns(googl_resolver)
+                      .once
+
+    aapl = securities(:aapl)
+    googl = Security.create!(ticker: "GOOGL", exchange_operating_mic: "XNAS")
+
+    aapl_resolver.stubs(:resolve).returns(aapl)
+    googl_resolver.stubs(:resolve).returns(googl)
+
+    import = <<~CSV
+      date,ticker,qty,price,currency,account,name,exchange_operating_mic
+      01/01/2024,AAPL,10,150.00,USD,TestAccount1,Apple Purchase,
+      01/02/2024,GOOGL,5,2500.00,USD,TestAccount1,Google Purchase,XNAS
+    CSV
+
+    @import.update!(
+      account: accounts(:depository),
+      raw_file_str: import,
+      date_col_label: "date",
+      ticker_col_label: "ticker",
+      qty_col_label: "qty",
+      price_col_label: "price",
+      exchange_operating_mic_col_label: "exchange_operating_mic",
+      date_format: "%m/%d/%Y",
+      signage_convention: "inflows_positive"
+    )
+
+    @import.generate_rows_from_csv
+
+    @import.mappings.create! key: "TestAccount1", create_when_empty: true, type: "Import::AccountMapping"
+
+    @import.reload
+
+    assert_difference -> { Entry.count } => 2,
+                      -> { Trade.count } => 2,
+                      -> { Account.count } => 1 do
+      @import.publish
+    end
+
+    assert_equal "complete", @import.status
+  end
+end
diff --git a/test/models/trade_test.rb b/test/models/trade_test.rb
new file mode 100644
index 00000000..c358a5ba
--- /dev/null
+++ b/test/models/trade_test.rb
@@ -0,0 +1,23 @@
+require "test_helper"
+
+class TradeTest < ActiveSupport::TestCase
+  test "build_name generates buy trade name" do
+    name = Trade.build_name("buy", 10, "AAPL")
+    assert_equal "Buy 10.0 shares of AAPL", name
+  end
+
+  test "build_name generates sell trade name" do
+    name = Trade.build_name("sell", 5, "MSFT")
+    assert_equal "Sell 5.0 shares of MSFT", name
+  end
+
+  test "build_name handles absolute value for negative quantities" do
+    name = Trade.build_name("sell", -5, "GOOGL")
+    assert_equal "Sell 5.0 shares of GOOGL", name
+  end
+
+  test "build_name handles decimal quantities" do
+    name = Trade.build_name("buy", 0.25, "BTC")
+    assert_equal "Buy 0.25 shares of BTC", name
+  end
+end
diff --git a/test/models/transaction/search_test.rb b/test/models/transaction/search_test.rb
new file mode 100644
index 00000000..c9c660b2
--- /dev/null
+++ b/test/models/transaction/search_test.rb
@@ -0,0 +1,301 @@
+require "test_helper"
+
+class Transaction::SearchTest < ActiveSupport::TestCase
+  include EntriesTestHelper
+
+  setup do
+    @family = families(:dylan_family)
+    @checking_account = accounts(:depository)
+    @credit_card_account = accounts(:credit_card)
+    @loan_account = accounts(:loan)
+
+    # Clean up existing entries/transactions from fixtures to ensure test isolation
+    @family.accounts.each { |account| account.entries.delete_all }
+  end
+
+  test "search filters by transaction types using kind enum" do
+    # Create different types of transactions using the helper method
+    standard_entry = create_transaction(
+      account: @checking_account,
+      amount: 100,
+      category: categories(:food_and_drink),
+      kind: "standard"
+    )
+
+    transfer_entry = create_transaction(
+      account: @checking_account,
+      amount: 200,
+      kind: "funds_movement"
+    )
+
+    payment_entry = create_transaction(
+      account: @credit_card_account,
+      amount: -300,
+      kind: "cc_payment"
+    )
+
+    loan_payment_entry = create_transaction(
+      account: @loan_account,
+      amount: 400,
+      kind: "loan_payment"
+    )
+
+    one_time_entry = create_transaction(
+      account: @checking_account,
+      amount: 500,
+      kind: "one_time"
+    )
+
+    # Test transfer type filter (includes loan_payment)
+    transfer_results = Transaction::Search.new(@family, filters: { types: [ "transfer" ] }).transactions_scope
+    transfer_ids = transfer_results.pluck(:id)
+
+    assert_includes transfer_ids, transfer_entry.entryable.id
+    assert_includes transfer_ids, payment_entry.entryable.id
+    assert_includes transfer_ids, loan_payment_entry.entryable.id
+    assert_not_includes transfer_ids, one_time_entry.entryable.id
+    assert_not_includes transfer_ids, standard_entry.entryable.id
+
+    # Test expense type filter (excludes transfer kinds but includes one_time)
+    expense_results = Transaction::Search.new(@family, filters: { types: [ "expense" ] }).transactions_scope
+    expense_ids = expense_results.pluck(:id)
+
+    assert_includes expense_ids, standard_entry.entryable.id
+    assert_includes expense_ids, one_time_entry.entryable.id
+    assert_not_includes expense_ids, loan_payment_entry.entryable.id
+    assert_not_includes expense_ids, transfer_entry.entryable.id
+    assert_not_includes expense_ids, payment_entry.entryable.id
+
+    # Test income type filter
+    income_entry = create_transaction(
+      account: @checking_account,
+      amount: -600,
+      kind: "standard"
+    )
+
+    income_results = Transaction::Search.new(@family, filters: { types: [ "income" ] }).transactions_scope
+    income_ids = income_results.pluck(:id)
+
+    assert_includes income_ids, income_entry.entryable.id
+    assert_not_includes income_ids, standard_entry.entryable.id
+    assert_not_includes income_ids, loan_payment_entry.entryable.id
+    assert_not_includes income_ids, transfer_entry.entryable.id
+
+    # Test combined expense and income filter (excludes transfer kinds but includes one_time)
+    non_transfer_results = Transaction::Search.new(@family, filters: { types: [ "expense", "income" ] }).transactions_scope
+    non_transfer_ids = non_transfer_results.pluck(:id)
+
+    assert_includes non_transfer_ids, standard_entry.entryable.id
+    assert_includes non_transfer_ids, income_entry.entryable.id
+    assert_includes non_transfer_ids, one_time_entry.entryable.id
+    assert_not_includes non_transfer_ids, loan_payment_entry.entryable.id
+    assert_not_includes non_transfer_ids, transfer_entry.entryable.id
+    assert_not_includes non_transfer_ids, payment_entry.entryable.id
+  end
+
+  test "search category filter handles uncategorized transactions correctly with kind filtering" do
+    # Create uncategorized transactions of different kinds
+    uncategorized_standard = create_transaction(
+      account: @checking_account,
+      amount: 100,
+      kind: "standard"
+    )
+
+    uncategorized_transfer = create_transaction(
+      account: @checking_account,
+      amount: 200,
+      kind: "funds_movement"
+    )
+
+    uncategorized_loan_payment = create_transaction(
+      account: @loan_account,
+      amount: 300,
+      kind: "loan_payment"
+    )
+
+    # Search for uncategorized transactions
+    uncategorized_results = Transaction::Search.new(@family, filters: { categories: [ "Uncategorized" ] }).transactions_scope
+    uncategorized_ids = uncategorized_results.pluck(:id)
+
+    # Should include standard uncategorized transactions
+    assert_includes uncategorized_ids, uncategorized_standard.entryable.id
+    # Should include loan_payment since it's treated specially in category logic
+    assert_includes uncategorized_ids, uncategorized_loan_payment.entryable.id
+
+    # Should exclude transfer transactions even if uncategorized
+    assert_not_includes uncategorized_ids, uncategorized_transfer.entryable.id
+  end
+
+  test "new family-based API works correctly" do
+    # Create transactions for testing
+    transaction1 = create_transaction(
+      account: @checking_account,
+      amount: 100,
+      category: categories(:food_and_drink),
+      kind: "standard"
+    )
+
+    transaction2 = create_transaction(
+      account: @checking_account,
+      amount: 200,
+      kind: "funds_movement"
+    )
+
+    # Test new family-based API
+    search = Transaction::Search.new(@family, filters: { types: [ "expense" ] })
+    results = search.transactions_scope
+    result_ids = results.pluck(:id)
+
+    # Should include expense transactions
+    assert_includes result_ids, transaction1.entryable.id
+    # Should exclude transfer transactions
+    assert_not_includes result_ids, transaction2.entryable.id
+
+    # Test that the relation builds from family.transactions correctly
+    assert_equal @family.transactions.joins(entry: :account).where(
+      "entries.amount >= 0 AND NOT (transactions.kind IN ('funds_movement', 'cc_payment', 'loan_payment'))"
+    ).count, results.count
+  end
+
+  test "family-based API requires family parameter" do
+    assert_raises(NoMethodError) do
+      search = Transaction::Search.new({ types: [ "expense" ] })
+      search.transactions_scope  # This will fail when trying to call .transactions on a Hash
+    end
+  end
+
+  # Totals method tests (lifted from Transaction::TotalsTest)
+
+  test "totals computes basic expense and income totals" do
+    # Create expense transaction
+    expense_entry = create_transaction(
+      account: @checking_account,
+      amount: 100,
+      category: categories(:food_and_drink),
+      kind: "standard"
+    )
+
+    # Create income transaction
+    income_entry = create_transaction(
+      account: @checking_account,
+      amount: -200,
+      kind: "standard"
+    )
+
+    search = Transaction::Search.new(@family)
+    totals = search.totals
+
+    assert_equal 2, totals.count
+    assert_equal Money.new(100, "USD"), totals.expense_money # $100
+    assert_equal Money.new(200, "USD"), totals.income_money  # $200
+  end
+
+  test "totals handles multi-currency transactions with exchange rates" do
+    # Create EUR transaction
+    eur_entry = create_transaction(
+      account: @checking_account,
+      amount: 100,
+      currency: "EUR",
+      kind: "standard"
+    )
+
+    # Create exchange rate EUR -> USD
+    ExchangeRate.create!(
+      from_currency: "EUR",
+      to_currency: "USD",
+      rate: 1.1,
+      date: eur_entry.date
+    )
+
+    # Create USD transaction
+    usd_entry = create_transaction(
+      account: @checking_account,
+      amount: 50,
+      currency: "USD",
+      kind: "standard"
+    )
+
+    search = Transaction::Search.new(@family)
+    totals = search.totals
+
+    assert_equal 2, totals.count
+    # EUR 100 * 1.1 + USD 50 = 110 + 50 = 160
+    assert_equal Money.new(160, "USD"), totals.expense_money
+    assert_equal Money.new(0, "USD"), totals.income_money
+  end
+
+  test "totals handles missing exchange rates gracefully" do
+    # Create EUR transaction without exchange rate
+    eur_entry = create_transaction(
+      account: @checking_account,
+      amount: 100,
+      currency: "EUR",
+      kind: "standard"
+    )
+
+    search = Transaction::Search.new(@family)
+    totals = search.totals
+
+    assert_equal 1, totals.count
+    # Should use rate of 1 when exchange rate is missing
+    assert_equal Money.new(100, "USD"), totals.expense_money # EUR 100 * 1
+    assert_equal Money.new(0, "USD"), totals.income_money
+  end
+
+  test "totals respects category filters" do
+    # Create transactions in different categories
+    food_entry = create_transaction(
+      account: @checking_account,
+      amount: 100,
+      category: categories(:food_and_drink),
+      kind: "standard"
+    )
+
+    other_entry = create_transaction(
+      account: @checking_account,
+      amount: 50,
+      category: categories(:income),
+      kind: "standard"
+    )
+
+    # Filter by food category only
+    search = Transaction::Search.new(@family, filters: { categories: [ "Food & Drink" ] })
+    totals = search.totals
+
+    assert_equal 1, totals.count
+    assert_equal Money.new(100, "USD"), totals.expense_money # Only food transaction
+    assert_equal Money.new(0, "USD"), totals.income_money
+  end
+
+  test "totals respects type filters" do
+    # Create expense and income transactions
+    expense_entry = create_transaction(
+      account: @checking_account,
+      amount: 100,
+      kind: "standard"
+    )
+
+    income_entry = create_transaction(
+      account: @checking_account,
+      amount: -200,
+      kind: "standard"
+    )
+
+    # Filter by expense type only
+    search = Transaction::Search.new(@family, filters: { types: [ "expense" ] })
+    totals = search.totals
+
+    assert_equal 1, totals.count
+    assert_equal Money.new(100, "USD"), totals.expense_money
+    assert_equal Money.new(0, "USD"), totals.income_money
+  end
+
+  test "totals handles empty results" do
+    search = Transaction::Search.new(@family)
+    totals = search.totals
+
+    assert_equal 0, totals.count
+    assert_equal Money.new(0, "USD"), totals.expense_money
+    assert_equal Money.new(0, "USD"), totals.income_money
+  end
+end
diff --git a/test/models/transaction_import_test.rb b/test/models/transaction_import_test.rb
index fc3e2ab9..dc94b20c 100644
--- a/test/models/transaction_import_test.rb
+++ b/test/models/transaction_import_test.rb
@@ -28,14 +28,19 @@ class TransactionImportTest < ActiveSupport::TestCase
   end
 
   test "imports transactions, categories, tags, and accounts" do
-    import = <<-CSV
+    import = <<~CSV
       date,name,amount,category,tags,account,notes
       01/01/2024,Txn1,100,TestCategory1,TestTag1,TestAccount1,notes1
       01/02/2024,Txn2,200,TestCategory2,TestTag1|TestTag2,TestAccount2,notes2
       01/03/2024,Txn3,300,,,,notes3
     CSV
 
-    @import.update!(raw_file_str: import)
+    @import.update!(
+      raw_file_str: import,
+      date_col_label: "date",
+      amount_col_label: "amount",
+      date_format: "%m/%d/%Y"
+    )
 
     @import.generate_rows_from_csv
 
@@ -53,8 +58,8 @@ class TransactionImportTest < ActiveSupport::TestCase
 
     @import.reload
 
-    assert_difference -> { Account::Entry.count } => 3,
-                      -> { Account::Transaction.count } => 3,
+    assert_difference -> { Entry.count } => 3,
+                      -> { Transaction.count } => 3,
                       -> { Tag.count } => 1,
                       -> { Category.count } => 1,
                       -> { Account.count } => 1 do
@@ -63,4 +68,36 @@ class TransactionImportTest < ActiveSupport::TestCase
 
     assert_equal "complete", @import.status
   end
+
+  test "imports transactions with separate type column for signage convention" do
+    import = <<~CSV
+      date,amount,amount_type
+      01/01/2024,100,debit
+      01/02/2024,200,credit
+      01/03/2024,300,debit
+    CSV
+
+    @import.update!(
+      account: accounts(:depository),
+      raw_file_str: import,
+      date_col_label: "date",
+      date_format: "%m/%d/%Y",
+      amount_col_label: "amount",
+      entity_type_col_label: "amount_type",
+      amount_type_inflow_value: "debit",
+      amount_type_strategy: "custom_column",
+      signage_convention: nil # Explicitly set to nil to prove this is not needed
+    )
+
+    @import.generate_rows_from_csv
+
+    @import.reload
+
+    assert_difference -> { Entry.count } => 3,
+                      -> { Transaction.count } => 3 do
+      @import.publish
+    end
+
+    assert_equal [ -100, 200, -300 ], @import.entries.map(&:amount)
+  end
 end
diff --git a/test/models/transfer/creator_test.rb b/test/models/transfer/creator_test.rb
new file mode 100644
index 00000000..f6d9379b
--- /dev/null
+++ b/test/models/transfer/creator_test.rb
@@ -0,0 +1,166 @@
+require "test_helper"
+
+class Transfer::CreatorTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:dylan_family)
+    @source_account = accounts(:depository)
+    @destination_account = accounts(:investment)
+    @date = Date.current
+    @amount = 100
+  end
+
+  test "creates basic transfer" do
+    creator = Transfer::Creator.new(
+      family: @family,
+      source_account_id: @source_account.id,
+      destination_account_id: @destination_account.id,
+      date: @date,
+      amount: @amount
+    )
+
+    transfer = creator.create
+
+    assert transfer.persisted?
+    assert_equal "confirmed", transfer.status
+    assert transfer.regular_transfer?
+    assert_equal "transfer", transfer.transfer_type
+
+    # Verify outflow transaction (from source account)
+    outflow = transfer.outflow_transaction
+    assert_equal "funds_movement", outflow.kind
+    assert_equal @amount, outflow.entry.amount
+    assert_equal @source_account.currency, outflow.entry.currency
+    assert_equal "Transfer to #{@destination_account.name}", outflow.entry.name
+
+    # Verify inflow transaction (to destination account)
+    inflow = transfer.inflow_transaction
+    assert_equal "funds_movement", inflow.kind
+    assert_equal(@amount * -1, inflow.entry.amount)
+    assert_equal @destination_account.currency, inflow.entry.currency
+    assert_equal "Transfer from #{@source_account.name}", inflow.entry.name
+  end
+
+  test "creates multi-currency transfer" do
+    # Use crypto account which has USD currency but different from source
+    crypto_account = accounts(:crypto)
+
+    creator = Transfer::Creator.new(
+      family: @family,
+      source_account_id: @source_account.id,
+      destination_account_id: crypto_account.id,
+      date: @date,
+      amount: @amount
+    )
+
+    transfer = creator.create
+
+    assert transfer.persisted?
+    assert transfer.regular_transfer?
+    assert_equal "transfer", transfer.transfer_type
+
+    # Verify outflow transaction
+    outflow = transfer.outflow_transaction
+    assert_equal "funds_movement", outflow.kind
+    assert_equal "Transfer to #{crypto_account.name}", outflow.entry.name
+
+    # Verify inflow transaction with currency handling
+    inflow = transfer.inflow_transaction
+    assert_equal "funds_movement", inflow.kind
+    assert_equal "Transfer from #{@source_account.name}", inflow.entry.name
+    assert_equal crypto_account.currency, inflow.entry.currency
+  end
+
+  test "creates loan payment" do
+    loan_account = accounts(:loan)
+
+    creator = Transfer::Creator.new(
+      family: @family,
+      source_account_id: @source_account.id,
+      destination_account_id: loan_account.id,
+      date: @date,
+      amount: @amount
+    )
+
+    transfer = creator.create
+
+    assert transfer.persisted?
+    assert transfer.loan_payment?
+    assert_equal "loan_payment", transfer.transfer_type
+
+    # Verify outflow transaction is marked as loan payment
+    outflow = transfer.outflow_transaction
+    assert_equal "loan_payment", outflow.kind
+    assert_equal "Payment to #{loan_account.name}", outflow.entry.name
+
+    # Verify inflow transaction
+    inflow = transfer.inflow_transaction
+    assert_equal "funds_movement", inflow.kind
+    assert_equal "Payment from #{@source_account.name}", inflow.entry.name
+  end
+
+  test "creates credit card payment" do
+    credit_card_account = accounts(:credit_card)
+
+    creator = Transfer::Creator.new(
+      family: @family,
+      source_account_id: @source_account.id,
+      destination_account_id: credit_card_account.id,
+      date: @date,
+      amount: @amount
+    )
+
+    transfer = creator.create
+
+    assert transfer.persisted?
+    assert transfer.liability_payment?
+    assert_equal "liability_payment", transfer.transfer_type
+
+    # Verify outflow transaction is marked as payment for liability
+    outflow = transfer.outflow_transaction
+    assert_equal "cc_payment", outflow.kind
+    assert_equal "Payment to #{credit_card_account.name}", outflow.entry.name
+
+    # Verify inflow transaction
+    inflow = transfer.inflow_transaction
+    assert_equal "funds_movement", inflow.kind
+    assert_equal "Payment from #{@source_account.name}", inflow.entry.name
+  end
+
+  test "raises error when source account ID is invalid" do
+    assert_raises(ActiveRecord::RecordNotFound) do
+      Transfer::Creator.new(
+        family: @family,
+        source_account_id: 99999,
+        destination_account_id: @destination_account.id,
+        date: @date,
+        amount: @amount
+      )
+    end
+  end
+
+  test "raises error when destination account ID is invalid" do
+    assert_raises(ActiveRecord::RecordNotFound) do
+      Transfer::Creator.new(
+        family: @family,
+        source_account_id: @source_account.id,
+        destination_account_id: 99999,
+        date: @date,
+        amount: @amount
+      )
+    end
+  end
+
+  test "raises error when source account belongs to different family" do
+    other_family = families(:empty)
+
+    assert_raises(ActiveRecord::RecordNotFound) do
+      Transfer::Creator.new(
+        family: other_family,
+        source_account_id: @source_account.id,
+        destination_account_id: @destination_account.id,
+        date: @date,
+        amount: @amount
+      )
+    end
+  end
+end
diff --git a/test/models/transfer_test.rb b/test/models/transfer_test.rb
new file mode 100644
index 00000000..33163816
--- /dev/null
+++ b/test/models/transfer_test.rb
@@ -0,0 +1,107 @@
+require "test_helper"
+
+class TransferTest < ActiveSupport::TestCase
+  include EntriesTestHelper
+
+  setup do
+    @outflow = transactions(:transfer_out)
+    @inflow = transactions(:transfer_in)
+  end
+
+  test "transfer destroyed if either transaction is destroyed" do
+    assert_difference [ "Transfer.count", "Transaction.count", "Entry.count" ], -1 do
+      @outflow.entry.destroy
+    end
+  end
+
+  test "transfer has different accounts, opposing amounts, and within 4 days of each other" do
+    outflow_entry = create_transaction(date: 1.day.ago.to_date, account: accounts(:depository), amount: 500)
+    inflow_entry = create_transaction(date: Date.current, account: accounts(:credit_card), amount: -500)
+
+    assert_difference -> { Transfer.count } => 1 do
+      Transfer.create!(
+        inflow_transaction: inflow_entry.transaction,
+        outflow_transaction: outflow_entry.transaction,
+      )
+    end
+  end
+
+  test "transfer cannot have 2 transactions from the same account" do
+    outflow_entry = create_transaction(date: Date.current, account: accounts(:depository), amount: 500)
+    inflow_entry = create_transaction(date: 1.day.ago.to_date, account: accounts(:depository), amount: -500)
+
+    transfer = Transfer.new(
+      inflow_transaction: inflow_entry.transaction,
+      outflow_transaction: outflow_entry.transaction,
+    )
+
+    assert_no_difference -> { Transfer.count } do
+      transfer.save
+    end
+
+    assert_equal "Must be from different accounts", transfer.errors.full_messages.first
+  end
+
+  test "Transfer transactions must have opposite amounts" do
+    outflow_entry = create_transaction(date: Date.current, account: accounts(:depository), amount: 500)
+    inflow_entry = create_transaction(date: Date.current, account: accounts(:credit_card), amount: -400)
+
+    transfer = Transfer.new(
+      inflow_transaction: inflow_entry.transaction,
+      outflow_transaction: outflow_entry.transaction,
+    )
+
+    assert_no_difference -> { Transfer.count } do
+      transfer.save
+    end
+
+    assert_equal "Must have opposite amounts", transfer.errors.full_messages.first
+  end
+
+  test "transfer dates must be within 4 days of each other" do
+    outflow_entry = create_transaction(date: Date.current, account: accounts(:depository), amount: 500)
+    inflow_entry = create_transaction(date: 5.days.ago.to_date, account: accounts(:credit_card), amount: -500)
+
+    transfer = Transfer.new(
+      inflow_transaction: inflow_entry.transaction,
+      outflow_transaction: outflow_entry.transaction,
+    )
+
+    assert_no_difference -> { Transfer.count } do
+      transfer.save
+    end
+
+    assert_equal "Must be within 4 days", transfer.errors.full_messages.first
+  end
+
+  test "transfer must be from the same family" do
+    family1 = families(:empty)
+    family2 = families(:dylan_family)
+
+    family1_account = family1.accounts.create!(name: "Family 1 Account", balance: 5000, currency: "USD", accountable: Depository.new)
+    family2_account = family2.accounts.create!(name: "Family 2 Account", balance: 5000, currency: "USD", accountable: Depository.new)
+
+    outflow_txn = create_transaction(date: Date.current, account: family1_account, amount: 500)
+    inflow_txn = create_transaction(date: Date.current, account: family2_account, amount: -500)
+
+    transfer = Transfer.new(
+      inflow_transaction: inflow_txn.transaction,
+      outflow_transaction: outflow_txn.transaction,
+    )
+
+    assert transfer.invalid?
+    assert_equal "Must be from same family", transfer.errors.full_messages.first
+  end
+
+  test "transaction can only belong to one transfer" do
+    outflow_entry = create_transaction(date: Date.current, account: accounts(:depository), amount: 500)
+    inflow_entry1 = create_transaction(date: Date.current, account: accounts(:credit_card), amount: -500)
+    inflow_entry2 = create_transaction(date: Date.current, account: accounts(:credit_card), amount: -500)
+
+    Transfer.create!(inflow_transaction: inflow_entry1.transaction, outflow_transaction: outflow_entry.transaction)
+
+    assert_raises ActiveRecord::RecordInvalid do
+      Transfer.create!(inflow_transaction: inflow_entry2.transaction, outflow_transaction: outflow_entry.transaction)
+    end
+  end
+end
diff --git a/test/models/trend_test.rb b/test/models/trend_test.rb
new file mode 100644
index 00000000..64601af1
--- /dev/null
+++ b/test/models/trend_test.rb
@@ -0,0 +1,40 @@
+require "test_helper"
+
+class TrendTest < ActiveSupport::TestCase
+  test "handles money trend" do
+    trend = Trend.new(current: Money.new(100), previous: Money.new(50))
+    assert_equal "up", trend.direction
+    assert_equal Money.new(50), trend.value
+    assert_equal 100.0, trend.percent
+  end
+
+  test "up" do
+    trend = Trend.new(current: 100, previous: 50)
+    assert_equal "up", trend.direction
+    assert_equal "var(--color-success)", trend.color
+  end
+
+  test "down" do
+    trend = Trend.new(current: 50, previous: 100)
+    assert_equal "down", trend.direction
+    assert_equal "var(--color-destructive)", trend.color
+  end
+
+  test "flat" do
+    trend1 = Trend.new(current: 100, previous: 100)
+    trend2 = Trend.new(current: 100, previous: nil)
+    assert_equal "flat", trend1.direction
+    assert_equal "up", trend2.direction
+    assert_equal "var(--color-gray)", trend1.color
+  end
+
+  test "infinitely up" do
+    trend = Trend.new(current: 100, previous: 0)
+    assert_equal "up", trend.direction
+  end
+
+  test "infinitely down" do
+    trend = Trend.new(current: 0, previous: 100)
+    assert_equal "down", trend.direction
+  end
+end
diff --git a/test/models/upgrader/upgrade_test.rb b/test/models/upgrader/upgrade_test.rb
deleted file mode 100644
index cf99ed7c..00000000
--- a/test/models/upgrader/upgrade_test.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require "test_helper"
-
-class UpgradeTest < ActiveSupport::TestCase
-  setup do
-    data = {
-      commit_sha: "latestcommit",
-      version: Semver.new("0.1.0-alpha.2")
-    }
-
-    @commit_upgrade = Upgrader::Upgrade.new "commit", data
-    @release_upgrade = Upgrader::Upgrade.new "release", data
-  end
-
-  test "available if latest commit and app not upgraded" do
-    Maybe.stubs(:version).returns(@commit_upgrade.version)
-    Maybe.stubs(:commit_sha).returns("outdatedcommitsha")
-
-    assert @commit_upgrade.available?
-    assert_not @release_upgrade.available?
-  end
-
-  test "available if latest release and app not upgraded" do
-    Maybe.stubs(:version).returns(Semver.new("0.1.0-alpha.1"))
-    Maybe.stubs(:commit_sha).returns("outdatedcommitsha")
-
-    assert @commit_upgrade.available?
-    assert @release_upgrade.available?
-  end
-
-  test "not available if app commit greater or equal to" do
-    Maybe.stubs(:version).returns(@commit_upgrade.version)
-    Maybe.stubs(:commit_sha).returns(@commit_upgrade.commit_sha)
-
-    assert_not @commit_upgrade.available?
-  end
-end
diff --git a/test/models/upgrader_test.rb b/test/models/upgrader_test.rb
deleted file mode 100644
index 6bad83ff..00000000
--- a/test/models/upgrader_test.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-require "test_helper"
-
-class UpgraderTest < ActiveSupport::TestCase
-  PRIOR_COMMIT = "47bb430954292d2fdcc81082af731a16b9587da2"
-  CURRENT_COMMIT = "47bb430954292d2fdcc81082af731a16b9587da3"
-  NEXT_COMMIT = "47bb430954292d2fdcc81082af731a16b9587da4"
-
-  PRIOR_VERSION = Semver.new("0.1.0-alpha.3")
-  CURRENT_VERSION = Semver.new("0.1.0-alpha.4")
-  NEXT_VERSION = Semver.new("0.1.0-alpha.5")
-
-  # Default setup assumes app is up to date
-  setup do
-    Upgrader.config = Upgrader::Config.new({ mode: :enabled })
-
-    Maybe.stubs(:version).returns(CURRENT_VERSION)
-    Maybe.stubs(:commit_sha).returns(CURRENT_COMMIT)
-
-    stub_github_data(
-      commit: create_upgrade_stub(CURRENT_VERSION, CURRENT_COMMIT),
-      release: create_upgrade_stub(CURRENT_VERSION, CURRENT_COMMIT)
-    )
-  end
-
-  test "finds 1 completed upgrade, 0 available upgrades when app is up to date" do
-    assert_instance_of Upgrader::Upgrade, Upgrader.completed_upgrade
-    assert_nil Upgrader.available_upgrade
-  end
-
-  test "finds 1 available and 1 completed upgrade when app is on latest release but behind latest commit" do
-    stub_github_data(
-      commit: create_upgrade_stub(CURRENT_VERSION, NEXT_COMMIT),
-      release: create_upgrade_stub(CURRENT_VERSION, CURRENT_COMMIT)
-    )
-
-    assert_instance_of Upgrader::Upgrade, Upgrader.available_upgrade # commit is ahead of release
-    assert_instance_of Upgrader::Upgrade, Upgrader.completed_upgrade # release is completed
-  end
-
-  test "when app is behind latest version and latest commit is ahead of release finds release upgrade and no completed upgrades" do
-    Maybe.stubs(:version).returns(PRIOR_VERSION)
-    Maybe.stubs(:commit_sha).returns(PRIOR_COMMIT)
-
-    stub_github_data(
-      commit: create_upgrade_stub(CURRENT_VERSION, NEXT_COMMIT),
-      release: create_upgrade_stub(CURRENT_VERSION, CURRENT_COMMIT)
-    )
-
-    assert_equal "release", Upgrader.available_upgrade.type
-    assert_nil Upgrader.completed_upgrade
-  end
-
-  test "defaults to app version when no release is found" do
-    stub_github_data(
-      commit: create_upgrade_stub(CURRENT_VERSION, NEXT_COMMIT),
-      release: nil
-    )
-
-    # Upstream is 1 commit ahead, and we assume we're on the same release
-    assert_equal "commit", Upgrader.available_upgrade.type
-  end
-
-  test "gracefully handles empty github info" do
-    Provider::Github.any_instance.stubs(:fetch_latest_upgrade_candidates).returns(nil)
-
-    assert_nil Upgrader.available_upgrade
-    assert_nil Upgrader.completed_upgrade
-  end
-
-  test "deployer is null by default" do
-    Upgrader.config = Upgrader::Config.new({ mode: :enabled })
-    Upgrader::Deployer::Null.any_instance.expects(:deploy).with(nil).once
-    Upgrader.upgrade_to(nil)
-  end
-
-  private
-    def create_upgrade_stub(version, commit_sha)
-      {
-        version: version,
-        commit_sha: commit_sha,
-        url: ""
-      }
-    end
-
-    def stub_github_data(commit: create_upgrade_stub(LATEST_VERSION, LATEST_COMMIT), release: create_upgrade_stub(LATEST_VERSION, LATEST_COMMIT))
-      Provider::Github.any_instance.stubs(:fetch_latest_upgrade_candidates).returns({ commit:, release: })
-    end
-end
diff --git a/test/models/user_message_test.rb b/test/models/user_message_test.rb
new file mode 100644
index 00000000..66d9fb42
--- /dev/null
+++ b/test/models/user_message_test.rb
@@ -0,0 +1,21 @@
+require "test_helper"
+
+class UserMessageTest < ActiveSupport::TestCase
+  setup do
+    @chat = chats(:one)
+  end
+
+  test "requests assistant response after creation" do
+    @chat.expects(:ask_assistant_later).once
+
+    message = UserMessage.create!(chat: @chat, content: "Hello from user", ai_model: "gpt-4.1")
+    message.update!(content: "updated")
+
+    streams = capture_turbo_stream_broadcasts(@chat)
+    assert_equal 2, streams.size
+    assert_equal "append", streams.first["action"]
+    assert_equal "messages", streams.first["target"]
+    assert_equal "update", streams.last["action"]
+    assert_equal "user_message_#{message.id}", streams.last["target"]
+  end
+end
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 582fc2e8..85e3c010 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -38,8 +38,8 @@ class UserTest < ActiveSupport::TestCase
   end
 
   test "email address is normalized" do
-    @user.update!(email: " User@ExAMPle.CoM ")
-    assert_equal "user@example.com", @user.reload.email
+    @user.update!(email: " UNIQUE-User@ExAMPle.CoM ")
+    assert_equal "unique-user@example.com", @user.reload.email
   end
 
   test "display name" do
@@ -70,4 +70,72 @@ class UserTest < ActiveSupport::TestCase
     assert_equal "Bob", @user.first_name
     assert_equal "Dylan", @user.last_name
   end
+
+  # MFA Tests
+  test "setup_mfa! generates required fields" do
+    user = users(:family_member)
+    user.setup_mfa!
+
+    assert user.otp_secret.present?
+    assert_not user.otp_required?
+    assert_empty user.otp_backup_codes
+  end
+
+  test "enable_mfa! enables MFA and generates backup codes" do
+    user = users(:family_member)
+    user.setup_mfa!
+    user.enable_mfa!
+
+    assert user.otp_required?
+    assert_equal 8, user.otp_backup_codes.length
+    assert user.otp_backup_codes.all? { |code| code.length == 8 }
+  end
+
+  test "disable_mfa! removes all MFA data" do
+    user = users(:family_member)
+    user.setup_mfa!
+    user.enable_mfa!
+    user.disable_mfa!
+
+    assert_nil user.otp_secret
+    assert_not user.otp_required?
+    assert_empty user.otp_backup_codes
+  end
+
+  test "verify_otp? validates TOTP codes" do
+    user = users(:family_member)
+    user.setup_mfa!
+
+    totp = ROTP::TOTP.new(user.otp_secret, issuer: "Maybe")
+    valid_code = totp.now
+
+    assert user.verify_otp?(valid_code)
+    assert_not user.verify_otp?("invalid")
+    assert_not user.verify_otp?("123456")
+  end
+
+  test "verify_otp? accepts backup codes" do
+    user = users(:family_member)
+    user.setup_mfa!
+    user.enable_mfa!
+
+    backup_code = user.otp_backup_codes.first
+    assert user.verify_otp?(backup_code)
+
+    # Backup code should be consumed
+    assert_not user.otp_backup_codes.include?(backup_code)
+    assert_equal 7, user.otp_backup_codes.length
+
+    # Used backup code should not work again
+    assert_not user.verify_otp?(backup_code)
+  end
+
+  test "provisioning_uri generates correct URI" do
+    user = users(:family_member)
+    user.setup_mfa!
+
+    assert_match %r{otpauth://totp/}, user.provisioning_uri
+    assert_match %r{secret=#{user.otp_secret}}, user.provisioning_uri
+    assert_match %r{issuer=Maybe}, user.provisioning_uri
+  end
 end
diff --git a/test/models/valuation/name_test.rb b/test/models/valuation/name_test.rb
new file mode 100644
index 00000000..feed97ea
--- /dev/null
+++ b/test/models/valuation/name_test.rb
@@ -0,0 +1,111 @@
+require "test_helper"
+
+class Valuation::NameTest < ActiveSupport::TestCase
+  # Opening anchor tests
+  test "generates opening anchor name for Property" do
+    name = Valuation::Name.new("opening_anchor", "Property")
+    assert_equal "Original purchase price", name.to_s
+  end
+
+  test "generates opening anchor name for Loan" do
+    name = Valuation::Name.new("opening_anchor", "Loan")
+    assert_equal "Original principal", name.to_s
+  end
+
+  test "generates opening anchor name for Investment" do
+    name = Valuation::Name.new("opening_anchor", "Investment")
+    assert_equal "Opening account value", name.to_s
+  end
+
+  test "generates opening anchor name for Vehicle" do
+    name = Valuation::Name.new("opening_anchor", "Vehicle")
+    assert_equal "Original purchase price", name.to_s
+  end
+
+  test "generates opening anchor name for Crypto" do
+    name = Valuation::Name.new("opening_anchor", "Crypto")
+    assert_equal "Opening account value", name.to_s
+  end
+
+  test "generates opening anchor name for OtherAsset" do
+    name = Valuation::Name.new("opening_anchor", "OtherAsset")
+    assert_equal "Opening account value", name.to_s
+  end
+
+  test "generates opening anchor name for other account types" do
+    name = Valuation::Name.new("opening_anchor", "Depository")
+    assert_equal "Opening balance", name.to_s
+  end
+
+  # Current anchor tests
+  test "generates current anchor name for Property" do
+    name = Valuation::Name.new("current_anchor", "Property")
+    assert_equal "Current market value", name.to_s
+  end
+
+  test "generates current anchor name for Loan" do
+    name = Valuation::Name.new("current_anchor", "Loan")
+    assert_equal "Current loan balance", name.to_s
+  end
+
+  test "generates current anchor name for Investment" do
+    name = Valuation::Name.new("current_anchor", "Investment")
+    assert_equal "Current account value", name.to_s
+  end
+
+  test "generates current anchor name for Vehicle" do
+    name = Valuation::Name.new("current_anchor", "Vehicle")
+    assert_equal "Current market value", name.to_s
+  end
+
+  test "generates current anchor name for Crypto" do
+    name = Valuation::Name.new("current_anchor", "Crypto")
+    assert_equal "Current account value", name.to_s
+  end
+
+  test "generates current anchor name for OtherAsset" do
+    name = Valuation::Name.new("current_anchor", "OtherAsset")
+    assert_equal "Current account value", name.to_s
+  end
+
+  test "generates current anchor name for other account types" do
+    name = Valuation::Name.new("current_anchor", "Depository")
+    assert_equal "Current balance", name.to_s
+  end
+
+  # Reconciliation tests
+  test "generates recon name for Property" do
+    name = Valuation::Name.new("reconciliation", "Property")
+    assert_equal "Manual value update", name.to_s
+  end
+
+  test "generates recon name for Investment" do
+    name = Valuation::Name.new("reconciliation", "Investment")
+    assert_equal "Manual value update", name.to_s
+  end
+
+  test "generates recon name for Vehicle" do
+    name = Valuation::Name.new("reconciliation", "Vehicle")
+    assert_equal "Manual value update", name.to_s
+  end
+
+  test "generates recon name for Crypto" do
+    name = Valuation::Name.new("reconciliation", "Crypto")
+    assert_equal "Manual value update", name.to_s
+  end
+
+  test "generates recon name for OtherAsset" do
+    name = Valuation::Name.new("reconciliation", "OtherAsset")
+    assert_equal "Manual value update", name.to_s
+  end
+
+  test "generates recon name for Loan" do
+    name = Valuation::Name.new("reconciliation", "Loan")
+    assert_equal "Manual principal update", name.to_s
+  end
+
+  test "generates recon name for other account types" do
+    name = Valuation::Name.new("reconciliation", "Depository")
+    assert_equal "Manual balance update", name.to_s
+  end
+end
diff --git a/test/models/value_group_test.rb b/test/models/value_group_test.rb
deleted file mode 100644
index 5c9e2bbf..00000000
--- a/test/models/value_group_test.rb
+++ /dev/null
@@ -1,141 +0,0 @@
-require "test_helper"
-require "ostruct"
-class ValueGroupTest < ActiveSupport::TestCase
-  setup do
-    # Level 1
-    @assets = ValueGroup.new("Assets", :usd)
-
-    # Level 2
-    @depositories = @assets.add_child_group("Depositories", :usd)
-    @other_assets = @assets.add_child_group("Other Assets", :usd)
-
-    # Level 3 (leaf/value nodes)
-    @checking_node = @depositories.add_value_node(OpenStruct.new({ name: "Checking", value: Money.new(5000) }), Money.new(5000))
-    @savings_node = @depositories.add_value_node(OpenStruct.new({ name: "Savings", value: Money.new(20000) }), Money.new(20000))
-    @collectable_node = @other_assets.add_value_node(OpenStruct.new({ name: "Collectable", value: Money.new(550) }), Money.new(550))
-  end
-
-  test "empty group works" do
-    group = ValueGroup.new("Root", :usd)
-
-    assert_equal "Root", group.name
-    assert_equal [], group.children
-    assert_equal 0, group.sum
-    assert_equal 0, group.avg
-    assert_equal 100, group.percent_of_total
-    assert_nil group.parent
-  end
-
-  test "group without value nodes has no value" do
-    assets = ValueGroup.new("Assets")
-    depositories = assets.add_child_group("Depositories")
-
-    assert_equal 0, assets.sum
-    assert_equal 0, depositories.sum
-  end
-
-  test "sum equals value at leaf level" do
-    assert_equal @checking_node.value, @checking_node.sum
-    assert_equal @savings_node.value, @savings_node.sum
-    assert_equal @collectable_node.value, @collectable_node.sum
-  end
-
-  test "value is nil at rollup levels" do
-    assert_not_equal @depositories.value, @depositories.sum
-    assert_nil @depositories.value
-    assert_nil @other_assets.value
-  end
-
-  test "generates list of value nodes regardless of level in hierarchy" do
-    assert_equal [ @checking_node, @savings_node, @collectable_node ], @assets.value_nodes
-    assert_equal [ @checking_node, @savings_node ], @depositories.value_nodes
-    assert_equal [ @collectable_node ], @other_assets.value_nodes
-  end
-
-  test "group with value nodes aggregates totals correctly" do
-    assert_equal Money.new(5000), @checking_node.sum
-    assert_equal Money.new(20000), @savings_node.sum
-    assert_equal Money.new(550), @collectable_node.sum
-
-    assert_equal Money.new(25000), @depositories.sum
-    assert_equal Money.new(550), @other_assets.sum
-
-    assert_equal Money.new(25550), @assets.sum
-  end
-
-  test "group averages leaf nodes" do
-    assert_equal Money.new(5000), @checking_node.avg
-    assert_equal Money.new(20000), @savings_node.avg
-    assert_equal Money.new(550), @collectable_node.avg
-
-    assert_in_delta 12500, @depositories.avg.amount, 0.01
-    assert_in_delta 550, @other_assets.avg.amount, 0.01
-    assert_in_delta 8516.67, @assets.avg.amount, 0.01
-  end
-
-  # Percentage of parent group (i.e. collectable is 100% of "Other Assets" group)
-  test "group calculates percent of parent total" do
-    assert_equal 100, @assets.percent_of_total
-    assert_in_delta 97.85, @depositories.percent_of_total, 0.1
-    assert_in_delta 2.15, @other_assets.percent_of_total, 0.1
-    assert_in_delta 80.0, @savings_node.percent_of_total, 0.1
-    assert_in_delta 20.0, @checking_node.percent_of_total, 0.1
-    assert_equal 100, @collectable_node.percent_of_total
-  end
-
-  test "handles unbalanced tree" do
-    vehicles = @assets.add_child_group("Vehicles")
-
-    # Since we didn't add any value nodes to vehicles, shouldn't affect rollups
-    assert_equal Money.new(25550), @assets.sum
-  end
-
-
-  test "can attach and aggregate time series" do
-    checking_series = TimeSeries.new([ { date: 1.day.ago.to_date, value: Money.new(4000) }, { date: Date.current, value: Money.new(5000) } ])
-    savings_series = TimeSeries.new([ { date: 1.day.ago.to_date, value: Money.new(19000) }, { date: Date.current, value: Money.new(20000) } ])
-
-    @checking_node.series = checking_series
-    @savings_node.series = savings_series
-
-    assert_not_nil @checking_node.series
-    assert_not_nil @savings_node.series
-
-    assert_equal @checking_node.sum, @checking_node.series.last.value
-    assert_equal @savings_node.sum, @savings_node.series.last.value
-
-    aggregated_depository_series = TimeSeries.new([ { date: 1.day.ago.to_date, value: Money.new(23000) }, { date: Date.current, value: Money.new(25000) } ])
-    aggregated_assets_series = TimeSeries.new([ { date: 1.day.ago.to_date, value: Money.new(23000) }, { date: Date.current, value: Money.new(25000) } ])
-
-    assert_equal aggregated_depository_series.values, @depositories.series.values
-    assert_equal aggregated_assets_series.values, @assets.series.values
-  end
-
-  test "attached series must be a TimeSeries" do
-    assert_raises(RuntimeError) do
-      @checking_node.series = []
-    end
-  end
-
-  test "cannot add time series to non-leaf node" do
-    assert_raises(RuntimeError) do
-      @assets.series = TimeSeries.new([])
-    end
-  end
-
-  test "can only add value node at leaf level of tree" do
-    root = ValueGroup.new("Root Level")
-    grandparent = root.add_child_group("Grandparent")
-    parent = grandparent.add_child_group("Parent")
-
-    value_node = parent.add_value_node(OpenStruct.new({ name: "Value Node", value: Money.new(100) }), Money.new(100))
-
-    assert_raises(RuntimeError) do
-      value_node.add_value_node(OpenStruct.new({ name: "Value Node", value: Money.new(100) }), Money.new(100))
-    end
-
-    assert_raises(RuntimeError) do
-      grandparent.add_value_node(OpenStruct.new({ name: "Value Node", value: Money.new(100) }), Money.new(100))
-    end
-  end
-end
diff --git a/test/models/vehicle_test.rb b/test/models/vehicle_test.rb
deleted file mode 100644
index 71c13e12..00000000
--- a/test/models/vehicle_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class VehicleTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/test/services/api_rate_limiter_test.rb b/test/services/api_rate_limiter_test.rb
new file mode 100644
index 00000000..8afc6bb9
--- /dev/null
+++ b/test/services/api_rate_limiter_test.rb
@@ -0,0 +1,138 @@
+require "test_helper"
+
+class ApiRateLimiterTest < ActiveSupport::TestCase
+  setup do
+    @user = users(:family_admin)
+    # Destroy any existing active API keys for this user
+    @user.api_keys.active.destroy_all
+
+    @api_key = ApiKey.create!(
+      user: @user,
+      name: "Rate Limiter Test Key",
+      scopes: [ "read" ],
+      display_key: "rate_limiter_test_#{SecureRandom.hex(8)}"
+    )
+    @rate_limiter = ApiRateLimiter.new(@api_key)
+
+    # Clear any existing rate limit data
+    Redis.new.del("api_rate_limit:#{@api_key.id}")
+  end
+
+  teardown do
+    # Clean up Redis data after each test
+    Redis.new.del("api_rate_limit:#{@api_key.id}")
+  end
+
+  test "should have default rate limit" do
+    assert_equal 100, @rate_limiter.rate_limit
+  end
+
+  test "should start with zero request count" do
+    assert_equal 0, @rate_limiter.current_count
+  end
+
+  test "should not be rate limited initially" do
+    assert_not @rate_limiter.rate_limit_exceeded?
+  end
+
+  test "should increment request count" do
+    assert_equal 0, @rate_limiter.current_count
+
+    @rate_limiter.increment_request_count!
+    assert_equal 1, @rate_limiter.current_count
+
+    @rate_limiter.increment_request_count!
+    assert_equal 2, @rate_limiter.current_count
+  end
+
+  test "should be rate limited when exceeding limit" do
+    # Simulate reaching the rate limit
+    100.times { @rate_limiter.increment_request_count! }
+
+    assert_equal 100, @rate_limiter.current_count
+    assert @rate_limiter.rate_limit_exceeded?
+  end
+
+  test "should provide correct usage info" do
+    5.times { @rate_limiter.increment_request_count! }
+
+    usage_info = @rate_limiter.usage_info
+
+    assert_equal 5, usage_info[:current_count]
+    assert_equal 100, usage_info[:rate_limit]
+    assert_equal 95, usage_info[:remaining]
+    assert_equal :standard, usage_info[:tier]
+    assert usage_info[:reset_time] > 0
+    assert usage_info[:reset_time] <= 3600
+  end
+
+  test "should calculate remaining requests correctly" do
+    10.times { @rate_limiter.increment_request_count! }
+
+    usage_info = @rate_limiter.usage_info
+    assert_equal 90, usage_info[:remaining]
+  end
+
+  test "should have zero remaining when at limit" do
+    100.times { @rate_limiter.increment_request_count! }
+
+    usage_info = @rate_limiter.usage_info
+    assert_equal 0, usage_info[:remaining]
+  end
+
+  test "should have zero remaining when over limit" do
+    105.times { @rate_limiter.increment_request_count! }
+
+    usage_info = @rate_limiter.usage_info
+    assert_equal 0, usage_info[:remaining]
+  end
+
+  test "class method usage_for should work without incrementing" do
+    5.times { @rate_limiter.increment_request_count! }
+
+    usage_info = ApiRateLimiter.usage_for(@api_key)
+    assert_equal 5, usage_info[:current_count]
+
+    # Should not increment when just checking usage
+    usage_info_again = ApiRateLimiter.usage_for(@api_key)
+    assert_equal 5, usage_info_again[:current_count]
+  end
+
+  test "should handle multiple API keys separately" do
+    # Create a different user for the second API key
+    other_user = users(:family_member)
+    other_api_key = ApiKey.create!(
+      user: other_user,
+      name: "Other API Key",
+      scopes: [ "read_write" ],
+      display_key: "rate_limiter_other_#{SecureRandom.hex(8)}"
+    )
+
+    other_rate_limiter = ApiRateLimiter.new(other_api_key)
+
+    @rate_limiter.increment_request_count!
+    other_rate_limiter.increment_request_count!
+    other_rate_limiter.increment_request_count!
+
+    assert_equal 1, @rate_limiter.current_count
+    assert_equal 2, other_rate_limiter.current_count
+  ensure
+    Redis.new.del("api_rate_limit:#{other_api_key.id}")
+    other_api_key.destroy
+  end
+
+  test "should calculate reset time correctly" do
+    reset_time = @rate_limiter.reset_time
+
+    # Reset time should be within the current hour
+    assert reset_time > 0
+    assert reset_time <= 3600
+
+    # Should be roughly the time until the next hour
+    current_time = Time.current.to_i
+    next_window = ((current_time / 3600) + 1) * 3600
+    expected_reset = next_window - current_time
+
+    assert_in_delta expected_reset, reset_time, 1
+  end
+end
diff --git a/test/support/account/entries_test_helper.rb b/test/support/account/entries_test_helper.rb
deleted file mode 100644
index fb0356f4..00000000
--- a/test/support/account/entries_test_helper.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-module Account::EntriesTestHelper
-  def create_transaction(attributes = {})
-    entry_attributes = attributes.except(:category, :tags, :merchant)
-    transaction_attributes = attributes.slice(:category, :tags, :merchant)
-
-    entry_defaults = {
-      account: accounts(:depository),
-      name: "Transaction",
-      date: Date.current,
-      currency: "USD",
-      amount: 100,
-      entryable: Account::Transaction.new(transaction_attributes)
-    }
-
-    Account::Entry.create! entry_defaults.merge(entry_attributes)
-  end
-
-  def create_valuation(attributes = {})
-    entry_defaults = {
-      account: accounts(:depository),
-      name: "Valuation",
-      date: 1.day.ago.to_date,
-      currency: "USD",
-      amount: 5000,
-      entryable: Account::Valuation.new
-    }
-
-    Account::Entry.create! entry_defaults.merge(attributes)
-  end
-
-  def create_trade(security, account:, qty:, date:, price: nil)
-    trade_price = price || Security::Price.find_by!(ticker: security.ticker, date: date).price
-
-    trade = Account::Trade.new \
-      qty: qty,
-      security: security,
-      price:    trade_price,
-      currency: "USD"
-
-    account.entries.create! \
-      name: "Trade",
-      date: date,
-      amount: qty * trade_price,
-      currency: "USD",
-      entryable: trade
-  end
-end
diff --git a/test/support/entries_test_helper.rb b/test/support/entries_test_helper.rb
new file mode 100644
index 00000000..f586b148
--- /dev/null
+++ b/test/support/entries_test_helper.rb
@@ -0,0 +1,82 @@
+module EntriesTestHelper
+  def create_transaction(attributes = {})
+    entry_attributes = attributes.except(:category, :tags, :merchant, :kind)
+    transaction_attributes = attributes.slice(:category, :tags, :merchant, :kind)
+
+    entry_defaults = {
+      account: accounts(:depository),
+      name: "Transaction",
+      date: Date.current,
+      currency: "USD",
+      amount: 100,
+      entryable: Transaction.new(transaction_attributes)
+    }
+
+    Entry.create! entry_defaults.merge(entry_attributes)
+  end
+
+  def create_valuation(attributes = {})
+    entry_attributes = attributes.except(:kind)
+    valuation_attributes = attributes.slice(:kind)
+
+    account = attributes[:account] || accounts(:depository)
+    amount = attributes[:amount] || 5000
+
+    entry_defaults = {
+      account: account,
+      name: "Valuation",
+      date: 1.day.ago.to_date,
+      currency: "USD",
+      amount: amount,
+      entryable: Valuation.new({ kind: "reconciliation" }.merge(valuation_attributes))
+    }
+
+    Entry.create! entry_defaults.merge(entry_attributes)
+  end
+
+  def create_trade(security, account:, qty:, date:, price: nil, currency: "USD")
+    trade_price = price || Security::Price.find_by!(security: security, date: date).price
+
+    trade = Trade.new \
+      qty: qty,
+      security: security,
+      price: trade_price,
+      currency: currency
+
+    account.entries.create! \
+      name: "Trade",
+      date: date,
+      amount: qty * trade_price,
+      currency: currency,
+      entryable: trade
+  end
+
+  def create_transfer(from_account:, to_account:, amount:, date: Date.current, currency: "USD")
+    outflow_transaction = Transaction.create!(kind: "funds_movement")
+    inflow_transaction = Transaction.create!(kind: "funds_movement")
+
+    transfer = Transfer.create!(
+      outflow_transaction: outflow_transaction,
+      inflow_transaction: inflow_transaction
+    )
+
+    # Create entries for both accounts
+    from_account.entries.create!(
+      name: "Transfer to #{to_account.name}",
+      date: date,
+      amount: -amount.abs,
+      currency: currency,
+      entryable: outflow_transaction
+    )
+
+    to_account.entries.create!(
+      name: "Transfer from #{from_account.name}",
+      date: date,
+      amount: amount.abs,
+      currency: currency,
+      entryable: inflow_transaction
+    )
+
+    transfer
+  end
+end
diff --git a/test/support/ledger_testing_helper.rb b/test/support/ledger_testing_helper.rb
new file mode 100644
index 00000000..6ae71678
--- /dev/null
+++ b/test/support/ledger_testing_helper.rb
@@ -0,0 +1,152 @@
+module LedgerTestingHelper
+  def create_account_with_ledger(account:, entries: [], exchange_rates: [], security_prices: [], holdings: [])
+    # Clear all exchange rates and security prices to ensure clean test environment
+    ExchangeRate.destroy_all
+    Security::Price.destroy_all
+
+    # Create account with specified attributes
+    account_attrs = account.except(:type)
+    account_type = account[:type]
+
+    # Create the account
+    created_account = families(:empty).accounts.create!(
+      name: "Test Account",
+      accountable: account_type.new,
+      **account_attrs
+    )
+
+    # Set up exchange rates if provided
+    exchange_rates.each do |rate_data|
+      ExchangeRate.create!(
+        date: rate_data[:date],
+        from_currency: rate_data[:from],
+        to_currency: rate_data[:to],
+        rate: rate_data[:rate]
+      )
+    end
+
+    # Set up security prices if provided
+    security_prices.each do |price_data|
+      security = Security.find_or_create_by!(ticker: price_data[:ticker]) do |s|
+        s.name = price_data[:ticker]
+      end
+
+      Security::Price.create!(
+        security: security,
+        date: price_data[:date],
+        price: price_data[:price],
+        currency: created_account.currency
+      )
+    end
+
+    # Create entries in the order they were specified
+    entries.each do |entry_data|
+      case entry_data[:type]
+      when "current_anchor", "opening_anchor", "reconciliation"
+        # Create valuation entry
+        created_account.entries.create!(
+          name: "Valuation",
+          date: entry_data[:date],
+          amount: entry_data[:balance],
+          currency: entry_data[:currency] || created_account.currency,
+          entryable: Valuation.new(kind: entry_data[:type])
+        )
+      when "transaction"
+        # Use account currency if not specified
+        currency = entry_data[:currency] || created_account.currency
+
+        created_account.entries.create!(
+          name: "Transaction",
+          date: entry_data[:date],
+          amount: entry_data[:amount],
+          currency: currency,
+          entryable: Transaction.new
+        )
+      when "trade"
+        # Find or create security
+        security = Security.find_or_create_by!(ticker: entry_data[:ticker]) do |s|
+          s.name = entry_data[:ticker]
+        end
+
+        # Use account currency if not specified
+        currency = entry_data[:currency] || created_account.currency
+
+        trade = Trade.new(
+          qty: entry_data[:qty],
+          security: security,
+          price: entry_data[:price],
+          currency: currency
+        )
+
+        created_account.entries.create!(
+          name: "Trade",
+          date: entry_data[:date],
+          amount: entry_data[:qty] * entry_data[:price],
+          currency: currency,
+          entryable: trade
+        )
+      end
+    end
+
+    # Create holdings if provided
+    holdings.each do |holding_data|
+      # Find or create security
+      security = Security.find_or_create_by!(ticker: holding_data[:ticker]) do |s|
+        s.name = holding_data[:ticker]
+      end
+
+      Holding.create!(
+        account: created_account,
+        security: security,
+        date: holding_data[:date],
+        qty: holding_data[:qty],
+        price: holding_data[:price],
+        amount: holding_data[:amount],
+        currency: holding_data[:currency] || created_account.currency
+      )
+    end
+
+    created_account
+  end
+
+  def assert_calculated_ledger_balances(calculated_data:, expected_balances:)
+    # Convert expected balances to a hash for easier lookup
+    expected_hash = expected_balances.to_h do |date, balance_data|
+      [ date.to_date, balance_data ]
+    end
+
+    # Get all unique dates from both calculated and expected data
+    all_dates = (calculated_data.map(&:date) + expected_hash.keys).uniq.sort
+
+    # Check each date
+    all_dates.each do |date|
+      calculated_balance = calculated_data.find { |b| b.date == date }
+      expected = expected_hash[date]
+
+      if expected
+        assert calculated_balance, "Expected balance for #{date} but none was calculated"
+
+        if expected[:balance]
+          assert_equal expected[:balance], calculated_balance.balance.to_d,
+            "Balance mismatch for #{date}"
+        end
+
+        if expected[:cash_balance]
+          assert_equal expected[:cash_balance], calculated_balance.cash_balance.to_d,
+            "Cash balance mismatch for #{date}"
+        end
+      else
+        assert_nil calculated_balance, "Unexpected balance calculated for #{date}"
+      end
+    end
+
+    # Verify we got all expected dates
+    expected_dates = expected_hash.keys.sort
+    calculated_dates = calculated_data.map(&:date).sort
+
+    expected_dates.each do |date|
+      assert_includes calculated_dates, date,
+        "Expected balance for #{date} was not in calculated data"
+    end
+  end
+end
diff --git a/test/support/provider_test_helper.rb b/test/support/provider_test_helper.rb
new file mode 100644
index 00000000..3e3ddcea
--- /dev/null
+++ b/test/support/provider_test_helper.rb
@@ -0,0 +1,17 @@
+module ProviderTestHelper
+  def provider_success_response(data)
+    Provider::Response.new(
+      success?: true,
+      data: data,
+      error: nil
+    )
+  end
+
+  def provider_error_response(error)
+    Provider::Response.new(
+      success?: false,
+      data: nil,
+      error: error
+    )
+  end
+end
diff --git a/test/support/securities_test_helper.rb b/test/support/securities_test_helper.rb
index b1ca5afc..2da334a6 100644
--- a/test/support/securities_test_helper.rb
+++ b/test/support/securities_test_helper.rb
@@ -1,9 +1,19 @@
 module SecuritiesTestHelper
   def create_security(ticker, prices:)
+    security = Security.create!(
+      ticker: ticker,
+      exchange_mic: "XNAS"
+    )
+
     prices.each do |price|
-      Security::Price.create! ticker: ticker, date: price[:date], price: price[:price]
+      Security::Price.create!(
+        security: security,
+        date: price[:date],
+        price: price[:price],
+        currency: "USD"
+      )
     end
 
-    Security.create! ticker: ticker
+    security
   end
 end
diff --git a/test/system/.keep b/test/system/.keep
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/system/accounts_test.rb b/test/system/accounts_test.rb
index 1b7248c0..da1b5938 100644
--- a/test/system/accounts_test.rb
+++ b/test/system/accounts_test.rb
@@ -4,6 +4,8 @@ class AccountsTest < ApplicationSystemTestCase
   setup do
     sign_in @user = users(:family_admin)
 
+    Family.any_instance.stubs(:get_link_token).returns("test-link-token")
+
     visit root_url
     open_new_account_modal
   end
@@ -21,16 +23,40 @@ class AccountsTest < ApplicationSystemTestCase
   end
 
   test "can create property account" do
-    assert_account_created "Property" do
-      fill_in "Year built", with: 2005
-      fill_in "Area value", with: 2250
-      fill_in "Address line 1", with: "123 Main St"
-      fill_in "Address line 2", with: "Apt 4B"
-      fill_in "City", with: "San Francisco"
-      fill_in "State", with: "CA"
-      fill_in "Postal code", with: "94101"
-      fill_in "Country", with: "US"
-    end
+    # Step 1: Select property type and enter basic details
+    click_link "Property"
+
+    account_name = "[system test] Property Account"
+    fill_in "Name*", with: account_name
+    select "Single Family Home", from: "Property type*"
+    fill_in "Year Built (optional)", with: 2005
+    fill_in "Area (optional)", with: 2250
+
+    click_button "Next"
+
+    # Step 2: Enter balance information
+    assert_text "Value"
+    fill_in "account[balance]", with: 500000
+    click_button "Next"
+
+    # Step 3: Enter address information
+    assert_text "Address"
+    fill_in "Address Line 1", with: "123 Main St"
+    fill_in "City", with: "San Francisco"
+    fill_in "State/Region", with: "CA"
+    fill_in "Postal Code", with: "94101"
+    fill_in "Country", with: "US"
+
+    click_button "Save"
+
+    # Verify account was created and is now active
+    assert_text account_name
+
+    created_account = Account.order(:created_at).last
+    assert_equal "active", created_account.status
+    assert_equal 500000, created_account.balance
+    assert_equal "123 Main St", created_account.property.address.line1
+    assert_equal "San Francisco", created_account.property.address.locality
   end
 
   test "can create vehicle account" do
@@ -49,7 +75,7 @@ class AccountsTest < ApplicationSystemTestCase
   test "can create credit card account" do
     assert_account_created "CreditCard" do
       fill_in "Available credit", with: 1000
-      fill_in "Minimum payment", with: 25
+      fill_in "account[accountable_attributes][minimum_payment]", with: 25.51
       fill_in "APR", with: 15.25
       fill_in "Expiration date", with: 1.year.from_now.to_date
       fill_in "Annual fee", with: 100
@@ -58,6 +84,7 @@ class AccountsTest < ApplicationSystemTestCase
 
   test "can create loan account" do
     assert_account_created "Loan" do
+      fill_in "account[accountable_attributes][initial_balance]", with: 1000
       fill_in "Interest rate", with: 5.25
       select "Fixed", from: "Rate type"
       fill_in "Term (months)", with: 360
@@ -68,51 +95,52 @@ class AccountsTest < ApplicationSystemTestCase
     assert_account_created("OtherLiability")
   end
 
-  test "can sync all acounts on accounts page" do
-    visit accounts_url
-    assert_button "Sync all"
-  end
-
   private
 
     def open_new_account_modal
-      click_link "sidebar-new-account"
+      within "[data-controller='DS--tabs']" do
+        click_button "All"
+        click_link "New account"
+      end
     end
 
     def assert_account_created(accountable_type, &block)
-      click_link humanized_accountable(accountable_type)
-      click_link "Enter account balance manually"
+      click_link Accountable.from_type(accountable_type).display_name.singularize
+      click_link "Enter account balance" if accountable_type.in?(%w[Depository Investment Crypto Loan CreditCard])
 
       account_name = "[system test] #{accountable_type} Account"
 
-      fill_in "Account name", with: account_name
+      fill_in "Account name*", with: account_name
       fill_in "account[balance]", with: 100.99
-      fill_in "Start date (optional)", with: 10.days.ago.to_date
-      fill_in "account[start_balance]", with: 95.25
 
       yield if block_given?
 
-      click_button "Add #{humanized_accountable(accountable_type).downcase}"
+      click_button "Create Account"
 
-      find("details", text: humanized_accountable(accountable_type)).click
-      assert_text account_name
+      within_testid("account-sidebar-tabs") do
+        click_on "All"
+        find("details", text: Accountable.from_type(accountable_type).display_name).click
+        assert_text account_name
+      end
 
       visit accounts_url
       assert_text account_name
 
-      visit account_url(Account.order(:created_at).last)
+      created_account = Account.order(:created_at).last
 
-      within "header" do
-        find('button[data-menu-target="button"]').click
+      visit account_url(created_account)
+
+      within_testid("account-menu") do
+        find("button").click
         click_on "Edit"
       end
 
       fill_in "Account name", with: "Updated account name"
-      click_button "Update #{humanized_accountable(accountable_type).downcase}"
+      click_button "Update Account"
       assert_selector "h2", text: "Updated account name"
     end
 
     def humanized_accountable(accountable_type)
-      accountable_type.constantize.model_name.human
+      Accountable.from_type(accountable_type).display_name.singularize
     end
 end
diff --git a/test/system/categories_test.rb b/test/system/categories_test.rb
new file mode 100644
index 00000000..5e92f1ad
--- /dev/null
+++ b/test/system/categories_test.rb
@@ -0,0 +1,26 @@
+require "application_system_test_case"
+
+class CategoriesTest < ApplicationSystemTestCase
+  setup do
+    sign_in @user = users(:family_admin)
+  end
+
+  test "can create category" do
+    visit categories_url
+    click_link I18n.t("categories.new.new_category")
+    fill_in "Name", with: "My Shiny New Category"
+    click_button "Create Category"
+
+    visit categories_url
+    assert_text "My Shiny New Category"
+  end
+
+  test "trying to create a duplicate category fails" do
+    visit categories_url
+    click_link I18n.t("categories.new.new_category")
+    fill_in "Name", with: categories(:food_and_drink).name
+    click_button "Create Category"
+
+    assert_text "Name has already been taken"
+  end
+end
diff --git a/test/system/chats_test.rb b/test/system/chats_test.rb
new file mode 100644
index 00000000..9d00fd99
--- /dev/null
+++ b/test/system/chats_test.rb
@@ -0,0 +1,66 @@
+require "application_system_test_case"
+
+class ChatsTest < ApplicationSystemTestCase
+  setup do
+    @user = users(:family_admin)
+    login_as(@user)
+  end
+
+  test "sidebar shows consent if ai is disabled for user" do
+    @user.update!(ai_enabled: false)
+
+    visit root_path
+
+    within "#chat-container" do
+      assert_selector "h3", text: "Enable Maybe AI"
+    end
+  end
+
+  test "sidebar shows index when enabled and chats are empty" do
+    @user.update!(ai_enabled: true)
+    @user.chats.destroy_all
+
+    visit root_url
+
+    within "#chat-container" do
+      assert_selector "h1", text: "Chats"
+    end
+  end
+
+  test "sidebar shows last viewed chat" do
+    @user.update!(ai_enabled: true)
+
+    click_on @user.chats.first.title
+
+    # Page refresh
+    visit root_url
+
+    # After page refresh, we're still on the last chat we were viewing
+    within "#chat-container" do
+      assert_selector "h1", text: @user.chats.first.title
+    end
+  end
+
+  test "create chat and navigate chats sidebar" do
+    @user.chats.destroy_all
+
+    visit root_url
+
+    Chat.any_instance.expects(:ask_assistant_later).once
+
+    within "#chat-form" do
+      fill_in "chat[content]", with: "Can you help with my finances?"
+      find("button[type='submit']").click
+    end
+
+    assert_text "Can you help with my finances?"
+
+    find("#chat-nav-back").click
+
+    assert_selector "h1", text: "Chats"
+
+    click_on @user.chats.reload.first.title
+
+    assert_text "Can you help with my finances?"
+  end
+end
diff --git a/test/system/imports_test.rb b/test/system/imports_test.rb
index 02270bb9..c39477ac 100644
--- a/test/system/imports_test.rb
+++ b/test/system/imports_test.rb
@@ -5,6 +5,9 @@ class ImportsTest < ApplicationSystemTestCase
 
   setup do
     sign_in @user = users(:family_admin)
+
+    # Trade securities will be imported as "offline" tickers
+    Security.stubs(:provider).returns(nil)
   end
 
   test "transaction import" do
@@ -12,18 +15,24 @@ class ImportsTest < ApplicationSystemTestCase
 
     click_on "Import transactions"
 
+    within_testid("import-tabs") do
+      click_on "Copy & Paste"
+    end
+
     fill_in "import[raw_file_str]", with: file_fixture("imports/transactions.csv").read
 
-    find('input[type="submit"][value="Upload CSV"]').click
+    within "form" do
+      click_on "Upload CSV"
+    end
 
-    select "Date", from: "Date"
-    select "YYYY-MM-DD", from: "Date format"
-    select "Amount", from: "Amount"
-    select "Account", from: "Account (optional)"
-    select "Name", from: "Name (optional)"
-    select "Category", from: "Category (optional)"
-    select "Tags", from: "Tags (optional)"
-    select "Notes", from: "Notes (optional)"
+    select "Date", from: "import[date_col_label]"
+    select "YYYY-MM-DD", from: "import[date_format]"
+    select "Amount", from: "import[amount_col_label]"
+    select "Account", from: "import[account_col_label]"
+    select "Name", from: "import[name_col_label]"
+    select "Category", from: "import[category_col_label]"
+    select "Tags", from: "import[tags_col_label]"
+    select "Notes", from: "import[notes_col_label]"
 
     click_on "Apply configuration"
 
@@ -56,11 +65,22 @@ class ImportsTest < ApplicationSystemTestCase
 
     click_on "Import investments"
 
+    within_testid("import-tabs") do
+      click_on "Copy & Paste"
+    end
+
     fill_in "import[raw_file_str]", with: file_fixture("imports/trades.csv").read
 
-    find('input[type="submit"][value="Upload CSV"]').click
+    within "form" do
+      click_on "Upload CSV"
+    end
 
-    select "YYYY-MM-DD", from: "Date format"
+    select "date", from: "import[date_col_label]"
+    select "YYYY-MM-DD", from: "import[date_format]"
+    select "qty", from: "import[qty_col_label]"
+    select "ticker", from: "import[ticker_col_label]"
+    select "price", from: "import[price_col_label]"
+    select "account", from: "import[account_col_label]"
 
     click_on "Apply configuration"
 
@@ -87,9 +107,19 @@ class ImportsTest < ApplicationSystemTestCase
 
     click_on "Import accounts"
 
+    within_testid("import-tabs") do
+      click_on "Copy & Paste"
+    end
+
     fill_in "import[raw_file_str]", with: file_fixture("imports/accounts.csv").read
 
-    find('input[type="submit"][value="Upload CSV"]').click
+    within "form" do
+      click_on "Upload CSV"
+    end
+
+    select "type", from: "import[entity_type_col_label]"
+    select "name", from: "import[name_col_label]"
+    select "amount", from: "import[amount_col_label]"
 
     click_on "Apply configuration"
 
@@ -101,7 +131,7 @@ class ImportsTest < ApplicationSystemTestCase
       within(form) do
         select = form.find("select")
         select "Depository", from: select["id"]
-        sleep 1
+        sleep 0.5
       end
     end
 
@@ -125,9 +155,15 @@ class ImportsTest < ApplicationSystemTestCase
 
     click_on "Import from Mint"
 
+    within_testid("import-tabs") do
+      click_on "Copy & Paste"
+    end
+
     fill_in "import[raw_file_str]", with: file_fixture("imports/mint.csv").read
 
-    find('input[type="submit"][value="Upload CSV"]').click
+    within "form" do
+      click_on "Upload CSV"
+    end
 
     click_on "Apply configuration"
 
diff --git a/test/system/onboardings_test.rb b/test/system/onboardings_test.rb
new file mode 100644
index 00000000..32dc1783
--- /dev/null
+++ b/test/system/onboardings_test.rb
@@ -0,0 +1,195 @@
+require "application_system_test_case"
+
+class OnboardingsTest < ApplicationSystemTestCase
+  setup do
+    @user = users(:family_admin)
+    @family = @user.family
+
+    # Reset onboarding state
+    @user.update!(set_onboarding_preferences_at: nil)
+
+    sign_in @user
+  end
+
+  test "can complete the full onboarding flow" do
+    # Start at the main onboarding page
+    visit onboarding_path
+
+    assert_text "Let's set up your account"
+    assert_button "Continue"
+
+    # Navigate to preferences
+    click_button "Continue"
+
+    assert_current_path preferences_onboarding_path
+    assert_text "Configure your preferences"
+
+    # Test that the chart renders without errors (this would catch the Series bug)
+    assert_selector "[data-controller='time-series-chart']"
+
+    # Fill out preferences form
+    select "English (en)", from: "user_family_attributes_locale"
+    select "United States Dollar (USD)", from: "user_family_attributes_currency"
+    select "MM/DD/YYYY", from: "user_family_attributes_date_format"
+    select "Light", from: "user_theme"
+
+    # Submit preferences
+    click_button "Complete"
+
+    # Should redirect to goals page
+    assert_current_path goals_onboarding_path
+    assert_text "What brings you to Maybe?"
+  end
+
+  test "preferences page renders chart without errors" do
+    visit preferences_onboarding_path
+
+    # This test specifically targets the Series model bug
+    # The chart should render without throwing JavaScript errors
+    assert_selector "[data-controller='time-series-chart']"
+    assert_selector "#previewChart"
+
+    # Verify the chart data is properly formatted JSON
+    chart_element = find("[data-controller='time-series-chart']")
+    chart_data = chart_element["data-time-series-chart-data-value"]
+
+    # Should be valid JSON
+    assert_nothing_raised do
+      JSON.parse(chart_data)
+    end
+
+    # Verify the preview example shows
+    assert_text "Example"
+    assert_text "$2,325.25"
+    assert_text "+$78.90"
+  end
+
+  test "can change currency and see preview update" do
+    visit preferences_onboarding_path
+
+    # Change currency
+    select "Euro (EUR)", from: "user_family_attributes_currency"
+
+    # The preview should update (this tests the JavaScript controller)
+    # Note: This would require the onboarding controller to handle currency changes
+    assert_text "Example"
+  end
+
+  test "can change date format and see preview update" do
+    visit preferences_onboarding_path
+
+    # Change date format
+    select "DD/MM/YYYY", from: "user_family_attributes_date_format"
+
+    # The preview should update
+    assert_text "Example"
+  end
+
+  test "can change theme" do
+    visit preferences_onboarding_path
+
+    # Change theme
+    select "Dark", from: "user_theme"
+
+    # Theme should be applied (this tests the JavaScript controller)
+    assert_text "Example"
+  end
+
+  test "preferences form validation" do
+    visit preferences_onboarding_path
+
+    # Clear required fields and try to submit
+    select "", from: "user_family_attributes_locale"
+    click_button "Complete"
+
+    # Should stay on preferences page with validation errors (may have query params)
+    assert_match %r{/onboarding/preferences}, current_path
+  end
+
+  test "preferences form saves data correctly" do
+    visit preferences_onboarding_path
+
+    # Fill out form with specific values
+    select "Spanish (es)", from: "user_family_attributes_locale"
+    select "Euro (EUR)", from: "user_family_attributes_currency"
+    select "DD/MM/YYYY", from: "user_family_attributes_date_format"
+    select "Dark", from: "user_theme"
+
+    click_button "Complete"
+
+    # Wait for redirect to goals page to ensure form was submitted
+    assert_current_path goals_onboarding_path
+
+    # Verify data was saved
+    @family.reload
+    @user.reload
+
+    assert_equal "es", @family.locale
+    assert_equal "EUR", @family.currency
+    assert_equal "%d/%m/%Y", @family.date_format
+    assert_equal "dark", @user.theme
+    assert_not_nil @user.set_onboarding_preferences_at
+  end
+
+  test "goals page renders correctly" do
+    # Complete preferences first
+    @user.update!(set_onboarding_preferences_at: Time.current)
+
+    visit goals_onboarding_path
+
+    assert_text "What brings you to Maybe?"
+    assert_button "Next"
+  end
+
+  test "trial page renders correctly" do
+    visit trial_onboarding_path
+
+    assert_text "trial" # Adjust based on actual content
+  end
+
+  test "navigation between onboarding steps" do
+    # Start at main onboarding
+    visit onboarding_path
+    click_button "Continue"
+
+    # Should be at preferences
+    assert_current_path preferences_onboarding_path
+
+    # Complete preferences
+    select "English (en)", from: "user_family_attributes_locale"
+    select "United States Dollar (USD)", from: "user_family_attributes_currency"
+    select "MM/DD/YYYY", from: "user_family_attributes_date_format"
+    click_button "Complete"
+
+    # Should be at goals
+    assert_current_path goals_onboarding_path
+  end
+
+  test "onboarding nav shows correct steps" do
+    visit preferences_onboarding_path
+
+    # Check that navigation shows current step
+    assert_selector "ul.hidden.md\\:flex.items-center.gap-2"
+  end
+
+  test "logout option is available during onboarding" do
+    visit preferences_onboarding_path
+
+    # Should have logout option (rendered as a button component)
+    assert_text "Sign out"
+  end
+
+  private
+
+    def sign_in(user)
+      visit new_session_path
+      within "form" do
+        fill_in "Email", with: user.email
+        fill_in "Password", with: user_password_test
+        click_on "Log in"
+      end
+
+      # Wait for successful login
+      assert_current_path root_path
+    end
+end
diff --git a/test/system/settings/api_keys_test.rb b/test/system/settings/api_keys_test.rb
new file mode 100644
index 00000000..d6beeeee
--- /dev/null
+++ b/test/system/settings/api_keys_test.rb
@@ -0,0 +1,207 @@
+require "application_system_test_case"
+
+class Settings::ApiKeysTest < ApplicationSystemTestCase
+  setup do
+    @user = users(:family_admin)
+    @user.api_keys.destroy_all # Ensure clean state
+    login_as @user
+  end
+
+  test "should show no API key state when user has no active keys" do
+    visit settings_api_key_path
+
+    assert_text "Create Your API Key"
+    assert_text "Get programmatic access to your Maybe data"
+    assert_text "Access your account data programmatically"
+    assert_link "Create API Key", href: new_settings_api_key_path
+  end
+
+  test "should navigate to create new API key form" do
+    visit settings_api_key_path
+    click_link "Create API Key"
+
+    assert_current_path new_settings_api_key_path
+    assert_text "Create New API Key"
+    assert_field "API Key Name"
+    assert_text "Read Only"
+    assert_text "Read/Write"
+  end
+
+  test "should create a new API key with selected scopes" do
+    visit new_settings_api_key_path
+
+    fill_in "API Key Name", with: "Test Integration Key"
+    choose "Read/Write"
+
+    click_button "Create API Key"
+
+    # Should redirect to show page with the API key details
+    assert_current_path settings_api_key_path
+    assert_text "Test Integration Key"
+    assert_text "Your API Key"
+
+    # Should show the actual API key value
+    api_key_display = find("#api-key-display")
+    assert api_key_display.text.length > 30 # Should be a long hex string
+
+    # Should show copy buttons
+    assert_button "Copy API Key"
+    assert_link "Create New Key"
+  end
+
+  test "should show current API key details after creation" do
+    # Create an API key first
+    api_key = ApiKey.create!(
+      user: @user,
+      name: "Production API Key",
+      display_key: "test_plain_key_123",
+      scopes: [ "read_write" ]
+    )
+
+    visit settings_api_key_path
+
+    assert_text "Your API Key"
+    assert_text "Production API Key"
+    assert_text "Active"
+    assert_text "Read/Write"
+    assert_text "Never used"
+    assert_link "Create New Key"
+    assert_button "Revoke Key"
+  end
+
+  test "should show usage instructions and example curl command" do
+    api_key = ApiKey.create!(
+      user: @user,
+      name: "Test API Key",
+      display_key: "test_key_123",
+      scopes: [ "read" ]
+    )
+
+    visit settings_api_key_path
+
+    assert_text "How to use your API key"
+    assert_text "curl -H \"X-Api-Key: test_key_123\""
+    assert_text "/api/v1/accounts"
+  end
+
+  test "should allow regenerating API key" do
+    api_key = ApiKey.create!(
+      user: @user,
+      name: "Old API Key",
+      display_key: "old_key_123",
+      scopes: [ "read" ]
+    )
+
+    visit settings_api_key_path
+    click_link "Create New Key"
+
+    # Should be on the new API key form
+    assert_text "Create New API Key"
+
+    fill_in "API Key Name", with: "New API Key"
+    choose "Read Only"
+    click_button "Create API Key"
+
+    # Should redirect to show page with new key
+    assert_text "New API Key"
+    assert_text "Your API Key"
+
+    # Old key should be revoked
+    api_key.reload
+    assert api_key.revoked?
+  end
+
+  test "should allow revoking API key with confirmation" do
+    api_key = ApiKey.create!(
+      user: @user,
+      name: "Test API Key",
+      display_key: "test_key_123",
+      scopes: [ "read" ]
+    )
+
+    visit settings_api_key_path
+
+    # Click the revoke button to open the modal
+    click_button "Revoke Key"
+
+    # Wait for the dialog and then confirm
+    assert_selector "#confirm-dialog", visible: true
+    within "#confirm-dialog" do
+      click_button "Confirm"
+    end
+
+    # Wait for redirect after revoke
+    assert_no_selector "#confirm-dialog"
+
+    assert_text "Create Your API Key"
+    assert_text "Get programmatic access to your Maybe data"
+
+    # Key should be revoked in the database
+    api_key.reload
+    assert api_key.revoked?
+  end
+
+  test "should redirect to show when user already has active key and tries to visit new" do
+    api_key = ApiKey.create!(
+      user: @user,
+      name: "Existing API Key",
+      display_key: "existing_key_123",
+      scopes: [ "read" ]
+    )
+
+    visit new_settings_api_key_path
+
+    assert_current_path settings_api_key_path
+  end
+
+  test "should show API key in navigation" do
+    visit settings_api_key_path
+
+    within("nav") do
+      assert_text "API Key"
+    end
+  end
+
+  test "should validate API key name is required" do
+    visit new_settings_api_key_path
+
+    # Try to submit without name
+    choose "Read Only"
+    click_button "Create API Key"
+
+    # Should stay on form with validation error
+    assert_current_path new_settings_api_key_path
+    assert_field "API Key Name" # Form should still be visible
+    # The form might not show the validation error inline, but should remain on the form
+  end
+
+  test "should show last used timestamp when API key has been used" do
+    api_key = ApiKey.create!(
+      user: @user,
+      name: "Used API Key",
+      display_key: "used_key_123",
+      scopes: [ "read" ],
+      last_used_at: 2.hours.ago
+    )
+
+    visit settings_api_key_path
+
+    assert_text "2 hours ago"
+    assert_no_text "Never used"
+  end
+
+  test "should show expiration date when API key has expiration" do
+    api_key = ApiKey.create!(
+      user: @user,
+      name: "Expiring API Key",
+      display_key: "expiring_key_123",
+      scopes: [ "read" ],
+      expires_at: 30.days.from_now
+    )
+
+    visit settings_api_key_path
+
+    # Should show some indication of expiration (exact format may vary)
+    assert_no_text "Never expires"
+  end
+end
diff --git a/test/system/settings_test.rb b/test/system/settings_test.rb
index 32f2b8c8..da9abeab 100644
--- a/test/system/settings_test.rb
+++ b/test/system/settings_test.rb
@@ -10,7 +10,7 @@ class SettingsTest < ApplicationSystemTestCase
       [ "Accounts", accounts_path ],
       [ "Tags", tags_path ],
       [ "Categories", categories_path ],
-      [ "Merchants", merchants_path ],
+      [ "Merchants", family_merchants_path ],
       [ "Imports", imports_path ],
       [ "What's new", changelog_path ],
       [ "Feedback", feedback_path ]
@@ -33,12 +33,13 @@ class SettingsTest < ApplicationSystemTestCase
 
   test "can update self hosting settings" do
     Rails.application.config.app_mode.stubs(:self_hosted?).returns(true)
+    Provider::Registry.stubs(:get_provider).with(:synth).returns(nil)
     open_settings_from_sidebar
     assert_selector "li", text: "Self hosting"
     click_link "Self hosting"
     assert_current_path settings_hosting_path
     assert_selector "h1", text: "Self-Hosting"
-    check "setting_require_invite_for_signup", allow_label_click: true
+    check "setting[require_invite_for_signup]", allow_label_click: true
     click_button "Generate new code"
     assert_selector 'span[data-clipboard-target="source"]', visible: true, count: 1 # invite code copy widget
     copy_button = find('button[data-action="clipboard#copy"]', match: :first) # Find the first copy button (adjust if needed)
@@ -46,10 +47,18 @@ class SettingsTest < ApplicationSystemTestCase
     assert_selector 'span[data-clipboard-target="iconSuccess"]', visible: true, count: 1 # text copied and icon changed to checkmark
   end
 
+  test "does not show billing link if self hosting" do
+    Rails.application.config.app_mode.stubs(:self_hosted?).returns(true)
+    open_settings_from_sidebar
+    assert_no_selector "li", text: I18n.t("settings.settings_nav.billing_label")
+  end
+
   private
 
     def open_settings_from_sidebar
-      find("#user-menu").click
+      within "div[data-testid=user-menu]" do
+        find("button").click
+      end
       click_link "Settings"
     end
 end
diff --git a/test/system/tooltips_test.rb b/test/system/tooltips_test.rb
deleted file mode 100644
index 7666269c..00000000
--- a/test/system/tooltips_test.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require "application_system_test_case"
-
-class TooltipsTest < ApplicationSystemTestCase
-  include ActionView::Helpers::NumberHelper
-  include ApplicationHelper
-
-  setup do
-    sign_in @user = users(:family_admin)
-    @account = accounts(:investment)
-  end
-
-  test "can see account information tooltip" do
-    visit account_path(@account)
-    tooltip_element = find('[data-controller="tooltip"]')
-    tooltip_element.hover
-    tooltip_contents = find('[data-tooltip-target="tooltip"]')
-    assert tooltip_contents.visible?
-    within tooltip_contents do
-      assert_text I18n.t("accounts.tooltip.total_value_tooltip")
-      assert_text I18n.t("accounts.tooltip.holdings")
-      assert_text format_money(@account.investment.holdings_value, precision: 0)
-      assert_text I18n.t("accounts.tooltip.cash")
-      assert_text format_money(@account.balance_money, precision: 0)
-    end
-    find("body").click
-    assert find('[data-tooltip-target="tooltip"]', visible: false)
-  end
-end
diff --git a/test/system/trades_test.rb b/test/system/trades_test.rb
index 541a445c..7d0183c3 100644
--- a/test/system/trades_test.rb
+++ b/test/system/trades_test.rb
@@ -6,62 +6,70 @@ class TradesTest < ApplicationSystemTestCase
   setup do
     sign_in @user = users(:family_admin)
 
+    @user.update!(show_sidebar: false, show_ai_sidebar: false)
+
     @account = accounts(:investment)
 
-    visit_account_trades
+    visit_account_portfolio
+
+    # Disable provider to focus on form testing
+    Security.stubs(:provider).returns(nil)
   end
 
   test "can create buy transaction" do
-    shares_qty = 25.0
+    shares_qty = 25
 
     open_new_trade_modal
 
-    fill_in "Ticker symbol", with: "NVDA"
+    fill_in "Ticker symbol", with: "AAPL"
     fill_in "Date", with: Date.current
     fill_in "Quantity", with: shares_qty
-    fill_in "account_entry[price]", with: 214.23
+    fill_in "model[price]", with: 214.23
 
     click_button "Add transaction"
 
-    visit_account_trades
+    visit_trades
 
     within_trades do
-      assert_text "Purchase 10 shares of AAPL"
-      assert_text "Buy #{shares_qty} shares of NVDA"
+      assert_text "Buy #{shares_qty}.0 shares of AAPL"
     end
   end
 
   test "can create sell transaction" do
-    aapl = @account.holdings.current.find { |h| h.security.ticker == "AAPL" }
+    qty = 10
+    aapl = @account.holdings.find { |h| h.security.ticker == "AAPL" }
 
     open_new_trade_modal
 
     select "Sell", from: "Type"
-    fill_in "Ticker symbol", with: aapl.ticker
+    fill_in "Ticker symbol", with: "AAPL"
     fill_in "Date", with: Date.current
-    fill_in "Quantity", with: aapl.qty
-    fill_in "account_entry[price]", with: 215.33
+    fill_in "Quantity", with: qty
+    fill_in "model[price]", with: 215.33
 
     click_button "Add transaction"
 
-    visit_account_trades
+    visit_trades
 
     within_trades do
-      assert_text "Sell #{aapl.qty} shares of AAPL"
+      assert_text "Sell #{qty}.0 shares of AAPL"
     end
   end
 
   private
-
     def open_new_trade_modal
-      click_link "new_trade_account_#{@account.id}"
+      click_on "New transaction"
     end
 
     def within_trades(&block)
-      within "#" + dom_id(@account, "trades"), &block
+      within "#" + dom_id(@account, "entries"), &block
     end
 
-    def visit_account_trades
-      visit account_url(@account, tab: "trades")
+    def visit_trades
+      visit account_path(@account, tab: "activity")
+    end
+
+    def visit_account_portfolio
+      visit account_path(@account, tab: "holdings")
     end
 end
diff --git a/test/system/transactions_test.rb b/test/system/transactions_test.rb
index 4544c6c4..be1f9b54 100644
--- a/test/system/transactions_test.rb
+++ b/test/system/transactions_test.rb
@@ -4,7 +4,7 @@ class TransactionsTest < ApplicationSystemTestCase
   setup do
     sign_in @user = users(:family_admin)
 
-    Account::Entry.delete_all # clean slate
+    Entry.delete_all # clean slate
 
     create_transaction("one", 12.days.ago.to_date, 100)
     create_transaction("two", 10.days.ago.to_date, 100)
@@ -15,11 +15,11 @@ class TransactionsTest < ApplicationSystemTestCase
     create_transaction("seven", 4.days.ago.to_date, 100)
     create_transaction("eight", 3.days.ago.to_date, 100)
     create_transaction("nine", 1.days.ago.to_date, 100)
-    create_transaction("ten", 1.days.ago.to_date, 100)
+    @uncategorized_transaction = create_transaction("ten", 1.days.ago.to_date, 100)
     create_transaction("eleven", Date.current, 100, category: categories(:food_and_drink), tags: [ tags(:one) ], merchant: merchants(:amazon))
 
     @transactions = @user.family.entries
-                         .account_transactions
+                         .transactions
                          .reverse_chronological
 
     @transaction = @transactions.first
@@ -33,7 +33,7 @@ class TransactionsTest < ApplicationSystemTestCase
     assert_selector "h1", text: "Transactions"
 
     within "form#transactions-search" do
-      fill_in "Search transactions by name", with: @transaction.name
+      fill_in "Search transactions ...", with: @transaction.name
     end
 
     assert_selector "#" + dom_id(@transaction), count: 1
@@ -49,7 +49,7 @@ class TransactionsTest < ApplicationSystemTestCase
     within "#transaction-filters-menu" do
       check(@transaction.account.name)
       click_button "Category"
-      check(@transaction.account_transaction.category.name)
+      check(@transaction.transaction.category.name)
       click_button "Apply"
     end
 
@@ -57,16 +57,40 @@ class TransactionsTest < ApplicationSystemTestCase
 
     within "#transaction-search-filters" do
       assert_text @transaction.account.name
-      assert_text @transaction.account_transaction.category.name
+      assert_text @transaction.transaction.category.name
     end
   end
 
+  test "can filter uncategorized transactions" do
+    find("#transaction-filters-button").click
+
+    within "#transaction-filters-menu" do
+      click_button "Category"
+      check("Uncategorized")
+      click_button "Apply"
+    end
+
+    assert_selector "#" + dom_id(@uncategorized_transaction), count: 1
+    assert_no_selector("#" + dom_id(@transaction))
+
+    find("#transaction-filters-button").click
+
+    within "#transaction-filters-menu" do
+      click_button "Category"
+      check(@transaction.transaction.category.name)
+      click_button "Apply"
+    end
+
+    assert_selector "#" + dom_id(@transaction), count: 1
+    assert_selector "#" + dom_id(@uncategorized_transaction), count: 1
+  end
+
   test "all filters work and empty state shows if no match" do
     find("#transaction-filters-button").click
 
     account = @transaction.account
-    category = @transaction.account_transaction.category
-    merchant = @transaction.account_transaction.merchant
+    category = @transaction.transaction.category
+    merchant = @transaction.transaction.merchant
 
     within "#transaction-filters-menu" do
       click_button "Account"
@@ -94,22 +118,25 @@ class TransactionsTest < ApplicationSystemTestCase
 
     assert_text "No entries found"
 
+    # Wait for Turbo to finish updating the DOM
+    sleep 0.5
+
     # Page reload doesn't affect results
     visit current_url
 
     assert_text "No entries found"
 
-    within "ul#transaction-search-filters" do
-      find("li", text: account.name).first("a").click
-      find("li", text: "on or after #{10.days.ago.to_date}").first("a").click
-      find("li", text: "on or before #{1.day.ago.to_date}").first("a").click
-      find("li", text: "Income").first("a").click
-      find("li", text: "less than 200").first("a").click
-      find("li", text: category.name).first("a").click
-      find("li", text: merchant.name).first("a").click
+    # Remove all filters by clicking their X buttons
+    # Get all the filter buttons at once to avoid stale elements
+    filter_count = page.all("ul#transaction-search-filters li button").count
+
+    # Click each one with a small delay to let Turbo update
+    filter_count.times do
+      page.all("ul#transaction-search-filters li button").first.click
+      sleep 0.1
     end
 
-    assert_selector "#" + dom_id(@transaction), count: 1
+    assert_text @transaction.name
   end
 
   test "can select and deselect entire page of transactions" do
@@ -156,36 +183,50 @@ class TransactionsTest < ApplicationSystemTestCase
 
   test "can create deposit transaction for investment account" do
     investment_account = accounts(:investment)
+    investment_account.entries.create!(name: "Investment account", date: Date.current, amount: 1000, currency: "USD", entryable: Transaction.new)
     transfer_date = Date.current
-    visit account_path(investment_account)
-    click_on "New transaction"
+    visit account_url(investment_account, tab: "activity")
+    within "[data-testid='activity-menu']" do
+      click_on "New"
+      click_on "New transaction"
+    end
     select "Deposit", from: "Type"
     fill_in "Date", with: transfer_date
-    fill_in "account_entry[amount]", with: 175.25
+    fill_in "model[amount]", with: 175.25
     click_button "Add transaction"
-    within "#account_" + investment_account.id do
-      click_on "Transactions"
-    end
-    within "#entry-group-" + transfer_date.to_s do
+    within "#" + dom_id(investment_account, "entries_#{transfer_date}") do
       assert_text "175.25"
     end
   end
 
+  test "transfers should always sum to zero" do
+    asset_account = accounts(:other_asset)
+    investment_account = accounts(:investment)
+    outflow_entry = create_transaction("outflow", Date.current, 500, account: asset_account)
+    inflow_entry = create_transaction("inflow", 1.day.ago.to_date, -500, account: investment_account)
+    @user.family.auto_match_transfers!
+    visit transactions_url
+
+    within "#entry-group-" + Date.current.to_s + "-totals" do
+      assert_text "-$100.00" # transaction eleven from setup
+    end
+  end
+
   private
 
-    def create_transaction(name, date, amount, category: nil, merchant: nil, tags: [])
-      account = accounts(:depository)
+    def create_transaction(name, date, amount, category: nil, merchant: nil, tags: [], account: nil)
+      account ||= accounts(:depository)
 
       account.entries.create! \
         name: name,
         date: date,
         amount: amount,
         currency: "USD",
-        entryable: Account::Transaction.new(category: category, merchant: merchant, tags: tags)
+        entryable: Transaction.new(category: category, merchant: merchant, tags: tags)
     end
 
     def number_of_transactions_on_page
-      [ @user.family.entries.without_transfers.count, @page_size ].min
+      [ @user.family.entries.count, @page_size ].min
     end
 
     def all_transactions_checkbox
diff --git a/test/system/transfers_test.rb b/test/system/transfers_test.rb
index 228c3ab2..a2481b18 100644
--- a/test/system/transfers_test.rb
+++ b/test/system/transfers_test.rb
@@ -17,73 +17,15 @@ class TransfersTest < ApplicationSystemTestCase
     click_on "Transfer"
     assert_text "New transfer"
 
-    fill_in "Description", with: "Transfer txn name"
     select checking_name, from: "From"
     select savings_name, from: "To"
-    fill_in "account_transfer[amount]", with: 500
+    fill_in "transfer[amount]", with: 500
     fill_in "Date", with: transfer_date
 
     click_button "Create transfer"
 
     within "#entry-group-" + transfer_date.to_s do
-      assert_text "Transfer from"
+      assert_text "Payment to"
     end
   end
-
-  test "can match 2 transactions and create a transfer" do
-    transfer_date = Date.current
-    outflow = accounts(:depository).entries.create! \
-      name: "Outflow from checking account",
-      date: transfer_date,
-      amount: 100,
-      currency: "USD",
-      entryable: Account::Transaction.new
-
-    inflow = accounts(:credit_card).entries.create! \
-      name: "Inflow to cc account",
-      date: transfer_date,
-      amount: -100,
-      currency: "USD",
-      entryable: Account::Transaction.new
-
-    visit transactions_url
-
-    transaction_entry_checkbox(inflow).check
-    transaction_entry_checkbox(outflow).check
-
-    bulk_transfer_action_button.click
-
-    click_on "Mark as transfers"
-
-    within "#entry-group-" + transfer_date.to_s do
-      assert_text "Transfer from"
-    end
-  end
-
-  test "can mark a single transaction as a transfer" do
-    txn = @user.family.entries.account_transactions.reverse_chronological.first
-
-    within "#" + dom_id(txn) do
-      assert_text txn.account_transaction.category.name || "Uncategorized"
-    end
-
-    transaction_entry_checkbox(txn).check
-
-    bulk_transfer_action_button.click
-    click_on "Mark as transfers"
-
-    within "#" + dom_id(txn) do
-      assert_no_text "Uncategorized"
-    end
-  end
-
-  private
-
-    def transaction_entry_checkbox(transaction_entry)
-      find("#" + dom_id(transaction_entry, "selection"))
-    end
-
-    def bulk_transfer_action_button
-      find("#bulk-transfer-btn")
-    end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index b3bacfa8..077eae5b 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -7,18 +7,21 @@ end
 
 require_relative "../config/environment"
 
-ENV["SELF_HOSTED"] = "false"
-ENV["UPGRADES_ENABLED"] = "false"
 ENV["RAILS_ENV"] ||= "test"
 
+# Set Plaid to sandbox mode for tests
+ENV["PLAID_ENV"] = "sandbox"
+ENV["PLAID_CLIENT_ID"] ||= "test_client_id"
+ENV["PLAID_SECRET"] ||= "test_secret"
+
 # Fixes Segfaults on M1 Macs when running tests in parallel (temporary workaround)
-# https://github.com/ged/ruby-pg/issues/538#issuecomment-1591629049
 ENV["PGGSSENCMODE"] = "disable"
 
 require "rails/test_help"
 require "minitest/mock"
 require "minitest/autorun"
 require "mocha/minitest"
+require "aasm/minitest"
 
 VCR.configure do |config|
   config.cassette_library_dir = "test/vcr_cassettes"
@@ -26,6 +29,12 @@ VCR.configure do |config|
   config.ignore_localhost = true
   config.default_cassette_options = { erb: true }
   config.filter_sensitive_data("<SYNTH_API_KEY>") { ENV["SYNTH_API_KEY"] }
+  config.filter_sensitive_data("<OPENAI_ACCESS_TOKEN>") { ENV["OPENAI_ACCESS_TOKEN"] }
+  config.filter_sensitive_data("<OPENAI_ORGANIZATION_ID>") { ENV["OPENAI_ORGANIZATION_ID"] }
+  config.filter_sensitive_data("<STRIPE_SECRET_KEY>") { ENV["STRIPE_SECRET_KEY"] }
+  config.filter_sensitive_data("<STRIPE_WEBHOOK_SECRET>") { ENV["STRIPE_WEBHOOK_SECRET"] }
+  config.filter_sensitive_data("<PLAID_CLIENT_ID>") { ENV["PLAID_CLIENT_ID"] }
+  config.filter_sensitive_data("<PLAID_SECRET>") { ENV["PLAID_SECRET"] }
 end
 
 module ActiveSupport
@@ -49,7 +58,7 @@ module ActiveSupport
 
     # Add more helper methods to be used by all tests here...
     def sign_in(user)
-      post sessions_path, params: { email: user.email, password: "password" }
+      post sessions_path, params: { email: user.email, password: user_password_test }
     end
 
     def with_env_overrides(overrides = {}, &block)
@@ -60,6 +69,10 @@ module ActiveSupport
       Rails.configuration.stubs(:app_mode).returns("self_hosted".inquiry)
       yield
     end
+
+    def user_password_test
+      "maybetestpassword817983172"
+    end
   end
 end
 
diff --git a/test/vcr_cassettes/git_repository_provider/fetch_latest_release_notes.yml b/test/vcr_cassettes/git_repository_provider/fetch_latest_release_notes.yml
index aef67d92..a14b1755 100644
--- a/test/vcr_cassettes/git_repository_provider/fetch_latest_release_notes.yml
+++ b/test/vcr_cassettes/git_repository_provider/fetch_latest_release_notes.yml
@@ -10,7 +10,7 @@ http_interactions:
       Accept:
       - application/vnd.github.v3+json
       User-Agent:
-      - Octokit Ruby Gem 9.1.0
+      - Octokit Ruby Gem 9.2.0
       Content-Type:
       - application/json
       Accept-Encoding:
@@ -21,7 +21,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Mon, 09 Sep 2024 20:03:24 GMT
+      - Wed, 19 Mar 2025 12:40:58 GMT
       Content-Type:
       - application/json; charset=utf-8
       Cache-Control:
@@ -29,7 +29,7 @@ http_interactions:
       Vary:
       - Accept,Accept-Encoding, Accept, X-Requested-With
       Etag:
-      - W/"17af70a435e3513d63e7fe569e0863ad17c500158f39055d1b1cab704ab54b96"
+      - W/"cc42fb8190e3219e91e46d75f709c8b5762a1e8bf472008a702a4adf1e7dfb95"
       X-Github-Media-Type:
       - github.v3; format=json
       X-Github-Api-Version-Selected:
@@ -55,62 +55,68 @@ http_interactions:
       - default-src 'none'
       Server:
       - github.com
+      Accept-Ranges:
+      - bytes
       X-Ratelimit-Limit:
       - '60'
       X-Ratelimit-Remaining:
-      - '57'
+      - '59'
       X-Ratelimit-Reset:
-      - '1725915804'
+      - '1742391658'
       X-Ratelimit-Resource:
       - core
       X-Ratelimit-Used:
-      - '3'
-      Accept-Ranges:
-      - bytes
-      Content-Length:
-      - '52546'
+      - '1'
+      Transfer-Encoding:
+      - chunked
       X-Github-Request-Id:
-      - E979:365B86:C03B37:171BC72:66DF5497
+      - DDED:38A4A1:15FB4B:2C2CC0:67DABB5A
     body:
       encoding: ASCII-8BIT
       string: !binary |-
-        [{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/171684870","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/171684870/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/171684870/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.16","id":171684870,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","site_admin":false},"node_id":"RE_kwDOK_txHM4KO7QG","tag_name":"v0.1.0-alpha.16","target_commitish":"main","name":"v0.1.0-alpha.16","draft":false,"prerelease":true,"created_at":"2024-08-23T14:39:14Z","published_at":"2024-08-23T14:44:15Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.16","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.16","body":"This week's release comes with a variety of bug fixes and improvements to the UI.\r\n\r\nAdditionally, users can now input details for their property and vehicle accounts as shown in the video below.  In the near future, Maybe will support data providers related to the \"valuation\" of properties and vehicles (i.e. Zillow, KBB).  We will use the information from user accounts to automatically fetch estimated market values for these assets which will then be added periodically as \"Valuations\" in the value tab of each account.  This will then show up in the history graph for the account balance.\r\n\r\nhttps://github.com/user-attachments/assets/fd759c82-a25c-4c8d-8f16-f577e0410fb5\r\n\r\n## What's Changed\r\n\r\n* Refactor: Allow other import files by @pedrocarmona in https://github.com/maybe-finance/maybe/pull/1099\r\n* Bump sentry-ruby from 5.18.2 to 5.19.0 by @dependabot in https://github.com/maybe-finance/maybe/pull/1108\r\n* Bump stimulus-rails from 1.3.3 to 1.3.4 by @dependabot in https://github.com/maybe-finance/maybe/pull/1106\r\n* Bump aws-sdk-s3 from 1.157.0 to 1.158.0 by @dependabot in https://github.com/maybe-finance/maybe/pull/1105\r\n* Bump ruby-lsp-rails from 0.3.12 to 0.3.13 by @dependabot in https://github.com/maybe-finance/maybe/pull/1107\r\n* Bump propshaft from 0.9.0 to 0.9.1 by @dependabot in https://github.com/maybe-finance/maybe/pull/1104\r\n* Bump good_job from 4.1.1 to 4.2.0 by @dependabot in https://github.com/maybe-finance/maybe/pull/1102\r\n* Bump tailwindcss-rails from 2.7.2 to 2.7.3 by @dependabot in https://github.com/maybe-finance/maybe/pull/1103\r\n* Fix query when account has zero income and expense by @zachgoll in https://github.com/maybe-finance/maybe/pull/1112\r\n* Fix holding name error by @zachgoll in https://github.com/maybe-finance/maybe/pull/1113\r\n* Add Property Details View by @zachgoll in https://github.com/maybe-finance/maybe/pull/1116\r\n* Basic Vehicle View by @zachgoll in https://github.com/maybe-finance/maybe/pull/1117\r\n* Rubocop updates by @zachgoll in https://github.com/maybe-finance/maybe/pull/1118\r\n* Fix file upload UI opening twice by @zachgoll in https://github.com/maybe-finance/maybe/pull/1119\r\n\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.15...v0.1.0-alpha.16","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/171684870/reactions","total_count":19,"+1":8,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":0,"rocket":9,"eyes":2},"mentions_count":3},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/170655924","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/170655924/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/170655924/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.15","id":170655924,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","site_admin":false},"node_id":"RE_kwDOK_txHM4KLAC0","tag_name":"v0.1.0-alpha.15","target_commitish":"main","name":"v0.1.0-alpha.15","draft":false,"prerelease":true,"created_at":"2024-08-16T20:09:37Z","published_at":"2024-08-16T20:18:22Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.15","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.15","body":"This week, we released the first version of an issue tracking system directly within the Maybe app!\r\n\r\nWhy?\r\n\r\nAs an open-source personal finance app, Maybe has a much larger \"self service\" component than most applications.  While we're in the early days, the goal is to support a global user base, which means we have to support _a lot_ of data providers.\r\n\r\nEach data provider comes with its own set of nuances and errors that can be challenging to debug; especially for our small team that doesn't have access to your self hosted configuration.  When things go wrong, there are a handful of possible causes.\r\n\r\nIn order to combat this, the `v0.1.0-alpha.15` release introduces a \"self resolution\" issue tracking system.  The video below demonstrates how a user who has incorrectly configured their exchange rates provider can **identify, diagnose, and fix the issue all within the Maybe app**:\r\n\r\nhttps://github.com/user-attachments/assets/7cc98c79-9b72-4260-bc17-907bc33b1390\r\n\r\n## What's Changed\r\n* Deposit, Withdrawal, and Interest Transactions for Investment View by @zachgoll in https://github.com/maybe-finance/maybe/pull/1075\r\n* Bump tailwindcss-rails from 2.6.5 to 2.7.2 by @dependabot in https://github.com/maybe-finance/maybe/pull/1078\r\n* Bump bootsnap from 1.18.3 to 1.18.4 by @dependabot in https://github.com/maybe-finance/maybe/pull/1079\r\n* Bump ruby-lsp-rails from 0.3.11 to 0.3.12 by @dependabot in https://github.com/maybe-finance/maybe/pull/1081\r\n* Refactor: Use native error i18n lookup by @pedrocarmona in https://github.com/maybe-finance/maybe/pull/1076\r\n* Bump rails from `43530b4` to `f6d62b5` by @dependabot in https://github.com/maybe-finance/maybe/pull/1083\r\n* Fix: i18n symbol typo by @pedrocarmona in https://github.com/maybe-finance/maybe/pull/1085\r\n* Bump ruby from 3.3.1 to 3.3.4 by @Cluster444 in https://github.com/maybe-finance/maybe/pull/1084\r\n* Fix for invalid accountable data by @zachgoll in https://github.com/maybe-finance/maybe/pull/1086\r\n* add pagination to account transactions list by @code-constructor in https://github.com/maybe-finance/maybe/pull/1095\r\n* Account Issue Model and Resolution Flow + Troubleshooting guides by @zachgoll in https://github.com/maybe-finance/maybe/pull/1090\r\n* Add support for different column separator in csv import logic by @code-constructor in https://github.com/maybe-finance/maybe/pull/1096\r\n* Improved UI warning states for holdings with missing data by @zachgoll in https://github.com/maybe-finance/maybe/pull/1098\r\n\r\n## New Contributors\r\n* @pedrocarmona made their first contribution in https://github.com/maybe-finance/maybe/pull/1076\r\n* @Cluster444 made their first contribution in https://github.com/maybe-finance/maybe/pull/1084\r\n* @code-constructor made their first contribution in https://github.com/maybe-finance/maybe/pull/1095\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.14...v0.1.0-alpha.15","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/170655924/reactions","total_count":11,"+1":11,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":0,"rocket":0,"eyes":0},"mentions_count":5},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/169591029","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/169591029/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/169591029/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.14","id":169591029,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","site_admin":false},"node_id":"RE_kwDOK_txHM4KG8D1","tag_name":"v0.1.0-alpha.14","target_commitish":"main","name":"v0.1.0-alpha.14","draft":false,"prerelease":true,"created_at":"2024-08-09T21:42:48Z","published_at":"2024-08-09T21:49:20Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.14","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.14","body":"Basic investment portfolios are here! 🥳 \r\n\r\nWhile we're still in the very early days for investment accounts, this week capped off some really important additions to the investment account page view.\r\n\r\nUsers can now:\r\n\r\n- See a breakdown of their cash + holdings balance in a tooltip\r\n- Add buy/sell investment trades that will automatically sync and rebuild their portfolio and historical graph\r\n\r\nMoving forward, we'll be refining and adding to the investment portfolio feature and complementing it with troubleshooting guides so you know exactly what's causing any discrepancies between Maybe's calculations and your brokerage's calculations.\r\n\r\nhttps://github.com/user-attachments/assets/f4c8bc65-31f6-4627-b4e7-477d0687c570\r\n\r\n## What's Changed\r\n\r\n* Bump tailwindcss-rails from 2.6.4 to 2.6.5 by @dependabot in https://github.com/maybe-finance/maybe/pull/1058\r\n* Bump faraday from 2.10.0 to 2.10.1 by @dependabot in https://github.com/maybe-finance/maybe/pull/1055\r\n* Bump erb_lint from 0.5.0 to 0.6.0 by @dependabot in https://github.com/maybe-finance/maybe/pull/1057\r\n* Bump aws-sdk-s3 from 1.156.0 to 1.157.0 by @dependabot in https://github.com/maybe-finance/maybe/pull/1054\r\n* Bump good_job from 4.1.0 to 4.1.1 by @dependabot in https://github.com/maybe-finance/maybe/pull/1053\r\n* Bump pagy from 9.0.3 to 9.0.5 by @dependabot in https://github.com/maybe-finance/maybe/pull/1056\r\n* Bump rails from `5cb5cad` to `43530b4` by @dependabot in https://github.com/maybe-finance/maybe/pull/1059\r\n* Add source headers to Synth calls by @zachgoll in https://github.com/maybe-finance/maybe/pull/1062\r\n* Add stimulus tooltip controller by @tonyvince in https://github.com/maybe-finance/maybe/pull/1065\r\n* Fetch exchange rates in bulk from synth by @tonyvince in https://github.com/maybe-finance/maybe/pull/1069\r\n* Fix minitest assert_nil warning by @tonyvince in https://github.com/maybe-finance/maybe/pull/1070\r\n* Allow user to add buy and sell trade transactions for investment accounts by @zachgoll in https://github.com/maybe-finance/maybe/pull/1066\r\n* Temp fix for missing accountables on self hosted instances by @zachgoll in https://github.com/maybe-finance/maybe/pull/1071\r\n\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.13...v0.1.0-alpha.14","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/169591029/reactions","total_count":16,"+1":0,"-1":0,"laugh":0,"hooray":16,"confused":0,"heart":0,"rocket":0,"eyes":0},"mentions_count":3},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/168510559","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/168510559/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/168510559/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.13","id":168510559,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","site_admin":false},"node_id":"RE_kwDOK_txHM4KC0Rf","tag_name":"v0.1.0-alpha.13","target_commitish":"main","name":"v0.1.0-alpha.13","draft":false,"prerelease":true,"created_at":"2024-08-02T21:10:16Z","published_at":"2024-08-02T21:10:59Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.13","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.13","body":"Coming off the back of last week's release which introduced basic investment portfolio views and the ability to sync investment holdings, this week's release introduces full support for stock prices with the [Synth API](https://synthfinance.com/)! (which has a generous free tier to get started)\r\n\r\nThis means that investment account views can now properly calculate and show an aggregated market value of all the investments in it and gracefully handle missing stock prices.\r\n\r\nIn a future release, users will have full control to create buy & sell trades, manage their investment portfolio, and see total returns over various time periods alongside their historical value graph.\r\n\r\nhttps://github.com/user-attachments/assets/c39b1706-97a7-4e3e-b568-9d9b09e38e05\r\n\r\n## What's Changed\r\n* Fix: Omit layout for turbo frames with custom sidebar layout by @pranavbabu in https://github.com/maybe-finance/maybe/pull/1024\r\n* fix: long emails overflow in account menu dropdown by @MikhailWahib in https://github.com/maybe-finance/maybe/pull/1034\r\n* Fix demo data reset by @tonyvince in https://github.com/maybe-finance/maybe/pull/1041\r\n* Ensure transfer name is populated by @zachgoll in https://github.com/maybe-finance/maybe/pull/1042\r\n* Add security prices provider (Synth integration) by @zachgoll in https://github.com/maybe-finance/maybe/pull/1039\r\n* Show cash + holdings value for investment account view by @zachgoll in https://github.com/maybe-finance/maybe/pull/1046\r\n\r\n## New Contributors\r\n* @pranavbabu made their first contribution in https://github.com/maybe-finance/maybe/pull/1024\r\n* @MikhailWahib made their first contribution in https://github.com/maybe-finance/maybe/pull/1034\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.12...v0.1.0-alpha.13","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/168510559/reactions","total_count":30,"+1":4,"-1":0,"laugh":0,"hooray":13,"confused":0,"heart":6,"rocket":7,"eyes":0},"mentions_count":4},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/167382277","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/167382277/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/167382277/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.12","id":167382277,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","site_admin":false},"node_id":"RE_kwDOK_txHM4J-g0F","tag_name":"v0.1.0-alpha.12","target_commitish":"main","name":"v0.1.0-alpha.12","draft":false,"prerelease":true,"created_at":"2024-07-26T14:48:21Z","published_at":"2024-07-26T14:50:36Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.12","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.12","body":"## What's Changed\r\n* Set last_login_at only on login instead of every single action by @tonyvince in https://github.com/maybe-finance/maybe/pull/1017\r\n* Bump pagy with fix for breaking changes  by @tonyvince in https://github.com/maybe-finance/maybe/pull/1016\r\n* Fix form labels by @tonyvince in https://github.com/maybe-finance/maybe/pull/1004\r\n* Fix curency format by @JuliusMieliauskas in https://github.com/maybe-finance/maybe/pull/1020\r\n* Implement auto family syncs on login by @zachgoll in https://github.com/maybe-finance/maybe/pull/1021\r\n* Basic Portfolio Views by @zachgoll in https://github.com/maybe-finance/maybe/pull/1000\r\n* Fix currency formatting in pie chart visualization by @zachgoll in https://github.com/maybe-finance/maybe/pull/1022\r\n* Set minimum supported date for account entries by @zachgoll in https://github.com/maybe-finance/maybe/pull/1023\r\n\r\n## New Contributors\r\n* @JuliusMieliauskas made their first contribution in https://github.com/maybe-finance/maybe/pull/1020\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.11...v0.1.0-alpha.12","mentions_count":3},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/166296953","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/166296953/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/166296953/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.11","id":166296953,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","site_admin":false},"node_id":"RE_kwDOK_txHM4J6X15","tag_name":"v0.1.0-alpha.11","target_commitish":"main","name":"v0.1.0-alpha.11","draft":false,"prerelease":true,"created_at":"2024-07-19T20:09:05Z","published_at":"2024-07-19T20:09:38Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.11","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.11","body":"## What's Changed\r\n* Wrap account update in a transaction by @accessd in https://github.com/maybe-finance/maybe/pull/985\r\n* Allow CSV file upload in import flow by @tonyvince in https://github.com/maybe-finance/maybe/pull/986\r\n* Sanitize input for ilike in Account::Entry.search by @tonyvince in https://github.com/maybe-finance/maybe/pull/988\r\n* Investment Portfolio Sync by @zachgoll in https://github.com/maybe-finance/maybe/pull/974\r\n* More composable forms by @zachgoll in https://github.com/maybe-finance/maybe/pull/989\r\n* Add default currencies to forms based on preference by @zachgoll in https://github.com/maybe-finance/maybe/pull/994\r\n* Build sample portfolio deterministically by @zachgoll in https://github.com/maybe-finance/maybe/pull/993\r\n* Add currency validation to account, update demo data generator by @zachgoll in https://github.com/maybe-finance/maybe/pull/996\r\n* Sync notifications and troubleshooting guides by @zachgoll in https://github.com/maybe-finance/maybe/pull/998\r\n\r\n## New Contributors\r\n* @accessd made their first contribution in https://github.com/maybe-finance/maybe/pull/985\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.10...v0.1.0-alpha.11","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/166296953/reactions","total_count":14,"+1":0,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":0,"rocket":14,"eyes":0},"mentions_count":3},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/165263324","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/165263324/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/165263324/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.10","id":165263324,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","site_admin":false},"node_id":"RE_kwDOK_txHM4J2bfc","tag_name":"v0.1.0-alpha.10","target_commitish":"main","name":"v0.1.0-alpha.10","draft":false,"prerelease":true,"created_at":"2024-07-12T22:38:17Z","published_at":"2024-07-12T22:39:11Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.10","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.10","body":"## What's Changed\r\n* Add error handling for AccountsController#create by @tonyvince in https://github.com/maybe-finance/maybe/pull/957\r\n* fix: #951 pointer cursor and bg hover for import flow buttons by @MagnusHJensen in https://github.com/maybe-finance/maybe/pull/954\r\n* Handle missing exchange rate provider, allow fallback for missing rates by @zachgoll in https://github.com/maybe-finance/maybe/pull/955\r\n* Add missing migrations for good_job 4x by @tonyvince in https://github.com/maybe-finance/maybe/pull/967\r\n* Account::Sync model and test fixture simplifications by @zachgoll in https://github.com/maybe-finance/maybe/pull/968\r\n* Demo Family data updates by @zachgoll in https://github.com/maybe-finance/maybe/pull/972\r\n* Make balance editing easier by @zachgoll in https://github.com/maybe-finance/maybe/pull/976\r\n\r\n## New Contributors\r\n* @MagnusHJensen made their first contribution in https://github.com/maybe-finance/maybe/pull/954\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.9...v0.1.0-alpha.10","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/165263324/reactions","total_count":7,"+1":7,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":0,"rocket":0,"eyes":0},"mentions_count":3},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/164198848","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/164198848/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/164198848/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.9","id":164198848,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","site_admin":false},"node_id":"RE_kwDOK_txHM4JyXnA","tag_name":"v0.1.0-alpha.9","target_commitish":"main","name":"v0.1.0-alpha.9","draft":false,"prerelease":true,"created_at":"2024-07-05T18:16:41Z","published_at":"2024-07-05T18:17:22Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.9","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.9","body":"## What's Changed\r\n* Account::Entry Delegated Type (namespace updates part 7) by @zachgoll in https://github.com/maybe-finance/maybe/pull/923\r\n* Fix decimal display for euro currency by @zachgoll in https://github.com/maybe-finance/maybe/pull/937\r\n* Enable updating Account::Entry#amount by @tonyvince in https://github.com/maybe-finance/maybe/pull/942\r\n* Fix bug where transactions were duplicated in import confirm by @ljhurst in https://github.com/maybe-finance/maybe/pull/941\r\n* Enque account sync job after creating transfer by @tonyvince in https://github.com/maybe-finance/maybe/pull/946\r\n* Enable syncing all accounts in one click by @tonyvince in https://github.com/maybe-finance/maybe/pull/948\r\n* Update docker compose example with fixed storage volume by @zachgoll in https://github.com/maybe-finance/maybe/pull/950\r\n\r\n## New Contributors\r\n* @ljhurst made their first contribution in https://github.com/maybe-finance/maybe/pull/941\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.8...v0.1.0-alpha.9","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/164198848/reactions","total_count":9,"+1":9,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":0,"rocket":0,"eyes":0},"mentions_count":3},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/163065844","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/163065844/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/163065844/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.8","id":163065844,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","site_admin":false},"node_id":"RE_kwDOK_txHM4JuC_0","tag_name":"v0.1.0-alpha.8","target_commitish":"main","name":"v0.1.0-alpha.8","draft":false,"prerelease":true,"created_at":"2024-06-28T21:22:26Z","published_at":"2024-06-28T21:23:33Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.8","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.8","body":"## What's Changed\r\n* Unify primary button styles and change cursor on account group by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/905\r\n* Fix issue #861: Correct header selection logic in get_selected_header_for_field method by @igorcarvalhh in https://github.com/maybe-finance/maybe/pull/918\r\n* Fix #910 by @tonyvince in https://github.com/maybe-finance/maybe/pull/917\r\n* Account namespace updates: part 6 (transactions) by @zachgoll in https://github.com/maybe-finance/maybe/pull/904\r\n* improvement/#890/clean_up_toast_notification_styles_and_allow_user_to_close_on-demand by @evangelos-com in https://github.com/maybe-finance/maybe/pull/919\r\n* Fix #921 by @tonyvince in https://github.com/maybe-finance/maybe/pull/922\r\n\r\n## New Contributors\r\n* @igorcarvalhh made their first contribution in https://github.com/maybe-finance/maybe/pull/918\r\n* @evangelos-com made their first contribution in https://github.com/maybe-finance/maybe/pull/919\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.7...v0.1.0-alpha.8","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/163065844/reactions","total_count":11,"+1":8,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":1,"rocket":2,"eyes":0},"mentions_count":5},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/161742130","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/161742130/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/161742130/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.7","id":161742130,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","site_admin":false},"node_id":"RE_kwDOK_txHM4Jo_0y","tag_name":"v0.1.0-alpha.7","target_commitish":"main","name":"v0.1.0-alpha.7","draft":false,"prerelease":true,"created_at":"2024-06-21T21:04:59Z","published_at":"2024-06-21T21:08:04Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.7","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.7","body":"## What's Changed\r\n\r\nMaybe now supports transfer matching 🥳 🌮 \r\n\r\nThis significantly improves income and expense calculations by excluding transfers from the calculation:\r\n\r\nhttps://github.com/maybe-finance/maybe/assets/16676157/a1cde494-b89f-466a-8c74-da194934288a\r\n\r\n* Add merchant select when editing transaction by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/885\r\n* Transaction transfers, payments, and matching by @zachgoll in https://github.com/maybe-finance/maybe/pull/883\r\n* Ensure correct form's hidden input for selectedIds by @ziraqyoung in https://github.com/maybe-finance/maybe/pull/891\r\n* Account namespace updates: part 1 (accountable types) by @zachgoll in https://github.com/maybe-finance/maybe/pull/893\r\n* Account namespace updates: part 2 (categories) by @zachgoll in https://github.com/maybe-finance/maybe/pull/894\r\n* Account namespace updates: part 3 (merchants) by @zachgoll in https://github.com/maybe-finance/maybe/pull/895\r\n* Account namespace updates: part 4 (transfers, singular namespacing) by @zachgoll in https://github.com/maybe-finance/maybe/pull/896\r\n* Fix Bug: after editing an account history value, it requires 2 clicks to close the menu by @tonyvince in https://github.com/maybe-finance/maybe/pull/900\r\n* feat: Transaction pagination Improvements by @karankiri in https://github.com/maybe-finance/maybe/pull/873\r\n* Fix transfer note overflow style by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/902\r\n* Account namespace updates: part 5 (valuations) by @zachgoll in https://github.com/maybe-finance/maybe/pull/901\r\n* Allow transfers based on transactions in different currencies by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/903\r\n\r\n## New Contributors\r\n* @ziraqyoung made their first contribution in https://github.com/maybe-finance/maybe/pull/891\r\n* @tonyvince made their first contribution in https://github.com/maybe-finance/maybe/pull/900\r\n* @karankiri made their first contribution in https://github.com/maybe-finance/maybe/pull/873\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.6...v0.1.0-alpha.7","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/161742130/reactions","total_count":26,"+1":0,"-1":0,"laugh":0,"hooray":9,"confused":0,"heart":7,"rocket":9,"eyes":1},"mentions_count":5},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/160566471","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/160566471/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/160566471/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.6","id":160566471,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","site_admin":false},"node_id":"RE_kwDOK_txHM4JkgzH","tag_name":"v0.1.0-alpha.6","target_commitish":"main","name":"v0.1.0-alpha.6","draft":false,"prerelease":true,"created_at":"2024-06-14T20:50:08Z","published_at":"2024-06-14T21:01:04Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.6","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.6","body":"## What's Changed\r\n\r\nThis release comes with a complete overhaul of our Docker setup guide, better internal navigation, and the ability to group your accounts by financial institution!\r\n\r\nhttps://github.com/maybe-finance/maybe/assets/16676157/be4d1ce8-7055-4f71-9c3f-c9bbc9cb451c\r\n\r\n* Improve account internal linking and redirect behavior by @zachgoll in https://github.com/maybe-finance/maybe/pull/864\r\n* Allow for optional start date on account creation by @zachgoll in https://github.com/maybe-finance/maybe/pull/866\r\n* Add institution management and account editing controls by @zachgoll in https://github.com/maybe-finance/maybe/pull/868\r\n* New Docker Compose Self Hosting Guide + UI Fixes by @zachgoll in https://github.com/maybe-finance/maybe/pull/870\r\n* Simplify account sync logic by @zachgoll in https://github.com/maybe-finance/maybe/pull/871\r\n* Changelog page that pulls from Github Release notes by @mattia-malnis in https://github.com/maybe-finance/maybe/pull/867\r\n\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.5...v0.1.0-alpha.6","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/160566471/reactions","total_count":36,"+1":27,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":9,"rocket":0,"eyes":0},"mentions_count":2},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/159452244","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/159452244/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/159452244/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.5","id":159452244,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","site_admin":false},"node_id":"RE_kwDOK_txHM4JgQxU","tag_name":"v0.1.0-alpha.5","target_commitish":"main","name":"v0.1.0-alpha.5","draft":false,"prerelease":true,"created_at":"2024-06-07T23:29:01Z","published_at":"2024-06-07T23:34:11Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.5","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.5","body":"## What's Changed\r\n\r\nBulk transaction editing and deletion is here!  Check out the demo below:\r\n\r\nhttps://github.com/maybe-finance/maybe/assets/16676157/d8a3ae39-4931-4775-8c76-211d6dc96bf6\r\n\r\n* Add bulk selection UI controls by @zachgoll in https://github.com/maybe-finance/maybe/pull/840\r\n* Bulk transaction deletion by @zachgoll in https://github.com/maybe-finance/maybe/pull/845\r\n* Bulk editing of transactions by @zachgoll in https://github.com/maybe-finance/maybe/pull/846\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.4...v0.1.0-alpha.5","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/159452244/reactions","total_count":48,"+1":35,"-1":0,"laugh":0,"hooray":6,"confused":0,"heart":7,"rocket":0,"eyes":0},"mentions_count":1},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/158390671","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/158390671/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/158390671/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.4","id":158390671,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","site_admin":false},"node_id":"RE_kwDOK_txHM4JcNmP","tag_name":"v0.1.0-alpha.4","target_commitish":"main","name":"v0.1.0-alpha.4","draft":false,"prerelease":true,"created_at":"2024-05-31T18:09:12Z","published_at":"2024-05-31T18:10:31Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.4","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.4","body":"## What's Changed\r\n* fix: png file can be selected as profile images by @pea-sys in https://github.com/maybe-finance/maybe/pull/809\r\n* Validate transaction filtering params by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/810\r\n* Fix foreign account sync crash by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/794\r\n* Sort accounts in the sidebar by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/815\r\n* Reusable CI workflow for GH actions by @zachgoll in https://github.com/maybe-finance/maybe/pull/819\r\n* Transactions cleanup by @zachgoll in https://github.com/maybe-finance/maybe/pull/817\r\n* Sync account after transaction import by @zachgoll in https://github.com/maybe-finance/maybe/pull/820\r\n* Fix overflow error on account value inputs by @zachgoll in https://github.com/maybe-finance/maybe/pull/821\r\n\r\n## New Contributors\r\n* @pea-sys made their first contribution in https://github.com/maybe-finance/maybe/pull/809\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.3...v0.1.0-alpha.4","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/158390671/reactions","total_count":21,"+1":0,"-1":0,"laugh":0,"hooray":21,"confused":0,"heart":0,"rocket":0,"eyes":0},"mentions_count":3},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/157397091","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/157397091/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/157397091/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.3","id":157397091,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","site_admin":false},"node_id":"RE_kwDOK_txHM4JYbBj","tag_name":"v0.1.0-alpha.3","target_commitish":"main","name":"v0.1.0-alpha.3","draft":false,"prerelease":true,"created_at":"2024-05-24T18:24:03Z","published_at":"2024-05-24T18:25:37Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.3","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.3","body":"## What's Changed\r\n* Fix currency when importing to foreign accounts by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/762\r\n* Show an error notification if account cannot be manually synced by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/761\r\n* Add migration to make all existing users admins by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/770\r\n* Fix issue with start_date not being set in account creation by @scubamaggo in https://github.com/maybe-finance/maybe/pull/781\r\n* Fix import crash with empty transaction name by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/783\r\n* Move category dropdown menu content into a turbo frame by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/782\r\n* Ignore empty categories while importing by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/789\r\n* Fix duplicate category creation on import by @zachgoll in https://github.com/maybe-finance/maybe/pull/791\r\n* Create tagging system by @zachgoll in https://github.com/maybe-finance/maybe/pull/792\r\n* Add tag preview when importing and fix empty category bug by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/800\r\n\r\n## New Contributors\r\n* @scubamaggo made their first contribution in https://github.com/maybe-finance/maybe/pull/781\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.2...v0.1.0-alpha.3","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/157397091/reactions","total_count":31,"+1":0,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":5,"rocket":26,"eyes":0},"mentions_count":3},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/156342152","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/156342152/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/156342152/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.2","id":156342152,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","site_admin":false},"node_id":"RE_kwDOK_txHM4JUZeI","tag_name":"v0.1.0-alpha.2","target_commitish":"main","name":"v0.1.0-alpha.2","draft":false,"prerelease":true,"created_at":"2024-05-17T22:20:19Z","published_at":"2024-05-17T22:33:24Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.2","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.2","body":"Second alpha release of Maybe 🎉 🌮\r\n\r\n## New features\r\n\r\n- Self hosting with Docker 🐳 ([setup guide](https://github.com/maybe-finance/maybe/blob/main/docs/hosting/docker.md))\r\n- CSV transaction imports\r\n- Transaction management with merchants and categories\r\n- Fresh design of user settings\r\n- Re-designed dashboard + accounts summary\r\n- Admin accounts, ability to delete and purge data\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.1...v0.1.0-alpha.2","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/156342152/reactions","total_count":51,"+1":0,"-1":0,"laugh":0,"hooray":49,"confused":0,"heart":2,"rocket":0,"eyes":0}},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/151028123","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/151028123/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/151028123/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.1","id":151028123,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","site_admin":false},"node_id":"RE_kwDOK_txHM4JAIGb","tag_name":"v0.1.0-alpha.1","target_commitish":"main","name":"v0.1.0-alpha.1","draft":false,"prerelease":true,"created_at":"2024-04-13T13:28:45Z","published_at":"2024-04-13T13:49:03Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.1","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.1","body":"Initial alpha version of Maybe 🎉 🌮","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/151028123/reactions","total_count":165,"+1":50,"-1":0,"laugh":0,"hooray":46,"confused":0,"heart":35,"rocket":23,"eyes":11}}]
-  recorded_at: Mon, 09 Sep 2024 20:03:35 GMT
+        [{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/203102278","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/203102278/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/203102278/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.4.3","id":203102278,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4MGxhG","tag_name":"v0.4.3","target_commitish":"main","name":"v0.4.3","draft":false,"prerelease":false,"created_at":"2025-02-28T20:11:41Z","published_at":"2025-02-28T20:17:17Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.4.3","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.4.3","body":"## Data resets, offline investment trades, and miscellaneous stability improvements\r\n\r\nThis release comes with a wide mix of stability improvements and quality of life updates; particularly for self hosted apps, which can now be \"reset\" in user settings.  If your data looks wrong or you want a \"clean slate\" to work from, we've added the ability for you to easily perform these resets without writing SQL or manually deleting records.\r\n\r\nThis release also comes with a much clearer UI surrounding the Synth data provider.  New self hosted users will now see a prominent warning message if they have missing data as a result of a misconfigured or absent data provider.\r\n\r\n## What's Changed\r\n* Add new category flow by @syedbarimanjan in https://github.com/maybe-finance/maybe/pull/1857\r\n* Fix parent category sums in budget by @zachgoll in https://github.com/maybe-finance/maybe/pull/1894\r\n* Add breadcrumbs support across application by @Shpigford in https://github.com/maybe-finance/maybe/pull/1897\r\n* Dashboard design fixes by @zachgoll in https://github.com/maybe-finance/maybe/pull/1898\r\n* Allow account balance to dynamically use currency format on preference page by @Harry-kp in https://github.com/maybe-finance/maybe/pull/1910\r\n* Feat: Data \"reset\" button by @tonyvince in https://github.com/maybe-finance/maybe/pull/1913\r\n* Fix: Make Tags selection scrollable by @tonyvince in https://github.com/maybe-finance/maybe/pull/1921\r\n* Fix value wrapping on account balance in sidebar by @zachgoll in https://github.com/maybe-finance/maybe/pull/1922\r\n* Fix import configuration form so number format is applied by @zachgoll in https://github.com/maybe-finance/maybe/pull/1923\r\n* Add transitions to buttons and other common design system elements by @zachgoll in https://github.com/maybe-finance/maybe/pull/1924\r\n* Allow offline trade tickers by @zachgoll in https://github.com/maybe-finance/maybe/pull/1925\r\n* fix: Don't show Billings on settings navbar when self-hosted by @tonyvince in https://github.com/maybe-finance/maybe/pull/1912\r\n* Show UI warning to user when they need provider data but have not setup Synth yet by @zachgoll in https://github.com/maybe-finance/maybe/pull/1926\r\n* Invert liability graphs to have correct signage by @zachgoll in https://github.com/maybe-finance/maybe/pull/1928\r\n* Escape quotations in CSV imports properly by @zachgoll in https://github.com/maybe-finance/maybe/pull/1929\r\n\r\n## New Contributors\r\n* @syedbarimanjan made their first contribution in https://github.com/maybe-finance/maybe/pull/1857\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.4.2...v0.4.3","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/203102278/reactions","total_count":22,"+1":0,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":22,"rocket":0,"eyes":0},"mentions_count":5},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/201766292","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/201766292/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/201766292/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.4.1","id":201766292,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4MBrWU","tag_name":"v0.4.1","target_commitish":"main","name":"v0.4.1","draft":false,"prerelease":false,"created_at":"2025-02-21T19:19:50Z","published_at":"2025-02-21T19:20:43Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.4.1","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.4.1","body":"Patch release for git versioning info crash error","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/201766292/reactions","total_count":13,"+1":13,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":0,"rocket":0,"eyes":0}},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/201745085","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/201745085/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/201745085/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.4.0","id":201745085,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4MBmK9","tag_name":"v0.4.0","target_commitish":"main","name":"v0.4.0","draft":false,"prerelease":false,"created_at":"2025-02-21T17:39:49Z","published_at":"2025-02-21T17:44:25Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.4.0","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.4.0","body":"## Maybe Refresh 🎉 \r\n\r\nThis latest version comes with a **brand new and simplified UI** plus a ton of huge performance improvements on the transactions, dashboard, and accounts pages.\r\n\r\n![CleanShot 2025-02-21 at 12 39 12](https://github.com/user-attachments/assets/7c9d220c-4a13-4eef-9866-05a61310e2cf)\r\n\r\n## What's Changed\r\n\r\n* Fix account deletion cascade bug by @zachgoll in https://github.com/maybe-finance/maybe/pull/1644\r\n* Do not raise on Plaid item not found exceptions for item deletions by @zachgoll in https://github.com/maybe-finance/maybe/pull/1646\r\n* Align cascade delete behavior for transfers by @zachgoll in https://github.com/maybe-finance/maybe/pull/1647\r\n* fix: Only admins can generate invite codes by @tonyvince in https://github.com/maybe-finance/maybe/pull/1611\r\n* Only update account balance if changed by @zachgoll in https://github.com/maybe-finance/maybe/pull/1676\r\n* Adjust queues to prioritize account syncs, handle missing current day values by @zachgoll in https://github.com/maybe-finance/maybe/pull/1682\r\n* Added Decimal Support in min transaction by @Harry-kp in https://github.com/maybe-finance/maybe/pull/1681\r\n* Fix n+1 for categories in for to_donut_segments_json in budget by @tapalilov in https://github.com/maybe-finance/maybe/pull/1693\r\n* Add More Timelines by @nikhilbadyal in https://github.com/maybe-finance/maybe/pull/1714\r\n* Add cabin / cottage as a property type by @eithe in https://github.com/maybe-finance/maybe/pull/1658\r\n* Add RejectedTransfer model, simplify auto matching by @zachgoll in https://github.com/maybe-finance/maybe/pull/1690\r\n* Fix: Editing a category does not show notification until next page refresh by @jestinjoshi in https://github.com/maybe-finance/maybe/pull/1720\r\n* Bump to Ruby 3.4.1 by @zachgoll in https://github.com/maybe-finance/maybe/pull/1721\r\n* Lazy load synth logos by @zachgoll in https://github.com/maybe-finance/maybe/pull/1731\r\n* Only build armv7 on official releases by @zachgoll in https://github.com/maybe-finance/maybe/pull/1732\r\n* Don't allow a subcategory to be assigned to another subcategory to ensure 1 level of nesting max by @elvisserrao in https://github.com/maybe-finance/maybe/pull/1730\r\n* Preserve transaction filters and transaction focus across page visits by @zachgoll in https://github.com/maybe-finance/maybe/pull/1733\r\n* Add/remove members and invitations by @Shpigford in https://github.com/maybe-finance/maybe/pull/1744\r\n* Ensure Consistent Category Colors by @JLambertazzo in https://github.com/maybe-finance/maybe/pull/1722\r\n* Allow users to update their email address by @Shpigford in https://github.com/maybe-finance/maybe/pull/1745\r\n* Initial pass at Plaid EU by @Shpigford in https://github.com/maybe-finance/maybe/pull/1555\r\n* Fix EU plaid flow by @zachgoll in https://github.com/maybe-finance/maybe/pull/1761\r\n* Improve speed of transactions page by @zachgoll in https://github.com/maybe-finance/maybe/pull/1752\r\n* Fix: unable to add accounts without plain set up by @F2210 in https://github.com/maybe-finance/maybe/pull/1769\r\n* Fix: make date format year consistent overall #1712 by @scodes73 in https://github.com/maybe-finance/maybe/pull/1726\r\n* Cursor rules and project design overview by @zachgoll in https://github.com/maybe-finance/maybe/pull/1788\r\n* Fix crypto.randomUUID errors when adding holdings by @zachgoll in https://github.com/maybe-finance/maybe/pull/1795\r\n* Split family and Plaid item syncs into multiple jobs by @zachgoll in https://github.com/maybe-finance/maybe/pull/1799\r\n* Fix: Incorrect Currency Assignment for Stock Prices (#1623) by @saphp in https://github.com/maybe-finance/maybe/pull/1798\r\n* Fix budget allocation forms from resetting and clearing data on slow networks by @zachgoll in https://github.com/maybe-finance/maybe/pull/1804\r\n* Refactor transaction enrichment to support batch processing by @Shpigford in https://github.com/maybe-finance/maybe/pull/1803\r\n* Add scope to filter transactions from active accounts by @Shpigford in https://github.com/maybe-finance/maybe/pull/1810\r\n* fix: Save completely allocated budget by @M123-dev in https://github.com/maybe-finance/maybe/pull/1811\r\n* feat: Add institution details to Plaid items by @Shpigford in https://github.com/maybe-finance/maybe/pull/1816\r\n* Multi-factor authentication by @Shpigford in https://github.com/maybe-finance/maybe/pull/1817\r\n* fix: Plaid webhook verification by @zachgoll in https://github.com/maybe-finance/maybe/pull/1824\r\n* Plaid EU webhooks migration task by @zachgoll in https://github.com/maybe-finance/maybe/pull/1825\r\n* Fix Account Holding validation and synchronization by @Shpigford in https://github.com/maybe-finance/maybe/pull/1818\r\n* Feature: Add the ability to \"revert\" a CSV import by @zachgoll in https://github.com/maybe-finance/maybe/pull/1814\r\n* feat(import): add currency and number format support for CSV imports by @danestves in https://github.com/maybe-finance/maybe/pull/1819\r\n* fix: subcategories are not properly handled for budget allocations by @pauleke65 in https://github.com/maybe-finance/maybe/pull/1844\r\n* Enhance security information retrieval and handling by @Shpigford in https://github.com/maybe-finance/maybe/pull/1826\r\n* fix: Liabilities favorable direction is \"down\" by @M123-dev in https://github.com/maybe-finance/maybe/pull/1849\r\n* Upgrade to Tailwind v4 by @zachgoll in https://github.com/maybe-finance/maybe/pull/1853\r\n* Enhance Plaid connection management with re-authentication and error handling by @Shpigford in https://github.com/maybe-finance/maybe/pull/1854\r\n* Maybe Design System Updates by @zachgoll in https://github.com/maybe-finance/maybe/pull/1856\r\n* fix: Transfers should always total to zero by @tonyvince in https://github.com/maybe-finance/maybe/pull/1859\r\n* fix: Ghost subcategories when parent category is deleted by @tonyvince in https://github.com/maybe-finance/maybe/pull/1874\r\n* Fix import configuration failures by @zachgoll in https://github.com/maybe-finance/maybe/pull/1876\r\n* New Design System + Codebase Refresh by @zachgoll in https://github.com/maybe-finance/maybe/pull/1823\r\n\r\n## New Contributors\r\n* @JLambertazzo made their first contribution in https://github.com/maybe-finance/maybe/pull/1699\r\n* @tapalilov made their first contribution in https://github.com/maybe-finance/maybe/pull/1693\r\n* @eithe made their first contribution in https://github.com/maybe-finance/maybe/pull/1658\r\n* @elvisserrao made their first contribution in https://github.com/maybe-finance/maybe/pull/1730\r\n* @F2210 made their first contribution in https://github.com/maybe-finance/maybe/pull/1769\r\n* @scodes73 made their first contribution in https://github.com/maybe-finance/maybe/pull/1726\r\n* @saphp made their first contribution in https://github.com/maybe-finance/maybe/pull/1798\r\n* @M123-dev made their first contribution in https://github.com/maybe-finance/maybe/pull/1811\r\n* @danestves made their first contribution in https://github.com/maybe-finance/maybe/pull/1819\r\n* @pauleke65 made their first contribution in https://github.com/maybe-finance/maybe/pull/1844\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.3.0...v0.4.0","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/201745085/reactions","total_count":28,"+1":5,"-1":0,"laugh":0,"hooray":7,"confused":0,"heart":11,"rocket":5,"eyes":0},"mentions_count":16},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/195415177","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/195415177/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/195415177/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.3.0","id":195415177,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4LpcyJ","tag_name":"v0.3.0","target_commitish":"main","name":"v0.3.0","draft":false,"prerelease":false,"created_at":"2025-01-17T22:01:26Z","published_at":"2025-01-17T22:05:19Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.3.0","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.3.0","body":"## Budgeting is here!\r\n\r\nA long awaited feature, Maybe now supports budgeting!  We believe budgeting should be easy and simple.  Categorize your transactions, mark transfers, one-time expenses, and get a clear breakdown of where your money is going each month.\r\n\r\nhttps://github.com/user-attachments/assets/4dcf3f66-7b26-42e7-9c6b-48df7e19a798\r\n\r\n## What's Changed\r\n* Add account data enrichment by @zachgoll in https://github.com/maybe-finance/maybe/pull/1532\r\n* Handle nil name for entries by @zachgoll in https://github.com/maybe-finance/maybe/pull/1550\r\n* Fix date format validation error by @zachgoll in https://github.com/maybe-finance/maybe/pull/1551\r\n* Make transaction enrichment opt-in for all users by @zachgoll in https://github.com/maybe-finance/maybe/pull/1552\r\n* Preserve original transaction names when enriching by @zachgoll in https://github.com/maybe-finance/maybe/pull/1556\r\n* Preserve pagination on entry updates by @zachgoll in https://github.com/maybe-finance/maybe/pull/1563\r\n* Nested Categories by @zachgoll in https://github.com/maybe-finance/maybe/pull/1561\r\n* Save error backtrace for sync errors for better debugging by @tonyvince in https://github.com/maybe-finance/maybe/pull/1578\r\n* fix: Bug | creating duplicate category leads to crash screen by @tonyvince in https://github.com/maybe-finance/maybe/pull/1577\r\n* Fix unknown attribute 'parent_category' for Category in demo generator by @akabiru in https://github.com/maybe-finance/maybe/pull/1575\r\n* Fix: breaking change after bumping hotwire-livereload to 2.0.0 by @tonyvince in https://github.com/maybe-finance/maybe/pull/1589\r\n* Transfer and Payment auto-matching, model and UI improvements by @zachgoll in https://github.com/maybe-finance/maybe/pull/1585\r\n* Budgeting V1 by @zachgoll in https://github.com/maybe-finance/maybe/pull/1609\r\n* Fix transfer matching logic by @zachgoll in https://github.com/maybe-finance/maybe/pull/1625\r\n* Fix budget money formatting by @zachgoll in https://github.com/maybe-finance/maybe/pull/1626\r\n* Update snapshot_account_transactions to only give transactions by filtering on entryable_type by @Repsay in https://github.com/maybe-finance/maybe/pull/1629\r\n* FIX: correct display of percentages by @MrTob in https://github.com/maybe-finance/maybe/pull/1622\r\n\r\n## New Contributors\r\n* @akabiru made their first contribution in https://github.com/maybe-finance/maybe/pull/1575\r\n* @Repsay made their first contribution in https://github.com/maybe-finance/maybe/pull/1629\r\n* @MrTob made their first contribution in https://github.com/maybe-finance/maybe/pull/1622\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.2.0...v0.3.0","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/195415177/reactions","total_count":73,"+1":23,"-1":0,"laugh":0,"hooray":2,"confused":0,"heart":37,"rocket":11,"eyes":0},"mentions_count":5},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/190695442","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/190695442/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/190695442/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.2.0","id":190695442,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4LXcgS","tag_name":"v0.2.0","target_commitish":"main","name":"v0.2.0","draft":false,"prerelease":false,"created_at":"2024-12-13T17:16:21Z","published_at":"2024-12-13T18:19:27Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.2.0","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.2.0","body":"## Plaid Integration + Multi-currency Investment Portfolio Support\r\n\r\nWe have completed the first pass at our fully automated bank syncing with Plaid on our _hosted version_ of the app!\r\n\r\nAutomated bank syncing is a huge milestone for the app and includes many UI improvements, accuracy improvements, and bug fixes:\r\n\r\n- Editing transactions is now much smoother\r\n- Account history can be calculated chronologically and reverse-chronologically (required for Plaid accounts)\r\n- Multi-currency investment accounts are now available\r\n- Investment accounts now properly calculate \"brokerage cash\" vs. \"holdings value\" and break this out clearly in the view\r\n- Investment accounts calculate cost basis more accurately\r\n\r\n![CleanShot 2024-12-13 at 12 31 03](https://github.com/user-attachments/assets/1fdbab79-7bc5-4631-80b4-a708df1783fd)\r\n\r\n### Can I self-host Plaid?\r\n\r\nAs an open-source project, self-hosters are more than welcome to configure (and pay for) their own Plaid accounts.  You can see the `.env.example` file for the required api keys that need to be provided to the app.\r\n\r\nThat said, due to the complexity around OAuth, Plaid's pricing structure, and costs associated with a personal Plaid subscription, we will not be officially supporting this setup.  The hosted version of our app has full Plaid support and is our recommended way to get access to automated bank syncing (more invites coming soon!).\r\n\r\n## What's Changed\r\n\r\n* Fix registration fails silently when there are errors by @tonyvince in https://github.com/maybe-finance/maybe/pull/1455\r\n* Adds a common DE date format by @sbehrends in https://github.com/maybe-finance/maybe/pull/1445\r\n* Basic Plaid Integration by @zachgoll in https://github.com/maybe-finance/maybe/pull/1433\r\n* Make encryption config optional for self hosting users by @zachgoll in https://github.com/maybe-finance/maybe/pull/1476\r\n* Allow custom column separator for CSV parsing in uploads controller by @acflint in https://github.com/maybe-finance/maybe/pull/1470\r\n* Fix transfers and form currencies by @zachgoll in https://github.com/maybe-finance/maybe/pull/1477\r\n* Don't refresh page when transaction details are edited by @zachgoll in https://github.com/maybe-finance/maybe/pull/1479\r\n* Add post-sync UI stream updates by @zachgoll in https://github.com/maybe-finance/maybe/pull/1482\r\n* Calculates trend based on previous transaction's balance on the same date by @nicogaldamez in https://github.com/maybe-finance/maybe/pull/1483\r\n* Replaced Native Scrollbars with Tailwind Scrollbars on Windows by @jestinjoshi in https://github.com/maybe-finance/maybe/pull/1493\r\n* Fix bug: Loan % doesn't allow exact rate by @arsenstorm in https://github.com/maybe-finance/maybe/pull/1492\r\n* Fix Account Disabling UI by @arsenstorm in https://github.com/maybe-finance/maybe/pull/1491\r\n* Feature: Add support for customized synth URL from env variable by @Evlos in https://github.com/maybe-finance/maybe/pull/1490\r\n* Synth error handling by @Shpigford in https://github.com/maybe-finance/maybe/pull/1502\r\n* Updated usage check threshold to 100pc instead of 1 by @nikhilbadyal in https://github.com/maybe-finance/maybe/pull/1504\r\n* Improve account transaction, trade, and valuation editing and sync experience by @zachgoll in https://github.com/maybe-finance/maybe/pull/1506\r\n* Handle invalid API key by @nikhilbadyal in https://github.com/maybe-finance/maybe/pull/1515\r\n* Plaid portfolio sync algorithm and calculation improvements by @zachgoll in https://github.com/maybe-finance/maybe/pull/1526\r\n* Plaid sync tests and multi-currency investment support by @zachgoll in https://github.com/maybe-finance/maybe/pull/1531\r\n\r\n## New Contributors\r\n\r\n* @sbehrends made their first contribution in https://github.com/maybe-finance/maybe/pull/1445\r\n* @acflint made their first contribution in https://github.com/maybe-finance/maybe/pull/1470\r\n* @Evlos made their first contribution in https://github.com/maybe-finance/maybe/pull/1490\r\n* @nikhilbadyal made their first contribution in https://github.com/maybe-finance/maybe/pull/1504\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0...v0.2.0","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/190695442/reactions","total_count":34,"+1":14,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":4,"rocket":16,"eyes":0},"mentions_count":10},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/184439478","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/184439478/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/184439478/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.2.0-alpha.2","id":184439478,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4K_lK2","tag_name":"v0.2.0-alpha.2","target_commitish":"main","name":"v0.2.0-alpha.2","draft":false,"prerelease":true,"created_at":"2024-11-08T19:55:56Z","published_at":"2024-11-08T20:03:02Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.2.0-alpha.2","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.2.0-alpha.2","body":"## Activity View \r\n\r\nAlongside several bug fixes, this pre-release comes with a brand new \"Activity View\" based on tons of user feedback.  This new activity view allows you to see the chronological updates of each account all in one place.  In addition, it should how each transaction and balance update affects the overall historical balance on the account.  You can see it in action below:\r\n\r\nhttps://github.com/user-attachments/assets/2ef7e691-a2fe-4dc6-b8bb-0896b9634258\r\n\r\n## What's Changed\r\n\r\n* Remove dependency on stock exchange table by @Shpigford in https://github.com/maybe-finance/maybe/pull/1368\r\n* fix bulk action bar positioning by @gariasf in https://github.com/maybe-finance/maybe/pull/1370\r\n* Stock filter by @Shpigford in https://github.com/maybe-finance/maybe/pull/1376\r\n* Remove missing prices issue by @zachgoll in https://github.com/maybe-finance/maybe/pull/1390\r\n* First pass at security price reference by @Shpigford in https://github.com/maybe-finance/maybe/pull/1388\r\n* Initial pass at Synth-based ticker selection by @Shpigford in https://github.com/maybe-finance/maybe/pull/1392\r\n* Groundwork for security info by @Shpigford in https://github.com/maybe-finance/maybe/pull/1396\r\n* Adds condition to skip link to transaction form if it's not editable by @nicogaldamez in https://github.com/maybe-finance/maybe/pull/1394\r\n* Do not include income transactions in liability accounts for savings rate by @tonyvince in https://github.com/maybe-finance/maybe/pull/1385\r\n* Auto naming of Transfer Transaction by @Harry-kp in https://github.com/maybe-finance/maybe/pull/1393\r\n* Family invites by @Shpigford in https://github.com/maybe-finance/maybe/pull/1397\r\n* En translation fix by @alekseyp in https://github.com/maybe-finance/maybe/pull/1401\r\n* Account Activity View + Account Forms by @zachgoll in https://github.com/maybe-finance/maybe/pull/1406\r\n* Fix account names are not truncated properly by @tonyvince in https://github.com/maybe-finance/maybe/pull/1431\r\n* Exclude inactive accounts from net-worth calculation and from sidebar by @tonyvince in https://github.com/maybe-finance/maybe/pull/1432\r\n* Fix timeframe dropdown next to Portfolio by @tonyvince in https://github.com/maybe-finance/maybe/pull/1434\r\n* Skip account valuation on entry balance_after_entry by @bruno-costanzo in https://github.com/maybe-finance/maybe/pull/1435\r\n* Fix duplicate invites by @tonyvince in https://github.com/maybe-finance/maybe/pull/1437\r\n\r\n## New Contributors\r\n* @alekseyp made their first contribution in https://github.com/maybe-finance/maybe/pull/1401\r\n* @3zcurdia made their first contribution in https://github.com/maybe-finance/maybe/pull/1402\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.2.0-alpha.1...v0.2.0-alpha.2","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/184439478/reactions","total_count":23,"+1":5,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":0,"rocket":18,"eyes":0},"mentions_count":9},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/181945744","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/181945744/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/181945744/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.2.0-alpha.1","id":181945744,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4K2EWQ","tag_name":"v0.2.0-alpha.1","target_commitish":"main","name":"v0.2.0-alpha.1","draft":false,"prerelease":true,"created_at":"2024-10-25T13:37:50Z","published_at":"2024-10-25T13:50:52Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.2.0-alpha.1","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.2.0-alpha.1","body":"## Improved Account Flows + Onboarding\r\n\r\nWith this release, we kick off work towards `v0.2.0`, which will add a basic bank provider integration (Plaid)!\r\n\r\nIn this release, we've added onboarding to the app so that users can select all of their preferences along with much simpler and intuitive account addition flows.\r\n\r\nHere's a quick demo of how easy it is to get started with Maybe!\r\n\r\nhttps://github.com/user-attachments/assets/dfdd88cb-23f4-40b8-b487-d97add9617fa\r\n\r\n## What's Changed\r\n* Add period to value delete modal by @ahatzz11 in https://github.com/maybe-finance/maybe/pull/1297\r\n* Add BiomeJS for Linting and Formatting JavaScript relates to #1295 by @oxdev03 in https://github.com/maybe-finance/maybe/pull/1299\r\n* Accounts in sidebar should be ordered the same as in the accounts summary page by @tonyvince in https://github.com/maybe-finance/maybe/pull/1318\r\n* add dashboard account pill tooltips by @gariasf in https://github.com/maybe-finance/maybe/pull/1315\r\n* Redirect upload step by @enderahmetyurt in https://github.com/maybe-finance/maybe/pull/1323\r\n* Impersonation by @Shpigford in https://github.com/maybe-finance/maybe/pull/1325\r\n* Rework account views and addition flow by @zachgoll in https://github.com/maybe-finance/maybe/pull/1324\r\n* Basic account onboarding by @zachgoll in https://github.com/maybe-finance/maybe/pull/1328\r\n* Fixes issue with mapping values during the transactions import by @nicogaldamez in https://github.com/maybe-finance/maybe/pull/1327\r\n* Stock Exchanges with seed by @Shpigford in https://github.com/maybe-finance/maybe/pull/1351\r\n* User Onboarding + Bug Fixes by @zachgoll in https://github.com/maybe-finance/maybe/pull/1352\r\n* Beta Testing Round 3 Bug Fixes by @zachgoll in https://github.com/maybe-finance/maybe/pull/1357\r\n* Add good job dashboard with auth by @zachgoll in https://github.com/maybe-finance/maybe/pull/1364\r\n* Stock imports by @Shpigford in https://github.com/maybe-finance/maybe/pull/1363\r\n* Feature | Filter on uncategorized transactions by @bruno-costanzo in https://github.com/maybe-finance/maybe/pull/1359\r\n\r\n## New Contributors\r\n* @oxdev03 made their first contribution in https://github.com/maybe-finance/maybe/pull/1299\r\n* @enderahmetyurt made their first contribution in https://github.com/maybe-finance/maybe/pull/1323\r\n* @nicogaldamez made their first contribution in https://github.com/maybe-finance/maybe/pull/1327\r\n* @bruno-costanzo made their first contribution in https://github.com/maybe-finance/maybe/pull/1359\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0...v0.2.0-alpha.1","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/181945744/reactions","total_count":32,"+1":9,"-1":0,"laugh":0,"hooray":17,"confused":0,"heart":6,"rocket":0,"eyes":0},"mentions_count":9},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/179581598","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/179581598/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/179581598/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0","id":179581598,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4KtDKe","tag_name":"v0.1.0","target_commitish":"main","name":"v0.1.0","draft":false,"prerelease":false,"created_at":"2024-10-11T17:15:46Z","published_at":"2024-10-11T17:52:07Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0","body":"## We're live! 🌮 🥳 \r\n\r\n![the-office-the](https://github.com/user-attachments/assets/28a3e1e1-027b-4f94-abd3-89d34c76d05b)\r\n\r\nAfter hundreds of contributors and hundreds of thousands of lines of code, `v0.1.0` is here!\r\n\r\nThis release comes with a TON of bug fixes and marks the launch of \"hosted\" Maybe.  We've still got a _ton_ of work ahead, but we're excited to release our first production-ready version of Maybe.\r\n\r\nWe're currently in a private, invite-only alpha.  Be sure to [join our Discord](https://link.maybe.co/discord) for announcements when new spots become available!\r\n\r\nIn this first version, you can:\r\n\r\n- Add all of your accounts\r\n- Import accounts, transactions, and trades by CSV\r\n- See your net worth, total spending, and total income\r\n- Manage transactions (categories, tags, notes)\r\n- Manage investment portfolios (buys, sells, deposits, withdrawals)\r\n\r\nAfter we incorporate all the feedback coming in, our hosted app will be introducing automated bank syncing!\r\n\r\n## What's Changed\r\n\r\n* Hide currency for transfers by @zachgoll in https://github.com/maybe-finance/maybe/pull/1260\r\n* Hide infinity trend percentage changes by @zachgoll in https://github.com/maybe-finance/maybe/pull/1261\r\n* Finalize other assets and liabilities view by @zachgoll in https://github.com/maybe-finance/maybe/pull/1264\r\n* Intercom integration by @Shpigford in https://github.com/maybe-finance/maybe/pull/1267\r\n* Add empty states to account summary page by @zachgoll in https://github.com/maybe-finance/maybe/pull/1265\r\n* Billing by @Shpigford in https://github.com/maybe-finance/maybe/pull/1269\r\n* Add loan and credit card views by @zachgoll in https://github.com/maybe-finance/maybe/pull/1268\r\n* Set 3000 as the default web port by @alagos in https://github.com/maybe-finance/maybe/pull/1215\r\n* Fix account pill on dashboard by @zachgoll in https://github.com/maybe-finance/maybe/pull/1270\r\n* Early access by @Shpigford in https://github.com/maybe-finance/maybe/pull/1272\r\n* Basic trade and holdings view by @zachgoll in https://github.com/maybe-finance/maybe/pull/1271\r\n* Link to CSV imports by @zachgoll in https://github.com/maybe-finance/maybe/pull/1273\r\n* Bug fixes for specialized account pages by @zachgoll in https://github.com/maybe-finance/maybe/pull/1275\r\n* Fix currency formatting for 0 values by @zachgoll in https://github.com/maybe-finance/maybe/pull/1276\r\n* Fix group trend color by @zachgoll in https://github.com/maybe-finance/maybe/pull/1277\r\n* fix: use correct delimiter on credit card zero values by @gariasf in https://github.com/maybe-finance/maybe/pull/1280\r\n* fix: amend inputs on loan, c.c., vehicle, and property partials by @gariasf in https://github.com/maybe-finance/maybe/pull/1281\r\n* Better import instructions, remove ambiguous field by @zachgoll in https://github.com/maybe-finance/maybe/pull/1284\r\n* Allow inline account creation when importing CSV by @zachgoll in https://github.com/maybe-finance/maybe/pull/1291\r\n* Minor improvements to categories & changelog pages by @arsenstorm in https://github.com/maybe-finance/maybe/pull/1274\r\n* Handle market holidays during holding sync by @zachgoll in https://github.com/maybe-finance/maybe/pull/1292\r\n* fix: default value if user's name isn't set by @ajmeese7 in https://github.com/maybe-finance/maybe/pull/1262\r\n* Add additional subtypes, add None option, prefill edit with previously selected option. by @ahatzz11 in https://github.com/maybe-finance/maybe/pull/1286\r\n\r\n## New Contributors\r\n* @gariasf made their first contribution in https://github.com/maybe-finance/maybe/pull/1280\r\n* @arsenstorm made their first contribution in https://github.com/maybe-finance/maybe/pull/1274\r\n* @ajmeese7 made their first contribution in https://github.com/maybe-finance/maybe/pull/1262\r\n* @ahatzz11 made their first contribution in https://github.com/maybe-finance/maybe/pull/1286\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.18...v0.1.0","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/179581598/reactions","total_count":139,"+1":8,"-1":0,"laugh":0,"hooray":86,"confused":0,"heart":22,"rocket":23,"eyes":0},"mentions_count":7},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/178469489","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/178469489/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/178469489/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.18","id":178469489,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4Kozpx","tag_name":"v0.1.0-alpha.18","target_commitish":"main","name":"v0.1.0-alpha.18","draft":false,"prerelease":true,"created_at":"2024-10-04T19:09:58Z","published_at":"2024-10-04T19:14:19Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.18","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.18","body":"## CSV Imports\r\n\r\nWe've made some big updates for the CSV imports feature 🌮 🎉 \r\n\r\n**You can now import transactions, trades, accounts, and even an old Mint export!**\r\n\r\nHere's a quick demo that shows how it all works: \r\n\r\nhttps://github.com/user-attachments/assets/e2eff55a-3c3d-4e42-8e4a-a966441dc9dc\r\n\r\nIn addition to the CSV imports, we have several app stability fixes and improvements such as:\r\n\r\n- `EUR` currencies and dates are now formatted correctly based on user locale\r\n- The transactions page now has a completed list of filters so you can find your transactions easier\r\n\r\n## What's Changed\r\n\r\n* Fix styles on import modal by @zachgoll in https://github.com/maybe-finance/maybe/pull/1188\r\n* Add error handling for vehicle and property account creation by @tonyvince in https://github.com/maybe-finance/maybe/pull/1179\r\n* Finish remaining transaction filters by @zachgoll in https://github.com/maybe-finance/maybe/pull/1189\r\n* Finalize transaction drawer, simplify money form helpers by @zachgoll in https://github.com/maybe-finance/maybe/pull/1191\r\n* Finalize profile settings page for v0.2.0-alpha by @zachgoll in https://github.com/maybe-finance/maybe/pull/1194\r\n* Fix: Escape button not being handled on settings pages by @jestinjoshi in https://github.com/maybe-finance/maybe/pull/1210\r\n* CSV Imports Overhaul (Transactions, Trades, Accounts, and Mint import support) by @zachgoll in https://github.com/maybe-finance/maybe/pull/1209\r\n* Sort currencies by name as a second order by @alagos in https://github.com/maybe-finance/maybe/pull/1216\r\n* Fix incorrect partial sync balance generation by @zachgoll in https://github.com/maybe-finance/maybe/pull/1223\r\n* Fix import migration by @zachgoll in https://github.com/maybe-finance/maybe/pull/1227\r\n* Add Synth provider to self host setting page by @zachgoll in https://github.com/maybe-finance/maybe/pull/1230\r\n* Allow users to set preferred locale in settings and provide basic date and time localization support by @zachgoll in https://github.com/maybe-finance/maybe/pull/1226\r\n* Add formatting for EUR locales by @zachgoll in https://github.com/maybe-finance/maybe/pull/1231\r\n* Use DB for auth sessions by @zachgoll in https://github.com/maybe-finance/maybe/pull/1233\r\n* Fix signage on transaction imports by @zachgoll in https://github.com/maybe-finance/maybe/pull/1236\r\n* Add tag filtering by @zachgoll in https://github.com/maybe-finance/maybe/pull/1240\r\n* Handle missing weekend stock prices in sync process by @zachgoll in https://github.com/maybe-finance/maybe/pull/1242\r\n\r\n## New Contributors\r\n* @alagos made their first contribution in https://github.com/maybe-finance/maybe/pull/1216\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.17...v0.1.0-alpha.18","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/178469489/reactions","total_count":31,"+1":0,"-1":0,"laugh":0,"hooray":20,"confused":0,"heart":4,"rocket":7,"eyes":0},"mentions_count":4},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/175041558","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/175041558/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/175041558/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.17","id":175041558,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4KbuwW","tag_name":"v0.1.0-alpha.17","target_commitish":"main","name":"v0.1.0-alpha.17","draft":false,"prerelease":true,"created_at":"2024-09-13T21:24:46Z","published_at":"2024-09-13T21:28:46Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.17","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.17","body":"## Self Hosted Maybe Instances can now block new registrations\r\n\r\nThis release comes with tons of little UI improvements, bug fixes, and most importantly, the ability to block user registrations on your self hosted Maybe instance! 🎉 \r\n\r\nBig S/O to @tonyvince for getting this implemented.  Here's a quick demo of how you can block signups to your instance with invite codes:\r\n\r\nhttps://github.com/user-attachments/assets/e4da9fdd-a76f-4ed0-8430-b86e71dbf320\r\n\r\n## What's Changed\r\n* Fix unable to create Deposit entries in investment portfolio by @tonyvince in https://github.com/maybe-finance/maybe/pull/1125\r\n* Fix account sync when prices missing by @tonyvince in https://github.com/maybe-finance/maybe/pull/1127\r\n* Fix account transaction form resetting amount to 0 by @zachgoll in https://github.com/maybe-finance/maybe/pull/1133\r\n* Fix merchants color picker by @zachgoll in https://github.com/maybe-finance/maybe/pull/1134\r\n* Categories, tags, merchants, and menus improvements by @zachgoll in https://github.com/maybe-finance/maybe/pull/1135\r\n* Remove unused settings temporarily by @zachgoll in https://github.com/maybe-finance/maybe/pull/1136\r\n* Feedback page by @zachgoll in https://github.com/maybe-finance/maybe/pull/1160\r\n* Fix valuation frame issue by @zachgoll in https://github.com/maybe-finance/maybe/pull/1162\r\n* Consolidate transaction menu items by @zachgoll in https://github.com/maybe-finance/maybe/pull/1164\r\n* Update empty account states on dashboard by @zachgoll in https://github.com/maybe-finance/maybe/pull/1166\r\n* Fix: When transaction drawer closed, turbo frame renders below main content by @jestinjoshi in https://github.com/maybe-finance/maybe/pull/1167\r\n* Add setting to disable new user registration on self-hosted instances by @tonyvince in https://github.com/maybe-finance/maybe/pull/1163\r\n* Fix guide text from \"register\" to \"create an account\" by @vallezw in https://github.com/maybe-finance/maybe/pull/1168\r\n* Add sync status and errors to account settings page by @zachgoll in https://github.com/maybe-finance/maybe/pull/1169\r\n* Fix missing sync_all_button partial by @tonyvince in https://github.com/maybe-finance/maybe/pull/1172\r\n* Omit trend if zero in sidebar by @zachgoll in https://github.com/maybe-finance/maybe/pull/1173\r\n* Support multi-currency transfers by @zachgoll in https://github.com/maybe-finance/maybe/pull/1175\r\n* Allow partial investment quantities by @zachgoll in https://github.com/maybe-finance/maybe/pull/1174\r\n* Transaction page design fixes by @zachgoll in https://github.com/maybe-finance/maybe/pull/1176\r\n* Add basic self hosted onboarding by @zachgoll in https://github.com/maybe-finance/maybe/pull/1177\r\n\r\n## New Contributors\r\n* @jestinjoshi made their first contribution in https://github.com/maybe-finance/maybe/pull/1167\r\n* @vallezw made their first contribution in https://github.com/maybe-finance/maybe/pull/1168\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.16...v0.1.0-alpha.17","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/175041558/reactions","total_count":29,"+1":6,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":7,"rocket":13,"eyes":3},"mentions_count":4},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/171684870","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/171684870/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/171684870/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.16","id":171684870,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4KO7QG","tag_name":"v0.1.0-alpha.16","target_commitish":"main","name":"v0.1.0-alpha.16","draft":false,"prerelease":true,"created_at":"2024-08-23T14:39:14Z","published_at":"2024-08-23T14:44:15Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.16","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.16","body":"This week's release comes with a variety of bug fixes and improvements to the UI.\r\n\r\nAdditionally, users can now input details for their property and vehicle accounts as shown in the video below.  In the near future, Maybe will support data providers related to the \"valuation\" of properties and vehicles (i.e. Zillow, KBB).  We will use the information from user accounts to automatically fetch estimated market values for these assets which will then be added periodically as \"Valuations\" in the value tab of each account.  This will then show up in the history graph for the account balance.\r\n\r\nhttps://github.com/user-attachments/assets/fd759c82-a25c-4c8d-8f16-f577e0410fb5\r\n\r\n## What's Changed\r\n\r\n* Refactor: Allow other import files by @pedrocarmona in https://github.com/maybe-finance/maybe/pull/1099\r\n* Bump sentry-ruby from 5.18.2 to 5.19.0 by @dependabot in https://github.com/maybe-finance/maybe/pull/1108\r\n* Bump stimulus-rails from 1.3.3 to 1.3.4 by @dependabot in https://github.com/maybe-finance/maybe/pull/1106\r\n* Bump aws-sdk-s3 from 1.157.0 to 1.158.0 by @dependabot in https://github.com/maybe-finance/maybe/pull/1105\r\n* Bump ruby-lsp-rails from 0.3.12 to 0.3.13 by @dependabot in https://github.com/maybe-finance/maybe/pull/1107\r\n* Bump propshaft from 0.9.0 to 0.9.1 by @dependabot in https://github.com/maybe-finance/maybe/pull/1104\r\n* Bump good_job from 4.1.1 to 4.2.0 by @dependabot in https://github.com/maybe-finance/maybe/pull/1102\r\n* Bump tailwindcss-rails from 2.7.2 to 2.7.3 by @dependabot in https://github.com/maybe-finance/maybe/pull/1103\r\n* Fix query when account has zero income and expense by @zachgoll in https://github.com/maybe-finance/maybe/pull/1112\r\n* Fix holding name error by @zachgoll in https://github.com/maybe-finance/maybe/pull/1113\r\n* Add Property Details View by @zachgoll in https://github.com/maybe-finance/maybe/pull/1116\r\n* Basic Vehicle View by @zachgoll in https://github.com/maybe-finance/maybe/pull/1117\r\n* Rubocop updates by @zachgoll in https://github.com/maybe-finance/maybe/pull/1118\r\n* Fix file upload UI opening twice by @zachgoll in https://github.com/maybe-finance/maybe/pull/1119\r\n\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.15...v0.1.0-alpha.16","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/171684870/reactions","total_count":23,"+1":10,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":0,"rocket":10,"eyes":3},"mentions_count":3},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/170655924","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/170655924/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/170655924/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.15","id":170655924,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4KLAC0","tag_name":"v0.1.0-alpha.15","target_commitish":"main","name":"v0.1.0-alpha.15","draft":false,"prerelease":true,"created_at":"2024-08-16T20:09:37Z","published_at":"2024-08-16T20:18:22Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.15","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.15","body":"This week, we released the first version of an issue tracking system directly within the Maybe app!\r\n\r\nWhy?\r\n\r\nAs an open-source personal finance app, Maybe has a much larger \"self service\" component than most applications.  While we're in the early days, the goal is to support a global user base, which means we have to support _a lot_ of data providers.\r\n\r\nEach data provider comes with its own set of nuances and errors that can be challenging to debug; especially for our small team that doesn't have access to your self hosted configuration.  When things go wrong, there are a handful of possible causes.\r\n\r\nIn order to combat this, the `v0.1.0-alpha.15` release introduces a \"self resolution\" issue tracking system.  The video below demonstrates how a user who has incorrectly configured their exchange rates provider can **identify, diagnose, and fix the issue all within the Maybe app**:\r\n\r\nhttps://github.com/user-attachments/assets/7cc98c79-9b72-4260-bc17-907bc33b1390\r\n\r\n## What's Changed\r\n* Deposit, Withdrawal, and Interest Transactions for Investment View by @zachgoll in https://github.com/maybe-finance/maybe/pull/1075\r\n* Bump tailwindcss-rails from 2.6.5 to 2.7.2 by @dependabot in https://github.com/maybe-finance/maybe/pull/1078\r\n* Bump bootsnap from 1.18.3 to 1.18.4 by @dependabot in https://github.com/maybe-finance/maybe/pull/1079\r\n* Bump ruby-lsp-rails from 0.3.11 to 0.3.12 by @dependabot in https://github.com/maybe-finance/maybe/pull/1081\r\n* Refactor: Use native error i18n lookup by @pedrocarmona in https://github.com/maybe-finance/maybe/pull/1076\r\n* Bump rails from `43530b4` to `f6d62b5` by @dependabot in https://github.com/maybe-finance/maybe/pull/1083\r\n* Fix: i18n symbol typo by @pedrocarmona in https://github.com/maybe-finance/maybe/pull/1085\r\n* Bump ruby from 3.3.1 to 3.3.4 by @Cluster444 in https://github.com/maybe-finance/maybe/pull/1084\r\n* Fix for invalid accountable data by @zachgoll in https://github.com/maybe-finance/maybe/pull/1086\r\n* add pagination to account transactions list by @code-constructor in https://github.com/maybe-finance/maybe/pull/1095\r\n* Account Issue Model and Resolution Flow + Troubleshooting guides by @zachgoll in https://github.com/maybe-finance/maybe/pull/1090\r\n* Add support for different column separator in csv import logic by @code-constructor in https://github.com/maybe-finance/maybe/pull/1096\r\n* Improved UI warning states for holdings with missing data by @zachgoll in https://github.com/maybe-finance/maybe/pull/1098\r\n\r\n## New Contributors\r\n* @pedrocarmona made their first contribution in https://github.com/maybe-finance/maybe/pull/1076\r\n* @Cluster444 made their first contribution in https://github.com/maybe-finance/maybe/pull/1084\r\n* @code-constructor made their first contribution in https://github.com/maybe-finance/maybe/pull/1095\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.14...v0.1.0-alpha.15","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/170655924/reactions","total_count":11,"+1":11,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":0,"rocket":0,"eyes":0},"mentions_count":5},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/169591029","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/169591029/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/169591029/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.14","id":169591029,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4KG8D1","tag_name":"v0.1.0-alpha.14","target_commitish":"main","name":"v0.1.0-alpha.14","draft":false,"prerelease":true,"created_at":"2024-08-09T21:42:48Z","published_at":"2024-08-09T21:49:20Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.14","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.14","body":"Basic investment portfolios are here! 🥳 \r\n\r\nWhile we're still in the very early days for investment accounts, this week capped off some really important additions to the investment account page view.\r\n\r\nUsers can now:\r\n\r\n- See a breakdown of their cash + holdings balance in a tooltip\r\n- Add buy/sell investment trades that will automatically sync and rebuild their portfolio and historical graph\r\n\r\nMoving forward, we'll be refining and adding to the investment portfolio feature and complementing it with troubleshooting guides so you know exactly what's causing any discrepancies between Maybe's calculations and your brokerage's calculations.\r\n\r\nhttps://github.com/user-attachments/assets/f4c8bc65-31f6-4627-b4e7-477d0687c570\r\n\r\n## What's Changed\r\n\r\n* Bump tailwindcss-rails from 2.6.4 to 2.6.5 by @dependabot in https://github.com/maybe-finance/maybe/pull/1058\r\n* Bump faraday from 2.10.0 to 2.10.1 by @dependabot in https://github.com/maybe-finance/maybe/pull/1055\r\n* Bump erb_lint from 0.5.0 to 0.6.0 by @dependabot in https://github.com/maybe-finance/maybe/pull/1057\r\n* Bump aws-sdk-s3 from 1.156.0 to 1.157.0 by @dependabot in https://github.com/maybe-finance/maybe/pull/1054\r\n* Bump good_job from 4.1.0 to 4.1.1 by @dependabot in https://github.com/maybe-finance/maybe/pull/1053\r\n* Bump pagy from 9.0.3 to 9.0.5 by @dependabot in https://github.com/maybe-finance/maybe/pull/1056\r\n* Bump rails from `5cb5cad` to `43530b4` by @dependabot in https://github.com/maybe-finance/maybe/pull/1059\r\n* Add source headers to Synth calls by @zachgoll in https://github.com/maybe-finance/maybe/pull/1062\r\n* Add stimulus tooltip controller by @tonyvince in https://github.com/maybe-finance/maybe/pull/1065\r\n* Fetch exchange rates in bulk from synth by @tonyvince in https://github.com/maybe-finance/maybe/pull/1069\r\n* Fix minitest assert_nil warning by @tonyvince in https://github.com/maybe-finance/maybe/pull/1070\r\n* Allow user to add buy and sell trade transactions for investment accounts by @zachgoll in https://github.com/maybe-finance/maybe/pull/1066\r\n* Temp fix for missing accountables on self hosted instances by @zachgoll in https://github.com/maybe-finance/maybe/pull/1071\r\n\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.13...v0.1.0-alpha.14","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/169591029/reactions","total_count":16,"+1":0,"-1":0,"laugh":0,"hooray":16,"confused":0,"heart":0,"rocket":0,"eyes":0},"mentions_count":3},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/168510559","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/168510559/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/168510559/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.13","id":168510559,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4KC0Rf","tag_name":"v0.1.0-alpha.13","target_commitish":"main","name":"v0.1.0-alpha.13","draft":false,"prerelease":true,"created_at":"2024-08-02T21:10:16Z","published_at":"2024-08-02T21:10:59Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.13","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.13","body":"Coming off the back of last week's release which introduced basic investment portfolio views and the ability to sync investment holdings, this week's release introduces full support for stock prices with the [Synth API](https://synthfinance.com/)! (which has a generous free tier to get started)\r\n\r\nThis means that investment account views can now properly calculate and show an aggregated market value of all the investments in it and gracefully handle missing stock prices.\r\n\r\nIn a future release, users will have full control to create buy & sell trades, manage their investment portfolio, and see total returns over various time periods alongside their historical value graph.\r\n\r\nhttps://github.com/user-attachments/assets/c39b1706-97a7-4e3e-b568-9d9b09e38e05\r\n\r\n## What's Changed\r\n* Fix: Omit layout for turbo frames with custom sidebar layout by @pranavbabu in https://github.com/maybe-finance/maybe/pull/1024\r\n* fix: long emails overflow in account menu dropdown by @MikhailWahib in https://github.com/maybe-finance/maybe/pull/1034\r\n* Fix demo data reset by @tonyvince in https://github.com/maybe-finance/maybe/pull/1041\r\n* Ensure transfer name is populated by @zachgoll in https://github.com/maybe-finance/maybe/pull/1042\r\n* Add security prices provider (Synth integration) by @zachgoll in https://github.com/maybe-finance/maybe/pull/1039\r\n* Show cash + holdings value for investment account view by @zachgoll in https://github.com/maybe-finance/maybe/pull/1046\r\n\r\n## New Contributors\r\n* @pranavbabu made their first contribution in https://github.com/maybe-finance/maybe/pull/1024\r\n* @MikhailWahib made their first contribution in https://github.com/maybe-finance/maybe/pull/1034\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.12...v0.1.0-alpha.13","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/168510559/reactions","total_count":30,"+1":4,"-1":0,"laugh":0,"hooray":13,"confused":0,"heart":6,"rocket":7,"eyes":0},"mentions_count":4},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/167382277","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/167382277/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/167382277/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.12","id":167382277,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4J-g0F","tag_name":"v0.1.0-alpha.12","target_commitish":"main","name":"v0.1.0-alpha.12","draft":false,"prerelease":true,"created_at":"2024-07-26T14:48:21Z","published_at":"2024-07-26T14:50:36Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.12","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.12","body":"## What's Changed\r\n* Set last_login_at only on login instead of every single action by @tonyvince in https://github.com/maybe-finance/maybe/pull/1017\r\n* Bump pagy with fix for breaking changes  by @tonyvince in https://github.com/maybe-finance/maybe/pull/1016\r\n* Fix form labels by @tonyvince in https://github.com/maybe-finance/maybe/pull/1004\r\n* Fix curency format by @JuliusMieliauskas in https://github.com/maybe-finance/maybe/pull/1020\r\n* Implement auto family syncs on login by @zachgoll in https://github.com/maybe-finance/maybe/pull/1021\r\n* Basic Portfolio Views by @zachgoll in https://github.com/maybe-finance/maybe/pull/1000\r\n* Fix currency formatting in pie chart visualization by @zachgoll in https://github.com/maybe-finance/maybe/pull/1022\r\n* Set minimum supported date for account entries by @zachgoll in https://github.com/maybe-finance/maybe/pull/1023\r\n\r\n## New Contributors\r\n* @JuliusMieliauskas made their first contribution in https://github.com/maybe-finance/maybe/pull/1020\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.11...v0.1.0-alpha.12","mentions_count":3},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/166296953","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/166296953/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/166296953/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.11","id":166296953,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4J6X15","tag_name":"v0.1.0-alpha.11","target_commitish":"main","name":"v0.1.0-alpha.11","draft":false,"prerelease":true,"created_at":"2024-07-19T20:09:05Z","published_at":"2024-07-19T20:09:38Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.11","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.11","body":"## What's Changed\r\n* Wrap account update in a transaction by @accessd in https://github.com/maybe-finance/maybe/pull/985\r\n* Allow CSV file upload in import flow by @tonyvince in https://github.com/maybe-finance/maybe/pull/986\r\n* Sanitize input for ilike in Account::Entry.search by @tonyvince in https://github.com/maybe-finance/maybe/pull/988\r\n* Investment Portfolio Sync by @zachgoll in https://github.com/maybe-finance/maybe/pull/974\r\n* More composable forms by @zachgoll in https://github.com/maybe-finance/maybe/pull/989\r\n* Add default currencies to forms based on preference by @zachgoll in https://github.com/maybe-finance/maybe/pull/994\r\n* Build sample portfolio deterministically by @zachgoll in https://github.com/maybe-finance/maybe/pull/993\r\n* Add currency validation to account, update demo data generator by @zachgoll in https://github.com/maybe-finance/maybe/pull/996\r\n* Sync notifications and troubleshooting guides by @zachgoll in https://github.com/maybe-finance/maybe/pull/998\r\n\r\n## New Contributors\r\n* @accessd made their first contribution in https://github.com/maybe-finance/maybe/pull/985\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.10...v0.1.0-alpha.11","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/166296953/reactions","total_count":14,"+1":0,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":0,"rocket":14,"eyes":0},"mentions_count":3},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/165263324","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/165263324/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/165263324/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.10","id":165263324,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4J2bfc","tag_name":"v0.1.0-alpha.10","target_commitish":"main","name":"v0.1.0-alpha.10","draft":false,"prerelease":true,"created_at":"2024-07-12T22:38:17Z","published_at":"2024-07-12T22:39:11Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.10","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.10","body":"## What's Changed\r\n* Add error handling for AccountsController#create by @tonyvince in https://github.com/maybe-finance/maybe/pull/957\r\n* fix: #951 pointer cursor and bg hover for import flow buttons by @MagnusHJensen in https://github.com/maybe-finance/maybe/pull/954\r\n* Handle missing exchange rate provider, allow fallback for missing rates by @zachgoll in https://github.com/maybe-finance/maybe/pull/955\r\n* Add missing migrations for good_job 4x by @tonyvince in https://github.com/maybe-finance/maybe/pull/967\r\n* Account::Sync model and test fixture simplifications by @zachgoll in https://github.com/maybe-finance/maybe/pull/968\r\n* Demo Family data updates by @zachgoll in https://github.com/maybe-finance/maybe/pull/972\r\n* Make balance editing easier by @zachgoll in https://github.com/maybe-finance/maybe/pull/976\r\n\r\n## New Contributors\r\n* @MagnusHJensen made their first contribution in https://github.com/maybe-finance/maybe/pull/954\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.9...v0.1.0-alpha.10","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/165263324/reactions","total_count":7,"+1":7,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":0,"rocket":0,"eyes":0},"mentions_count":3},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/164198848","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/164198848/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/164198848/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.9","id":164198848,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4JyXnA","tag_name":"v0.1.0-alpha.9","target_commitish":"main","name":"v0.1.0-alpha.9","draft":false,"prerelease":true,"created_at":"2024-07-05T18:16:41Z","published_at":"2024-07-05T18:17:22Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.9","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.9","body":"## What's Changed\r\n* Account::Entry Delegated Type (namespace updates part 7) by @zachgoll in https://github.com/maybe-finance/maybe/pull/923\r\n* Fix decimal display for euro currency by @zachgoll in https://github.com/maybe-finance/maybe/pull/937\r\n* Enable updating Account::Entry#amount by @tonyvince in https://github.com/maybe-finance/maybe/pull/942\r\n* Fix bug where transactions were duplicated in import confirm by @ljhurst in https://github.com/maybe-finance/maybe/pull/941\r\n* Enque account sync job after creating transfer by @tonyvince in https://github.com/maybe-finance/maybe/pull/946\r\n* Enable syncing all accounts in one click by @tonyvince in https://github.com/maybe-finance/maybe/pull/948\r\n* Update docker compose example with fixed storage volume by @zachgoll in https://github.com/maybe-finance/maybe/pull/950\r\n\r\n## New Contributors\r\n* @ljhurst made their first contribution in https://github.com/maybe-finance/maybe/pull/941\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.8...v0.1.0-alpha.9","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/164198848/reactions","total_count":9,"+1":9,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":0,"rocket":0,"eyes":0},"mentions_count":3},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/163065844","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/163065844/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/163065844/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.8","id":163065844,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4JuC_0","tag_name":"v0.1.0-alpha.8","target_commitish":"main","name":"v0.1.0-alpha.8","draft":false,"prerelease":true,"created_at":"2024-06-28T21:22:26Z","published_at":"2024-06-28T21:23:33Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.8","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.8","body":"## What's Changed\r\n* Unify primary button styles and change cursor on account group by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/905\r\n* Fix issue #861: Correct header selection logic in get_selected_header_for_field method by @igorcarvalhh in https://github.com/maybe-finance/maybe/pull/918\r\n* Fix #910 by @tonyvince in https://github.com/maybe-finance/maybe/pull/917\r\n* Account namespace updates: part 6 (transactions) by @zachgoll in https://github.com/maybe-finance/maybe/pull/904\r\n* improvement/#890/clean_up_toast_notification_styles_and_allow_user_to_close_on-demand by @evangelos-com in https://github.com/maybe-finance/maybe/pull/919\r\n* Fix #921 by @tonyvince in https://github.com/maybe-finance/maybe/pull/922\r\n\r\n## New Contributors\r\n* @igorcarvalhh made their first contribution in https://github.com/maybe-finance/maybe/pull/918\r\n* @evangelos-com made their first contribution in https://github.com/maybe-finance/maybe/pull/919\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.7...v0.1.0-alpha.8","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/163065844/reactions","total_count":12,"+1":9,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":1,"rocket":2,"eyes":0},"mentions_count":5},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/161742130","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/161742130/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/161742130/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.7","id":161742130,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4Jo_0y","tag_name":"v0.1.0-alpha.7","target_commitish":"main","name":"v0.1.0-alpha.7","draft":false,"prerelease":true,"created_at":"2024-06-21T21:04:59Z","published_at":"2024-06-21T21:08:04Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.7","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.7","body":"## What's Changed\r\n\r\nMaybe now supports transfer matching 🥳 🌮 \r\n\r\nThis significantly improves income and expense calculations by excluding transfers from the calculation:\r\n\r\nhttps://github.com/maybe-finance/maybe/assets/16676157/a1cde494-b89f-466a-8c74-da194934288a\r\n\r\n* Add merchant select when editing transaction by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/885\r\n* Transaction transfers, payments, and matching by @zachgoll in https://github.com/maybe-finance/maybe/pull/883\r\n* Ensure correct form's hidden input for selectedIds by @ziraqyoung in https://github.com/maybe-finance/maybe/pull/891\r\n* Account namespace updates: part 1 (accountable types) by @zachgoll in https://github.com/maybe-finance/maybe/pull/893\r\n* Account namespace updates: part 2 (categories) by @zachgoll in https://github.com/maybe-finance/maybe/pull/894\r\n* Account namespace updates: part 3 (merchants) by @zachgoll in https://github.com/maybe-finance/maybe/pull/895\r\n* Account namespace updates: part 4 (transfers, singular namespacing) by @zachgoll in https://github.com/maybe-finance/maybe/pull/896\r\n* Fix Bug: after editing an account history value, it requires 2 clicks to close the menu by @tonyvince in https://github.com/maybe-finance/maybe/pull/900\r\n* feat: Transaction pagination Improvements by @karankiri in https://github.com/maybe-finance/maybe/pull/873\r\n* Fix transfer note overflow style by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/902\r\n* Account namespace updates: part 5 (valuations) by @zachgoll in https://github.com/maybe-finance/maybe/pull/901\r\n* Allow transfers based on transactions in different currencies by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/903\r\n\r\n## New Contributors\r\n* @ziraqyoung made their first contribution in https://github.com/maybe-finance/maybe/pull/891\r\n* @tonyvince made their first contribution in https://github.com/maybe-finance/maybe/pull/900\r\n* @karankiri made their first contribution in https://github.com/maybe-finance/maybe/pull/873\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.6...v0.1.0-alpha.7","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/161742130/reactions","total_count":26,"+1":0,"-1":0,"laugh":0,"hooray":9,"confused":0,"heart":7,"rocket":9,"eyes":1},"mentions_count":5},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/160566471","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/160566471/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/160566471/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.6","id":160566471,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4JkgzH","tag_name":"v0.1.0-alpha.6","target_commitish":"main","name":"v0.1.0-alpha.6","draft":false,"prerelease":true,"created_at":"2024-06-14T20:50:08Z","published_at":"2024-06-14T21:01:04Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.6","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.6","body":"## What's Changed\r\n\r\nThis release comes with a complete overhaul of our Docker setup guide, better internal navigation, and the ability to group your accounts by financial institution!\r\n\r\nhttps://github.com/maybe-finance/maybe/assets/16676157/be4d1ce8-7055-4f71-9c3f-c9bbc9cb451c\r\n\r\n* Improve account internal linking and redirect behavior by @zachgoll in https://github.com/maybe-finance/maybe/pull/864\r\n* Allow for optional start date on account creation by @zachgoll in https://github.com/maybe-finance/maybe/pull/866\r\n* Add institution management and account editing controls by @zachgoll in https://github.com/maybe-finance/maybe/pull/868\r\n* New Docker Compose Self Hosting Guide + UI Fixes by @zachgoll in https://github.com/maybe-finance/maybe/pull/870\r\n* Simplify account sync logic by @zachgoll in https://github.com/maybe-finance/maybe/pull/871\r\n* Changelog page that pulls from Github Release notes by @mattia-malnis in https://github.com/maybe-finance/maybe/pull/867\r\n\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.5...v0.1.0-alpha.6","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/160566471/reactions","total_count":36,"+1":27,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":9,"rocket":0,"eyes":0},"mentions_count":2},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/159452244","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/159452244/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/159452244/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.5","id":159452244,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4JgQxU","tag_name":"v0.1.0-alpha.5","target_commitish":"main","name":"v0.1.0-alpha.5","draft":false,"prerelease":true,"created_at":"2024-06-07T23:29:01Z","published_at":"2024-06-07T23:34:11Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.5","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.5","body":"## What's Changed\r\n\r\nBulk transaction editing and deletion is here!  Check out the demo below:\r\n\r\nhttps://github.com/maybe-finance/maybe/assets/16676157/d8a3ae39-4931-4775-8c76-211d6dc96bf6\r\n\r\n* Add bulk selection UI controls by @zachgoll in https://github.com/maybe-finance/maybe/pull/840\r\n* Bulk transaction deletion by @zachgoll in https://github.com/maybe-finance/maybe/pull/845\r\n* Bulk editing of transactions by @zachgoll in https://github.com/maybe-finance/maybe/pull/846\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.4...v0.1.0-alpha.5","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/159452244/reactions","total_count":48,"+1":35,"-1":0,"laugh":0,"hooray":6,"confused":0,"heart":7,"rocket":0,"eyes":0},"mentions_count":1},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/158390671","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/158390671/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/158390671/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.4","id":158390671,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4JcNmP","tag_name":"v0.1.0-alpha.4","target_commitish":"main","name":"v0.1.0-alpha.4","draft":false,"prerelease":true,"created_at":"2024-05-31T18:09:12Z","published_at":"2024-05-31T18:10:31Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.4","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.4","body":"## What's Changed\r\n* fix: png file can be selected as profile images by @pea-sys in https://github.com/maybe-finance/maybe/pull/809\r\n* Validate transaction filtering params by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/810\r\n* Fix foreign account sync crash by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/794\r\n* Sort accounts in the sidebar by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/815\r\n* Reusable CI workflow for GH actions by @zachgoll in https://github.com/maybe-finance/maybe/pull/819\r\n* Transactions cleanup by @zachgoll in https://github.com/maybe-finance/maybe/pull/817\r\n* Sync account after transaction import by @zachgoll in https://github.com/maybe-finance/maybe/pull/820\r\n* Fix overflow error on account value inputs by @zachgoll in https://github.com/maybe-finance/maybe/pull/821\r\n\r\n## New Contributors\r\n* @pea-sys made their first contribution in https://github.com/maybe-finance/maybe/pull/809\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.3...v0.1.0-alpha.4","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/158390671/reactions","total_count":21,"+1":0,"-1":0,"laugh":0,"hooray":21,"confused":0,"heart":0,"rocket":0,"eyes":0},"mentions_count":3},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/157397091","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/157397091/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/157397091/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.3","id":157397091,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4JYbBj","tag_name":"v0.1.0-alpha.3","target_commitish":"main","name":"v0.1.0-alpha.3","draft":false,"prerelease":true,"created_at":"2024-05-24T18:24:03Z","published_at":"2024-05-24T18:25:37Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.3","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.3","body":"## What's Changed\r\n* Fix currency when importing to foreign accounts by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/762\r\n* Show an error notification if account cannot be manually synced by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/761\r\n* Add migration to make all existing users admins by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/770\r\n* Fix issue with start_date not being set in account creation by @scubamaggo in https://github.com/maybe-finance/maybe/pull/781\r\n* Fix import crash with empty transaction name by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/783\r\n* Move category dropdown menu content into a turbo frame by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/782\r\n* Ignore empty categories while importing by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/789\r\n* Fix duplicate category creation on import by @zachgoll in https://github.com/maybe-finance/maybe/pull/791\r\n* Create tagging system by @zachgoll in https://github.com/maybe-finance/maybe/pull/792\r\n* Add tag preview when importing and fix empty category bug by @jakubkottnauer in https://github.com/maybe-finance/maybe/pull/800\r\n\r\n## New Contributors\r\n* @scubamaggo made their first contribution in https://github.com/maybe-finance/maybe/pull/781\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.2...v0.1.0-alpha.3","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/157397091/reactions","total_count":31,"+1":0,"-1":0,"laugh":0,"hooray":0,"confused":0,"heart":5,"rocket":26,"eyes":0},"mentions_count":3},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/156342152","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/156342152/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/156342152/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.2","id":156342152,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4JUZeI","tag_name":"v0.1.0-alpha.2","target_commitish":"main","name":"v0.1.0-alpha.2","draft":false,"prerelease":true,"created_at":"2024-05-17T22:20:19Z","published_at":"2024-05-17T22:33:24Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.2","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.2","body":"Second alpha release of Maybe 🎉 🌮\r\n\r\n## New features\r\n\r\n- Self hosting with Docker 🐳 ([setup guide](https://github.com/maybe-finance/maybe/blob/main/docs/hosting/docker.md))\r\n- CSV transaction imports\r\n- Transaction management with merchants and categories\r\n- Fresh design of user settings\r\n- Re-designed dashboard + accounts summary\r\n- Admin accounts, ability to delete and purge data\r\n\r\n**Full Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.1...v0.1.0-alpha.2","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/156342152/reactions","total_count":50,"+1":0,"-1":0,"laugh":0,"hooray":48,"confused":0,"heart":2,"rocket":0,"eyes":0}},{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/151028123","assets_url":"https://api.github.com/repos/maybe-finance/maybe/releases/151028123/assets","upload_url":"https://uploads.github.com/repos/maybe-finance/maybe/releases/151028123/assets{?name,label}","html_url":"https://github.com/maybe-finance/maybe/releases/tag/v0.1.0-alpha.1","id":151028123,"author":{"login":"zachgoll","id":16676157,"node_id":"MDQ6VXNlcjE2Njc2MTU3","avatar_url":"https://avatars.githubusercontent.com/u/16676157?v=4","gravatar_id":"","url":"https://api.github.com/users/zachgoll","html_url":"https://github.com/zachgoll","followers_url":"https://api.github.com/users/zachgoll/followers","following_url":"https://api.github.com/users/zachgoll/following{/other_user}","gists_url":"https://api.github.com/users/zachgoll/gists{/gist_id}","starred_url":"https://api.github.com/users/zachgoll/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zachgoll/subscriptions","organizations_url":"https://api.github.com/users/zachgoll/orgs","repos_url":"https://api.github.com/users/zachgoll/repos","events_url":"https://api.github.com/users/zachgoll/events{/privacy}","received_events_url":"https://api.github.com/users/zachgoll/received_events","type":"User","user_view_type":"public","site_admin":false},"node_id":"RE_kwDOK_txHM4JAIGb","tag_name":"v0.1.0-alpha.1","target_commitish":"main","name":"v0.1.0-alpha.1","draft":false,"prerelease":true,"created_at":"2024-04-13T13:28:45Z","published_at":"2024-04-13T13:49:03Z","assets":[],"tarball_url":"https://api.github.com/repos/maybe-finance/maybe/tarball/v0.1.0-alpha.1","zipball_url":"https://api.github.com/repos/maybe-finance/maybe/zipball/v0.1.0-alpha.1","body":"Initial alpha version of Maybe 🎉 🌮","reactions":{"url":"https://api.github.com/repos/maybe-finance/maybe/releases/151028123/reactions","total_count":165,"+1":50,"-1":0,"laugh":0,"hooray":46,"confused":0,"heart":35,"rocket":23,"eyes":11}}]
+  recorded_at: Wed, 19 Mar 2025 12:40:58 GMT
 - request:
     method: post
     uri: https://api.github.com/markdown
     body:
       encoding: UTF-8
-      string: '{"mode":"gfm","context":"maybe-finance/maybe","text":"This week''s
-        release comes with a variety of bug fixes and improvements to the UI.\r\n\r\nAdditionally,
-        users can now input details for their property and vehicle accounts as shown
-        in the video below.  In the near future, Maybe will support data providers
-        related to the \"valuation\" of properties and vehicles (i.e. Zillow, KBB).  We
-        will use the information from user accounts to automatically fetch estimated
-        market values for these assets which will then be added periodically as \"Valuations\"
-        in the value tab of each account.  This will then show up in the history graph
-        for the account balance.\r\n\r\nhttps://github.com/user-attachments/assets/fd759c82-a25c-4c8d-8f16-f577e0410fb5\r\n\r\n##
-        What''s Changed\r\n\r\n* Refactor: Allow other import files by @pedrocarmona
-        in https://github.com/maybe-finance/maybe/pull/1099\r\n* Bump sentry-ruby
-        from 5.18.2 to 5.19.0 by @dependabot in https://github.com/maybe-finance/maybe/pull/1108\r\n*
-        Bump stimulus-rails from 1.3.3 to 1.3.4 by @dependabot in https://github.com/maybe-finance/maybe/pull/1106\r\n*
-        Bump aws-sdk-s3 from 1.157.0 to 1.158.0 by @dependabot in https://github.com/maybe-finance/maybe/pull/1105\r\n*
-        Bump ruby-lsp-rails from 0.3.12 to 0.3.13 by @dependabot in https://github.com/maybe-finance/maybe/pull/1107\r\n*
-        Bump propshaft from 0.9.0 to 0.9.1 by @dependabot in https://github.com/maybe-finance/maybe/pull/1104\r\n*
-        Bump good_job from 4.1.1 to 4.2.0 by @dependabot in https://github.com/maybe-finance/maybe/pull/1102\r\n*
-        Bump tailwindcss-rails from 2.7.2 to 2.7.3 by @dependabot in https://github.com/maybe-finance/maybe/pull/1103\r\n*
-        Fix query when account has zero income and expense by @zachgoll in https://github.com/maybe-finance/maybe/pull/1112\r\n*
-        Fix holding name error by @zachgoll in https://github.com/maybe-finance/maybe/pull/1113\r\n*
-        Add Property Details View by @zachgoll in https://github.com/maybe-finance/maybe/pull/1116\r\n*
-        Basic Vehicle View by @zachgoll in https://github.com/maybe-finance/maybe/pull/1117\r\n*
-        Rubocop updates by @zachgoll in https://github.com/maybe-finance/maybe/pull/1118\r\n*
-        Fix file upload UI opening twice by @zachgoll in https://github.com/maybe-finance/maybe/pull/1119\r\n\r\n\r\n**Full
-        Changelog**: https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.15...v0.1.0-alpha.16"}'
+      string: '{"mode":"gfm","context":"maybe-finance/maybe","text":"## Data resets,
+        offline investment trades, and miscellaneous stability improvements\r\n\r\nThis
+        release comes with a wide mix of stability improvements and quality of life
+        updates; particularly for self hosted apps, which can now be \"reset\" in
+        user settings.  If your data looks wrong or you want a \"clean slate\" to
+        work from, we''ve added the ability for you to easily perform these resets
+        without writing SQL or manually deleting records.\r\n\r\nThis release also
+        comes with a much clearer UI surrounding the Synth data provider.  New self
+        hosted users will now see a prominent warning message if they have missing
+        data as a result of a misconfigured or absent data provider.\r\n\r\n## What''s
+        Changed\r\n* Add new category flow by @syedbarimanjan in https://github.com/maybe-finance/maybe/pull/1857\r\n*
+        Fix parent category sums in budget by @zachgoll in https://github.com/maybe-finance/maybe/pull/1894\r\n*
+        Add breadcrumbs support across application by @Shpigford in https://github.com/maybe-finance/maybe/pull/1897\r\n*
+        Dashboard design fixes by @zachgoll in https://github.com/maybe-finance/maybe/pull/1898\r\n*
+        Allow account balance to dynamically use currency format on preference page
+        by @Harry-kp in https://github.com/maybe-finance/maybe/pull/1910\r\n* Feat:
+        Data \"reset\" button by @tonyvince in https://github.com/maybe-finance/maybe/pull/1913\r\n*
+        Fix: Make Tags selection scrollable by @tonyvince in https://github.com/maybe-finance/maybe/pull/1921\r\n*
+        Fix value wrapping on account balance in sidebar by @zachgoll in https://github.com/maybe-finance/maybe/pull/1922\r\n*
+        Fix import configuration form so number format is applied by @zachgoll in
+        https://github.com/maybe-finance/maybe/pull/1923\r\n* Add transitions to buttons
+        and other common design system elements by @zachgoll in https://github.com/maybe-finance/maybe/pull/1924\r\n*
+        Allow offline trade tickers by @zachgoll in https://github.com/maybe-finance/maybe/pull/1925\r\n*
+        fix: Don''t show Billings on settings navbar when self-hosted by @tonyvince
+        in https://github.com/maybe-finance/maybe/pull/1912\r\n* Show UI warning to
+        user when they need provider data but have not setup Synth yet by @zachgoll
+        in https://github.com/maybe-finance/maybe/pull/1926\r\n* Invert liability
+        graphs to have correct signage by @zachgoll in https://github.com/maybe-finance/maybe/pull/1928\r\n*
+        Escape quotations in CSV imports properly by @zachgoll in https://github.com/maybe-finance/maybe/pull/1929\r\n\r\n##
+        New Contributors\r\n* @syedbarimanjan made their first contribution in https://github.com/maybe-finance/maybe/pull/1857\r\n\r\n**Full
+        Changelog**: https://github.com/maybe-finance/maybe/compare/v0.4.2...v0.4.3"}'
     headers:
       Accept:
       - application/vnd.github.raw
       User-Agent:
-      - Octokit Ruby Gem 9.1.0
+      - Octokit Ruby Gem 9.2.0
       Content-Type:
       - application/json
       Accept-Encoding:
@@ -121,7 +127,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Mon, 09 Sep 2024 20:03:35 GMT
+      - Wed, 19 Mar 2025 12:40:58 GMT
       Content-Type:
       - text/html;charset=utf-8
       X-Commonmarker-Version:
@@ -131,7 +137,7 @@ http_interactions:
       Vary:
       - Accept,Accept-Encoding, Accept, X-Requested-With
       Etag:
-      - W/"4b6d4a2163bd3920fb140d306008bd394fd881338320e3400547c6833368f2ea"
+      - W/"bff98cc65001c41f8dd63749dc92891772179ad935cf7a314a5e9a289fd17557"
       X-Github-Media-Type:
       - github.v3; param=raw
       X-Github-Api-Version-Selected:
@@ -160,55 +166,45 @@ http_interactions:
       X-Ratelimit-Limit:
       - '60'
       X-Ratelimit-Remaining:
-      - '56'
+      - '58'
       X-Ratelimit-Reset:
-      - '1725915804'
+      - '1742391658'
       X-Ratelimit-Resource:
       - core
       X-Ratelimit-Used:
-      - '4'
-      Accept-Ranges:
-      - bytes
+      - '2'
       Content-Length:
-      - '12673'
+      - '11567'
       X-Github-Request-Id:
-      - E97A:2198A3:C56E5C:17C26E8:66DF5497
+      - DDEE:10ABF0:184826:30A90D:67DABB5A
     body:
       encoding: ASCII-8BIT
       string: |-
-        <p dir="auto">This week's release comes with a variety of bug fixes and improvements to the UI.</p>
-        <p dir="auto">Additionally, users can now input details for their property and vehicle accounts as shown in the video below.  In the near future, Maybe will support data providers related to the "valuation" of properties and vehicles (i.e. Zillow, KBB).  We will use the information from user accounts to automatically fetch estimated market values for these assets which will then be added periodically as "Valuations" in the value tab of each account.  This will then show up in the history graph for the account balance.</p>
-        <details open="" class="details-reset border rounded-2">
-          <summary class="px-3 py-2">
-            <svg aria-hidden="true" height="16" viewBox="0 0 16 16" version="1.1" width="16" data-view-component="true" class="octicon octicon-device-camera-video">
-            <path d="M16 3.75v8.5a.75.75 0 0 1-1.136.643L11 10.575v.675A1.75 1.75 0 0 1 9.25 13h-7.5A1.75 1.75 0 0 1 0 11.25v-6.5C0 3.784.784 3 1.75 3h7.5c.966 0 1.75.784 1.75 1.75v.675l3.864-2.318A.75.75 0 0 1 16 3.75Zm-6.5 1a.25.25 0 0 0-.25-.25h-7.5a.25.25 0 0 0-.25.25v6.5c0 .138.112.25.25.25h7.5a.25.25 0 0 0 .25-.25v-6.5ZM11 8.825l3.5 2.1v-5.85l-3.5 2.1Z"></path>
-        </svg>
-            <span aria-label="Video description CleanShot.2024-08-23.at.10.37.04.mp4" class="m-1">CleanShot.2024-08-23.at.10.37.04.mp4</span>
-            <span class="dropdown-caret"></span>
-          </summary>
-
-          <video src="https://private-user-images.githubusercontent.com/16676157/360965341-fd759c82-a25c-4c8d-8f16-f577e0410fb5.mp4?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjU5MTI1MTUsIm5iZiI6MTcyNTkxMjIxNSwicGF0aCI6Ii8xNjY3NjE1Ny8zNjA5NjUzNDEtZmQ3NTljODItYTI1Yy00YzhkLThmMTYtZjU3N2UwNDEwZmI1Lm1wND9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA5MDklMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwOTA5VDIwMDMzNVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTY3ZGFmNDhhYTVmMGU3YWQ3MjA1YjZhN2NjY2EzNjdjODU5NGVhMGI3ZGE4MDAxMjlkNDdlNTY0MGY3ODRmYTkmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.cJ7HYOJZbnsjGcleqfz-0njFB6Z8zpBXsB9PprFe1uQ" data-canonical-src="https://private-user-images.githubusercontent.com/16676157/360965341-fd759c82-a25c-4c8d-8f16-f577e0410fb5.mp4?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjU5MTI1MTUsIm5iZiI6MTcyNTkxMjIxNSwicGF0aCI6Ii8xNjY3NjE1Ny8zNjA5NjUzNDEtZmQ3NTljODItYTI1Yy00YzhkLThmMTYtZjU3N2UwNDEwZmI1Lm1wND9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA5MDklMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwOTA5VDIwMDMzNVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTY3ZGFmNDhhYTVmMGU3YWQ3MjA1YjZhN2NjY2EzNjdjODU5NGVhMGI3ZGE4MDAxMjlkNDdlNTY0MGY3ODRmYTkmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.cJ7HYOJZbnsjGcleqfz-0njFB6Z8zpBXsB9PprFe1uQ" controls="controls" muted="muted" class="d-block rounded-bottom-2 border-top width-fit" style="max-height:640px; min-height: 200px">
-
-          </video>
-        </details>
-
+        <h2 dir="auto">Data resets, offline investment trades, and miscellaneous stability improvements</h2>
+        <p dir="auto">This release comes with a wide mix of stability improvements and quality of life updates; particularly for self hosted apps, which can now be "reset" in user settings.  If your data looks wrong or you want a "clean slate" to work from, we've added the ability for you to easily perform these resets without writing SQL or manually deleting records.</p>
+        <p dir="auto">This release also comes with a much clearer UI surrounding the Synth data provider.  New self hosted users will now see a prominent warning message if they have missing data as a result of a misconfigured or absent data provider.</p>
         <h2 dir="auto">What's Changed</h2>
         <ul dir="auto">
-        <li>Refactor: Allow other import files by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/pedrocarmona/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/pedrocarmona">@pedrocarmona</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2471575614" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1099" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1099/hovercard" href="https://github.com/maybe-finance/maybe/pull/1099">#1099</a></li>
-        <li>Bump sentry-ruby from 5.18.2 to 5.19.0 by <a class="user-mention notranslate" data-hovercard-type="organization" data-hovercard-url="/orgs/dependabot/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/dependabot">@dependabot</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2472705424" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1108" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1108/hovercard" href="https://github.com/maybe-finance/maybe/pull/1108">#1108</a></li>
-        <li>Bump stimulus-rails from 1.3.3 to 1.3.4 by <a class="user-mention notranslate" data-hovercard-type="organization" data-hovercard-url="/orgs/dependabot/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/dependabot">@dependabot</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2472704588" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1106" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1106/hovercard" href="https://github.com/maybe-finance/maybe/pull/1106">#1106</a></li>
-        <li>Bump aws-sdk-s3 from 1.157.0 to 1.158.0 by <a class="user-mention notranslate" data-hovercard-type="organization" data-hovercard-url="/orgs/dependabot/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/dependabot">@dependabot</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2472704205" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1105" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1105/hovercard" href="https://github.com/maybe-finance/maybe/pull/1105">#1105</a></li>
-        <li>Bump ruby-lsp-rails from 0.3.12 to 0.3.13 by <a class="user-mention notranslate" data-hovercard-type="organization" data-hovercard-url="/orgs/dependabot/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/dependabot">@dependabot</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2472704965" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1107" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1107/hovercard" href="https://github.com/maybe-finance/maybe/pull/1107">#1107</a></li>
-        <li>Bump propshaft from 0.9.0 to 0.9.1 by <a class="user-mention notranslate" data-hovercard-type="organization" data-hovercard-url="/orgs/dependabot/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/dependabot">@dependabot</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2472703805" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1104" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1104/hovercard" href="https://github.com/maybe-finance/maybe/pull/1104">#1104</a></li>
-        <li>Bump good_job from 4.1.1 to 4.2.0 by <a class="user-mention notranslate" data-hovercard-type="organization" data-hovercard-url="/orgs/dependabot/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/dependabot">@dependabot</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2472702919" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1102" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1102/hovercard" href="https://github.com/maybe-finance/maybe/pull/1102">#1102</a></li>
-        <li>Bump tailwindcss-rails from 2.7.2 to 2.7.3 by <a class="user-mention notranslate" data-hovercard-type="organization" data-hovercard-url="/orgs/dependabot/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/dependabot">@dependabot</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2472703362" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1103" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1103/hovercard" href="https://github.com/maybe-finance/maybe/pull/1103">#1103</a></li>
-        <li>Fix query when account has zero income and expense by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/zachgoll/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/zachgoll">@zachgoll</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2476405724" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1112" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1112/hovercard" href="https://github.com/maybe-finance/maybe/pull/1112">#1112</a></li>
-        <li>Fix holding name error by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/zachgoll/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/zachgoll">@zachgoll</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2476568556" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1113" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1113/hovercard" href="https://github.com/maybe-finance/maybe/pull/1113">#1113</a></li>
-        <li>Add Property Details View by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/zachgoll/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/zachgoll">@zachgoll</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2481914012" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1116" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1116/hovercard" href="https://github.com/maybe-finance/maybe/pull/1116">#1116</a></li>
-        <li>Basic Vehicle View by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/zachgoll/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/zachgoll">@zachgoll</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2483159382" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1117" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1117/hovercard" href="https://github.com/maybe-finance/maybe/pull/1117">#1117</a></li>
-        <li>Rubocop updates by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/zachgoll/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/zachgoll">@zachgoll</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2483227380" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1118" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1118/hovercard" href="https://github.com/maybe-finance/maybe/pull/1118">#1118</a></li>
-        <li>Fix file upload UI opening twice by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/zachgoll/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/zachgoll">@zachgoll</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2483259912" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1119" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1119/hovercard" href="https://github.com/maybe-finance/maybe/pull/1119">#1119</a></li>
+        <li>Add new category flow by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/syedbarimanjan/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/syedbarimanjan">@syedbarimanjan</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2851271813" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1857" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1857/hovercard" href="https://github.com/maybe-finance/maybe/pull/1857">#1857</a></li>
+        <li>Fix parent category sums in budget by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/zachgoll/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/zachgoll">@zachgoll</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2875715226" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1894" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1894/hovercard" href="https://github.com/maybe-finance/maybe/pull/1894">#1894</a></li>
+        <li>Add breadcrumbs support across application by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/Shpigford/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/Shpigford">@Shpigford</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2876669162" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1897" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1897/hovercard" href="https://github.com/maybe-finance/maybe/pull/1897">#1897</a></li>
+        <li>Dashboard design fixes by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/zachgoll/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/zachgoll">@zachgoll</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2878684037" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1898" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1898/hovercard" href="https://github.com/maybe-finance/maybe/pull/1898">#1898</a></li>
+        <li>Allow account balance to dynamically use currency format on preference page by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/Harry-kp/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/Harry-kp">@Harry-kp</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2882416377" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1910" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1910/hovercard" href="https://github.com/maybe-finance/maybe/pull/1910">#1910</a></li>
+        <li>Feat: Data "reset" button by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/tonyvince/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/tonyvince">@tonyvince</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2884371634" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1913" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1913/hovercard" href="https://github.com/maybe-finance/maybe/pull/1913">#1913</a></li>
+        <li>Fix: Make Tags selection scrollable by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/tonyvince/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/tonyvince">@tonyvince</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2886838108" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1921" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1921/hovercard" href="https://github.com/maybe-finance/maybe/pull/1921">#1921</a></li>
+        <li>Fix value wrapping on account balance in sidebar by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/zachgoll/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/zachgoll">@zachgoll</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2887107646" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1922" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1922/hovercard" href="https://github.com/maybe-finance/maybe/pull/1922">#1922</a></li>
+        <li>Fix import configuration form so number format is applied by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/zachgoll/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/zachgoll">@zachgoll</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2887166618" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1923" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1923/hovercard" href="https://github.com/maybe-finance/maybe/pull/1923">#1923</a></li>
+        <li>Add transitions to buttons and other common design system elements by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/zachgoll/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/zachgoll">@zachgoll</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2887226476" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1924" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1924/hovercard" href="https://github.com/maybe-finance/maybe/pull/1924">#1924</a></li>
+        <li>Allow offline trade tickers by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/zachgoll/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/zachgoll">@zachgoll</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2887293141" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1925" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1925/hovercard" href="https://github.com/maybe-finance/maybe/pull/1925">#1925</a></li>
+        <li>fix: Don't show Billings on settings navbar when self-hosted by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/tonyvince/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/tonyvince">@tonyvince</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2883665500" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1912" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1912/hovercard" href="https://github.com/maybe-finance/maybe/pull/1912">#1912</a></li>
+        <li>Show UI warning to user when they need provider data but have not setup Synth yet by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/zachgoll/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/zachgoll">@zachgoll</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2887589859" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1926" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1926/hovercard" href="https://github.com/maybe-finance/maybe/pull/1926">#1926</a></li>
+        <li>Invert liability graphs to have correct signage by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/zachgoll/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/zachgoll">@zachgoll</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2887629144" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1928" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1928/hovercard" href="https://github.com/maybe-finance/maybe/pull/1928">#1928</a></li>
+        <li>Escape quotations in CSV imports properly by <a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/zachgoll/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/zachgoll">@zachgoll</a> in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2887688665" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1929" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1929/hovercard" href="https://github.com/maybe-finance/maybe/pull/1929">#1929</a></li>
         </ul>
-        <p dir="auto"><strong>Full Changelog</strong>: <a class="commit-link" href="https://github.com/maybe-finance/maybe/compare/v0.1.0-alpha.15...v0.1.0-alpha.16"><tt>v0.1.0-alpha.15...v0.1.0-alpha.16</tt></a></p>
-  recorded_at: Mon, 09 Sep 2024 20:03:35 GMT
+        <h2 dir="auto">New Contributors</h2>
+        <ul dir="auto">
+        <li><a class="user-mention notranslate" data-hovercard-type="user" data-hovercard-url="/users/syedbarimanjan/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/syedbarimanjan">@syedbarimanjan</a> made their first contribution in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="2851271813" data-permission-text="Title is private" data-url="https://github.com/maybe-finance/maybe/issues/1857" data-hovercard-type="pull_request" data-hovercard-url="/maybe-finance/maybe/pull/1857/hovercard" href="https://github.com/maybe-finance/maybe/pull/1857">#1857</a></li>
+        </ul>
+        <p dir="auto"><strong>Full Changelog</strong>: <a class="commit-link" href="https://github.com/maybe-finance/maybe/compare/v0.4.2...v0.4.3"><tt>v0.4.2...v0.4.3</tt></a></p>
+  recorded_at: Wed, 19 Mar 2025 12:40:58 GMT
 recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/git_repository_provider/fetch_latest_upgrade_candidates.yml b/test/vcr_cassettes/git_repository_provider/fetch_latest_upgrade_candidates.yml
deleted file mode 100644
index 2e44df83..00000000
--- a/test/vcr_cassettes/git_repository_provider/fetch_latest_upgrade_candidates.yml
+++ /dev/null
@@ -1,235 +0,0 @@
----
-http_interactions:
-  - request:
-      method: get
-      uri: https://api.github.com/repos/rails/rails/releases
-      body:
-        encoding: US-ASCII
-        string: ""
-      headers:
-        Accept:
-          - application/vnd.github.v3+json
-        User-Agent:
-          - Octokit Ruby Gem 8.1.0
-        Content-Type:
-          - application/json
-        Accept-Encoding:
-          - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-    response:
-      status:
-        code: 200
-        message: OK
-      headers:
-        Server:
-          - GitHub.com
-        Date:
-          - Wed, 10 Apr 2024 19:52:56 GMT
-        Content-Type:
-          - application/json; charset=utf-8
-        Cache-Control:
-          - public, max-age=60, s-maxage=60
-        Vary:
-          - Accept, Accept-Encoding, Accept, X-Requested-With
-        Etag:
-          - W/"a032e5cc14d6dc10a55126bd742c08afc1365c4cf381d6d5ce3b4014cfbf2de5"
-        X-Github-Media-Type:
-          - github.v3; format=json
-        Link:
-          - <https://api.github.com/repositories/8514/releases?page=2>; rel="next", <https://api.github.com/repositories/8514/releases?page=4>;
-            rel="last"
-        X-Github-Api-Version-Selected:
-          - "2022-11-28"
-        Access-Control-Expose-Headers:
-          - ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining,
-            X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes,
-            X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO,
-            X-GitHub-Request-Id, Deprecation, Sunset
-        Access-Control-Allow-Origin:
-          - "*"
-        Strict-Transport-Security:
-          - max-age=31536000; includeSubdomains; preload
-        X-Frame-Options:
-          - deny
-        X-Content-Type-Options:
-          - nosniff
-        X-Xss-Protection:
-          - "0"
-        Referrer-Policy:
-          - origin-when-cross-origin, strict-origin-when-cross-origin
-        Content-Security-Policy:
-          - default-src 'none'
-        X-Ratelimit-Limit:
-          - "60"
-        X-Ratelimit-Remaining:
-          - "53"
-        X-Ratelimit-Reset:
-          - "1712781639"
-        X-Ratelimit-Resource:
-          - core
-        X-Ratelimit-Used:
-          - "7"
-        Accept-Ranges:
-          - bytes
-        Transfer-Encoding:
-          - chunked
-        X-Github-Request-Id:
-          - C8A7:A3F5F:11C7A6D:1BA83CE:6616EE18
-      body:
-        encoding: ASCII-8BIT
-        string: '[{"tag_name": "v7.1.3.2", "html_url": "http://localhost"}]' # manually abbreviated for clarity
-    recorded_at: Wed, 10 Apr 2024 19:52:56 GMT
-  - request:
-      method: get
-      uri: https://api.github.com/repos/rails/rails/branches/main
-      body:
-        encoding: US-ASCII
-        string: ""
-      headers:
-        Accept:
-          - application/vnd.github.v3+json
-        User-Agent:
-          - Octokit Ruby Gem 8.1.0
-        Content-Type:
-          - application/json
-        Accept-Encoding:
-          - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-    response:
-      status:
-        code: 200
-        message: OK
-      headers:
-        Server:
-          - GitHub.com
-        Date:
-          - Wed, 10 Apr 2024 19:52:57 GMT
-        Content-Type:
-          - application/json; charset=utf-8
-        Cache-Control:
-          - public, max-age=60, s-maxage=60
-        Vary:
-          - Accept, Accept-Encoding, Accept, X-Requested-With
-        Etag:
-          - W/"bbcf30919f0ef5fae2b2a28f58d50e3fb2cea8aa75418d5f2b919a7f857b27d0"
-        X-Github-Media-Type:
-          - github.v3; format=json
-        X-Github-Api-Version-Selected:
-          - "2022-11-28"
-        Access-Control-Expose-Headers:
-          - ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining,
-            X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes,
-            X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO,
-            X-GitHub-Request-Id, Deprecation, Sunset
-        Access-Control-Allow-Origin:
-          - "*"
-        Strict-Transport-Security:
-          - max-age=31536000; includeSubdomains; preload
-        X-Frame-Options:
-          - deny
-        X-Content-Type-Options:
-          - nosniff
-        X-Xss-Protection:
-          - "0"
-        Referrer-Policy:
-          - origin-when-cross-origin, strict-origin-when-cross-origin
-        Content-Security-Policy:
-          - default-src 'none'
-        X-Ratelimit-Limit:
-          - "60"
-        X-Ratelimit-Remaining:
-          - "52"
-        X-Ratelimit-Reset:
-          - "1712781639"
-        X-Ratelimit-Resource:
-          - core
-        X-Ratelimit-Used:
-          - "8"
-        Accept-Ranges:
-          - bytes
-        Content-Length:
-          - "3964"
-        X-Github-Request-Id:
-          - C8A8:281896:11B1812:1B69B2F:6616EE19
-      body:
-        encoding: ASCII-8BIT
-        # manually abbreviated for clarity
-        string: '{"commit":{"sha":"84997578c59aa88fe114cef176115f1612b6de6b", "html_url":"https://github.com/rails/rails/commit/84997578c59aa88fe114cef176115f1612b6de6b"}}'
-    recorded_at: Wed, 10 Apr 2024 19:52:57 GMT
-  - request:
-      method: get
-      uri: https://api.github.com/repos/rails/rails/commits/v7.1.3.2
-      body:
-        encoding: US-ASCII
-        string: ""
-      headers:
-        Accept:
-          - application/vnd.github.v3+json
-        User-Agent:
-          - Octokit Ruby Gem 8.1.0
-        Content-Type:
-          - application/json
-        Accept-Encoding:
-          - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-    response:
-      status:
-        code: 200
-        message: OK
-      headers:
-        Server:
-          - GitHub.com
-        Date:
-          - Wed, 10 Apr 2024 19:52:57 GMT
-        Content-Type:
-          - application/json; charset=utf-8
-        Cache-Control:
-          - public, max-age=60, s-maxage=60
-        Vary:
-          - Accept, Accept-Encoding, Accept, X-Requested-With
-        Etag:
-          - W/"0668fc459669113a200777ee9ddd56a6ca2efb647894b006d3966504c7c82f13"
-        Last-Modified:
-          - Wed, 21 Feb 2024 21:43:55 GMT
-        X-Github-Media-Type:
-          - github.v3; format=json
-        X-Github-Api-Version-Selected:
-          - "2022-11-28"
-        Access-Control-Expose-Headers:
-          - ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining,
-            X-RateLimit-Used, X-RateLimit-Resource, X-RateLimit-Reset, X-OAuth-Scopes,
-            X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, X-GitHub-SSO,
-            X-GitHub-Request-Id, Deprecation, Sunset
-        Access-Control-Allow-Origin:
-          - "*"
-        Strict-Transport-Security:
-          - max-age=31536000; includeSubdomains; preload
-        X-Frame-Options:
-          - deny
-        X-Content-Type-Options:
-          - nosniff
-        X-Xss-Protection:
-          - "0"
-        Referrer-Policy:
-          - origin-when-cross-origin, strict-origin-when-cross-origin
-        Content-Security-Policy:
-          - default-src 'none'
-        X-Ratelimit-Limit:
-          - "60"
-        X-Ratelimit-Remaining:
-          - "51"
-        X-Ratelimit-Reset:
-          - "1712781639"
-        X-Ratelimit-Resource:
-          - core
-        X-Ratelimit-Used:
-          - "9"
-        Accept-Ranges:
-          - bytes
-        Transfer-Encoding:
-          - chunked
-        X-Github-Request-Id:
-          - C8A9:23AA82:11FFCB8:1C057CD:6616EE19
-      body:
-        encoding: ASCII-8BIT
-        # manually abbreviated for clarity
-        string: '{"sha":"6f0d1ad14b92b9f5906e44740fce8b4f1c7075dc"}'
-    recorded_at: Wed, 10 Apr 2024 19:52:57 GMT
-recorded_with: VCR 6.2.0
diff --git a/test/vcr_cassettes/openai/auto_categorize.yml b/test/vcr_cassettes/openai/auto_categorize.yml
new file mode 100644
index 00000000..8bd186c0
--- /dev/null
+++ b/test/vcr_cassettes/openai/auto_categorize.yml
@@ -0,0 +1,194 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.openai.com/v1/responses
+    body:
+      encoding: UTF-8
+      string: '{"model":"gpt-4.1-mini","input":[{"role":"developer","content":"Here
+        are the user''s available categories in JSON format:\n\n```json\n[{\"id\":\"shopping_id\",\"name\":\"Shopping\",\"is_subcategory\":false,\"parent_id\":null,\"classification\":\"expense\"},{\"id\":\"subscriptions_id\",\"name\":\"Subscriptions\",\"is_subcategory\":true,\"parent_id\":null,\"classification\":\"expense\"},{\"id\":\"restaurants_id\",\"name\":\"Restaurants\",\"is_subcategory\":false,\"parent_id\":null,\"classification\":\"expense\"},{\"id\":\"fast_food_id\",\"name\":\"Fast
+        Food\",\"is_subcategory\":true,\"parent_id\":\"restaurants_id\",\"classification\":\"expense\"},{\"id\":\"income_id\",\"name\":\"Income\",\"is_subcategory\":false,\"parent_id\":null,\"classification\":\"income\"}]\n```\n\nUse
+        the available categories to auto-categorize the following transactions:\n\n```json\n[{\"id\":\"1\",\"name\":\"McDonalds\",\"amount\":20,\"classification\":\"expense\",\"merchant\":\"McDonalds\",\"hint\":\"Fast
+        Food\"},{\"id\":\"2\",\"name\":\"Amazon purchase\",\"amount\":100,\"classification\":\"expense\",\"merchant\":\"Amazon\"},{\"id\":\"3\",\"name\":\"Netflix
+        subscription\",\"amount\":10,\"classification\":\"expense\",\"merchant\":\"Netflix\",\"hint\":\"Subscriptions\"},{\"id\":\"4\",\"name\":\"paycheck\",\"amount\":3000,\"classification\":\"income\"},{\"id\":\"5\",\"name\":\"Italian
+        dinner with friends\",\"amount\":100,\"classification\":\"expense\"},{\"id\":\"6\",\"name\":\"1212XXXBCaaa
+        charge\",\"amount\":2.99,\"classification\":\"expense\"}]\n```\n"}],"text":{"format":{"type":"json_schema","name":"auto_categorize_personal_finance_transactions","strict":true,"schema":{"type":"object","properties":{"categorizations":{"type":"array","description":"An
+        array of auto-categorizations for each transaction","items":{"type":"object","properties":{"transaction_id":{"type":"string","description":"The
+        internal ID of the original transaction","enum":["1","2","3","4","5","6"]},"category_name":{"type":"string","description":"The
+        matched category name of the transaction, or null if no match","enum":["Shopping","Subscriptions","Restaurants","Fast
+        Food","Income","null"]}},"required":["transaction_id","category_name"],"additionalProperties":false}}},"required":["categorizations"],"additionalProperties":false}}},"instructions":"You
+        are an assistant to a consumer personal finance app.  You will be provided
+        a list\nof the user''s transactions and a list of the user''s categories.  Your
+        job is to auto-categorize\neach transaction.\n\nClosely follow ALL the rules
+        below while auto-categorizing:\n\n- Return 1 result per transaction\n- Correlate
+        each transaction by ID (transaction_id)\n- Attempt to match the most specific
+        category possible (i.e. subcategory over parent category)\n- Category and
+        transaction classifications should match (i.e. if transaction is an \"expense\",
+        the category must have classification of \"expense\")\n- If you don''t know
+        the category, return \"null\"\n  - You should always favor \"null\" over false
+        positives\n  - Be slightly pessimistic.  Only match a category if you''re
+        60%+ confident it is the correct one.\n- Each transaction has varying metadata
+        that can be used to determine the category\n  - Note: \"hint\" comes from
+        3rd party aggregators and typically represents a category name that\n    may
+        or may not match any of the user-supplied categories\n"}'
+    headers:
+      Content-Type:
+      - application/json
+      Authorization:
+      - Bearer <OPENAI_ACCESS_TOKEN>
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Wed, 16 Apr 2025 14:07:39 GMT
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Openai-Version:
+      - '2020-10-01'
+      Openai-Organization:
+      - user-r6cwd3mn6iv6gn748b2xoajx
+      X-Request-Id:
+      - req_01b869bd9eb7b994a80e79f6de92e5a2
+      Openai-Processing-Ms:
+      - '2173'
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      Cf-Cache-Status:
+      - DYNAMIC
+      Set-Cookie:
+      - __cf_bm=xGkX7L6XeEFLp6ZPB2Y.LLHD_YSpzTH28MUro6fQG7Y-1744812459-1.0.1.1-uy8WQsFzGblq3h.u6WFs2vld_HM.5fveVAFBsQ6y.Za22DSEa22k3NS7.GAUbgAvoVjGvSQlkm8LkSZyU3wZfN70cUpZrg27orQt0Nfq91U;
+        path=/; expires=Wed, 16-Apr-25 14:37:39 GMT; domain=.api.openai.com; HttpOnly;
+        Secure; SameSite=None
+      - _cfuvid=LicWzTMZxt1n1GLU6XQx3NnU0PbKnI0m97CH.p0895U-1744812459077-0.0.1.1-604800000;
+        path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None
+      X-Content-Type-Options:
+      - nosniff
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 93143ffeffe8cf6b-CMH
+      Alt-Svc:
+      - h3=":443"; ma=86400
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        {
+          "id": "resp_67ffb9a8e530819290c5d3ec8aaf326d0e0f06e2ac13ae37",
+          "object": "response",
+          "created_at": 1744812456,
+          "status": "completed",
+          "error": null,
+          "incomplete_details": null,
+          "instructions": "You are an assistant to a consumer personal finance app.  You will be provided a list\nof the user's transactions and a list of the user's categories.  Your job is to auto-categorize\neach transaction.\n\nClosely follow ALL the rules below while auto-categorizing:\n\n- Return 1 result per transaction\n- Correlate each transaction by ID (transaction_id)\n- Attempt to match the most specific category possible (i.e. subcategory over parent category)\n- Category and transaction classifications should match (i.e. if transaction is an \"expense\", the category must have classification of \"expense\")\n- If you don't know the category, return \"null\"\n  - You should always favor \"null\" over false positives\n  - Be slightly pessimistic.  Only match a category if you're 60%+ confident it is the correct one.\n- Each transaction has varying metadata that can be used to determine the category\n  - Note: \"hint\" comes from 3rd party aggregators and typically represents a category name that\n    may or may not match any of the user-supplied categories\n",
+          "max_output_tokens": null,
+          "model": "gpt-4.1-mini-2025-04-14",
+          "output": [
+            {
+              "id": "msg_67ffb9a96b3c81928d9da130e889a9aa0e0f06e2ac13ae37",
+              "type": "message",
+              "status": "completed",
+              "content": [
+                {
+                  "type": "output_text",
+                  "annotations": [],
+                  "text": "{\"categorizations\":[{\"transaction_id\":\"1\",\"category_name\":\"Fast Food\"},{\"transaction_id\":\"2\",\"category_name\":\"Shopping\"},{\"transaction_id\":\"3\",\"category_name\":\"Subscriptions\"},{\"transaction_id\":\"4\",\"category_name\":\"Income\"},{\"transaction_id\":\"5\",\"category_name\":\"Restaurants\"},{\"transaction_id\":\"6\",\"category_name\":\"null\"}]}"
+                }
+              ],
+              "role": "assistant"
+            }
+          ],
+          "parallel_tool_calls": true,
+          "previous_response_id": null,
+          "reasoning": {
+            "effort": null,
+            "summary": null
+          },
+          "store": true,
+          "temperature": 1.0,
+          "text": {
+            "format": {
+              "type": "json_schema",
+              "description": null,
+              "name": "auto_categorize_personal_finance_transactions",
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "categorizations": {
+                    "type": "array",
+                    "description": "An array of auto-categorizations for each transaction",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "transaction_id": {
+                          "type": "string",
+                          "description": "The internal ID of the original transaction",
+                          "enum": [
+                            "1",
+                            "2",
+                            "3",
+                            "4",
+                            "5",
+                            "6"
+                          ]
+                        },
+                        "category_name": {
+                          "type": "string",
+                          "description": "The matched category name of the transaction, or null if no match",
+                          "enum": [
+                            "Shopping",
+                            "Subscriptions",
+                            "Restaurants",
+                            "Fast Food",
+                            "Income",
+                            "null"
+                          ]
+                        }
+                      },
+                      "required": [
+                        "transaction_id",
+                        "category_name"
+                      ],
+                      "additionalProperties": false
+                    }
+                  }
+                },
+                "required": [
+                  "categorizations"
+                ],
+                "additionalProperties": false
+              },
+              "strict": true
+            }
+          },
+          "tool_choice": "auto",
+          "tools": [],
+          "top_p": 1.0,
+          "truncation": "disabled",
+          "usage": {
+            "input_tokens": 659,
+            "input_tokens_details": {
+              "cached_tokens": 0
+            },
+            "output_tokens": 70,
+            "output_tokens_details": {
+              "reasoning_tokens": 0
+            },
+            "total_tokens": 729
+          },
+          "user": null,
+          "metadata": {}
+        }
+  recorded_at: Wed, 16 Apr 2025 14:07:39 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/openai/auto_detect_merchants.yml b/test/vcr_cassettes/openai/auto_detect_merchants.yml
new file mode 100644
index 00000000..c8f4a67e
--- /dev/null
+++ b/test/vcr_cassettes/openai/auto_detect_merchants.yml
@@ -0,0 +1,203 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.openai.com/v1/responses
+    body:
+      encoding: UTF-8
+      string: '{"model":"gpt-4.1-mini","input":[{"role":"developer","content":"Here
+        are the user''s available merchants in JSON format:\n\n```json\n[{\"name\":\"Shooters\"}]\n```\n\nUse
+        BOTH your knowledge AND the user-generated merchants to auto-detect the following
+        transactions:\n\n```json\n[{\"id\":\"1\",\"name\":\"McDonalds\",\"amount\":20,\"classification\":\"expense\"},{\"id\":\"2\",\"name\":\"local
+        pub\",\"amount\":20,\"classification\":\"expense\"},{\"id\":\"3\",\"name\":\"WMT
+        purchases\",\"amount\":20,\"classification\":\"expense\"},{\"id\":\"4\",\"name\":\"amzn
+        123 abc\",\"amount\":20,\"classification\":\"expense\"},{\"id\":\"5\",\"name\":\"chaseX1231\",\"amount\":2000,\"classification\":\"income\"},{\"id\":\"6\",\"name\":\"check
+        deposit 022\",\"amount\":200,\"classification\":\"income\"},{\"id\":\"7\",\"name\":\"shooters
+        bar and grill\",\"amount\":200,\"classification\":\"expense\"},{\"id\":\"8\",\"name\":\"Microsoft
+        Office subscription\",\"amount\":200,\"classification\":\"expense\"}]\n```\n\nReturn
+        \"null\" if you are not 80%+ confident in your answer.\n"}],"text":{"format":{"type":"json_schema","name":"auto_detect_personal_finance_merchants","strict":true,"schema":{"type":"object","properties":{"merchants":{"type":"array","description":"An
+        array of auto-detected merchant businesses for each transaction","items":{"type":"object","properties":{"transaction_id":{"type":"string","description":"The
+        internal ID of the original transaction","enum":["1","2","3","4","5","6","7","8"]},"business_name":{"type":["string","null"],"description":"The
+        detected business name of the transaction, or `null` if uncertain"},"business_url":{"type":["string","null"],"description":"The
+        URL of the detected business, or `null` if uncertain"}},"required":["transaction_id","business_name","business_url"],"additionalProperties":false}}},"required":["merchants"],"additionalProperties":false}}},"instructions":"You
+        are an assistant to a consumer personal finance app.\n\nClosely follow ALL
+        the rules below while auto-detecting business names and website URLs:\n\n-
+        Return 1 result per transaction\n- Correlate each transaction by ID (transaction_id)\n-
+        Do not include the subdomain in the business_url (i.e. \"amazon.com\" not
+        \"www.amazon.com\")\n- User merchants are considered \"manual\" user-generated
+        merchants and should only be used in 100% clear cases\n- Be slightly pessimistic.  We
+        favor returning \"null\" over returning a false positive.\n- NEVER return
+        a name or URL for generic transaction names (e.g. \"Paycheck\", \"Laundromat\",
+        \"Grocery store\", \"Local diner\")\n\nDetermining a value:\n\n- First attempt
+        to determine the name + URL from your knowledge of global businesses\n- If
+        no certain match, attempt to match one of the user-provided merchants\n- If
+        no match, return \"null\"\n\nExample 1 (known business):\n\n```\nTransaction
+        name: \"Some Amazon purchases\"\n\nResult:\n- business_name: \"Amazon\"\n-
+        business_url: \"amazon.com\"\n```\n\nExample 2 (generic business):\n\n```\nTransaction
+        name: \"local diner\"\n\nResult:\n- business_name: null\n- business_url: null\n```\n"}'
+    headers:
+      Content-Type:
+      - application/json
+      Authorization:
+      - Bearer <OPENAI_ACCESS_TOKEN>
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Wed, 16 Apr 2025 15:41:50 GMT
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Openai-Version:
+      - '2020-10-01'
+      Openai-Organization:
+      - user-r6cwd3mn6iv6gn748b2xoajx
+      X-Request-Id:
+      - req_77a41d32ae2c3dbd9081b34bc5e4ce61
+      Openai-Processing-Ms:
+      - '2152'
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      Cf-Cache-Status:
+      - DYNAMIC
+      Set-Cookie:
+      - __cf_bm=hCFJRspk322ZVvRasJGcux5mYDyfa5aO7EQOCAbnhjM-1744818110-1.0.1.1-.fRz_SYTG_PqZ3VCSDju7YeDaZwCyf5OGVvDvaN.h3aegNTlYtdPwbnZ5NNFxLRJhWFRY4vwHYkHm1DGTarK5NQ6UjA1sOrRpmS5eZ.zabw;
+        path=/; expires=Wed, 16-Apr-25 16:11:50 GMT; domain=.api.openai.com; HttpOnly;
+        Secure; SameSite=None
+      - _cfuvid=At3dVxwug2seJ3Oa02PSnIoKhVSEvt6IPCLfhkULvac-1744818110064-0.0.1.1-604800000;
+        path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None
+      X-Content-Type-Options:
+      - nosniff
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 9314c9f5cef5efe9-CMH
+      Alt-Svc:
+      - h3=":443"; ma=86400
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        {
+          "id": "resp_67ffcfbbddb48192a251a3c0f341941a04d20b39fa51ef90",
+          "object": "response",
+          "created_at": 1744818107,
+          "status": "completed",
+          "error": null,
+          "incomplete_details": null,
+          "instructions": "You are an assistant to a consumer personal finance app.\n\nClosely follow ALL the rules below while auto-detecting business names and website URLs:\n\n- Return 1 result per transaction\n- Correlate each transaction by ID (transaction_id)\n- Do not include the subdomain in the business_url (i.e. \"amazon.com\" not \"www.amazon.com\")\n- User merchants are considered \"manual\" user-generated merchants and should only be used in 100% clear cases\n- Be slightly pessimistic.  We favor returning \"null\" over returning a false positive.\n- NEVER return a name or URL for generic transaction names (e.g. \"Paycheck\", \"Laundromat\", \"Grocery store\", \"Local diner\")\n\nDetermining a value:\n\n- First attempt to determine the name + URL from your knowledge of global businesses\n- If no certain match, attempt to match one of the user-provided merchants\n- If no match, return \"null\"\n\nExample 1 (known business):\n\n```\nTransaction name: \"Some Amazon purchases\"\n\nResult:\n- business_name: \"Amazon\"\n- business_url: \"amazon.com\"\n```\n\nExample 2 (generic business):\n\n```\nTransaction name: \"local diner\"\n\nResult:\n- business_name: null\n- business_url: null\n```\n",
+          "max_output_tokens": null,
+          "model": "gpt-4.1-mini-2025-04-14",
+          "output": [
+            {
+              "id": "msg_67ffcfbc58bc8192bbcf4dc54759837c04d20b39fa51ef90",
+              "type": "message",
+              "status": "completed",
+              "content": [
+                {
+                  "type": "output_text",
+                  "annotations": [],
+                  "text": "{\"merchants\":[{\"transaction_id\":\"1\",\"business_name\":\"McDonald's\",\"business_url\":\"mcdonalds.com\"},{\"transaction_id\":\"2\",\"business_name\":null,\"business_url\":null},{\"transaction_id\":\"3\",\"business_name\":\"Walmart\",\"business_url\":\"walmart.com\"},{\"transaction_id\":\"4\",\"business_name\":\"Amazon\",\"business_url\":\"amazon.com\"},{\"transaction_id\":\"5\",\"business_name\":null,\"business_url\":null},{\"transaction_id\":\"6\",\"business_name\":null,\"business_url\":null},{\"transaction_id\":\"7\",\"business_name\":\"Shooters\",\"business_url\":null},{\"transaction_id\":\"8\",\"business_name\":\"Microsoft\",\"business_url\":\"microsoft.com\"}]}"
+                }
+              ],
+              "role": "assistant"
+            }
+          ],
+          "parallel_tool_calls": true,
+          "previous_response_id": null,
+          "reasoning": {
+            "effort": null,
+            "summary": null
+          },
+          "store": true,
+          "temperature": 1.0,
+          "text": {
+            "format": {
+              "type": "json_schema",
+              "description": null,
+              "name": "auto_detect_personal_finance_merchants",
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "merchants": {
+                    "type": "array",
+                    "description": "An array of auto-detected merchant businesses for each transaction",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "transaction_id": {
+                          "type": "string",
+                          "description": "The internal ID of the original transaction",
+                          "enum": [
+                            "1",
+                            "2",
+                            "3",
+                            "4",
+                            "5",
+                            "6",
+                            "7",
+                            "8"
+                          ]
+                        },
+                        "business_name": {
+                          "type": [
+                            "string",
+                            "null"
+                          ],
+                          "description": "The detected business name of the transaction, or `null` if uncertain"
+                        },
+                        "business_url": {
+                          "type": [
+                            "string",
+                            "null"
+                          ],
+                          "description": "The URL of the detected business, or `null` if uncertain"
+                        }
+                      },
+                      "required": [
+                        "transaction_id",
+                        "business_name",
+                        "business_url"
+                      ],
+                      "additionalProperties": false
+                    }
+                  }
+                },
+                "required": [
+                  "merchants"
+                ],
+                "additionalProperties": false
+              },
+              "strict": true
+            }
+          },
+          "tool_choice": "auto",
+          "tools": [],
+          "top_p": 1.0,
+          "truncation": "disabled",
+          "usage": {
+            "input_tokens": 635,
+            "input_tokens_details": {
+              "cached_tokens": 0
+            },
+            "output_tokens": 140,
+            "output_tokens_details": {
+              "reasoning_tokens": 0
+            },
+            "total_tokens": 775
+          },
+          "user": null,
+          "metadata": {}
+        }
+  recorded_at: Wed, 16 Apr 2025 15:41:50 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/openai/chat/basic_response.yml b/test/vcr_cassettes/openai/chat/basic_response.yml
new file mode 100644
index 00000000..e70f98a4
--- /dev/null
+++ b/test/vcr_cassettes/openai/chat/basic_response.yml
@@ -0,0 +1,120 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.openai.com/v1/responses
+    body:
+      encoding: UTF-8
+      string: '{"model":"gpt-4.1","input":[{"role":"user","content":"This is a chat
+        test.  If it''s working, respond with a single word: Yes"}],"instructions":null,"tools":[],"previous_response_id":null,"stream":null}'
+    headers:
+      Content-Type:
+      - application/json
+      Authorization:
+      - Bearer <OPENAI_ACCESS_TOKEN>
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 31 Mar 2025 20:38:55 GMT
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Openai-Version:
+      - '2020-10-01'
+      Openai-Organization:
+      - "<OPENAI_ORGANIZATION_ID>"
+      X-Request-Id:
+      - req_f99033a5841a7d9357ee08d301ad634e
+      Openai-Processing-Ms:
+      - '713'
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      Cf-Cache-Status:
+      - DYNAMIC
+      Set-Cookie:
+      - __cf_bm=UOaolWyAE3WXhLfg9c3KmO4d_Nq6t9cedTfZ6hznYEE-1743453535-1.0.1.1-GyQq_xeRpsyxxp8QQja5Bvo2XqUGfXHNGehtQoPV.BIgyLbERSIqJAK0IEKcYgpuLCyvQdlMNGqtdBHB6r5XMPHjOSMN1bTQYJHLsvlD5Z4;
+        path=/; expires=Mon, 31-Mar-25 21:08:55 GMT; domain=.api.openai.com; HttpOnly;
+        Secure; SameSite=None
+      - _cfuvid=_zDj2dj75eLeGSzZxpBpzHxYg4gJpEfQpcnT9aCJXqM-1743453535930-0.0.1.1-604800000;
+        path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None
+      X-Content-Type-Options:
+      - nosniff
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 9292a7325d09cf53-CMH
+      Alt-Svc:
+      - h3=":443"; ma=86400
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        {
+          "id": "resp_67eafd5f2b7c81928d6834e7f4d26deb0bfadc995fda2b45",
+          "object": "response",
+          "created_at": 1743453535,
+          "status": "completed",
+          "error": null,
+          "incomplete_details": null,
+          "instructions": null,
+          "max_output_tokens": null,
+          "model": "gpt-4.1-2024-08-06",
+          "output": [
+            {
+              "type": "message",
+              "id": "msg_67eafd5fba44819287b79107821a818b0bfadc995fda2b45",
+              "status": "completed",
+              "role": "assistant",
+              "content": [
+                {
+                  "type": "output_text",
+                  "text": "Yes",
+                  "annotations": []
+                }
+              ]
+            }
+          ],
+          "parallel_tool_calls": true,
+          "previous_response_id": null,
+          "reasoning": {
+            "effort": null,
+            "generate_summary": null
+          },
+          "store": true,
+          "temperature": 1.0,
+          "text": {
+            "format": {
+              "type": "text"
+            }
+          },
+          "tool_choice": "auto",
+          "tools": [],
+          "top_p": 1.0,
+          "truncation": "disabled",
+          "usage": {
+            "input_tokens": 25,
+            "input_tokens_details": {
+              "cached_tokens": 0
+            },
+            "output_tokens": 2,
+            "output_tokens_details": {
+              "reasoning_tokens": 0
+            },
+            "total_tokens": 27
+          },
+          "user": null,
+          "metadata": {}
+        }
+  recorded_at: Mon, 31 Mar 2025 20:38:55 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/openai/chat/basic_streaming_response.yml b/test/vcr_cassettes/openai/chat/basic_streaming_response.yml
new file mode 100644
index 00000000..dc620f36
--- /dev/null
+++ b/test/vcr_cassettes/openai/chat/basic_streaming_response.yml
@@ -0,0 +1,92 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.openai.com/v1/responses
+    body:
+      encoding: UTF-8
+      string: '{"model":"gpt-4.1","input":[{"role":"user","content":"This is a chat
+        test.  If it''s working, respond with a single word: Yes"}],"instructions":null,"tools":[],"previous_response_id":null,"stream":true}'
+    headers:
+      Content-Type:
+      - application/json
+      Authorization:
+      - Bearer <OPENAI_ACCESS_TOKEN>
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 31 Mar 2025 20:38:55 GMT
+      Content-Type:
+      - text/event-stream; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Openai-Version:
+      - '2020-10-01'
+      Openai-Organization:
+      - "<OPENAI_ORGANIZATION_ID>"
+      X-Request-Id:
+      - req_d88b2a28252a098fe9f6e1223baebad8
+      Openai-Processing-Ms:
+      - '124'
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      Cf-Cache-Status:
+      - DYNAMIC
+      Set-Cookie:
+      - __cf_bm=wP2ENU9eOGUSzQ8wOjb31UiZAZVX021QgA1NuYcfKeo-1743453535-1.0.1.1-d08X7zX7cf._5LTGrF6qL17AtdgsKpEWLWnZ0dl5KgPWXEK.oqoDgoQ_pa8j5rKYZkeZUDxMhcpP266z9tJpPJ2ZPX8bkZYAjlnlcOa5.JM;
+        path=/; expires=Mon, 31-Mar-25 21:08:55 GMT; domain=.api.openai.com; HttpOnly;
+        Secure; SameSite=None
+      - _cfuvid=F6OIQe1fgGYxb6xer0VjBA1aHrf6osX7wJU6adYsMy0-1743453535321-0.0.1.1-604800000;
+        path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None
+      X-Content-Type-Options:
+      - nosniff
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 9292a7324c3dcf78-CMH
+      Alt-Svc:
+      - h3=":443"; ma=86400
+    body:
+      encoding: UTF-8
+      string: |+
+        event: response.created
+        data: {"type":"response.created","response":{"id":"resp_67eafd5f2b90819288af54361ff81a100e51d01dbd4ed330","object":"response","created_at":1743453535,"status":"in_progress","error":null,"incomplete_details":null,"instructions":null,"max_output_tokens":null,"model":"gpt-4.1-2024-08-06","output":[],"parallel_tool_calls":true,"previous_response_id":null,"reasoning":{"effort":null,"generate_summary":null},"store":true,"temperature":1.0,"text":{"format":{"type":"text"}},"tool_choice":"auto","tools":[],"top_p":1.0,"truncation":"disabled","usage":null,"user":null,"metadata":{}}}
+
+        event: response.in_progress
+        data: {"type":"response.in_progress","response":{"id":"resp_67eafd5f2b90819288af54361ff81a100e51d01dbd4ed330","object":"response","created_at":1743453535,"status":"in_progress","error":null,"incomplete_details":null,"instructions":null,"max_output_tokens":null,"model":"gpt-4.1-2024-08-06","output":[],"parallel_tool_calls":true,"previous_response_id":null,"reasoning":{"effort":null,"generate_summary":null},"store":true,"temperature":1.0,"text":{"format":{"type":"text"}},"tool_choice":"auto","tools":[],"top_p":1.0,"truncation":"disabled","usage":null,"user":null,"metadata":{}}}
+
+        event: response.output_item.added
+        data: {"type":"response.output_item.added","output_index":0,"item":{"type":"message","id":"msg_67eafd5f7c048192a24ce545ebfd908a0e51d01dbd4ed330","status":"in_progress","role":"assistant","content":[]}}
+
+        event: response.content_part.added
+        data: {"type":"response.content_part.added","item_id":"msg_67eafd5f7c048192a24ce545ebfd908a0e51d01dbd4ed330","output_index":0,"content_index":0,"part":{"type":"output_text","text":"","annotations":[]}}
+
+        event: response.output_text.delta
+        data: {"type":"response.output_text.delta","item_id":"msg_67eafd5f7c048192a24ce545ebfd908a0e51d01dbd4ed330","output_index":0,"content_index":0,"delta":"Yes"}
+
+        event: response.output_text.done
+        data: {"type":"response.output_text.done","item_id":"msg_67eafd5f7c048192a24ce545ebfd908a0e51d01dbd4ed330","output_index":0,"content_index":0,"text":"Yes"}
+
+        event: response.content_part.done
+        data: {"type":"response.content_part.done","item_id":"msg_67eafd5f7c048192a24ce545ebfd908a0e51d01dbd4ed330","output_index":0,"content_index":0,"part":{"type":"output_text","text":"Yes","annotations":[]}}
+
+        event: response.output_item.done
+        data: {"type":"response.output_item.done","output_index":0,"item":{"type":"message","id":"msg_67eafd5f7c048192a24ce545ebfd908a0e51d01dbd4ed330","status":"completed","role":"assistant","content":[{"type":"output_text","text":"Yes","annotations":[]}]}}
+
+        event: response.completed
+        data: {"type":"response.completed","response":{"id":"resp_67eafd5f2b90819288af54361ff81a100e51d01dbd4ed330","object":"response","created_at":1743453535,"status":"completed","error":null,"incomplete_details":null,"instructions":null,"max_output_tokens":null,"model":"gpt-4.1-2024-08-06","output":[{"type":"message","id":"msg_67eafd5f7c048192a24ce545ebfd908a0e51d01dbd4ed330","status":"completed","role":"assistant","content":[{"type":"output_text","text":"Yes","annotations":[]}]}],"parallel_tool_calls":true,"previous_response_id":null,"reasoning":{"effort":null,"generate_summary":null},"store":true,"temperature":1.0,"text":{"format":{"type":"text"}},"tool_choice":"auto","tools":[],"top_p":1.0,"truncation":"disabled","usage":{"input_tokens":25,"input_tokens_details":{"cached_tokens":0},"output_tokens":2,"output_tokens_details":{"reasoning_tokens":0},"total_tokens":27},"user":null,"metadata":{}}}
+
+  recorded_at: Mon, 31 Mar 2025 20:38:55 GMT
+recorded_with: VCR 6.3.1
+...
diff --git a/test/vcr_cassettes/openai/chat/error.yml b/test/vcr_cassettes/openai/chat/error.yml
new file mode 100644
index 00000000..3d8ab1c4
--- /dev/null
+++ b/test/vcr_cassettes/openai/chat/error.yml
@@ -0,0 +1,71 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.openai.com/v1/responses
+    body:
+      encoding: UTF-8
+      string: '{"model":"invalid-model-that-will-trigger-api-error","input":[{"role":"user","content":"Test"}],"instructions":null,"tools":[],"previous_response_id":null,"stream":null}'
+    headers:
+      Content-Type:
+      - application/json
+      Authorization:
+      - Bearer <OPENAI_ACCESS_TOKEN>
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 400
+      message: Bad Request
+    headers:
+      Date:
+      - Mon, 31 Mar 2025 20:38:55 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '207'
+      Connection:
+      - keep-alive
+      Openai-Version:
+      - '2020-10-01'
+      Openai-Organization:
+      - "<OPENAI_ORGANIZATION_ID>"
+      X-Request-Id:
+      - req_3981f27aa18db734b3dd530fa2929b95
+      Openai-Processing-Ms:
+      - '113'
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      Cf-Cache-Status:
+      - DYNAMIC
+      Set-Cookie:
+      - __cf_bm=8KUMK_Gp4f97KLactyy3QniUZbNmN9Zwbx9WowYCc98-1743453535-1.0.1.1-opjT17tCwi9U0AukBXoHrpPEcC4Z.GIyEt.AjjrzRWln62SWPIvggY4L19JabZu09.9cmxfyrwAFHmvDeCVxSWqAVf88PAZwwRICkZZUut0;
+        path=/; expires=Mon, 31-Mar-25 21:08:55 GMT; domain=.api.openai.com; HttpOnly;
+        Secure; SameSite=None
+      - _cfuvid=uZB07768IynyRRP6oxwcnC4Rfn.lGT1yRhzzGvNw0kc-1743453535322-0.0.1.1-604800000;
+        path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None
+      X-Content-Type-Options:
+      - nosniff
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 9292a7327d5161d6-ORD
+      Alt-Svc:
+      - h3=":443"; ma=86400
+    body:
+      encoding: UTF-8
+      string: |-
+        {
+          "error": {
+            "message": "The requested model 'invalid-model-that-will-trigger-api-error' does not exist.",
+            "type": "invalid_request_error",
+            "param": "model",
+            "code": "model_not_found"
+          }
+        }
+  recorded_at: Mon, 31 Mar 2025 20:38:55 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/openai/chat/function_calls.yml b/test/vcr_cassettes/openai/chat/function_calls.yml
new file mode 100644
index 00000000..b51f80c4
--- /dev/null
+++ b/test/vcr_cassettes/openai/chat/function_calls.yml
@@ -0,0 +1,247 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.openai.com/v1/responses
+    body:
+      encoding: UTF-8
+      string: '{"model":"gpt-4.1","input":[{"role":"user","content":"What is my net
+        worth?"}],"instructions":"Use the tools available to you to answer the user''s
+        question.","tools":[{"type":"function","name":"get_net_worth","description":"Gets
+        a user''s net worth","parameters":{"type":"object","properties":{},"required":[],"additionalProperties":false},"strict":true}],"previous_response_id":null,"stream":null}'
+    headers:
+      Content-Type:
+      - application/json
+      Authorization:
+      - Bearer <OPENAI_ACCESS_TOKEN>
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 31 Mar 2025 20:38:55 GMT
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Openai-Version:
+      - '2020-10-01'
+      Openai-Organization:
+      - "<OPENAI_ORGANIZATION_ID>"
+      X-Request-Id:
+      - req_a179c8964589756af0d4b5af864a29a7
+      Openai-Processing-Ms:
+      - '761'
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      Cf-Cache-Status:
+      - DYNAMIC
+      Set-Cookie:
+      - __cf_bm=niiWOEhogNgWfxuZanJKipOlIrWGEPtp7bUpqDAp9Lo-1743453535-1.0.1.1-ytL9wC5t5fjY2v90vscRJLokIeZyVY2hmBqFuWbA_BOvZaw9aPFmtQDKhDD3WcLQryEtXiEGAyOANHnaeItCR0J_sXu7Jy4wdpJ4EMShQxU;
+        path=/; expires=Mon, 31-Mar-25 21:08:55 GMT; domain=.api.openai.com; HttpOnly;
+        Secure; SameSite=None
+      - _cfuvid=kKjDNYSJJidsRTyFQWUgt6xlnqW_DkveNOUYxpBe9EE-1743453535972-0.0.1.1-604800000;
+        path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None
+      X-Content-Type-Options:
+      - nosniff
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 9292a732598dcf52-CMH
+      Alt-Svc:
+      - h3=":443"; ma=86400
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        {
+          "id": "resp_67eafd5f2d1881928f10551839e8219102a5ebf5f2a599ef",
+          "object": "response",
+          "created_at": 1743453535,
+          "status": "completed",
+          "error": null,
+          "incomplete_details": null,
+          "instructions": "Use the tools available to you to answer the user's question.",
+          "max_output_tokens": null,
+          "model": "gpt-4.1-2024-08-06",
+          "output": [
+            {
+              "type": "function_call",
+              "id": "fc_67eafd5f9c88819286afe92f08354f7302a5ebf5f2a599ef",
+              "call_id": "call_KrFORr53UBxdwZ9SQ6fkpU0F",
+              "name": "get_net_worth",
+              "arguments": "{}",
+              "status": "completed"
+            }
+          ],
+          "parallel_tool_calls": true,
+          "previous_response_id": null,
+          "reasoning": {
+            "effort": null,
+            "generate_summary": null
+          },
+          "store": true,
+          "temperature": 1.0,
+          "text": {
+            "format": {
+              "type": "text"
+            }
+          },
+          "tool_choice": "auto",
+          "tools": [
+            {
+              "type": "function",
+              "description": "Gets a user's net worth",
+              "name": "get_net_worth",
+              "parameters": {
+                "type": "object",
+                "properties": {},
+                "required": [],
+                "additionalProperties": false
+              },
+              "strict": true
+            }
+          ],
+          "top_p": 1.0,
+          "truncation": "disabled",
+          "usage": {
+            "input_tokens": 55,
+            "input_tokens_details": {
+              "cached_tokens": 0
+            },
+            "output_tokens": 13,
+            "output_tokens_details": {
+              "reasoning_tokens": 0
+            },
+            "total_tokens": 68
+          },
+          "user": null,
+          "metadata": {}
+        }
+  recorded_at: Mon, 31 Mar 2025 20:38:55 GMT
+- request:
+    method: post
+    uri: https://api.openai.com/v1/responses
+    body:
+      encoding: UTF-8
+      string: '{"model":"gpt-4.1","input":[{"role":"user","content":"What is my net
+        worth?"},{"type":"function_call_output","call_id":"call_KrFORr53UBxdwZ9SQ6fkpU0F","output":"\"{\\\"amount\\\":10000,\\\"currency\\\":\\\"USD\\\"}\""}],"instructions":null,"tools":[],"previous_response_id":"resp_67eafd5f2d1881928f10551839e8219102a5ebf5f2a599ef","stream":null}'
+    headers:
+      Content-Type:
+      - application/json
+      Authorization:
+      - Bearer <OPENAI_ACCESS_TOKEN>
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 31 Mar 2025 20:38:56 GMT
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Openai-Version:
+      - '2020-10-01'
+      Openai-Organization:
+      - "<OPENAI_ORGANIZATION_ID>"
+      X-Request-Id:
+      - req_edd5bafc982bae46e92d0cd79e594779
+      Openai-Processing-Ms:
+      - '805'
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      Cf-Cache-Status:
+      - DYNAMIC
+      Set-Cookie:
+      - __cf_bm=jOZGEPyAByXhGrQIvKzbj_6TEODdZWw_S0BZsxbsuDc-1743453536-1.0.1.1-YpxHv.vmXVdwzQV5dMTB0I851tQSlDf.NboFddRq_aLDM1CnQW143gRcYbfPpCREij9SDqhnluZ4kxCuD3eaarhmFn2liMVHHRYUgMsUhck;
+        path=/; expires=Mon, 31-Mar-25 21:08:56 GMT; domain=.api.openai.com; HttpOnly;
+        Secure; SameSite=None
+      - _cfuvid=1BoPw7WORdkfBQmal3sGAXdHGiJiFkXK8HXhWPWf7Vw-1743453536967-0.0.1.1-604800000;
+        path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None
+      X-Content-Type-Options:
+      - nosniff
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 9292a7385ec6cf62-CMH
+      Alt-Svc:
+      - h3=":443"; ma=86400
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        {
+          "id": "resp_67eafd6023488192b382acd64a514ff002a5ebf5f2a599ef",
+          "object": "response",
+          "created_at": 1743453536,
+          "status": "completed",
+          "error": null,
+          "incomplete_details": null,
+          "instructions": null,
+          "max_output_tokens": null,
+          "model": "gpt-4.1-2024-08-06",
+          "output": [
+            {
+              "type": "message",
+              "id": "msg_67eafd60a42c8192906eb4d48f8970de02a5ebf5f2a599ef",
+              "status": "completed",
+              "role": "assistant",
+              "content": [
+                {
+                  "type": "output_text",
+                  "text": "Your net worth is $10,000 USD.",
+                  "annotations": []
+                }
+              ]
+            }
+          ],
+          "parallel_tool_calls": true,
+          "previous_response_id": "resp_67eafd5f2d1881928f10551839e8219102a5ebf5f2a599ef",
+          "reasoning": {
+            "effort": null,
+            "generate_summary": null
+          },
+          "store": true,
+          "temperature": 1.0,
+          "text": {
+            "format": {
+              "type": "text"
+            }
+          },
+          "tool_choice": "auto",
+          "tools": [],
+          "top_p": 1.0,
+          "truncation": "disabled",
+          "usage": {
+            "input_tokens": 58,
+            "input_tokens_details": {
+              "cached_tokens": 0
+            },
+            "output_tokens": 11,
+            "output_tokens_details": {
+              "reasoning_tokens": 0
+            },
+            "total_tokens": 69
+          },
+          "user": null,
+          "metadata": {}
+        }
+  recorded_at: Mon, 31 Mar 2025 20:38:57 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/openai/chat/streaming_function_calls.yml b/test/vcr_cassettes/openai/chat/streaming_function_calls.yml
new file mode 100644
index 00000000..41bc3971
--- /dev/null
+++ b/test/vcr_cassettes/openai/chat/streaming_function_calls.yml
@@ -0,0 +1,203 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.openai.com/v1/responses
+    body:
+      encoding: UTF-8
+      string: '{"model":"gpt-4.1","input":[{"role":"user","content":"What is my net
+        worth?"}],"instructions":"Use the tools available to you to answer the user''s
+        question.","tools":[{"type":"function","name":"get_net_worth","description":"Gets
+        a user''s net worth","parameters":{"type":"object","properties":{},"required":[],"additionalProperties":false},"strict":true}],"previous_response_id":null,"stream":true}'
+    headers:
+      Content-Type:
+      - application/json
+      Authorization:
+      - Bearer <OPENAI_ACCESS_TOKEN>
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 31 Mar 2025 20:38:55 GMT
+      Content-Type:
+      - text/event-stream; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Openai-Version:
+      - '2020-10-01'
+      Openai-Organization:
+      - "<OPENAI_ORGANIZATION_ID>"
+      X-Request-Id:
+      - req_8c4d6f0ad0ae3095353a5c19fd128c56
+      Openai-Processing-Ms:
+      - '129'
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      Cf-Cache-Status:
+      - DYNAMIC
+      Set-Cookie:
+      - __cf_bm=5yRGSo0Y69GvEK51Bq2.Np0DSg9DmAJKNqvE3_XgKBg-1743453535-1.0.1.1-sH1YR42zmznwvKlaBUM.bPKvJl_PiebfNBKhREMO.sSa5gvFEkpcKaCG4x3XUdZ19XGTEF0CbRII3mqtcPJhxFzX3uVLGuVsyjz6odYDisM;
+        path=/; expires=Mon, 31-Mar-25 21:08:55 GMT; domain=.api.openai.com; HttpOnly;
+        Secure; SameSite=None
+      - _cfuvid=tblnBnP9s7yFkSzbYy9zuzuDkxS9i_n7hk3XdiiGui8-1743453535332-0.0.1.1-604800000;
+        path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None
+      X-Content-Type-Options:
+      - nosniff
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 9292a7324dfbcf46-CMH
+      Alt-Svc:
+      - h3=":443"; ma=86400
+    body:
+      encoding: UTF-8
+      string: |+
+        event: response.created
+        data: {"type":"response.created","response":{"id":"resp_67eafd5f2ef0819290ec6bbbc5f27c8e0aa8698ee903b906","object":"response","created_at":1743453535,"status":"in_progress","error":null,"incomplete_details":null,"instructions":"Use the tools available to you to answer the user's question.","max_output_tokens":null,"model":"gpt-4.1-2024-08-06","output":[],"parallel_tool_calls":true,"previous_response_id":null,"reasoning":{"effort":null,"generate_summary":null},"store":true,"temperature":1.0,"text":{"format":{"type":"text"}},"tool_choice":"auto","tools":[{"type":"function","description":"Gets a user's net worth","name":"get_net_worth","parameters":{"type":"object","properties":{},"required":[],"additionalProperties":false},"strict":true}],"top_p":1.0,"truncation":"disabled","usage":null,"user":null,"metadata":{}}}
+
+        event: response.in_progress
+        data: {"type":"response.in_progress","response":{"id":"resp_67eafd5f2ef0819290ec6bbbc5f27c8e0aa8698ee903b906","object":"response","created_at":1743453535,"status":"in_progress","error":null,"incomplete_details":null,"instructions":"Use the tools available to you to answer the user's question.","max_output_tokens":null,"model":"gpt-4.1-2024-08-06","output":[],"parallel_tool_calls":true,"previous_response_id":null,"reasoning":{"effort":null,"generate_summary":null},"store":true,"temperature":1.0,"text":{"format":{"type":"text"}},"tool_choice":"auto","tools":[{"type":"function","description":"Gets a user's net worth","name":"get_net_worth","parameters":{"type":"object","properties":{},"required":[],"additionalProperties":false},"strict":true}],"top_p":1.0,"truncation":"disabled","usage":null,"user":null,"metadata":{}}}
+
+        event: response.output_item.added
+        data: {"type":"response.output_item.added","output_index":0,"item":{"type":"function_call","id":"fc_67eafd5fa714819287b2bff8c76935690aa8698ee903b906","call_id":"call_7EY6rF7mkfNyMIz3HQmrYIOq","name":"get_net_worth","arguments":"","status":"in_progress"}}
+
+        event: response.function_call_arguments.delta
+        data: {"type":"response.function_call_arguments.delta","item_id":"fc_67eafd5fa714819287b2bff8c76935690aa8698ee903b906","output_index":0,"delta":"{}"}
+
+        event: response.function_call_arguments.done
+        data: {"type":"response.function_call_arguments.done","item_id":"fc_67eafd5fa714819287b2bff8c76935690aa8698ee903b906","output_index":0,"arguments":"{}"}
+
+        event: response.output_item.done
+        data: {"type":"response.output_item.done","output_index":0,"item":{"type":"function_call","id":"fc_67eafd5fa714819287b2bff8c76935690aa8698ee903b906","call_id":"call_7EY6rF7mkfNyMIz3HQmrYIOq","name":"get_net_worth","arguments":"{}","status":"completed"}}
+
+        event: response.completed
+        data: {"type":"response.completed","response":{"id":"resp_67eafd5f2ef0819290ec6bbbc5f27c8e0aa8698ee903b906","object":"response","created_at":1743453535,"status":"completed","error":null,"incomplete_details":null,"instructions":"Use the tools available to you to answer the user's question.","max_output_tokens":null,"model":"gpt-4.1-2024-08-06","output":[{"type":"function_call","id":"fc_67eafd5fa714819287b2bff8c76935690aa8698ee903b906","call_id":"call_7EY6rF7mkfNyMIz3HQmrYIOq","name":"get_net_worth","arguments":"{}","status":"completed"}],"parallel_tool_calls":true,"previous_response_id":null,"reasoning":{"effort":null,"generate_summary":null},"store":true,"temperature":1.0,"text":{"format":{"type":"text"}},"tool_choice":"auto","tools":[{"type":"function","description":"Gets a user's net worth","name":"get_net_worth","parameters":{"type":"object","properties":{},"required":[],"additionalProperties":false},"strict":true}],"top_p":1.0,"truncation":"disabled","usage":{"input_tokens":55,"input_tokens_details":{"cached_tokens":0},"output_tokens":13,"output_tokens_details":{"reasoning_tokens":0},"total_tokens":68},"user":null,"metadata":{}}}
+
+  recorded_at: Mon, 31 Mar 2025 20:38:55 GMT
+- request:
+    method: post
+    uri: https://api.openai.com/v1/responses
+    body:
+      encoding: UTF-8
+      string: '{"model":"gpt-4.1","input":[{"role":"user","content":"What is my net
+        worth?"},{"type":"function_call_output","call_id":"call_7EY6rF7mkfNyMIz3HQmrYIOq","output":"{\"amount\":10000,\"currency\":\"USD\"}"}],"instructions":null,"tools":[],"previous_response_id":"resp_67eafd5f2ef0819290ec6bbbc5f27c8e0aa8698ee903b906","stream":true}'
+    headers:
+      Content-Type:
+      - application/json
+      Authorization:
+      - Bearer <OPENAI_ACCESS_TOKEN>
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 31 Mar 2025 20:38:56 GMT
+      Content-Type:
+      - text/event-stream; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Openai-Version:
+      - '2020-10-01'
+      Openai-Organization:
+      - "<OPENAI_ORGANIZATION_ID>"
+      X-Request-Id:
+      - req_be9f30124a3a4cdae2d3b038692f6699
+      Openai-Processing-Ms:
+      - '177'
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      Cf-Cache-Status:
+      - DYNAMIC
+      Set-Cookie:
+      - __cf_bm=gNS8vmdzyz2jct__mfjLZGkJhCxddarRy62IkzSIFWM-1743453536-1.0.1.1-ufcPPmSzEaEysjhkRUozTfCIriRWy5iyeXCaVqeFDaJDWT4lc8ate4JhryV0fVQSZBi6pRN8zYh9dkLyYuXoSqYDCsZTN1uk6vO84nX1qGo;
+        path=/; expires=Mon, 31-Mar-25 21:08:56 GMT; domain=.api.openai.com; HttpOnly;
+        Secure; SameSite=None
+      - _cfuvid=3D41ZgFle.u0ER2Ehnm.bsdnSGlCXVArPa7bx9zumYU-1743453536171-0.0.1.1-604800000;
+        path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None
+      X-Content-Type-Options:
+      - nosniff
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 9292a7376f5acf4e-CMH
+      Alt-Svc:
+      - h3=":443"; ma=86400
+    body:
+      encoding: UTF-8
+      string: |+
+        event: response.created
+        data: {"type":"response.created","response":{"id":"resp_67eafd5ff7448192af7cd9e9dde90f5e0aa8698ee903b906","object":"response","created_at":1743453536,"status":"in_progress","error":null,"incomplete_details":null,"instructions":null,"max_output_tokens":null,"model":"gpt-4.1-2024-08-06","output":[],"parallel_tool_calls":true,"previous_response_id":"resp_67eafd5f2ef0819290ec6bbbc5f27c8e0aa8698ee903b906","reasoning":{"effort":null,"generate_summary":null},"store":true,"temperature":1.0,"text":{"format":{"type":"text"}},"tool_choice":"auto","tools":[],"top_p":1.0,"truncation":"disabled","usage":null,"user":null,"metadata":{}}}
+
+        event: response.in_progress
+        data: {"type":"response.in_progress","response":{"id":"resp_67eafd5ff7448192af7cd9e9dde90f5e0aa8698ee903b906","object":"response","created_at":1743453536,"status":"in_progress","error":null,"incomplete_details":null,"instructions":null,"max_output_tokens":null,"model":"gpt-4.1-2024-08-06","output":[],"parallel_tool_calls":true,"previous_response_id":"resp_67eafd5f2ef0819290ec6bbbc5f27c8e0aa8698ee903b906","reasoning":{"effort":null,"generate_summary":null},"store":true,"temperature":1.0,"text":{"format":{"type":"text"}},"tool_choice":"auto","tools":[],"top_p":1.0,"truncation":"disabled","usage":null,"user":null,"metadata":{}}}
+
+        event: response.output_item.added
+        data: {"type":"response.output_item.added","output_index":0,"item":{"type":"message","id":"msg_67eafd6084ec81929a5132414ef713180aa8698ee903b906","status":"in_progress","role":"assistant","content":[]}}
+
+        event: response.content_part.added
+        data: {"type":"response.content_part.added","item_id":"msg_67eafd6084ec81929a5132414ef713180aa8698ee903b906","output_index":0,"content_index":0,"part":{"type":"output_text","text":"","annotations":[]}}
+
+        event: response.output_text.delta
+        data: {"type":"response.output_text.delta","item_id":"msg_67eafd6084ec81929a5132414ef713180aa8698ee903b906","output_index":0,"content_index":0,"delta":"Your"}
+
+        event: response.output_text.delta
+        data: {"type":"response.output_text.delta","item_id":"msg_67eafd6084ec81929a5132414ef713180aa8698ee903b906","output_index":0,"content_index":0,"delta":" net"}
+
+        event: response.output_text.delta
+        data: {"type":"response.output_text.delta","item_id":"msg_67eafd6084ec81929a5132414ef713180aa8698ee903b906","output_index":0,"content_index":0,"delta":" worth"}
+
+        event: response.output_text.delta
+        data: {"type":"response.output_text.delta","item_id":"msg_67eafd6084ec81929a5132414ef713180aa8698ee903b906","output_index":0,"content_index":0,"delta":" is"}
+
+        event: response.output_text.delta
+        data: {"type":"response.output_text.delta","item_id":"msg_67eafd6084ec81929a5132414ef713180aa8698ee903b906","output_index":0,"content_index":0,"delta":" $"}
+
+        event: response.output_text.delta
+        data: {"type":"response.output_text.delta","item_id":"msg_67eafd6084ec81929a5132414ef713180aa8698ee903b906","output_index":0,"content_index":0,"delta":"10"}
+
+        event: response.output_text.delta
+        data: {"type":"response.output_text.delta","item_id":"msg_67eafd6084ec81929a5132414ef713180aa8698ee903b906","output_index":0,"content_index":0,"delta":","}
+
+        event: response.output_text.delta
+        data: {"type":"response.output_text.delta","item_id":"msg_67eafd6084ec81929a5132414ef713180aa8698ee903b906","output_index":0,"content_index":0,"delta":"000"}
+
+        event: response.output_text.delta
+        data: {"type":"response.output_text.delta","item_id":"msg_67eafd6084ec81929a5132414ef713180aa8698ee903b906","output_index":0,"content_index":0,"delta":" USD"}
+
+        event: response.output_text.delta
+        data: {"type":"response.output_text.delta","item_id":"msg_67eafd6084ec81929a5132414ef713180aa8698ee903b906","output_index":0,"content_index":0,"delta":"."}
+
+        event: response.output_text.done
+        data: {"type":"response.output_text.done","item_id":"msg_67eafd6084ec81929a5132414ef713180aa8698ee903b906","output_index":0,"content_index":0,"text":"Your net worth is $10,000 USD."}
+
+        event: response.content_part.done
+        data: {"type":"response.content_part.done","item_id":"msg_67eafd6084ec81929a5132414ef713180aa8698ee903b906","output_index":0,"content_index":0,"part":{"type":"output_text","text":"Your net worth is $10,000 USD.","annotations":[]}}
+
+        event: response.output_item.done
+        data: {"type":"response.output_item.done","output_index":0,"item":{"type":"message","id":"msg_67eafd6084ec81929a5132414ef713180aa8698ee903b906","status":"completed","role":"assistant","content":[{"type":"output_text","text":"Your net worth is $10,000 USD.","annotations":[]}]}}
+
+        event: response.completed
+        data: {"type":"response.completed","response":{"id":"resp_67eafd5ff7448192af7cd9e9dde90f5e0aa8698ee903b906","object":"response","created_at":1743453536,"status":"completed","error":null,"incomplete_details":null,"instructions":null,"max_output_tokens":null,"model":"gpt-4.1-2024-08-06","output":[{"type":"message","id":"msg_67eafd6084ec81929a5132414ef713180aa8698ee903b906","status":"completed","role":"assistant","content":[{"type":"output_text","text":"Your net worth is $10,000 USD.","annotations":[]}]}],"parallel_tool_calls":true,"previous_response_id":"resp_67eafd5f2ef0819290ec6bbbc5f27c8e0aa8698ee903b906","reasoning":{"effort":null,"generate_summary":null},"store":true,"temperature":1.0,"text":{"format":{"type":"text"}},"tool_choice":"auto","tools":[],"top_p":1.0,"truncation":"disabled","usage":{"input_tokens":56,"input_tokens_details":{"cached_tokens":0},"output_tokens":11,"output_tokens_details":{"reasoning_tokens":0},"total_tokens":67},"user":null,"metadata":{}}}
+
+  recorded_at: Mon, 31 Mar 2025 20:38:58 GMT
+recorded_with: VCR 6.3.1
+...
diff --git a/test/vcr_cassettes/plaid/access_token.yml b/test/vcr_cassettes/plaid/access_token.yml
new file mode 100644
index 00000000..5855687b
--- /dev/null
+++ b/test/vcr_cassettes/plaid/access_token.yml
@@ -0,0 +1,124 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://sandbox.plaid.com/sandbox/public_token/create
+    body:
+      encoding: UTF-8
+      string: '{"institution_id":"ins_109508","initial_products":["transactions","investments","liabilities"],"options":{"override_username":"custom_test"}}'
+    headers:
+      Content-Type:
+      - application/json
+      User-Agent:
+      - Plaid Ruby v38.0.0
+      Accept:
+      - application/json
+      Plaid-Client-Id:
+      - "<PLAID_CLIENT_ID>"
+      Plaid-Version:
+      - '2020-09-14'
+      Plaid-Secret:
+      - "<PLAID_SECRET>"
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Mon, 19 May 2025 17:24:03 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '110'
+      Connection:
+      - keep-alive
+      Plaid-Version:
+      - '2020-09-14'
+      Vary:
+      - Accept-Encoding
+      X-Envoy-Upstream-Service-Time:
+      - '2892'
+      X-Envoy-Decorator-Operation:
+      - default.svc-apiv2:8080/*
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - DENY
+      X-Xss-Protection:
+      - 1; mode=block
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        {
+          "public_token": "public-sandbox-0463cb9d-8bdb-4e01-9b33-243e1370623c",
+          "request_id": "FaSopSLAyHsZM9O"
+        }
+  recorded_at: Mon, 19 May 2025 17:24:03 GMT
+- request:
+    method: post
+    uri: https://sandbox.plaid.com/item/public_token/exchange
+    body:
+      encoding: UTF-8
+      string: '{"public_token":"public-sandbox-0463cb9d-8bdb-4e01-9b33-243e1370623c"}'
+    headers:
+      Content-Type:
+      - application/json
+      User-Agent:
+      - Plaid Ruby v38.0.0
+      Accept:
+      - application/json
+      Plaid-Client-Id:
+      - "<PLAID_CLIENT_ID>"
+      Plaid-Version:
+      - '2020-09-14'
+      Plaid-Secret:
+      - "<PLAID_SECRET>"
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Mon, 19 May 2025 17:24:03 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '164'
+      Connection:
+      - keep-alive
+      Plaid-Version:
+      - '2020-09-14'
+      Vary:
+      - Accept-Encoding
+      X-Envoy-Upstream-Service-Time:
+      - '171'
+      X-Envoy-Decorator-Operation:
+      - default.svc-apiv2:8080/*
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - DENY
+      X-Xss-Protection:
+      - 1; mode=block
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        {
+          "access_token": "access-sandbox-0af2c971-41a6-4fc5-a97d-f2b27ab0a648",
+          "item_id": "n7XKpjRmDkHENymaBw7rU71wxQnrW4i6DDrQP",
+          "request_id": "2e1nOnm2CoOXVcH"
+        }
+  recorded_at: Mon, 19 May 2025 17:24:03 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/plaid/exchange_public_token.yml b/test/vcr_cassettes/plaid/exchange_public_token.yml
new file mode 100644
index 00000000..f5e9047c
--- /dev/null
+++ b/test/vcr_cassettes/plaid/exchange_public_token.yml
@@ -0,0 +1,124 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://sandbox.plaid.com/sandbox/public_token/create
+    body:
+      encoding: UTF-8
+      string: '{"institution_id":"ins_109508","initial_products":["transactions","investments","liabilities"],"options":{"override_username":"custom_test"}}'
+    headers:
+      Content-Type:
+      - application/json
+      User-Agent:
+      - Plaid Ruby v38.0.0
+      Accept:
+      - application/json
+      Plaid-Client-Id:
+      - "<PLAID_CLIENT_ID>"
+      Plaid-Version:
+      - '2020-09-14'
+      Plaid-Secret:
+      - "<PLAID_SECRET>"
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Mon, 19 May 2025 17:24:09 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '110'
+      Connection:
+      - keep-alive
+      Plaid-Version:
+      - '2020-09-14'
+      Vary:
+      - Accept-Encoding
+      X-Envoy-Upstream-Service-Time:
+      - '3086'
+      X-Envoy-Decorator-Operation:
+      - default.svc-apiv2:8080/*
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - DENY
+      X-Xss-Protection:
+      - 1; mode=block
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        {
+          "public_token": "public-sandbox-29a5644f-001d-4bf5-abae-d26ecf8ee211",
+          "request_id": "6dz2Xo7zoyT9W9R"
+        }
+  recorded_at: Mon, 19 May 2025 17:24:09 GMT
+- request:
+    method: post
+    uri: https://sandbox.plaid.com/item/public_token/exchange
+    body:
+      encoding: UTF-8
+      string: '{"public_token":"public-sandbox-29a5644f-001d-4bf5-abae-d26ecf8ee211"}'
+    headers:
+      Content-Type:
+      - application/json
+      User-Agent:
+      - Plaid Ruby v38.0.0
+      Accept:
+      - application/json
+      Plaid-Client-Id:
+      - "<PLAID_CLIENT_ID>"
+      Plaid-Version:
+      - '2020-09-14'
+      Plaid-Secret:
+      - "<PLAID_SECRET>"
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Mon, 19 May 2025 17:24:09 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '164'
+      Connection:
+      - keep-alive
+      Plaid-Version:
+      - '2020-09-14'
+      Vary:
+      - Accept-Encoding
+      X-Envoy-Upstream-Service-Time:
+      - '152'
+      X-Envoy-Decorator-Operation:
+      - default.svc-apiv2:8080/*
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - DENY
+      X-Xss-Protection:
+      - 1; mode=block
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        {
+          "access_token": "access-sandbox-fb7bb5da-e3e2-464e-8644-4eeafbf6541f",
+          "item_id": "bd9d3lAbjqhWyRz7bl61s9R7npPJ87HVzAyvn",
+          "request_id": "GqA99rziFZduKYg"
+        }
+  recorded_at: Mon, 19 May 2025 17:24:09 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/plaid/get_item.yml b/test/vcr_cassettes/plaid/get_item.yml
new file mode 100644
index 00000000..eae6bc32
--- /dev/null
+++ b/test/vcr_cassettes/plaid/get_item.yml
@@ -0,0 +1,106 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://sandbox.plaid.com/item/get
+    body:
+      encoding: UTF-8
+      string: '{"access_token":"access-sandbox-0af2c971-41a6-4fc5-a97d-f2b27ab0a648"}'
+    headers:
+      Content-Type:
+      - application/json
+      User-Agent:
+      - Plaid Ruby v38.0.0
+      Accept:
+      - application/json
+      Plaid-Client-Id:
+      - "<PLAID_CLIENT_ID>"
+      Plaid-Version:
+      - '2020-09-14'
+      Plaid-Secret:
+      - "<PLAID_SECRET>"
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Mon, 19 May 2025 17:24:03 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '1050'
+      Connection:
+      - keep-alive
+      Plaid-Version:
+      - '2020-09-14'
+      Vary:
+      - Accept-Encoding
+      X-Envoy-Upstream-Service-Time:
+      - '157'
+      X-Envoy-Decorator-Operation:
+      - default.svc-apiv2:8080/*
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - DENY
+      X-Xss-Protection:
+      - 1; mode=block
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        {
+          "item": {
+            "available_products": [
+              "assets",
+              "auth",
+              "balance",
+              "credit_details",
+              "identity",
+              "identity_match",
+              "income",
+              "income_verification",
+              "recurring_transactions",
+              "signal",
+              "statements"
+            ],
+            "billed_products": [
+              "investments",
+              "liabilities",
+              "transactions"
+            ],
+            "consent_expiration_time": null,
+            "created_at": "2025-05-19T17:24:00Z",
+            "error": null,
+            "institution_id": "ins_109508",
+            "institution_name": "First Platypus Bank",
+            "item_id": "n7XKpjRmDkHENymaBw7rU71wxQnrW4i6DDrQP",
+            "products": [
+              "investments",
+              "liabilities",
+              "transactions"
+            ],
+            "update_type": "background",
+            "webhook": ""
+          },
+          "request_id": "dpcY8geAZ93oxJm",
+          "status": {
+            "investments": {
+              "last_failed_update": null,
+              "last_successful_update": "2025-05-19T17:24:01.861Z"
+            },
+            "last_webhook": null,
+            "transactions": {
+              "last_failed_update": null,
+              "last_successful_update": null
+            }
+          }
+        }
+  recorded_at: Mon, 19 May 2025 17:24:03 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/plaid/get_item_accounts.yml b/test/vcr_cassettes/plaid/get_item_accounts.yml
new file mode 100644
index 00000000..8594dc7a
--- /dev/null
+++ b/test/vcr_cassettes/plaid/get_item_accounts.yml
@@ -0,0 +1,160 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://sandbox.plaid.com/accounts/get
+    body:
+      encoding: UTF-8
+      string: '{"access_token":"access-sandbox-0af2c971-41a6-4fc5-a97d-f2b27ab0a648"}'
+    headers:
+      Content-Type:
+      - application/json
+      User-Agent:
+      - Plaid Ruby v38.0.0
+      Accept:
+      - application/json
+      Plaid-Client-Id:
+      - "<PLAID_CLIENT_ID>"
+      Plaid-Version:
+      - '2020-09-14'
+      Plaid-Secret:
+      - "<PLAID_SECRET>"
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Mon, 19 May 2025 17:24:04 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '2578'
+      Connection:
+      - keep-alive
+      Plaid-Version:
+      - '2020-09-14'
+      Vary:
+      - Accept-Encoding
+      X-Envoy-Upstream-Service-Time:
+      - '191'
+      X-Envoy-Decorator-Operation:
+      - default.svc-apiv2:8080/*
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - DENY
+      X-Xss-Protection:
+      - 1; mode=block
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        {
+          "accounts": [
+            {
+              "account_id": "vor45kgbDjfqa1BMD8QRU4om8adWNWtqbzQJe",
+              "balances": {
+                "available": 8000,
+                "current": 10000,
+                "iso_currency_code": "USD",
+                "limit": null,
+                "unofficial_currency_code": null
+              },
+              "holder_category": "personal",
+              "mask": "1122",
+              "name": "Test Brokerage Account",
+              "official_name": "Plaid brokerage",
+              "subtype": "brokerage",
+              "type": "investment"
+            },
+            {
+              "account_id": "RperV9wJMNiDWKljGMkPCkwDGJb7q7FaNlVMp",
+              "balances": {
+                "available": 9372.38,
+                "current": 1000,
+                "iso_currency_code": "USD",
+                "limit": 10500,
+                "unofficial_currency_code": null
+              },
+              "holder_category": "personal",
+              "mask": "1219",
+              "name": "Test Credit Card Account",
+              "official_name": "Plaid credit card",
+              "subtype": "credit card",
+              "type": "credit"
+            },
+            {
+              "account_id": "9mvxVZRW7LUD67QbEBm1CPZ6XlqkmkF4oGNBo",
+              "balances": {
+                "available": 10000,
+                "current": 10000,
+                "iso_currency_code": "USD",
+                "limit": null,
+                "unofficial_currency_code": null
+              },
+              "holder_category": "personal",
+              "mask": "4243",
+              "name": "Test Depository Account",
+              "official_name": "Plaid checking",
+              "subtype": "checking",
+              "type": "depository"
+            },
+            {
+              "account_id": "6Gwzm7nJ6ZU4VbqEyKzZszyPQ8keRet8Q97k7",
+              "balances": {
+                "available": 15000,
+                "current": 15000,
+                "iso_currency_code": "USD",
+                "limit": null,
+                "unofficial_currency_code": null
+              },
+              "holder_category": "personal",
+              "mask": "9572",
+              "name": "Test Student Loan Account",
+              "official_name": "Plaid student",
+              "subtype": "student",
+              "type": "loan"
+            }
+          ],
+          "item": {
+            "available_products": [
+              "assets",
+              "auth",
+              "balance",
+              "credit_details",
+              "identity",
+              "identity_match",
+              "income",
+              "income_verification",
+              "recurring_transactions",
+              "signal",
+              "statements"
+            ],
+            "billed_products": [
+              "investments",
+              "liabilities",
+              "transactions"
+            ],
+            "consent_expiration_time": null,
+            "error": null,
+            "institution_id": "ins_109508",
+            "institution_name": "First Platypus Bank",
+            "item_id": "n7XKpjRmDkHENymaBw7rU71wxQnrW4i6DDrQP",
+            "products": [
+              "investments",
+              "liabilities",
+              "transactions"
+            ],
+            "update_type": "background",
+            "webhook": ""
+          },
+          "request_id": "EWD5MMMYV0o9cZ0"
+        }
+  recorded_at: Mon, 19 May 2025 17:24:04 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/plaid/get_item_investments.yml b/test/vcr_cassettes/plaid/get_item_investments.yml
new file mode 100644
index 00000000..c1703a86
--- /dev/null
+++ b/test/vcr_cassettes/plaid/get_item_investments.yml
@@ -0,0 +1,570 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://sandbox.plaid.com/investments/holdings/get
+    body:
+      encoding: UTF-8
+      string: '{"access_token":"access-sandbox-0af2c971-41a6-4fc5-a97d-f2b27ab0a648"}'
+    headers:
+      Content-Type:
+      - application/json
+      User-Agent:
+      - Plaid Ruby v38.0.0
+      Accept:
+      - application/json
+      Plaid-Client-Id:
+      - "<PLAID_CLIENT_ID>"
+      Plaid-Version:
+      - '2020-09-14'
+      Plaid-Secret:
+      - "<PLAID_SECRET>"
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Mon, 19 May 2025 17:24:05 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '6199'
+      Connection:
+      - keep-alive
+      Plaid-Version:
+      - '2020-09-14'
+      Vary:
+      - Accept-Encoding
+      X-Envoy-Upstream-Service-Time:
+      - '324'
+      X-Envoy-Decorator-Operation:
+      - default.svc-apiv2:8080/*
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - DENY
+      X-Xss-Protection:
+      - 1; mode=block
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        {
+          "accounts": [
+            {
+              "account_id": "vor45kgbDjfqa1BMD8QRU4om8adWNWtqbzQJe",
+              "balances": {
+                "available": 8000,
+                "current": 10000,
+                "iso_currency_code": "USD",
+                "limit": null,
+                "unofficial_currency_code": null
+              },
+              "holder_category": "personal",
+              "mask": "1122",
+              "name": "Test Brokerage Account",
+              "official_name": "Plaid brokerage",
+              "subtype": "brokerage",
+              "type": "investment"
+            },
+            {
+              "account_id": "RperV9wJMNiDWKljGMkPCkwDGJb7q7FaNlVMp",
+              "balances": {
+                "available": 9372.38,
+                "current": 1000,
+                "iso_currency_code": "USD",
+                "limit": 10500,
+                "unofficial_currency_code": null
+              },
+              "holder_category": "personal",
+              "mask": "1219",
+              "name": "Test Credit Card Account",
+              "official_name": "Plaid credit card",
+              "subtype": "credit card",
+              "type": "credit"
+            },
+            {
+              "account_id": "9mvxVZRW7LUD67QbEBm1CPZ6XlqkmkF4oGNBo",
+              "balances": {
+                "available": 10000,
+                "current": 10000,
+                "iso_currency_code": "USD",
+                "limit": null,
+                "unofficial_currency_code": null
+              },
+              "holder_category": "personal",
+              "mask": "4243",
+              "name": "Test Depository Account",
+              "official_name": "Plaid checking",
+              "subtype": "checking",
+              "type": "depository"
+            },
+            {
+              "account_id": "6Gwzm7nJ6ZU4VbqEyKzZszyPQ8keRet8Q97k7",
+              "balances": {
+                "available": 15000,
+                "current": 15000,
+                "iso_currency_code": "USD",
+                "limit": null,
+                "unofficial_currency_code": null
+              },
+              "holder_category": "personal",
+              "mask": "9572",
+              "name": "Test Student Loan Account",
+              "official_name": "Plaid student",
+              "subtype": "student",
+              "type": "loan"
+            }
+          ],
+          "holdings": [
+            {
+              "account_id": "vor45kgbDjfqa1BMD8QRU4om8adWNWtqbzQJe",
+              "cost_basis": 2000,
+              "institution_price": 100,
+              "institution_price_as_of": "2025-05-08",
+              "institution_price_datetime": null,
+              "institution_value": 2000,
+              "iso_currency_code": "USD",
+              "quantity": 20,
+              "security_id": "xnL3QM3Ax4fP9lVmNLblTDaMkVMqN3fmxrXRd",
+              "unofficial_currency_code": null,
+              "vested_quantity": null,
+              "vested_value": null
+            },
+            {
+              "account_id": "vor45kgbDjfqa1BMD8QRU4om8adWNWtqbzQJe",
+              "cost_basis": 3000,
+              "institution_price": 1,
+              "institution_price_as_of": "2025-05-08",
+              "institution_price_datetime": null,
+              "institution_value": 3000,
+              "iso_currency_code": "USD",
+              "quantity": 3000,
+              "security_id": "EDRxkXxj7mtj8EzBBxllUqpy7KyNDBugoZrMX",
+              "unofficial_currency_code": null,
+              "vested_quantity": null,
+              "vested_value": null
+            },
+            {
+              "account_id": "vor45kgbDjfqa1BMD8QRU4om8adWNWtqbzQJe",
+              "cost_basis": 5000,
+              "institution_price": 1,
+              "institution_price_as_of": "2025-05-08",
+              "institution_price_datetime": null,
+              "institution_value": 5000,
+              "iso_currency_code": "USD",
+              "quantity": 5000,
+              "security_id": "7Dv19k16PZtEaexk6EZyFxP95o9ynrF4REalG",
+              "unofficial_currency_code": null,
+              "vested_quantity": null,
+              "vested_value": null
+            }
+          ],
+          "item": {
+            "available_products": [
+              "assets",
+              "auth",
+              "balance",
+              "credit_details",
+              "identity",
+              "identity_match",
+              "income",
+              "income_verification",
+              "recurring_transactions",
+              "signal",
+              "statements"
+            ],
+            "billed_products": [
+              "investments",
+              "liabilities",
+              "transactions"
+            ],
+            "consent_expiration_time": null,
+            "error": null,
+            "institution_id": "ins_109508",
+            "institution_name": "First Platypus Bank",
+            "item_id": "n7XKpjRmDkHENymaBw7rU71wxQnrW4i6DDrQP",
+            "products": [
+              "investments",
+              "liabilities",
+              "transactions"
+            ],
+            "update_type": "background",
+            "webhook": ""
+          },
+          "request_id": "uRzq5c4Y37RCNNj",
+          "securities": [
+            {
+              "close_price": 1,
+              "close_price_as_of": "2025-04-28",
+              "cusip": null,
+              "fixed_income": null,
+              "industry": "Investment Trusts or Mutual Funds",
+              "institution_id": null,
+              "institution_security_id": null,
+              "is_cash_equivalent": true,
+              "isin": null,
+              "iso_currency_code": "USD",
+              "market_identifier_code": null,
+              "name": "Vanguard Money Market Reserves - Federal Money Market Fd USD MNT",
+              "option_contract": null,
+              "proxy_security_id": null,
+              "sector": "Miscellaneous",
+              "security_id": "7Dv19k16PZtEaexk6EZyFxP95o9ynrF4REalG",
+              "sedol": "2571678",
+              "ticker_symbol": "VMFXX",
+              "type": "mutual fund",
+              "unofficial_currency_code": null,
+              "update_datetime": null
+            },
+            {
+              "close_price": 1,
+              "close_price_as_of": "2025-05-18",
+              "cusip": null,
+              "fixed_income": null,
+              "industry": null,
+              "institution_id": null,
+              "institution_security_id": null,
+              "is_cash_equivalent": true,
+              "isin": null,
+              "iso_currency_code": "USD",
+              "market_identifier_code": null,
+              "name": "U S Dollar",
+              "option_contract": null,
+              "proxy_security_id": null,
+              "sector": null,
+              "security_id": "EDRxkXxj7mtj8EzBBxllUqpy7KyNDBugoZrMX",
+              "sedol": null,
+              "ticker_symbol": "CUR:USD",
+              "type": "cash",
+              "unofficial_currency_code": null,
+              "update_datetime": null
+            },
+            {
+              "close_price": 211.26,
+              "close_price_as_of": "2025-05-16",
+              "cusip": null,
+              "fixed_income": null,
+              "industry": "Telecommunications Equipment",
+              "institution_id": null,
+              "institution_security_id": null,
+              "is_cash_equivalent": false,
+              "isin": null,
+              "iso_currency_code": "USD",
+              "market_identifier_code": "XNAS",
+              "name": "Apple Inc",
+              "option_contract": null,
+              "proxy_security_id": null,
+              "sector": "Electronic Technology",
+              "security_id": "xnL3QM3Ax4fP9lVmNLblTDaMkVMqN3fmxrXRd",
+              "sedol": "2046251",
+              "ticker_symbol": "AAPL",
+              "type": "equity",
+              "unofficial_currency_code": null,
+              "update_datetime": null
+            }
+          ]
+        }
+  recorded_at: Mon, 19 May 2025 17:24:05 GMT
+- request:
+    method: post
+    uri: https://sandbox.plaid.com/investments/transactions/get
+    body:
+      encoding: UTF-8
+      string: '{"access_token":"access-sandbox-0af2c971-41a6-4fc5-a97d-f2b27ab0a648","start_date":"2023-05-20","end_date":"2025-05-19","options":{"offset":0}}'
+    headers:
+      Content-Type:
+      - application/json
+      User-Agent:
+      - Plaid Ruby v38.0.0
+      Accept:
+      - application/json
+      Plaid-Client-Id:
+      - "<PLAID_CLIENT_ID>"
+      Plaid-Version:
+      - '2020-09-14'
+      Plaid-Secret:
+      - "<PLAID_SECRET>"
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Mon, 19 May 2025 17:24:05 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '6964'
+      Connection:
+      - keep-alive
+      Plaid-Version:
+      - '2020-09-14'
+      Vary:
+      - Accept-Encoding
+      X-Envoy-Upstream-Service-Time:
+      - '334'
+      X-Envoy-Decorator-Operation:
+      - default.svc-apiv2:8080/*
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - DENY
+      X-Xss-Protection:
+      - 1; mode=block
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        {
+          "accounts": [
+            {
+              "account_id": "vor45kgbDjfqa1BMD8QRU4om8adWNWtqbzQJe",
+              "balances": {
+                "available": 8000,
+                "current": 10000,
+                "iso_currency_code": "USD",
+                "limit": null,
+                "unofficial_currency_code": null
+              },
+              "holder_category": "personal",
+              "mask": "1122",
+              "name": "Test Brokerage Account",
+              "official_name": "Plaid brokerage",
+              "subtype": "brokerage",
+              "type": "investment"
+            },
+            {
+              "account_id": "RperV9wJMNiDWKljGMkPCkwDGJb7q7FaNlVMp",
+              "balances": {
+                "available": 9372.38,
+                "current": 1000,
+                "iso_currency_code": "USD",
+                "limit": 10500,
+                "unofficial_currency_code": null
+              },
+              "holder_category": "personal",
+              "mask": "1219",
+              "name": "Test Credit Card Account",
+              "official_name": "Plaid credit card",
+              "subtype": "credit card",
+              "type": "credit"
+            },
+            {
+              "account_id": "9mvxVZRW7LUD67QbEBm1CPZ6XlqkmkF4oGNBo",
+              "balances": {
+                "available": 10000,
+                "current": 10000,
+                "iso_currency_code": "USD",
+                "limit": null,
+                "unofficial_currency_code": null
+              },
+              "holder_category": "personal",
+              "mask": "4243",
+              "name": "Test Depository Account",
+              "official_name": "Plaid checking",
+              "subtype": "checking",
+              "type": "depository"
+            },
+            {
+              "account_id": "6Gwzm7nJ6ZU4VbqEyKzZszyPQ8keRet8Q97k7",
+              "balances": {
+                "available": 15000,
+                "current": 15000,
+                "iso_currency_code": "USD",
+                "limit": null,
+                "unofficial_currency_code": null
+              },
+              "holder_category": "personal",
+              "mask": "9572",
+              "name": "Test Student Loan Account",
+              "official_name": "Plaid student",
+              "subtype": "student",
+              "type": "loan"
+            }
+          ],
+          "investment_transactions": [
+            {
+              "account_id": "vor45kgbDjfqa1BMD8QRU4om8adWNWtqbzQJe",
+              "amount": -5000,
+              "cancel_transaction_id": null,
+              "date": "2025-05-03",
+              "fees": 0,
+              "investment_transaction_id": "eBqoazM4XkiXx5gZbmD7UKRZ3jE3ABUreq4R1",
+              "iso_currency_code": "USD",
+              "name": "retirement contribution",
+              "price": 1,
+              "quantity": -5000,
+              "security_id": "EDRxkXxj7mtj8EzBBxllUqpy7KyNDBugoZrMX",
+              "subtype": "contribution",
+              "type": "cash",
+              "unofficial_currency_code": null
+            },
+            {
+              "account_id": "vor45kgbDjfqa1BMD8QRU4om8adWNWtqbzQJe",
+              "amount": 5000,
+              "cancel_transaction_id": null,
+              "date": "2025-05-03",
+              "fees": 0,
+              "investment_transaction_id": "QLeKVkpQM4ck1qMRGp6PUPp7obKowGtwRN547",
+              "iso_currency_code": "USD",
+              "name": "buy money market shares with contribution cash",
+              "price": 1,
+              "quantity": 5000,
+              "security_id": "7Dv19k16PZtEaexk6EZyFxP95o9ynrF4REalG",
+              "subtype": "contribution",
+              "type": "buy",
+              "unofficial_currency_code": null
+            },
+            {
+              "account_id": "vor45kgbDjfqa1BMD8QRU4om8adWNWtqbzQJe",
+              "amount": 2000,
+              "cancel_transaction_id": null,
+              "date": "2025-05-02",
+              "fees": 0,
+              "investment_transaction_id": "ZnxNgJEwM1ig5476JqZxUKeJLXNLnMUe9o6Al",
+              "iso_currency_code": "USD",
+              "name": "buy AAPL stock",
+              "price": 100,
+              "quantity": 20,
+              "security_id": "xnL3QM3Ax4fP9lVmNLblTDaMkVMqN3fmxrXRd",
+              "subtype": "buy",
+              "type": "buy",
+              "unofficial_currency_code": null
+            },
+            {
+              "account_id": "vor45kgbDjfqa1BMD8QRU4om8adWNWtqbzQJe",
+              "amount": -5000,
+              "cancel_transaction_id": null,
+              "date": "2025-05-01",
+              "fees": 0,
+              "investment_transaction_id": "MQ1Awmg943IKyWlQjRXgUqXrxD6xo3CLGjJw1",
+              "iso_currency_code": "USD",
+              "name": "Deposit cash into brokerage account",
+              "price": 1,
+              "quantity": -5000,
+              "security_id": "EDRxkXxj7mtj8EzBBxllUqpy7KyNDBugoZrMX",
+              "subtype": "deposit",
+              "type": "cash",
+              "unofficial_currency_code": null
+            }
+          ],
+          "item": {
+            "available_products": [
+              "assets",
+              "auth",
+              "balance",
+              "credit_details",
+              "identity",
+              "identity_match",
+              "income",
+              "income_verification",
+              "recurring_transactions",
+              "signal",
+              "statements"
+            ],
+            "billed_products": [
+              "investments",
+              "liabilities",
+              "transactions"
+            ],
+            "consent_expiration_time": null,
+            "error": null,
+            "institution_id": "ins_109508",
+            "institution_name": "First Platypus Bank",
+            "item_id": "n7XKpjRmDkHENymaBw7rU71wxQnrW4i6DDrQP",
+            "products": [
+              "investments",
+              "liabilities",
+              "transactions"
+            ],
+            "update_type": "background",
+            "webhook": ""
+          },
+          "request_id": "dTc49uKiBZWzxHS",
+          "securities": [
+            {
+              "close_price": 1,
+              "close_price_as_of": "2025-04-28",
+              "cusip": null,
+              "fixed_income": null,
+              "industry": "Investment Trusts or Mutual Funds",
+              "institution_id": null,
+              "institution_security_id": null,
+              "is_cash_equivalent": true,
+              "isin": null,
+              "iso_currency_code": "USD",
+              "market_identifier_code": null,
+              "name": "Vanguard Money Market Reserves - Federal Money Market Fd USD MNT",
+              "option_contract": null,
+              "proxy_security_id": null,
+              "sector": "Miscellaneous",
+              "security_id": "7Dv19k16PZtEaexk6EZyFxP95o9ynrF4REalG",
+              "sedol": "2571678",
+              "ticker_symbol": "VMFXX",
+              "type": "mutual fund",
+              "unofficial_currency_code": null,
+              "update_datetime": null
+            },
+            {
+              "close_price": 1,
+              "close_price_as_of": "2025-05-18",
+              "cusip": null,
+              "fixed_income": null,
+              "industry": null,
+              "institution_id": null,
+              "institution_security_id": null,
+              "is_cash_equivalent": true,
+              "isin": null,
+              "iso_currency_code": "USD",
+              "market_identifier_code": null,
+              "name": "U S Dollar",
+              "option_contract": null,
+              "proxy_security_id": null,
+              "sector": null,
+              "security_id": "EDRxkXxj7mtj8EzBBxllUqpy7KyNDBugoZrMX",
+              "sedol": null,
+              "ticker_symbol": "CUR:USD",
+              "type": "cash",
+              "unofficial_currency_code": null,
+              "update_datetime": null
+            },
+            {
+              "close_price": 211.26,
+              "close_price_as_of": "2025-05-16",
+              "cusip": null,
+              "fixed_income": null,
+              "industry": "Telecommunications Equipment",
+              "institution_id": null,
+              "institution_security_id": null,
+              "is_cash_equivalent": false,
+              "isin": null,
+              "iso_currency_code": "USD",
+              "market_identifier_code": "XNAS",
+              "name": "Apple Inc",
+              "option_contract": null,
+              "proxy_security_id": null,
+              "sector": "Electronic Technology",
+              "security_id": "xnL3QM3Ax4fP9lVmNLblTDaMkVMqN3fmxrXRd",
+              "sedol": "2046251",
+              "ticker_symbol": "AAPL",
+              "type": "equity",
+              "unofficial_currency_code": null,
+              "update_datetime": null
+            }
+          ],
+          "total_investment_transactions": 4
+        }
+  recorded_at: Mon, 19 May 2025 17:24:05 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/plaid/get_item_liabilities.yml b/test/vcr_cassettes/plaid/get_item_liabilities.yml
new file mode 100644
index 00000000..933c126d
--- /dev/null
+++ b/test/vcr_cassettes/plaid/get_item_liabilities.yml
@@ -0,0 +1,236 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://sandbox.plaid.com/liabilities/get
+    body:
+      encoding: UTF-8
+      string: '{"access_token":"access-sandbox-0af2c971-41a6-4fc5-a97d-f2b27ab0a648"}'
+    headers:
+      Content-Type:
+      - application/json
+      User-Agent:
+      - Plaid Ruby v38.0.0
+      Accept:
+      - application/json
+      Plaid-Client-Id:
+      - "<PLAID_CLIENT_ID>"
+      Plaid-Version:
+      - '2020-09-14'
+      Plaid-Secret:
+      - "<PLAID_SECRET>"
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Mon, 19 May 2025 17:24:04 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '4907'
+      Connection:
+      - keep-alive
+      Plaid-Version:
+      - '2020-09-14'
+      Vary:
+      - Accept-Encoding
+      X-Envoy-Upstream-Service-Time:
+      - '253'
+      X-Envoy-Decorator-Operation:
+      - default.svc-apiv2:8080/*
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - DENY
+      X-Xss-Protection:
+      - 1; mode=block
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        {
+          "accounts": [
+            {
+              "account_id": "vor45kgbDjfqa1BMD8QRU4om8adWNWtqbzQJe",
+              "balances": {
+                "available": 8000,
+                "current": 10000,
+                "iso_currency_code": "USD",
+                "limit": null,
+                "unofficial_currency_code": null
+              },
+              "holder_category": "personal",
+              "mask": "1122",
+              "name": "Test Brokerage Account",
+              "official_name": "Plaid brokerage",
+              "subtype": "brokerage",
+              "type": "investment"
+            },
+            {
+              "account_id": "RperV9wJMNiDWKljGMkPCkwDGJb7q7FaNlVMp",
+              "balances": {
+                "available": 9372.38,
+                "current": 1000,
+                "iso_currency_code": "USD",
+                "limit": 10500,
+                "unofficial_currency_code": null
+              },
+              "holder_category": "personal",
+              "mask": "1219",
+              "name": "Test Credit Card Account",
+              "official_name": "Plaid credit card",
+              "subtype": "credit card",
+              "type": "credit"
+            },
+            {
+              "account_id": "9mvxVZRW7LUD67QbEBm1CPZ6XlqkmkF4oGNBo",
+              "balances": {
+                "available": 10000,
+                "current": 10000,
+                "iso_currency_code": "USD",
+                "limit": null,
+                "unofficial_currency_code": null
+              },
+              "holder_category": "personal",
+              "mask": "4243",
+              "name": "Test Depository Account",
+              "official_name": "Plaid checking",
+              "subtype": "checking",
+              "type": "depository"
+            },
+            {
+              "account_id": "6Gwzm7nJ6ZU4VbqEyKzZszyPQ8keRet8Q97k7",
+              "balances": {
+                "available": 15000,
+                "current": 15000,
+                "iso_currency_code": "USD",
+                "limit": null,
+                "unofficial_currency_code": null
+              },
+              "holder_category": "personal",
+              "mask": "9572",
+              "name": "Test Student Loan Account",
+              "official_name": "Plaid student",
+              "subtype": "student",
+              "type": "loan"
+            }
+          ],
+          "item": {
+            "available_products": [
+              "assets",
+              "auth",
+              "balance",
+              "credit_details",
+              "identity",
+              "identity_match",
+              "income",
+              "income_verification",
+              "recurring_transactions",
+              "signal",
+              "statements"
+            ],
+            "billed_products": [
+              "investments",
+              "liabilities",
+              "transactions"
+            ],
+            "consent_expiration_time": null,
+            "error": null,
+            "institution_id": "ins_109508",
+            "institution_name": "First Platypus Bank",
+            "item_id": "n7XKpjRmDkHENymaBw7rU71wxQnrW4i6DDrQP",
+            "products": [
+              "investments",
+              "liabilities",
+              "transactions"
+            ],
+            "update_type": "background",
+            "webhook": ""
+          },
+          "liabilities": {
+            "credit": [
+              {
+                "account_id": "RperV9wJMNiDWKljGMkPCkwDGJb7q7FaNlVMp",
+                "aprs": [
+                  {
+                    "apr_percentage": 12.5,
+                    "apr_type": "purchase_apr",
+                    "balance_subject_to_apr": null,
+                    "interest_charge_amount": null
+                  },
+                  {
+                    "apr_percentage": 27.95,
+                    "apr_type": "cash_apr",
+                    "balance_subject_to_apr": null,
+                    "interest_charge_amount": null
+                  }
+                ],
+                "is_overdue": false,
+                "last_payment_amount": null,
+                "last_payment_date": "2025-04-24",
+                "last_statement_balance": 1000,
+                "last_statement_issue_date": "2025-05-19",
+                "minimum_payment_amount": 50,
+                "next_payment_due_date": "2025-06-19"
+              }
+            ],
+            "mortgage": null,
+            "student": [
+              {
+                "account_id": "6Gwzm7nJ6ZU4VbqEyKzZszyPQ8keRet8Q97k7",
+                "account_number": "3117529572",
+                "disbursement_dates": [
+                  "2023-05-01"
+                ],
+                "expected_payoff_date": "2036-05-01",
+                "guarantor": "DEPT OF ED",
+                "interest_rate_percentage": 5.25,
+                "is_overdue": false,
+                "last_payment_amount": null,
+                "last_payment_date": null,
+                "last_statement_balance": 16577.16,
+                "last_statement_issue_date": "2025-05-01",
+                "loan_name": "Consolidation",
+                "loan_status": {
+                  "end_date": null,
+                  "type": "in school"
+                },
+                "minimum_payment_amount": 25,
+                "next_payment_due_date": "2025-06-01",
+                "origination_date": "2023-05-01",
+                "origination_principal_amount": 15000,
+                "outstanding_interest_amount": 1577.16,
+                "payment_reference_number": "3117529572",
+                "pslf_status": {
+                  "estimated_eligibility_date": null,
+                  "payments_made": null,
+                  "payments_remaining": null
+                },
+                "repayment_plan": {
+                  "description": "Standard Repayment",
+                  "type": "standard"
+                },
+                "sequence_number": "1",
+                "servicer_address": {
+                  "city": "San Matias",
+                  "country": "US",
+                  "postal_code": "99415",
+                  "region": "CA",
+                  "street": "123 Relaxation Road"
+                },
+                "ytd_interest_paid": 0,
+                "ytd_principal_paid": 0
+              }
+            ]
+          },
+          "request_id": "nFlL291sKIy1LkJ"
+        }
+  recorded_at: Mon, 19 May 2025 17:24:04 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/plaid/link_token.yml b/test/vcr_cassettes/plaid/link_token.yml
new file mode 100644
index 00000000..4b7fcf96
--- /dev/null
+++ b/test/vcr_cassettes/plaid/link_token.yml
@@ -0,0 +1,64 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://sandbox.plaid.com/link/token/create
+    body:
+      encoding: UTF-8
+      string: '{"client_name":"Maybe Finance","language":"en","country_codes":["US","CA"],"user":{"client_user_id":"test-user-id"},"products":["transactions"],"additional_consented_products":["investments","liabilities"],"webhook":"https://example.com/webhooks","redirect_uri":"http://localhost:3000/accounts","transactions":{"days_requested":730}}'
+    headers:
+      Content-Type:
+      - application/json
+      User-Agent:
+      - Plaid Ruby v38.0.0
+      Accept:
+      - application/json
+      Plaid-Client-Id:
+      - "<PLAID_CLIENT_ID>"
+      Plaid-Version:
+      - '2020-09-14'
+      Plaid-Secret:
+      - "<PLAID_SECRET>"
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Mon, 19 May 2025 17:24:04 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '146'
+      Connection:
+      - keep-alive
+      Plaid-Version:
+      - '2020-09-14'
+      Vary:
+      - Accept-Encoding
+      X-Envoy-Upstream-Service-Time:
+      - '70'
+      X-Envoy-Decorator-Operation:
+      - default.svc-apiv2:8080/*
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - DENY
+      X-Xss-Protection:
+      - 1; mode=block
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        {
+          "expiration": "2025-05-19T21:24:04Z",
+          "link_token": "link-sandbox-33432e02-32e2-415d-8f00-e626c6f4c6a6",
+          "request_id": "Gys5pGY7tIPDrlL"
+        }
+  recorded_at: Mon, 19 May 2025 17:24:04 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/stripe/checkout_session.yml b/test/vcr_cassettes/stripe/checkout_session.yml
new file mode 100644
index 00000000..7d032cbd
--- /dev/null
+++ b/test/vcr_cassettes/stripe/checkout_session.yml
@@ -0,0 +1,181 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.stripe.com/v1/checkout/sessions/cs_test_b1RD8r6DAkSA8vrQ3grBC2QVgR5zUJ7QQFuVHZkcKoSYaEOQgCMPMOCOM5
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Stripe/v1 RubyBindings/15.1.0
+      Authorization:
+      - Bearer <STRIPE_SECRET_KEY>
+      Stripe-Version:
+      - 2025-04-30.basil
+      X-Stripe-Client-User-Agent:
+      - '{"bindings_version":"15.1.0","lang":"ruby","lang_version":"3.4.1 p0 (2024-12-25)","platform":"arm64-darwin24","engine":"ruby","publisher":"stripe","uname":"Darwin
+        Zachs-MacBook-Pro.local 24.3.0 Darwin Kernel Version 24.3.0: Thu Jan  2 20:24:16
+        PST 2025; root:xnu-11215.81.4~3/RELEASE_ARM64_T6000 arm64","hostname":"Zachs-MacBook-Pro.local"}'
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Mon, 05 May 2025 16:09:23 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '2667'
+      Connection:
+      - keep-alive
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Allow-Methods:
+      - GET, HEAD, PUT, PATCH, POST, DELETE
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Request-Id, Stripe-Manage-Version, Stripe-Should-Retry, X-Stripe-External-Auth-Required,
+        X-Stripe-Privileged-Session-Required
+      Access-Control-Max-Age:
+      - '300'
+      Cache-Control:
+      - no-cache, no-store
+      Content-Security-Policy:
+      - base-uri 'none'; default-src 'none'; form-action 'none'; frame-ancestors 'none';
+        img-src 'self'; script-src 'self' 'report-sample'; style-src 'self'; worker-src
+        'none'; upgrade-insecure-requests; report-uri https://q.stripe.com/csp-violation?q=7L6NHIm4wk05H5wi0PfH951BH62utb5j2ZImtzEXvcfJgdc1v5juGoNb0oSAXIHhGQtWiGOiCmz3UG1W
+      Request-Id:
+      - req_c2n4M98HkgTk63
+      Stripe-Version:
+      - 2025-04-30.basil
+      Vary:
+      - Origin
+      X-Stripe-Priority-Routing-Enabled:
+      - 'true'
+      X-Stripe-Routing-Context-Priority-Tier:
+      - api-testmode
+      X-Wc:
+      - ABGHI
+      Strict-Transport-Security:
+      - max-age=63072000; includeSubDomains; preload
+    body:
+      encoding: UTF-8
+      string: |-
+        {
+          "id": "cs_test_b1RD8r6DAkSA8vrQ3grBC2QVgR5zUJ7QQFuVHZkcKoSYaEOQgCMPMOCOM5",
+          "object": "checkout.session",
+          "adaptive_pricing": null,
+          "after_expiration": null,
+          "allow_promotion_codes": true,
+          "amount_subtotal": 900,
+          "amount_total": 900,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "provider": null,
+            "status": null
+          },
+          "billing_address_collection": null,
+          "cancel_url": "http://localhost:3000/subscription/upgrade?plan=monthly",
+          "client_reference_id": null,
+          "client_secret": null,
+          "collected_information": {
+            "shipping_details": null
+          },
+          "consent": null,
+          "consent_collection": null,
+          "created": 1746281950,
+          "currency": "usd",
+          "currency_conversion": null,
+          "custom_fields": [],
+          "custom_text": {
+            "after_submit": null,
+            "shipping_address": null,
+            "submit": null,
+            "terms_of_service_acceptance": null
+          },
+          "customer": "cus_SFBH32Bf5lsggB",
+          "customer_creation": "always",
+          "customer_details": {
+            "address": {
+              "city": null,
+              "country": "US",
+              "line1": null,
+              "line2": null,
+              "postal_code": "12345",
+              "state": null
+            },
+            "email": "user@maybe.local",
+            "name": "Test Checkout User",
+            "phone": null,
+            "tax_exempt": "none",
+            "tax_ids": []
+          },
+          "customer_email": "user@maybe.local",
+          "discounts": [],
+          "expires_at": 1746368350,
+          "invoice": "in_1RKguoQT2jbOS8G0PuBVklxw",
+          "invoice_creation": null,
+          "livemode": false,
+          "locale": null,
+          "metadata": {},
+          "mode": "subscription",
+          "payment_intent": null,
+          "payment_link": null,
+          "payment_method_collection": "always",
+          "payment_method_configuration_details": {
+            "id": "pmc_1RJyv5QT2jbOS8G0PDwTVBar",
+            "parent": null
+          },
+          "payment_method_options": {
+            "card": {
+              "request_three_d_secure": "automatic"
+            }
+          },
+          "payment_method_types": [
+            "card",
+            "link",
+            "cashapp",
+            "amazon_pay"
+          ],
+          "payment_status": "paid",
+          "permissions": null,
+          "phone_number_collection": {
+            "enabled": false
+          },
+          "recovered_from": null,
+          "saved_payment_method_options": {
+            "allow_redisplay_filters": [
+              "always"
+            ],
+            "payment_method_remove": null,
+            "payment_method_save": null
+          },
+          "setup_intent": null,
+          "shipping_address_collection": null,
+          "shipping_cost": null,
+          "shipping_options": [],
+          "status": "complete",
+          "submit_type": null,
+          "subscription": "sub_1RKguoQT2jbOS8G0Zih79ix9",
+          "success_url": "http://localhost:3000/subscription/success?session_id={CHECKOUT_SESSION_ID}",
+          "total_details": {
+            "amount_discount": 0,
+            "amount_shipping": 0,
+            "amount_tax": 0
+          },
+          "ui_mode": "hosted",
+          "url": null,
+          "wallet_options": null
+        }
+  recorded_at: Mon, 05 May 2025 16:09:23 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/stripe/create_checkout_session.yml b/test/vcr_cassettes/stripe/create_checkout_session.yml
new file mode 100644
index 00000000..773ff2d3
--- /dev/null
+++ b/test/vcr_cassettes/stripe/create_checkout_session.yml
@@ -0,0 +1,298 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.stripe.com/v1/customers
+    body:
+      encoding: UTF-8
+      string: email=test%40example.com&metadata[family_id]=1
+    headers:
+      User-Agent:
+      - Stripe/v1 RubyBindings/15.1.0
+      Authorization:
+      - Bearer <STRIPE_SECRET_KEY>
+      Idempotency-Key:
+      - 7e129de1-324e-456a-8bd7-44382f6b4fa7
+      Stripe-Version:
+      - 2025-04-30.basil
+      X-Stripe-Client-User-Agent:
+      - '{"bindings_version":"15.1.0","lang":"ruby","lang_version":"3.4.1 p0 (2024-12-25)","platform":"arm64-darwin24","engine":"ruby","publisher":"stripe","uname":"Darwin
+        Zachs-MacBook-Pro.local 24.3.0 Darwin Kernel Version 24.3.0: Thu Jan  2 20:24:16
+        PST 2025; root:xnu-11215.81.4~3/RELEASE_ARM64_T6000 arm64","hostname":"Zachs-MacBook-Pro.local"}'
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Mon, 05 May 2025 16:09:23 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '652'
+      Connection:
+      - keep-alive
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Allow-Methods:
+      - GET, HEAD, PUT, PATCH, POST, DELETE
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Request-Id, Stripe-Manage-Version, Stripe-Should-Retry, X-Stripe-External-Auth-Required,
+        X-Stripe-Privileged-Session-Required
+      Access-Control-Max-Age:
+      - '300'
+      Cache-Control:
+      - no-cache, no-store
+      Content-Security-Policy:
+      - base-uri 'none'; default-src 'none'; form-action 'none'; frame-ancestors 'none';
+        img-src 'self'; script-src 'self' 'report-sample'; style-src 'self'; worker-src
+        'none'; upgrade-insecure-requests; report-uri https://q.stripe.com/csp-violation?q=o27rhODPrC4hNe4D-N6JT0tcY2dQoSKNy5hNsSJNdH_SL3lHJ8eS2959Oc-3UnIGMeyex9H3Qo_613Zp
+      Idempotency-Key:
+      - 7e129de1-324e-456a-8bd7-44382f6b4fa7
+      Original-Request:
+      - req_LIU5SlUlOEkoOg
+      Request-Id:
+      - req_LIU5SlUlOEkoOg
+      Stripe-Should-Retry:
+      - 'false'
+      Stripe-Version:
+      - 2025-04-30.basil
+      Vary:
+      - Origin
+      X-Stripe-Priority-Routing-Enabled:
+      - 'true'
+      X-Stripe-Routing-Context-Priority-Tier:
+      - api-testmode
+      X-Wc:
+      - ABGHI
+      Strict-Transport-Security:
+      - max-age=63072000; includeSubDomains; preload
+    body:
+      encoding: UTF-8
+      string: |-
+        {
+          "id": "cus_SFxVsSZ9enVBNC",
+          "object": "customer",
+          "address": null,
+          "balance": 0,
+          "created": 1746461363,
+          "currency": null,
+          "default_source": null,
+          "delinquent": false,
+          "description": null,
+          "discount": null,
+          "email": "test@example.com",
+          "invoice_prefix": "JPHCOASK",
+          "invoice_settings": {
+            "custom_fields": null,
+            "default_payment_method": null,
+            "footer": null,
+            "rendering_options": null
+          },
+          "livemode": false,
+          "metadata": {
+            "family_id": "1"
+          },
+          "name": null,
+          "next_invoice_sequence": 1,
+          "phone": null,
+          "preferred_locales": [],
+          "shipping": null,
+          "tax_exempt": "none",
+          "test_clock": null
+        }
+  recorded_at: Mon, 05 May 2025 16:09:23 GMT
+- request:
+    method: post
+    uri: https://api.stripe.com/v1/checkout/sessions
+    body:
+      encoding: UTF-8
+      string: customer=cus_SFxVsSZ9enVBNC&line_items[0][price]=price_1RJz6KQT2jbOS8G0Otv3qD01&line_items[0][quantity]=1&mode=subscription&allow_promotion_codes=true&success_url=http%3A%2F%2Flocalhost%3A3000%2Fsubscription%2Fsuccess%3Fsession_id%3D%7BCHECKOUT_SESSION_ID%7D&cancel_url=http%3A%2F%2Flocalhost%3A3000%2Fsubscription%2Fupgrade
+    headers:
+      User-Agent:
+      - Stripe/v1 RubyBindings/15.1.0
+      Authorization:
+      - Bearer <STRIPE_SECRET_KEY>
+      X-Stripe-Client-Telemetry:
+      - '{"last_request_metrics":{"request_id":"req_LIU5SlUlOEkoOg","request_duration_ms":307}}'
+      Idempotency-Key:
+      - d62353a3-199a-468d-9f78-a4fb10fa28bd
+      Stripe-Version:
+      - 2025-04-30.basil
+      X-Stripe-Client-User-Agent:
+      - '{"bindings_version":"15.1.0","lang":"ruby","lang_version":"3.4.1 p0 (2024-12-25)","platform":"arm64-darwin24","engine":"ruby","publisher":"stripe","uname":"Darwin
+        Zachs-MacBook-Pro.local 24.3.0 Darwin Kernel Version 24.3.0: Thu Jan  2 20:24:16
+        PST 2025; root:xnu-11215.81.4~3/RELEASE_ARM64_T6000 arm64","hostname":"Zachs-MacBook-Pro.local"}'
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Mon, 05 May 2025 16:09:24 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '2850'
+      Connection:
+      - keep-alive
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Allow-Methods:
+      - GET, HEAD, PUT, PATCH, POST, DELETE
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Request-Id, Stripe-Manage-Version, Stripe-Should-Retry, X-Stripe-External-Auth-Required,
+        X-Stripe-Privileged-Session-Required
+      Access-Control-Max-Age:
+      - '300'
+      Cache-Control:
+      - no-cache, no-store
+      Content-Security-Policy:
+      - base-uri 'none'; default-src 'none'; form-action 'none'; frame-ancestors 'none';
+        img-src 'self'; script-src 'self' 'report-sample'; style-src 'self'; worker-src
+        'none'; upgrade-insecure-requests; report-uri https://q.stripe.com/csp-violation?q=7L6NHIm4wk05H5wi0PfH951BH62utb5j2ZImtzEXvcfJgdc1v5juGoNb0oSAXIHhGQtWiGOiCmz3UG1W
+      Idempotency-Key:
+      - d62353a3-199a-468d-9f78-a4fb10fa28bd
+      Original-Request:
+      - req_8AIKuqTzBWcO76
+      Request-Id:
+      - req_8AIKuqTzBWcO76
+      Stripe-Should-Retry:
+      - 'false'
+      Stripe-Version:
+      - 2025-04-30.basil
+      Vary:
+      - Origin
+      X-Stripe-Priority-Routing-Enabled:
+      - 'true'
+      X-Stripe-Routing-Context-Priority-Tier:
+      - api-testmode
+      X-Wc:
+      - ABGHI
+      Strict-Transport-Security:
+      - max-age=63072000; includeSubDomains; preload
+    body:
+      encoding: UTF-8
+      string: |-
+        {
+          "id": "cs_test_b1lPPmtTEFw5w9GpyzQYlxz2TAN4JeUTosGjyXzfjkx9ocP59UhcF0WgWf",
+          "object": "checkout.session",
+          "adaptive_pricing": null,
+          "after_expiration": null,
+          "allow_promotion_codes": true,
+          "amount_subtotal": 900,
+          "amount_total": 900,
+          "automatic_tax": {
+            "enabled": false,
+            "liability": null,
+            "provider": null,
+            "status": null
+          },
+          "billing_address_collection": null,
+          "cancel_url": "http://localhost:3000/subscription/upgrade",
+          "client_reference_id": null,
+          "client_secret": null,
+          "collected_information": {
+            "shipping_details": null
+          },
+          "consent": null,
+          "consent_collection": null,
+          "created": 1746461364,
+          "currency": "usd",
+          "currency_conversion": null,
+          "custom_fields": [],
+          "custom_text": {
+            "after_submit": null,
+            "shipping_address": null,
+            "submit": null,
+            "terms_of_service_acceptance": null
+          },
+          "customer": "cus_SFxVsSZ9enVBNC",
+          "customer_creation": null,
+          "customer_details": {
+            "address": null,
+            "email": "test@example.com",
+            "name": null,
+            "phone": null,
+            "tax_exempt": "none",
+            "tax_ids": null
+          },
+          "customer_email": null,
+          "discounts": [],
+          "expires_at": 1746547763,
+          "invoice": null,
+          "invoice_creation": null,
+          "livemode": false,
+          "locale": null,
+          "metadata": {},
+          "mode": "subscription",
+          "payment_intent": null,
+          "payment_link": null,
+          "payment_method_collection": "always",
+          "payment_method_configuration_details": {
+            "id": "pmc_1RJyv5QT2jbOS8G0PDwTVBar",
+            "parent": null
+          },
+          "payment_method_options": {
+            "card": {
+              "request_three_d_secure": "automatic"
+            }
+          },
+          "payment_method_types": [
+            "card",
+            "link",
+            "cashapp",
+            "amazon_pay"
+          ],
+          "payment_status": "unpaid",
+          "permissions": null,
+          "phone_number_collection": {
+            "enabled": false
+          },
+          "recovered_from": null,
+          "saved_payment_method_options": {
+            "allow_redisplay_filters": [
+              "always"
+            ],
+            "payment_method_remove": null,
+            "payment_method_save": null
+          },
+          "setup_intent": null,
+          "shipping_address_collection": null,
+          "shipping_cost": null,
+          "shipping_options": [],
+          "status": "open",
+          "submit_type": null,
+          "subscription": null,
+          "success_url": "http://localhost:3000/subscription/success?session_id={CHECKOUT_SESSION_ID}",
+          "total_details": {
+            "amount_discount": 0,
+            "amount_shipping": 0,
+            "amount_tax": 0
+          },
+          "ui_mode": "hosted",
+          "url": "https://checkout.stripe.com/c/pay/cs_test_b1lPPmtTEFw5w9GpyzQYlxz2TAN4JeUTosGjyXzfjkx9ocP59UhcF0WgWf#fid2cGd2ZndsdXFsamtQa2x0cGBrYHZ2QGtkZ2lgYSc%2FY2RpdmApJ2R1bE5gfCc%2FJ3VuWnFgdnFaMDRXT3xwYVRRN29nSlY9QjUzNUttakJibmcxXH11Z2M8R3UzYUh3dGtNNlA8M3ExMTRKd0Z3M2p%2FdXdkcTNHcmg8NWA1YUx%2FbTRdTEM1cXI8TXNIT0FTRkY1NU5RME9EcjBpJyknY3dqaFZgd3Ngdyc%2FcXdwYCknaWR8anBxUXx1YCc%2FJ2hwaXFsWmxxYGgnKSdga2RnaWBVaWRmYG1qaWFgd3YnP3F3cGB4JSUl",
+          "wallet_options": null
+        }
+  recorded_at: Mon, 05 May 2025 16:09:24 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/synth/exchange_rate.yml b/test/vcr_cassettes/synth/exchange_rate.yml
index 40fb9995..adc22263 100644
--- a/test/vcr_cassettes/synth/exchange_rate.yml
+++ b/test/vcr_cassettes/synth/exchange_rate.yml
@@ -2,15 +2,19 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.synthfinance.com/rates/historical?date=2024-08-01&from=USD&to=MXN
+    uri: https://api.synthfinance.com/rates/historical?date=2024-01-01&from=USD&to=GBP
     body:
       encoding: US-ASCII
       string: ''
     headers:
-      User-Agent:
-        - Faraday v2.10.0
       Authorization:
       - Bearer <SYNTH_API_KEY>
+      X-Source:
+      - maybe_app
+      X-Source-Type:
+      - managed
+      User-Agent:
+      - Faraday v2.13.1
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
@@ -21,29 +25,25 @@ http_interactions:
       message: OK
     headers:
       Date:
-        - Thu, 01 Aug 2024 17:20:28 GMT
+      - Fri, 16 May 2025 13:01:38 GMT
       Content-Type:
       - application/json; charset=utf-8
       Transfer-Encoding:
-        - chunked
+      - chunked
       Connection:
       - keep-alive
-      Cf-Ray:
-        - 8ac77fbcc9d013ae-CMH
-      Cf-Cache-Status:
-      - DYNAMIC
       Cache-Control:
       - max-age=0, private, must-revalidate
       Etag:
-        - W/"668c8ac287a5ff6d6a705c35c69823b1"
+      - W/"0c93a67d0c68e6f206e2954a41aa2933"
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      Rndr-Id:
+      - 146e30b2-e03b-47e3
       Strict-Transport-Security:
       - max-age=63072000; includeSubDomains
       Vary:
       - Accept-Encoding
-      Referrer-Policy:
-      - strict-origin-when-cross-origin
-      Rndr-Id:
-        - ff56c2fe-6252-4b2c
       X-Content-Type-Options:
       - nosniff
       X-Frame-Options:
@@ -53,17 +53,29 @@ http_interactions:
       X-Render-Origin-Server:
       - Render
       X-Request-Id:
-        - 61992b01-969b-4af5-8119-9b17e385da07
+      - 3cf7ade1-8066-422a-97c7-5f8b99e24296
       X-Runtime:
-        - '0.369358'
+      - '0.024284'
       X-Xss-Protection:
       - '0'
+      Cf-Cache-Status:
+      - DYNAMIC
+      Report-To:
+      - '{"endpoints":[{"url":"https:\/\/a.nel.cloudflare.com\/report\/v4?s=ih8sEFqAOWyINqAEtKGKPKO2lr1qAYSVeipyB5F8g2umPODXvCD4hN3G6wTTs2Q7H8CDWsqiOlYkmVvmr%2BWvl2ojOtBwO25Ahk9TbhlcgRO9nT6mEIXOSdVXJpzpRn5Ov%2FMGigpQ"}],"group":"cf-nel","max_age":604800}'
+      Nel:
+      - '{"success_fraction":0,"report_to":"cf-nel","max_age":604800}'
+      Speculation-Rules:
+      - '"/cdn-cgi/speculation"'
       Server:
       - cloudflare
+      Cf-Ray:
+      - 940b109b5df1a3d7-ORD
       Alt-Svc:
       - h3=":443"; ma=86400
+      Server-Timing:
+      - cfL4;desc="?proto=TCP&rtt=25865&min_rtt=25683&rtt_var=9996&sent=4&recv=6&lost=0&retrans=0&sent_bytes=2827&recv_bytes=922&delivery_rate=106690&cwnd=219&unsent_bytes=0&cid=e48ae188d1f86721&ts=190&x=0"
     body:
       encoding: ASCII-8BIT
-      string: '{"data":{"date":"2024-08-01","source":"USD","rates":{"MXN":18.645877}},"meta":{"total_records":1,"credits_used":1,"credits_remaining":248999}}'
-  recorded_at: Thu, 01 Aug 2024 17:20:28 GMT
-recorded_with: VCR 6.2.0
+      string: '{"data":{"date":"2024-01-01","source":"USD","rates":{"GBP":0.785476}},"meta":{"total_records":1,"credits_used":1,"credits_remaining":249734,"date":"2024-01-01"}}'
+  recorded_at: Fri, 16 May 2025 13:01:38 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/synth/exchange_rate_historical.yml b/test/vcr_cassettes/synth/exchange_rate_historical.yml
deleted file mode 100644
index 7e34a6ae..00000000
--- a/test/vcr_cassettes/synth/exchange_rate_historical.yml
+++ /dev/null
@@ -1,213 +0,0 @@
----
-http_interactions:
-- request:
-    method: get
-    uri: https://api.synthfinance.com/rates/historical-range?date_end=2024-07-31&date_start=2024-01-01&from=USD&page=1&to=GBP
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Authorization:
-      - Bearer <SYNTH_API_KEY>
-      X-Source:
-      - maybe_app
-      X-Source-Type:
-      - managed
-      User-Agent:
-      - Faraday v2.10.1
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      Accept:
-      - "*/*"
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Date:
-      - Thu, 08 Aug 2024 17:57:48 GMT
-      Content-Type:
-      - application/json; charset=utf-8
-      Transfer-Encoding:
-      - chunked
-      Connection:
-      - keep-alive
-      Cf-Ray:
-      - 8b01640eb8e8451c-TXL
-      Cf-Cache-Status:
-      - DYNAMIC
-      Cache-Control:
-      - max-age=0, private, must-revalidate
-      Etag:
-      - W/"fe9bd64a1b712e0577da8fbfd5bad08d"
-      Strict-Transport-Security:
-      - max-age=63072000; includeSubDomains
-      Vary:
-      - Accept-Encoding
-      Referrer-Policy:
-      - strict-origin-when-cross-origin
-      Rndr-Id:
-      - d8c1b21e-a6f4-48a0
-      X-Content-Type-Options:
-      - nosniff
-      X-Frame-Options:
-      - SAMEORIGIN
-      X-Permitted-Cross-Domain-Policies:
-      - none
-      X-Render-Origin-Server:
-      - Render
-      X-Request-Id:
-      - 0003eaec-e246-4769-84f5-7a062eef0908
-      X-Runtime:
-      - '0.040177'
-      X-Xss-Protection:
-      - '0'
-      Server:
-      - cloudflare
-      Alt-Svc:
-      - h3=":443"; ma=86400
-    body:
-      encoding: ASCII-8BIT
-      string: '{"data":[{"date":"2024-01-01","source":"USD","rates":{"GBP":0.785476}},{"date":"2024-01-02","source":"USD","rates":{"GBP":0.785644}},{"date":"2024-01-03","source":"USD","rates":{"GBP":0.792232}},{"date":"2024-01-04","source":"USD","rates":{"GBP":0.789053}},{"date":"2024-01-05","source":"USD","rates":{"GBP":0.788487}},{"date":"2024-01-06","source":"USD","rates":{"GBP":0.785787}},{"date":"2024-01-07","source":"USD","rates":{"GBP":0.785994}},{"date":"2024-01-08","source":"USD","rates":{"GBP":0.786378}},{"date":"2024-01-09","source":"USD","rates":{"GBP":0.784775}},{"date":"2024-01-10","source":"USD","rates":{"GBP":0.786769}},{"date":"2024-01-11","source":"USD","rates":{"GBP":0.784633}},{"date":"2024-01-12","source":"USD","rates":{"GBP":0.782576}},{"date":"2024-01-13","source":"USD","rates":{"GBP":0.78447}},{"date":"2024-01-14","source":"USD","rates":{"GBP":0.784423}},{"date":"2024-01-15","source":"USD","rates":{"GBP":0.785204}},{"date":"2024-01-16","source":"USD","rates":{"GBP":0.786438}},{"date":"2024-01-17","source":"USD","rates":{"GBP":0.791264}},{"date":"2024-01-18","source":"USD","rates":{"GBP":0.788852}},{"date":"2024-01-19","source":"USD","rates":{"GBP":0.786744}},{"date":"2024-01-20","source":"USD","rates":{"GBP":0.787186}},{"date":"2024-01-21","source":"USD","rates":{"GBP":0.787166}},{"date":"2024-01-22","source":"USD","rates":{"GBP":0.787487}},{"date":"2024-01-23","source":"USD","rates":{"GBP":0.786985}},{"date":"2024-01-24","source":"USD","rates":{"GBP":0.787961}},{"date":"2024-01-25","source":"USD","rates":{"GBP":0.786236}},{"date":"2024-01-26","source":"USD","rates":{"GBP":0.786961}},{"date":"2024-01-27","source":"USD","rates":{"GBP":0.786935}},{"date":"2024-01-28","source":"USD","rates":{"GBP":0.787014}},{"date":"2024-01-29","source":"USD","rates":{"GBP":0.78761}},{"date":"2024-01-30","source":"USD","rates":{"GBP":0.786652}},{"date":"2024-01-31","source":"USD","rates":{"GBP":0.787736}},{"date":"2024-02-01","source":"USD","rates":{"GBP":0.788759}},{"date":"2024-02-02","source":"USD","rates":{"GBP":0.784546}},{"date":"2024-02-03","source":"USD","rates":{"GBP":0.791634}},{"date":"2024-02-04","source":"USD","rates":{"GBP":0.791637}},{"date":"2024-02-05","source":"USD","rates":{"GBP":0.792205}},{"date":"2024-02-06","source":"USD","rates":{"GBP":0.797836}},{"date":"2024-02-07","source":"USD","rates":{"GBP":0.79341}},{"date":"2024-02-08","source":"USD","rates":{"GBP":0.791971}},{"date":"2024-02-09","source":"USD","rates":{"GBP":0.792371}},{"date":"2024-02-10","source":"USD","rates":{"GBP":0.791997}},{"date":"2024-02-11","source":"USD","rates":{"GBP":0.792019}},{"date":"2024-02-12","source":"USD","rates":{"GBP":0.791339}},{"date":"2024-02-13","source":"USD","rates":{"GBP":0.791977}},{"date":"2024-02-14","source":"USD","rates":{"GBP":0.794262}},{"date":"2024-02-15","source":"USD","rates":{"GBP":0.795709}},{"date":"2024-02-16","source":"USD","rates":{"GBP":0.793714}},{"date":"2024-02-17","source":"USD","rates":{"GBP":0.793499}},{"date":"2024-02-18","source":"USD","rates":{"GBP":0.79367}},{"date":"2024-02-19","source":"USD","rates":{"GBP":0.792968}},{"date":"2024-02-20","source":"USD","rates":{"GBP":0.794437}},{"date":"2024-02-21","source":"USD","rates":{"GBP":0.791988}},{"date":"2024-02-22","source":"USD","rates":{"GBP":0.791262}},{"date":"2024-02-23","source":"USD","rates":{"GBP":0.789749}},{"date":"2024-02-24","source":"USD","rates":{"GBP":0.78886}},{"date":"2024-02-25","source":"USD","rates":{"GBP":0.789107}},{"date":"2024-02-26","source":"USD","rates":{"GBP":0.78917}},{"date":"2024-02-27","source":"USD","rates":{"GBP":0.788381}},{"date":"2024-02-28","source":"USD","rates":{"GBP":0.78861}},{"date":"2024-02-29","source":"USD","rates":{"GBP":0.789837}},{"date":"2024-03-01","source":"USD","rates":{"GBP":0.792028}},{"date":"2024-03-02","source":"USD","rates":{"GBP":0.790312}},{"date":"2024-03-03","source":"USD","rates":{"GBP":0.790258}},{"date":"2024-03-04","source":"USD","rates":{"GBP":0.789891}},{"date":"2024-03-05","source":"USD","rates":{"GBP":0.788025}},{"date":"2024-03-06","source":"USD","rates":{"GBP":0.787136}},{"date":"2024-03-07","source":"USD","rates":{"GBP":0.785219}},{"date":"2024-03-08","source":"USD","rates":{"GBP":0.780438}},{"date":"2024-03-09","source":"USD","rates":{"GBP":0.777772}},{"date":"2024-03-10","source":"USD","rates":{"GBP":0.777884}},{"date":"2024-03-11","source":"USD","rates":{"GBP":0.77786}},{"date":"2024-03-12","source":"USD","rates":{"GBP":0.780067}},{"date":"2024-03-13","source":"USD","rates":{"GBP":0.781535}},{"date":"2024-03-14","source":"USD","rates":{"GBP":0.781184}},{"date":"2024-03-15","source":"USD","rates":{"GBP":0.784604}},{"date":"2024-03-16","source":"USD","rates":{"GBP":0.785537}},{"date":"2024-03-17","source":"USD","rates":{"GBP":0.785147}},{"date":"2024-03-18","source":"USD","rates":{"GBP":0.785457}},{"date":"2024-03-19","source":"USD","rates":{"GBP":0.785746}},{"date":"2024-03-20","source":"USD","rates":{"GBP":0.786238}},{"date":"2024-03-21","source":"USD","rates":{"GBP":0.781351}},{"date":"2024-03-22","source":"USD","rates":{"GBP":0.789841}},{"date":"2024-03-23","source":"USD","rates":{"GBP":0.793659}},{"date":"2024-03-24","source":"USD","rates":{"GBP":0.793385}},{"date":"2024-03-25","source":"USD","rates":{"GBP":0.793673}},{"date":"2024-03-26","source":"USD","rates":{"GBP":0.791344}},{"date":"2024-03-27","source":"USD","rates":{"GBP":0.791899}},{"date":"2024-03-28","source":"USD","rates":{"GBP":0.792585}},{"date":"2024-03-29","source":"USD","rates":{"GBP":0.792205}},{"date":"2024-03-30","source":"USD","rates":{"GBP":0.792228}},{"date":"2024-03-31","source":"USD","rates":{"GBP":0.792057}},{"date":"2024-04-01","source":"USD","rates":{"GBP":0.79134}},{"date":"2024-04-02","source":"USD","rates":{"GBP":0.797058}},{"date":"2024-04-03","source":"USD","rates":{"GBP":0.795147}},{"date":"2024-04-04","source":"USD","rates":{"GBP":0.790398}},{"date":"2024-04-05","source":"USD","rates":{"GBP":0.791151}},{"date":"2024-04-06","source":"USD","rates":{"GBP":0.791314}},{"date":"2024-04-07","source":"USD","rates":{"GBP":0.791273}},{"date":"2024-04-08","source":"USD","rates":{"GBP":0.792111}},{"date":"2024-04-09","source":"USD","rates":{"GBP":0.790047}}],"paging":{"prev":"/rates/historical-range?date_end=2024-07-31\u0026date_start=2024-01-01\u0026from=USD\u0026page=\u0026to=GBP","next":"/rates/historical-range?date_end=2024-07-31\u0026date_start=2024-01-01\u0026from=USD\u0026page=2\u0026to=GBP","total_records":213,"current_page":1,"per_page":100,"total_pages":3},"meta":{"credits_used":1,"credits_remaining":53,"date_start":"2024-01-01","date_end":"2024-07-31"}}'
-  recorded_at: Thu, 08 Aug 2024 17:57:48 GMT
-- request:
-    method: get
-    uri: https://api.synthfinance.com/rates/historical-range?date_end=2024-07-31&date_start=2024-01-01&from=USD&page=2&to=GBP
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Authorization:
-      - Bearer <SYNTH_API_KEY>
-      X-Source:
-      - maybe_app
-      X-Source-Type:
-      - managed
-      User-Agent:
-      - Faraday v2.10.1
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      Accept:
-      - "*/*"
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Date:
-      - Thu, 08 Aug 2024 17:57:48 GMT
-      Content-Type:
-      - application/json; charset=utf-8
-      Transfer-Encoding:
-      - chunked
-      Connection:
-      - keep-alive
-      Cf-Ray:
-      - 8b016411c8da2685-TXL
-      Cf-Cache-Status:
-      - DYNAMIC
-      Cache-Control:
-      - max-age=0, private, must-revalidate
-      Etag:
-      - W/"7617d44c8da4ad2ecd071eae8522f17c"
-      Strict-Transport-Security:
-      - max-age=63072000; includeSubDomains
-      Vary:
-      - Accept-Encoding
-      Referrer-Policy:
-      - strict-origin-when-cross-origin
-      Rndr-Id:
-      - a882d8f9-da35-4532
-      X-Content-Type-Options:
-      - nosniff
-      X-Frame-Options:
-      - SAMEORIGIN
-      X-Permitted-Cross-Domain-Policies:
-      - none
-      X-Render-Origin-Server:
-      - Render
-      X-Request-Id:
-      - 06a85aa9-8288-484c-80f2-f90ddd97c36e
-      X-Runtime:
-      - '0.026746'
-      X-Xss-Protection:
-      - '0'
-      Server:
-      - cloudflare
-      Alt-Svc:
-      - h3=":443"; ma=86400
-    body:
-      encoding: ASCII-8BIT
-      string: '{"data":[{"date":"2024-04-10","source":"USD","rates":{"GBP":0.788828}},{"date":"2024-04-11","source":"USD","rates":{"GBP":0.797646}},{"date":"2024-04-12","source":"USD","rates":{"GBP":0.796524}},{"date":"2024-04-13","source":"USD","rates":{"GBP":0.803024}},{"date":"2024-04-14","source":"USD","rates":{"GBP":0.802912}},{"date":"2024-04-15","source":"USD","rates":{"GBP":0.8025}},{"date":"2024-04-16","source":"USD","rates":{"GBP":0.80344}},{"date":"2024-04-17","source":"USD","rates":{"GBP":0.804505}},{"date":"2024-04-18","source":"USD","rates":{"GBP":0.80301}},{"date":"2024-04-19","source":"USD","rates":{"GBP":0.804145}},{"date":"2024-04-20","source":"USD","rates":{"GBP":0.80845}},{"date":"2024-04-21","source":"USD","rates":{"GBP":0.808199}},{"date":"2024-04-22","source":"USD","rates":{"GBP":0.808004}},{"date":"2024-04-23","source":"USD","rates":{"GBP":0.809734}},{"date":"2024-04-24","source":"USD","rates":{"GBP":0.802955}},{"date":"2024-04-25","source":"USD","rates":{"GBP":0.80264}},{"date":"2024-04-26","source":"USD","rates":{"GBP":0.799526}},{"date":"2024-04-27","source":"USD","rates":{"GBP":0.80053}},{"date":"2024-04-28","source":"USD","rates":{"GBP":0.800761}},{"date":"2024-04-29","source":"USD","rates":{"GBP":0.799397}},{"date":"2024-04-30","source":"USD","rates":{"GBP":0.796217}},{"date":"2024-05-01","source":"USD","rates":{"GBP":0.800703}},{"date":"2024-05-02","source":"USD","rates":{"GBP":0.797562}},{"date":"2024-05-03","source":"USD","rates":{"GBP":0.797457}},{"date":"2024-05-04","source":"USD","rates":{"GBP":0.797001}},{"date":"2024-05-05","source":"USD","rates":{"GBP":0.797107}},{"date":"2024-05-06","source":"USD","rates":{"GBP":0.797363}},{"date":"2024-05-07","source":"USD","rates":{"GBP":0.796218}},{"date":"2024-05-08","source":"USD","rates":{"GBP":0.799915}},{"date":"2024-05-09","source":"USD","rates":{"GBP":0.800422}},{"date":"2024-05-10","source":"USD","rates":{"GBP":0.798411}},{"date":"2024-05-11","source":"USD","rates":{"GBP":0.798489}},{"date":"2024-05-12","source":"USD","rates":{"GBP":0.798475}},{"date":"2024-05-13","source":"USD","rates":{"GBP":0.79853}},{"date":"2024-05-14","source":"USD","rates":{"GBP":0.796122}},{"date":"2024-05-15","source":"USD","rates":{"GBP":0.794614}},{"date":"2024-05-16","source":"USD","rates":{"GBP":0.78804}},{"date":"2024-05-17","source":"USD","rates":{"GBP":0.789188}},{"date":"2024-05-18","source":"USD","rates":{"GBP":0.787162}},{"date":"2024-05-19","source":"USD","rates":{"GBP":0.787194}},{"date":"2024-05-20","source":"USD","rates":{"GBP":0.787022}},{"date":"2024-05-21","source":"USD","rates":{"GBP":0.786793}},{"date":"2024-05-22","source":"USD","rates":{"GBP":0.786723}},{"date":"2024-05-23","source":"USD","rates":{"GBP":0.786132}},{"date":"2024-05-24","source":"USD","rates":{"GBP":0.78778}},{"date":"2024-05-25","source":"USD","rates":{"GBP":0.785013}},{"date":"2024-05-26","source":"USD","rates":{"GBP":0.785081}},{"date":"2024-05-27","source":"USD","rates":{"GBP":0.78526}},{"date":"2024-05-28","source":"USD","rates":{"GBP":0.78296}},{"date":"2024-05-29","source":"USD","rates":{"GBP":0.783808}},{"date":"2024-05-30","source":"USD","rates":{"GBP":0.787552}},{"date":"2024-05-31","source":"USD","rates":{"GBP":0.785599}},{"date":"2024-06-01","source":"USD","rates":{"GBP":0.785113}},{"date":"2024-06-02","source":"USD","rates":{"GBP":0.785019}},{"date":"2024-06-03","source":"USD","rates":{"GBP":0.784657}},{"date":"2024-06-04","source":"USD","rates":{"GBP":0.780649}},{"date":"2024-06-05","source":"USD","rates":{"GBP":0.782934}},{"date":"2024-06-06","source":"USD","rates":{"GBP":0.781631}},{"date":"2024-06-07","source":"USD","rates":{"GBP":0.781732}},{"date":"2024-06-08","source":"USD","rates":{"GBP":0.785947}},{"date":"2024-06-09","source":"USD","rates":{"GBP":0.785767}},{"date":"2024-06-10","source":"USD","rates":{"GBP":0.785588}},{"date":"2024-06-11","source":"USD","rates":{"GBP":0.785791}},{"date":"2024-06-12","source":"USD","rates":{"GBP":0.784932}},{"date":"2024-06-13","source":"USD","rates":{"GBP":0.781472}},{"date":"2024-06-14","source":"USD","rates":{"GBP":0.784041}},{"date":"2024-06-15","source":"USD","rates":{"GBP":0.789096}},{"date":"2024-06-16","source":"USD","rates":{"GBP":0.788449}},{"date":"2024-06-17","source":"USD","rates":{"GBP":0.788479}},{"date":"2024-06-18","source":"USD","rates":{"GBP":0.786542}},{"date":"2024-06-19","source":"USD","rates":{"GBP":0.786916}},{"date":"2024-06-20","source":"USD","rates":{"GBP":0.786107}},{"date":"2024-06-21","source":"USD","rates":{"GBP":0.789875}},{"date":"2024-06-22","source":"USD","rates":{"GBP":0.79058}},{"date":"2024-06-23","source":"USD","rates":{"GBP":0.790546}},{"date":"2024-06-24","source":"USD","rates":{"GBP":0.791248}},{"date":"2024-06-25","source":"USD","rates":{"GBP":0.788496}},{"date":"2024-06-26","source":"USD","rates":{"GBP":0.788395}},{"date":"2024-06-27","source":"USD","rates":{"GBP":0.792298}},{"date":"2024-06-28","source":"USD","rates":{"GBP":0.79087}},{"date":"2024-06-29","source":"USD","rates":{"GBP":0.790726}},{"date":"2024-06-30","source":"USD","rates":{"GBP":0.790719}},{"date":"2024-07-01","source":"USD","rates":{"GBP":0.790622}},{"date":"2024-07-02","source":"USD","rates":{"GBP":0.790812}},{"date":"2024-07-03","source":"USD","rates":{"GBP":0.78816}},{"date":"2024-07-04","source":"USD","rates":{"GBP":0.784451}},{"date":"2024-07-05","source":"USD","rates":{"GBP":0.783992}},{"date":"2024-07-06","source":"USD","rates":{"GBP":0.780243}},{"date":"2024-07-07","source":"USD","rates":{"GBP":0.780594}},{"date":"2024-07-08","source":"USD","rates":{"GBP":0.780827}},{"date":"2024-07-09","source":"USD","rates":{"GBP":0.780333}},{"date":"2024-07-10","source":"USD","rates":{"GBP":0.781936}},{"date":"2024-07-11","source":"USD","rates":{"GBP":0.777992}},{"date":"2024-07-12","source":"USD","rates":{"GBP":0.773816}},{"date":"2024-07-13","source":"USD","rates":{"GBP":0.770374}},{"date":"2024-07-14","source":"USD","rates":{"GBP":0.770294}},{"date":"2024-07-15","source":"USD","rates":{"GBP":0.771174}},{"date":"2024-07-16","source":"USD","rates":{"GBP":0.771041}},{"date":"2024-07-17","source":"USD","rates":{"GBP":0.770574}},{"date":"2024-07-18","source":"USD","rates":{"GBP":0.768775}}],"paging":{"prev":"/rates/historical-range?date_end=2024-07-31\u0026date_start=2024-01-01\u0026from=USD\u0026page=1\u0026to=GBP","next":"/rates/historical-range?date_end=2024-07-31\u0026date_start=2024-01-01\u0026from=USD\u0026page=3\u0026to=GBP","total_records":213,"current_page":2,"per_page":100,"total_pages":3},"meta":{"credits_used":1,"credits_remaining":52,"date_start":"2024-01-01","date_end":"2024-07-31"}}'
-  recorded_at: Thu, 08 Aug 2024 17:57:48 GMT
-- request:
-    method: get
-    uri: https://api.synthfinance.com/rates/historical-range?date_end=2024-07-31&date_start=2024-01-01&from=USD&page=3&to=GBP
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Authorization:
-      - Bearer <SYNTH_API_KEY>
-      X-Source:
-      - maybe_app
-      X-Source-Type:
-      - managed
-      User-Agent:
-      - Faraday v2.10.1
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      Accept:
-      - "*/*"
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Date:
-      - Thu, 08 Aug 2024 17:57:49 GMT
-      Content-Type:
-      - application/json; charset=utf-8
-      Transfer-Encoding:
-      - chunked
-      Connection:
-      - keep-alive
-      Cf-Ray:
-      - 8b016414b8f758de-TXL
-      Cf-Cache-Status:
-      - DYNAMIC
-      Cache-Control:
-      - max-age=0, private, must-revalidate
-      Etag:
-      - W/"6efe5a0b3e3e58e3c8d2fa5d6525bd61"
-      Strict-Transport-Security:
-      - max-age=63072000; includeSubDomains
-      Vary:
-      - Accept-Encoding
-      Referrer-Policy:
-      - strict-origin-when-cross-origin
-      Rndr-Id:
-      - bcf6b2fc-a331-4293
-      X-Content-Type-Options:
-      - nosniff
-      X-Frame-Options:
-      - SAMEORIGIN
-      X-Permitted-Cross-Domain-Policies:
-      - none
-      X-Render-Origin-Server:
-      - Render
-      X-Request-Id:
-      - 87b3e27e-08bd-4784-8c6f-350622aa08e6
-      X-Runtime:
-      - '0.029529'
-      X-Xss-Protection:
-      - '0'
-      Server:
-      - cloudflare
-      Alt-Svc:
-      - h3=":443"; ma=86400
-    body:
-      encoding: ASCII-8BIT
-      string: '{"data":[{"date":"2024-07-19","source":"USD","rates":{"GBP":0.772195}},{"date":"2024-07-20","source":"USD","rates":{"GBP":0.774311}},{"date":"2024-07-21","source":"USD","rates":{"GBP":0.774027}},{"date":"2024-07-22","source":"USD","rates":{"GBP":0.773514}},{"date":"2024-07-23","source":"USD","rates":{"GBP":0.77348}},{"date":"2024-07-24","source":"USD","rates":{"GBP":0.775341}},{"date":"2024-07-25","source":"USD","rates":{"GBP":0.775425}},{"date":"2024-07-26","source":"USD","rates":{"GBP":0.777798}},{"date":"2024-07-27","source":"USD","rates":{"GBP":0.777333}},{"date":"2024-07-28","source":"USD","rates":{"GBP":0.77693}},{"date":"2024-07-29","source":"USD","rates":{"GBP":0.77605}},{"date":"2024-07-30","source":"USD","rates":{"GBP":0.77799}},{"date":"2024-07-31","source":"USD","rates":{"GBP":0.778763}}],"paging":{"prev":"/rates/historical-range?date_end=2024-07-31\u0026date_start=2024-01-01\u0026from=USD\u0026page=2\u0026to=GBP","next":"/rates/historical-range?date_end=2024-07-31\u0026date_start=2024-01-01\u0026from=USD\u0026page=\u0026to=GBP","total_records":213,"current_page":3,"per_page":100,"total_pages":3},"meta":{"credits_used":1,"credits_remaining":51,"date_start":"2024-01-01","date_end":"2024-07-31"}}'
-  recorded_at: Thu, 08 Aug 2024 17:57:49 GMT
-recorded_with: VCR 6.2.0
diff --git a/test/vcr_cassettes/synth/exchange_rates.yml b/test/vcr_cassettes/synth/exchange_rates.yml
new file mode 100644
index 00000000..87071b8f
--- /dev/null
+++ b/test/vcr_cassettes/synth/exchange_rates.yml
@@ -0,0 +1,81 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.synthfinance.com/rates/historical-range?date_end=2024-07-31&date_start=2024-01-01&from=USD&page=1&to=GBP
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
+      - Bearer <SYNTH_API_KEY>
+      X-Source:
+      - maybe_app
+      X-Source-Type:
+      - managed
+      User-Agent:
+      - Faraday v2.13.1
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 16 May 2025 13:01:35 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      Etag:
+      - W/"ad21b1fba71fe0b149fe37b483a60438"
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      Rndr-Id:
+      - 28bc6622-47b8-4aeb
+      Strict-Transport-Security:
+      - max-age=63072000; includeSubDomains
+      Vary:
+      - Accept-Encoding
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Render-Origin-Server:
+      - Render
+      X-Request-Id:
+      - fcf251a3-f850-4464-9592-ced9de5e0c86
+      X-Runtime:
+      - '0.080857'
+      X-Xss-Protection:
+      - '0'
+      Cf-Cache-Status:
+      - DYNAMIC
+      Report-To:
+      - '{"endpoints":[{"url":"https:\/\/a.nel.cloudflare.com\/report\/v4?s=622lysAXubNaj3TsuhR9RYZRXPc%2BgnyMWj52fxy%2BptvXoPr%2FxVJgJZ0g02mOUjCywdAymkMpawfWCaZVQOIaPVpocco3g4Y%2B0FB667ilf3UtCyiHwqCosUq0T99JabIsgFFJ%2FhP4"}],"group":"cf-nel","max_age":604800}'
+      Nel:
+      - '{"success_fraction":0,"report_to":"cf-nel","max_age":604800}'
+      Speculation-Rules:
+      - '"/cdn-cgi/speculation"'
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 940b108a2921607d-ORD
+      Alt-Svc:
+      - h3=":443"; ma=86400
+      Server-Timing:
+      - cfL4;desc="?proto=TCP&rtt=25729&min_rtt=25575&rtt_var=9899&sent=4&recv=6&lost=0&retrans=0&sent_bytes=2825&recv_bytes=961&delivery_rate=108019&cwnd=251&unsent_bytes=0&cid=ca574e4a637aba29&ts=241&x=0"
+    body:
+      encoding: ASCII-8BIT
+      string: '{"data":[{"date":"2024-01-01","source":"USD","rates":{"GBP":0.785476}},{"date":"2024-01-02","source":"USD","rates":{"GBP":0.785644}},{"date":"2024-01-03","source":"USD","rates":{"GBP":0.792232}},{"date":"2024-01-04","source":"USD","rates":{"GBP":0.789053}},{"date":"2024-01-05","source":"USD","rates":{"GBP":0.788487}},{"date":"2024-01-06","source":"USD","rates":{"GBP":0.785787}},{"date":"2024-01-07","source":"USD","rates":{"GBP":0.785994}},{"date":"2024-01-08","source":"USD","rates":{"GBP":0.786378}},{"date":"2024-01-09","source":"USD","rates":{"GBP":0.784775}},{"date":"2024-01-10","source":"USD","rates":{"GBP":0.786769}},{"date":"2024-01-11","source":"USD","rates":{"GBP":0.784633}},{"date":"2024-01-12","source":"USD","rates":{"GBP":0.782576}},{"date":"2024-01-13","source":"USD","rates":{"GBP":0.78447}},{"date":"2024-01-14","source":"USD","rates":{"GBP":0.784423}},{"date":"2024-01-15","source":"USD","rates":{"GBP":0.785204}},{"date":"2024-01-16","source":"USD","rates":{"GBP":0.786438}},{"date":"2024-01-17","source":"USD","rates":{"GBP":0.791264}},{"date":"2024-01-18","source":"USD","rates":{"GBP":0.788852}},{"date":"2024-01-19","source":"USD","rates":{"GBP":0.786744}},{"date":"2024-01-20","source":"USD","rates":{"GBP":0.787186}},{"date":"2024-01-21","source":"USD","rates":{"GBP":0.787166}},{"date":"2024-01-22","source":"USD","rates":{"GBP":0.787487}},{"date":"2024-01-23","source":"USD","rates":{"GBP":0.786985}},{"date":"2024-01-24","source":"USD","rates":{"GBP":0.787961}},{"date":"2024-01-25","source":"USD","rates":{"GBP":0.786236}},{"date":"2024-01-26","source":"USD","rates":{"GBP":0.786961}},{"date":"2024-01-27","source":"USD","rates":{"GBP":0.786935}},{"date":"2024-01-28","source":"USD","rates":{"GBP":0.787014}},{"date":"2024-01-29","source":"USD","rates":{"GBP":0.78761}},{"date":"2024-01-30","source":"USD","rates":{"GBP":0.786652}},{"date":"2024-01-31","source":"USD","rates":{"GBP":0.787736}},{"date":"2024-02-01","source":"USD","rates":{"GBP":0.788759}},{"date":"2024-02-02","source":"USD","rates":{"GBP":0.784546}},{"date":"2024-02-03","source":"USD","rates":{"GBP":0.791634}},{"date":"2024-02-04","source":"USD","rates":{"GBP":0.791637}},{"date":"2024-02-05","source":"USD","rates":{"GBP":0.792205}},{"date":"2024-02-06","source":"USD","rates":{"GBP":0.797836}},{"date":"2024-02-07","source":"USD","rates":{"GBP":0.79341}},{"date":"2024-02-08","source":"USD","rates":{"GBP":0.791971}},{"date":"2024-02-09","source":"USD","rates":{"GBP":0.792371}},{"date":"2024-02-10","source":"USD","rates":{"GBP":0.791997}},{"date":"2024-02-11","source":"USD","rates":{"GBP":0.792019}},{"date":"2024-02-12","source":"USD","rates":{"GBP":0.791339}},{"date":"2024-02-13","source":"USD","rates":{"GBP":0.791977}},{"date":"2024-02-14","source":"USD","rates":{"GBP":0.794262}},{"date":"2024-02-15","source":"USD","rates":{"GBP":0.795709}},{"date":"2024-02-16","source":"USD","rates":{"GBP":0.793714}},{"date":"2024-02-17","source":"USD","rates":{"GBP":0.793499}},{"date":"2024-02-18","source":"USD","rates":{"GBP":0.79367}},{"date":"2024-02-19","source":"USD","rates":{"GBP":0.792968}},{"date":"2024-02-20","source":"USD","rates":{"GBP":0.794437}},{"date":"2024-02-21","source":"USD","rates":{"GBP":0.791988}},{"date":"2024-02-22","source":"USD","rates":{"GBP":0.791262}},{"date":"2024-02-23","source":"USD","rates":{"GBP":0.789749}},{"date":"2024-02-24","source":"USD","rates":{"GBP":0.78886}},{"date":"2024-02-25","source":"USD","rates":{"GBP":0.789107}},{"date":"2024-02-26","source":"USD","rates":{"GBP":0.78917}},{"date":"2024-02-27","source":"USD","rates":{"GBP":0.788381}},{"date":"2024-02-28","source":"USD","rates":{"GBP":0.78861}},{"date":"2024-02-29","source":"USD","rates":{"GBP":0.789837}},{"date":"2024-03-01","source":"USD","rates":{"GBP":0.792028}},{"date":"2024-03-02","source":"USD","rates":{"GBP":0.790312}},{"date":"2024-03-03","source":"USD","rates":{"GBP":0.790258}},{"date":"2024-03-04","source":"USD","rates":{"GBP":0.789891}},{"date":"2024-03-05","source":"USD","rates":{"GBP":0.788025}},{"date":"2024-03-06","source":"USD","rates":{"GBP":0.787136}},{"date":"2024-03-07","source":"USD","rates":{"GBP":0.785219}},{"date":"2024-03-08","source":"USD","rates":{"GBP":0.780438}},{"date":"2024-03-09","source":"USD","rates":{"GBP":0.777772}},{"date":"2024-03-10","source":"USD","rates":{"GBP":0.777884}},{"date":"2024-03-11","source":"USD","rates":{"GBP":0.77786}},{"date":"2024-03-12","source":"USD","rates":{"GBP":0.780067}},{"date":"2024-03-13","source":"USD","rates":{"GBP":0.781535}},{"date":"2024-03-14","source":"USD","rates":{"GBP":0.781184}},{"date":"2024-03-15","source":"USD","rates":{"GBP":0.784604}},{"date":"2024-03-16","source":"USD","rates":{"GBP":0.785537}},{"date":"2024-03-17","source":"USD","rates":{"GBP":0.785147}},{"date":"2024-03-18","source":"USD","rates":{"GBP":0.785457}},{"date":"2024-03-19","source":"USD","rates":{"GBP":0.785746}},{"date":"2024-03-20","source":"USD","rates":{"GBP":0.786238}},{"date":"2024-03-21","source":"USD","rates":{"GBP":0.781351}},{"date":"2024-03-22","source":"USD","rates":{"GBP":0.789841}},{"date":"2024-03-23","source":"USD","rates":{"GBP":0.793659}},{"date":"2024-03-24","source":"USD","rates":{"GBP":0.793385}},{"date":"2024-03-25","source":"USD","rates":{"GBP":0.793673}},{"date":"2024-03-26","source":"USD","rates":{"GBP":0.791344}},{"date":"2024-03-27","source":"USD","rates":{"GBP":0.791899}},{"date":"2024-03-28","source":"USD","rates":{"GBP":0.792585}},{"date":"2024-03-29","source":"USD","rates":{"GBP":0.792205}},{"date":"2024-03-30","source":"USD","rates":{"GBP":0.792228}},{"date":"2024-03-31","source":"USD","rates":{"GBP":0.792057}},{"date":"2024-04-01","source":"USD","rates":{"GBP":0.79134}},{"date":"2024-04-02","source":"USD","rates":{"GBP":0.797058}},{"date":"2024-04-03","source":"USD","rates":{"GBP":0.795147}},{"date":"2024-04-04","source":"USD","rates":{"GBP":0.790398}},{"date":"2024-04-05","source":"USD","rates":{"GBP":0.791151}},{"date":"2024-04-06","source":"USD","rates":{"GBP":0.791314}},{"date":"2024-04-07","source":"USD","rates":{"GBP":0.791273}},{"date":"2024-04-08","source":"USD","rates":{"GBP":0.792111}},{"date":"2024-04-09","source":"USD","rates":{"GBP":0.790047}},{"date":"2024-04-10","source":"USD","rates":{"GBP":0.788828}},{"date":"2024-04-11","source":"USD","rates":{"GBP":0.797646}},{"date":"2024-04-12","source":"USD","rates":{"GBP":0.796524}},{"date":"2024-04-13","source":"USD","rates":{"GBP":0.803024}},{"date":"2024-04-14","source":"USD","rates":{"GBP":0.802912}},{"date":"2024-04-15","source":"USD","rates":{"GBP":0.8025}},{"date":"2024-04-16","source":"USD","rates":{"GBP":0.80344}},{"date":"2024-04-17","source":"USD","rates":{"GBP":0.804505}},{"date":"2024-04-18","source":"USD","rates":{"GBP":0.80301}},{"date":"2024-04-19","source":"USD","rates":{"GBP":0.804145}},{"date":"2024-04-20","source":"USD","rates":{"GBP":0.80845}},{"date":"2024-04-21","source":"USD","rates":{"GBP":0.808199}},{"date":"2024-04-22","source":"USD","rates":{"GBP":0.808004}},{"date":"2024-04-23","source":"USD","rates":{"GBP":0.809734}},{"date":"2024-04-24","source":"USD","rates":{"GBP":0.802955}},{"date":"2024-04-25","source":"USD","rates":{"GBP":0.80264}},{"date":"2024-04-26","source":"USD","rates":{"GBP":0.799526}},{"date":"2024-04-27","source":"USD","rates":{"GBP":0.80053}},{"date":"2024-04-28","source":"USD","rates":{"GBP":0.800761}},{"date":"2024-04-29","source":"USD","rates":{"GBP":0.799397}},{"date":"2024-04-30","source":"USD","rates":{"GBP":0.796217}},{"date":"2024-05-01","source":"USD","rates":{"GBP":0.800703}},{"date":"2024-05-02","source":"USD","rates":{"GBP":0.797562}},{"date":"2024-05-03","source":"USD","rates":{"GBP":0.797457}},{"date":"2024-05-04","source":"USD","rates":{"GBP":0.797001}},{"date":"2024-05-05","source":"USD","rates":{"GBP":0.797107}},{"date":"2024-05-06","source":"USD","rates":{"GBP":0.797363}},{"date":"2024-05-07","source":"USD","rates":{"GBP":0.796218}},{"date":"2024-05-08","source":"USD","rates":{"GBP":0.799915}},{"date":"2024-05-09","source":"USD","rates":{"GBP":0.800422}},{"date":"2024-05-10","source":"USD","rates":{"GBP":0.798411}},{"date":"2024-05-11","source":"USD","rates":{"GBP":0.798489}},{"date":"2024-05-12","source":"USD","rates":{"GBP":0.798475}},{"date":"2024-05-13","source":"USD","rates":{"GBP":0.79853}},{"date":"2024-05-14","source":"USD","rates":{"GBP":0.796122}},{"date":"2024-05-15","source":"USD","rates":{"GBP":0.794614}},{"date":"2024-05-16","source":"USD","rates":{"GBP":0.78804}},{"date":"2024-05-17","source":"USD","rates":{"GBP":0.789188}},{"date":"2024-05-18","source":"USD","rates":{"GBP":0.787162}},{"date":"2024-05-19","source":"USD","rates":{"GBP":0.787194}},{"date":"2024-05-20","source":"USD","rates":{"GBP":0.787022}},{"date":"2024-05-21","source":"USD","rates":{"GBP":0.786793}},{"date":"2024-05-22","source":"USD","rates":{"GBP":0.786723}},{"date":"2024-05-23","source":"USD","rates":{"GBP":0.786132}},{"date":"2024-05-24","source":"USD","rates":{"GBP":0.78778}},{"date":"2024-05-25","source":"USD","rates":{"GBP":0.785013}},{"date":"2024-05-26","source":"USD","rates":{"GBP":0.785081}},{"date":"2024-05-27","source":"USD","rates":{"GBP":0.78526}},{"date":"2024-05-28","source":"USD","rates":{"GBP":0.78296}},{"date":"2024-05-29","source":"USD","rates":{"GBP":0.783808}},{"date":"2024-05-30","source":"USD","rates":{"GBP":0.787552}},{"date":"2024-05-31","source":"USD","rates":{"GBP":0.785599}},{"date":"2024-06-01","source":"USD","rates":{"GBP":0.785113}},{"date":"2024-06-02","source":"USD","rates":{"GBP":0.785019}},{"date":"2024-06-03","source":"USD","rates":{"GBP":0.784657}},{"date":"2024-06-04","source":"USD","rates":{"GBP":0.780649}},{"date":"2024-06-05","source":"USD","rates":{"GBP":0.782934}},{"date":"2024-06-06","source":"USD","rates":{"GBP":0.781631}},{"date":"2024-06-07","source":"USD","rates":{"GBP":0.781732}},{"date":"2024-06-08","source":"USD","rates":{"GBP":0.785947}},{"date":"2024-06-09","source":"USD","rates":{"GBP":0.785767}},{"date":"2024-06-10","source":"USD","rates":{"GBP":0.785588}},{"date":"2024-06-11","source":"USD","rates":{"GBP":0.785791}},{"date":"2024-06-12","source":"USD","rates":{"GBP":0.784932}},{"date":"2024-06-13","source":"USD","rates":{"GBP":0.781472}},{"date":"2024-06-14","source":"USD","rates":{"GBP":0.784041}},{"date":"2024-06-15","source":"USD","rates":{"GBP":0.789096}},{"date":"2024-06-16","source":"USD","rates":{"GBP":0.788449}},{"date":"2024-06-17","source":"USD","rates":{"GBP":0.788479}},{"date":"2024-06-18","source":"USD","rates":{"GBP":0.786542}},{"date":"2024-06-19","source":"USD","rates":{"GBP":0.786916}},{"date":"2024-06-20","source":"USD","rates":{"GBP":0.786107}},{"date":"2024-06-21","source":"USD","rates":{"GBP":0.789875}},{"date":"2024-06-22","source":"USD","rates":{"GBP":0.79058}},{"date":"2024-06-23","source":"USD","rates":{"GBP":0.790546}},{"date":"2024-06-24","source":"USD","rates":{"GBP":0.791248}},{"date":"2024-06-25","source":"USD","rates":{"GBP":0.788496}},{"date":"2024-06-26","source":"USD","rates":{"GBP":0.788395}},{"date":"2024-06-27","source":"USD","rates":{"GBP":0.792298}},{"date":"2024-06-28","source":"USD","rates":{"GBP":0.79087}},{"date":"2024-06-29","source":"USD","rates":{"GBP":0.790726}},{"date":"2024-06-30","source":"USD","rates":{"GBP":0.790719}},{"date":"2024-07-01","source":"USD","rates":{"GBP":0.790622}},{"date":"2024-07-02","source":"USD","rates":{"GBP":0.790812}},{"date":"2024-07-03","source":"USD","rates":{"GBP":0.78816}},{"date":"2024-07-04","source":"USD","rates":{"GBP":0.784451}},{"date":"2024-07-05","source":"USD","rates":{"GBP":0.783992}},{"date":"2024-07-06","source":"USD","rates":{"GBP":0.780243}},{"date":"2024-07-07","source":"USD","rates":{"GBP":0.780594}},{"date":"2024-07-08","source":"USD","rates":{"GBP":0.780827}},{"date":"2024-07-09","source":"USD","rates":{"GBP":0.780333}},{"date":"2024-07-10","source":"USD","rates":{"GBP":0.781936}},{"date":"2024-07-11","source":"USD","rates":{"GBP":0.777992}},{"date":"2024-07-12","source":"USD","rates":{"GBP":0.773816}},{"date":"2024-07-13","source":"USD","rates":{"GBP":0.770374}},{"date":"2024-07-14","source":"USD","rates":{"GBP":0.770294}},{"date":"2024-07-15","source":"USD","rates":{"GBP":0.771174}},{"date":"2024-07-16","source":"USD","rates":{"GBP":0.771041}},{"date":"2024-07-17","source":"USD","rates":{"GBP":0.770574}},{"date":"2024-07-18","source":"USD","rates":{"GBP":0.768775}},{"date":"2024-07-19","source":"USD","rates":{"GBP":0.772195}},{"date":"2024-07-20","source":"USD","rates":{"GBP":0.774311}},{"date":"2024-07-21","source":"USD","rates":{"GBP":0.774096}},{"date":"2024-07-22","source":"USD","rates":{"GBP":0.773251}},{"date":"2024-07-23","source":"USD","rates":{"GBP":0.773304}},{"date":"2024-07-24","source":"USD","rates":{"GBP":0.775165}},{"date":"2024-07-25","source":"USD","rates":{"GBP":0.775289}},{"date":"2024-07-26","source":"USD","rates":{"GBP":0.777882}},{"date":"2024-07-27","source":"USD","rates":{"GBP":0.777203}},{"date":"2024-07-28","source":"USD","rates":{"GBP":0.776969}},{"date":"2024-07-29","source":"USD","rates":{"GBP":0.777176}},{"date":"2024-07-30","source":"USD","rates":{"GBP":0.777613}},{"date":"2024-07-31","source":"USD","rates":{"GBP":0.778999}}],"paging":{"prev":"/rates/historical-range?date_end=2024-07-31\u0026date_start=2024-01-01\u0026from=USD\u0026page=\u0026to=GBP","next":"/rates/historical-range?date_end=2024-07-31\u0026date_start=2024-01-01\u0026from=USD\u0026page=\u0026to=GBP","total_records":213,"current_page":1,"per_page":500,"total_pages":1},"meta":{"credits_used":1,"credits_remaining":249739,"date_start":"2024-01-01","date_end":"2024-07-31"}}'
+  recorded_at: Fri, 16 May 2025 13:01:35 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/synth/health.yml b/test/vcr_cassettes/synth/health.yml
new file mode 100644
index 00000000..24e3e67b
--- /dev/null
+++ b/test/vcr_cassettes/synth/health.yml
@@ -0,0 +1,82 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.synthfinance.com/user
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
+      - Bearer <SYNTH_API_KEY>
+      X-Source:
+      - maybe_app
+      X-Source-Type:
+      - managed
+      User-Agent:
+      - Faraday v2.13.1
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 16 May 2025 13:01:39 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      Etag:
+      - W/"c5c1d51b68b499d00936c9eb1e8bfdbb"
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      Rndr-Id:
+      - 3abc1256-5517-44a7
+      Strict-Transport-Security:
+      - max-age=63072000; includeSubDomains
+      Vary:
+      - Accept-Encoding
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Render-Origin-Server:
+      - Render
+      X-Request-Id:
+      - aaf85301-dd16-4b9b-a3a4-c4fbcf1d3f55
+      X-Runtime:
+      - '0.014386'
+      X-Xss-Protection:
+      - '0'
+      Cf-Cache-Status:
+      - DYNAMIC
+      Report-To:
+      - '{"endpoints":[{"url":"https:\/\/a.nel.cloudflare.com\/report\/v4?s=OaVSdNPSl6CQ8gbhnDzkCisX2ILOEWAwweMW3rXXP5rBKuxZoDT024srQWmHKGLsCEhpt4G9mqCthDwlHu2%2BuZ3AyTJQcnBONtE%2FNQ7fKT9x8nLz4mnqL8iyynLuRWQSUJ8SWMj5"}],"group":"cf-nel","max_age":604800}'
+      Nel:
+      - '{"success_fraction":0,"report_to":"cf-nel","max_age":604800}'
+      Speculation-Rules:
+      - '"/cdn-cgi/speculation"'
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 940b109d086eb4b8-ORD
+      Alt-Svc:
+      - h3=":443"; ma=86400
+      Server-Timing:
+      - cfL4;desc="?proto=TCP&rtt=32457&min_rtt=26792&rtt_var=14094&sent=5&recv=6&lost=0&retrans=0&sent_bytes=2826&recv_bytes=878&delivery_rate=108091&cwnd=229&unsent_bytes=0&cid=a6f330e4d5f16682&ts=309&x=0"
+    body:
+      encoding: ASCII-8BIT
+      string: '{"id":"user_3208c49393f54b3e974795e4bea5b864","email":"zach@maybe.co","name":"Zach
+        Gollwitzer","plan":"Business","api_calls_remaining":249733,"api_limit":250000,"credits_reset_at":"2025-06-01T00:00:00.000-04:00","current_period_start":"2025-05-01T00:00:00.000-04:00"}'
+  recorded_at: Fri, 16 May 2025 13:01:39 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/synth/security_info.yml b/test/vcr_cassettes/synth/security_info.yml
new file mode 100644
index 00000000..8dbb76d1
--- /dev/null
+++ b/test/vcr_cassettes/synth/security_info.yml
@@ -0,0 +1,105 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.synthfinance.com/tickers/AAPL?operating_mic=XNAS
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
+      - Bearer <SYNTH_API_KEY>
+      X-Source:
+      - maybe_app
+      X-Source-Type:
+      - managed
+      User-Agent:
+      - Faraday v2.13.1
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 16 May 2025 13:01:37 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      Etag:
+      - W/"75f336ad88e262c72044e8b865265298"
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      Rndr-Id:
+      - ba973abf-7d96-4a9a
+      Strict-Transport-Security:
+      - max-age=63072000; includeSubDomains
+      Vary:
+      - Accept-Encoding
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Render-Origin-Server:
+      - Render
+      X-Request-Id:
+      - 76cb13a6-0d7e-4c36-8df9-bb63110d9e2a
+      X-Runtime:
+      - '0.099716'
+      X-Xss-Protection:
+      - '0'
+      Cf-Cache-Status:
+      - DYNAMIC
+      Report-To:
+      - '{"endpoints":[{"url":"https:\/\/a.nel.cloudflare.com\/report\/v4?s=aDn7ApAO9Ma86gZ%2BJKCUCFjH2Re%2BtXdB5gcqYj2KTGXJKNpgf5TNgzbrp5%2Bw%2FGL5nTvtp%2B7cxT8MMcLWjAV6Ne1r6z5YBFq1K4W7Zw5m1lhMiqYLnTnEs2Oq85TjzOvpsE%2BmC33d"}],"group":"cf-nel","max_age":604800}'
+      Nel:
+      - '{"success_fraction":0,"report_to":"cf-nel","max_age":604800}'
+      Speculation-Rules:
+      - '"/cdn-cgi/speculation"'
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 940b10910abdd2ec-ORD
+      Alt-Svc:
+      - h3=":443"; ma=86400
+      Server-Timing:
+      - cfL4;desc="?proto=TCP&rtt=28163&min_rtt=27237&rtt_var=12066&sent=5&recv=6&lost=0&retrans=0&sent_bytes=2827&recv_bytes=905&delivery_rate=83590&cwnd=239&unsent_bytes=0&cid=7ef62bd693b52ccd&ts=240&x=0"
+    body:
+      encoding: ASCII-8BIT
+      string: '{"data":{"ticker":"AAPL","name":"Apple Inc.","links":{"homepage_url":"https://www.apple.com"},"logo_url":"https://logo.synthfinance.com/ticker/AAPL","description":"Apple
+        Inc. designs, manufactures, and markets smartphones, personal computers, tablets,
+        wearables, and accessories worldwide. The company offers iPhone, a line of
+        smartphones; Mac, a line of personal computers; iPad, a line of multi-purpose
+        tablets; and wearables, home, and accessories comprising AirPods, Apple TV,
+        Apple Watch, Beats products, and HomePod. It also provides AppleCare support
+        and cloud services; and operates various platforms, including the App Store
+        that allow customers to discover and download applications and digital content,
+        such as books, music, video, games, and podcasts. In addition, the company
+        offers various services, such as Apple Arcade, a game subscription service;
+        Apple Fitness+, a personalized fitness service; Apple Music, which offers
+        users a curated listening experience with on-demand radio stations; Apple
+        News+, a subscription news and magazine service; Apple TV+, which offers exclusive
+        original content; Apple Card, a co-branded credit card; and Apple Pay, a cashless
+        payment service, as well as licenses its intellectual property. The company
+        serves consumers, and small and mid-sized businesses; and the education, enterprise,
+        and government markets. It distributes third-party applications for its products
+        through the App Store. The company also sells its products through its retail
+        and online stores, and direct sales force; and third-party cellular network
+        carriers, wholesalers, retailers, and resellers. Apple Inc. was founded in
+        1976 and is headquartered in Cupertino, California.","kind":"common stock","cik":"0000320193","currency":"USD","address":{"country":"USA","address_line1":"One
+        Apple Park Way","city":"Cupertino","state":"CA","postal_code":"95014"},"exchange":{"name":"Nasdaq/Ngs
+        (Global Select Market)","mic_code":"XNGS","operating_mic_code":"XNAS","acronym":"NGS","country":"United
+        States","country_code":"US","timezone":"America/New_York"},"ceo":"Mr. Timothy
+        D. Cook","founding_year":1976,"industry":"Consumer Electronics","sector":"Technology","phone":"408-996-1010","total_employees":161000,"composite_figi":"BBG000B9Y5X2","market_data":{"high_today":212.96,"low_today":209.54,"open_today":210.95,"close_today":211.45,"volume_today":44979900.0,"fifty_two_week_high":260.1,"fifty_two_week_low":169.21,"average_volume":61769396.875,"price_change":0.0,"percent_change":0.0}},"meta":{"credits_used":1,"credits_remaining":249737}}'
+  recorded_at: Fri, 16 May 2025 13:01:37 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/synth/security_price.yml b/test/vcr_cassettes/synth/security_price.yml
new file mode 100644
index 00000000..5cd435d4
--- /dev/null
+++ b/test/vcr_cassettes/synth/security_price.yml
@@ -0,0 +1,83 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.synthfinance.com/tickers/AAPL/open-close?end_date=2024-08-01&operating_mic_code=XNAS&page=1&start_date=2024-08-01
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
+      - Bearer <SYNTH_API_KEY>
+      X-Source:
+      - maybe_app
+      X-Source-Type:
+      - managed
+      User-Agent:
+      - Faraday v2.13.1
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 16 May 2025 13:01:36 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      Etag:
+      - W/"72340d82266397447b865407dda15492"
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      Rndr-Id:
+      - 4c3462aa-2471-40b4
+      Strict-Transport-Security:
+      - max-age=63072000; includeSubDomains
+      Vary:
+      - Accept-Encoding
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Render-Origin-Server:
+      - Render
+      X-Request-Id:
+      - bdbc757d-2528-44c3-ae08-9788e8ee15f7
+      X-Runtime:
+      - '0.034898'
+      X-Xss-Protection:
+      - '0'
+      Cf-Cache-Status:
+      - DYNAMIC
+      Report-To:
+      - '{"endpoints":[{"url":"https:\/\/a.nel.cloudflare.com\/report\/v4?s=2Mu4PK4XTsAq%2Bn1%2F2yxy%2Blj7kz3ZCiQ9t8ikr2m19BrhQhrqfeUQfPwxbLc1WIgGMIxpPInKYtDVIX3En%2FGpTNQLAeu%2FpuLKv%2BRmCx%2B7u28od5L%2F9%2BLmEhFWqJjs8Y6C1O2a3SKv"}],"group":"cf-nel","max_age":604800}'
+      Nel:
+      - '{"success_fraction":0,"report_to":"cf-nel","max_age":604800}'
+      Speculation-Rules:
+      - '"/cdn-cgi/speculation"'
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 940b108f29129d03-ORD
+      Alt-Svc:
+      - h3=":443"; ma=86400
+      Server-Timing:
+      - cfL4;desc="?proto=TCP&rtt=27793&min_rtt=26182&rtt_var=13041&sent=5&recv=6&lost=0&retrans=0&sent_bytes=2827&recv_bytes=970&delivery_rate=74111&cwnd=244&unsent_bytes=0&cid=9bcc030369a615fb&ts=210&x=0"
+    body:
+      encoding: ASCII-8BIT
+      string: '{"ticker":"AAPL","currency":"USD","exchange":{"name":"Nasdaq/Ngs (Global
+        Select Market)","mic_code":"XNGS","operating_mic_code":"XNAS","acronym":"NGS","country":"United
+        States","country_code":"US","timezone":"America/New_York"},"prices":[{"date":"2024-08-01","open":224.37,"close":218.36,"high":224.48,"low":217.02,"volume":62501000}],"paging":{"prev":"/tickers/AAPL/open-close?end_date=2024-08-01\u0026operating_mic_code=XNAS\u0026page=\u0026start_date=2024-08-01","next":"/tickers/AAPL/open-close?end_date=2024-08-01\u0026operating_mic_code=XNAS\u0026page=\u0026start_date=2024-08-01","total_records":1,"current_page":1,"per_page":100,"total_pages":1},"meta":{"total_records":1,"credits_used":1,"credits_remaining":249738}}'
+  recorded_at: Fri, 16 May 2025 13:01:36 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/synth/security_prices.yml b/test/vcr_cassettes/synth/security_prices.yml
index 6cdf1fe6..8f41f56a 100644
--- a/test/vcr_cassettes/synth/security_prices.yml
+++ b/test/vcr_cassettes/synth/security_prices.yml
@@ -1,135 +1,163 @@
 ---
 http_interactions:
-  - request:
-      method: get
-      uri: https://api.synthfinance.com/tickers/AAPL/open-close?end_date=2024-08-01&page=1&start_date=2024-01-01
-      body:
-        encoding: US-ASCII
-        string: ''
-      headers:
-        User-Agent:
-          - Faraday v2.10.0
-        Authorization:
-          - Bearer <SYNTH_API_KEY>
-        Accept-Encoding:
-          - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-        Accept:
-          - "*/*"
-    response:
-      status:
-        code: 200
-        message: OK
-      headers:
-        Date:
-          - Thu, 01 Aug 2024 17:21:42 GMT
-        Content-Type:
-          - application/json; charset=utf-8
-        Transfer-Encoding:
-          - chunked
-        Connection:
-          - keep-alive
-        Cf-Ray:
-          - 8ac781877cbb13ae-CMH
-        Cf-Cache-Status:
-          - DYNAMIC
-        Cache-Control:
-          - max-age=0, private, must-revalidate
-        Etag:
-          - W/"c1f8d4686b33c94fa18354b54c960f43"
-        Strict-Transport-Security:
-          - max-age=63072000; includeSubDomains
-        Vary:
-          - Accept-Encoding
-        Referrer-Policy:
-          - strict-origin-when-cross-origin
-        Rndr-Id:
-          - e6566c15-53f8-44b0
-        X-Content-Type-Options:
-          - nosniff
-        X-Frame-Options:
-          - SAMEORIGIN
-        X-Permitted-Cross-Domain-Policies:
-          - none
-        X-Render-Origin-Server:
-          - Render
-        X-Request-Id:
-          - 14434e85-b1d4-4c36-a69a-efd14c562649
-        X-Runtime:
-          - '1.397922'
-        X-Xss-Protection:
-          - '0'
-        Server:
-          - cloudflare
-        Alt-Svc:
-          - h3=":443"; ma=86400
-      body:
-        encoding: ASCII-8BIT
-        string: '{"ticker":"AAPL","prices":[{"date":"2024-01-02","open":187.15,"close":185.64,"high":188.44,"low":183.89,"volume":81964874},{"date":"2024-01-03","open":184.22,"close":184.25,"high":185.88,"low":183.43,"volume":58414460},{"date":"2024-01-04","open":182.15,"close":181.91,"high":183.09,"low":180.88,"volume":71878670},{"date":"2024-01-05","open":181.99,"close":181.18,"high":182.76,"low":180.17,"volume":62371161},{"date":"2024-01-08","open":182.09,"close":185.56,"high":185.6,"low":181.5,"volume":59144470},{"date":"2024-01-09","open":183.92,"close":185.14,"high":185.15,"low":182.73,"volume":42841809},{"date":"2024-01-10","open":184.35,"close":186.19,"high":186.4,"low":183.92,"volume":46192908},{"date":"2024-01-11","open":186.54,"close":185.59,"high":187.05,"low":183.62,"volume":49128408},{"date":"2024-01-12","open":186.06,"close":185.92,"high":186.74,"low":185.19,"volume":40477782},{"date":"2024-01-16","open":182.16,"close":183.63,"high":184.26,"low":180.93,"volume":65076641},{"date":"2024-01-17","open":181.27,"close":182.68,"high":182.93,"low":180.3,"volume":47317433},{"date":"2024-01-18","open":186.09,"close":188.63,"high":189.14,"low":185.83,"volume":77722754},{"date":"2024-01-19","open":189.33,"close":191.56,"high":191.95,"low":188.82,"volume":68887985},{"date":"2024-01-22","open":192.3,"close":193.89,"high":195.33,"low":192.26,"volume":60131852},{"date":"2024-01-23","open":195.02,"close":195.18,"high":195.75,"low":193.83,"volume":42355590},{"date":"2024-01-24","open":195.42,"close":194.5,"high":196.38,"low":194.34,"volume":53631316},{"date":"2024-01-25","open":195.22,"close":194.17,"high":196.27,"low":193.11,"volume":54822126},{"date":"2024-01-26","open":194.27,"close":192.42,"high":194.76,"low":191.94,"volume":44587111},{"date":"2024-01-29","open":192.01,"close":191.73,"high":192.2,"low":189.58,"volume":47145622},{"date":"2024-01-30","open":190.94,"close":188.04,"high":191.8,"low":187.47,"volume":55836970},{"date":"2024-01-31","open":187.04,"close":184.4,"high":187.1,"low":184.35,"volume":55467803},{"date":"2024-02-01","open":183.99,"close":186.86,"high":186.95,"low":183.82,"volume":64885408},{"date":"2024-02-02","open":179.86,"close":185.85,"high":187.33,"low":179.25,"volume":102527680},{"date":"2024-02-05","open":188.15,"close":187.68,"high":189.25,"low":185.84,"volume":69654320},{"date":"2024-02-06","open":186.86,"close":189.3,"high":189.31,"low":186.77,"volume":43490759},{"date":"2024-02-07","open":190.64,"close":189.41,"high":191.05,"low":188.61,"volume":53438955},{"date":"2024-02-08","open":189.39,"close":188.32,"high":189.54,"low":187.35,"volume":40962046},{"date":"2024-02-09","open":188.65,"close":188.85,"high":189.99,"low":188.0,"volume":45155216},{"date":"2024-02-12","open":188.42,"close":187.15,"high":188.67,"low":186.79,"volume":41781934},{"date":"2024-02-13","open":185.77,"close":185.04,"high":186.21,"low":183.51,"volume":56529529},{"date":"2024-02-14","open":185.32,"close":184.15,"high":185.53,"low":182.44,"volume":54617917},{"date":"2024-02-15","open":183.55,"close":183.86,"high":184.49,"low":181.35,"volume":65434496},{"date":"2024-02-16","open":183.42,"close":182.31,"high":184.85,"low":181.67,"volume":49752465},{"date":"2024-02-20","open":181.79,"close":181.56,"high":182.43,"low":180.0,"volume":53574453},{"date":"2024-02-21","open":181.94,"close":182.32,"high":182.89,"low":180.66,"volume":41496371},{"date":"2024-02-22","open":183.48,"close":184.37,"high":184.96,"low":182.46,"volume":52284192},{"date":"2024-02-23","open":185.01,"close":182.52,"high":185.04,"low":182.23,"volume":44926677},{"date":"2024-02-26","open":182.24,"close":181.16,"high":182.76,"low":180.65,"volume":40867421},{"date":"2024-02-27","open":181.1,"close":182.63,"high":183.92,"low":179.56,"volume":54318851},{"date":"2024-02-28","open":182.51,"close":181.42,"high":183.12,"low":180.13,"volume":48943139},{"date":"2024-02-29","open":181.27,"close":180.75,"high":182.57,"low":179.53,"volume":136682597},{"date":"2024-03-01","open":179.55,"close":179.66,"high":180.53,"low":177.38,"volume":73450582},{"date":"2024-03-04","open":176.15,"close":175.1,"high":176.9,"low":173.79,"volume":81505451},{"date":"2024-03-05","open":170.76,"close":170.12,"high":172.04,"low":169.62,"volume":94702355},{"date":"2024-03-06","open":171.06,"close":169.12,"high":171.24,"low":168.68,"volume":68568907},{"date":"2024-03-07","open":169.15,"close":169.0,"high":170.73,"low":168.49,"volume":71763761},{"date":"2024-03-08","open":169.0,"close":170.73,"high":173.7,"low":168.94,"volume":76267041},{"date":"2024-03-11","open":172.94,"close":172.75,"high":174.38,"low":172.05,"volume":60139473},{"date":"2024-03-12","open":173.15,"close":173.23,"high":174.03,"low":171.01,"volume":59813522},{"date":"2024-03-13","open":172.77,"close":171.13,"high":173.19,"low":170.76,"volume":52488692},{"date":"2024-03-14","open":172.91,"close":173.0,"high":174.31,"low":172.05,"volume":72913507},{"date":"2024-03-15","open":171.17,"close":172.62,"high":172.62,"low":170.29,"volume":121752699},{"date":"2024-03-18","open":175.57,"close":173.72,"high":177.71,"low":173.52,"volume":75606556},{"date":"2024-03-19","open":174.34,"close":176.08,"high":176.61,"low":173.03,"volume":55215244},{"date":"2024-03-20","open":175.72,"close":178.67,"high":178.67,"low":175.09,"volume":53423102},{"date":"2024-03-21","open":177.05,"close":171.37,"high":177.49,"low":170.84,"volume":106181270},{"date":"2024-03-22","open":171.76,"close":172.28,"high":173.05,"low":170.06,"volume":71146138},{"date":"2024-03-25","open":170.57,"close":170.85,"high":171.94,"low":169.45,"volume":54288328},{"date":"2024-03-26","open":170.0,"close":169.71,"high":171.42,"low":169.58,"volume":57388449},{"date":"2024-03-27","open":170.41,"close":173.31,"high":173.6,"low":170.11,"volume":60263665},{"date":"2024-03-28","open":171.75,"close":171.48,"high":172.23,"low":170.51,"volume":65671690},{"date":"2024-04-01","open":171.19,"close":170.03,"high":171.25,"low":169.48,"volume":46240500},{"date":"2024-04-02","open":169.08,"close":168.84,"high":169.34,"low":168.23,"volume":49297581},{"date":"2024-04-03","open":168.79,"close":169.65,"high":170.68,"low":168.58,"volume":47691715},{"date":"2024-04-04","open":170.29,"close":168.82,"high":171.92,"low":168.82,"volume":53682486},{"date":"2024-04-05","open":169.59,"close":169.58,"high":170.39,"low":168.95,"volume":42104826},{"date":"2024-04-08","open":169.03,"close":168.45,"high":169.2,"low":168.24,"volume":37425513},{"date":"2024-04-09","open":168.7,"close":169.67,"high":170.08,"low":168.35,"volume":42451209},{"date":"2024-04-10","open":168.8,"close":167.78,"high":169.09,"low":167.11,"volume":49691936},{"date":"2024-04-11","open":168.34,"close":175.04,"high":175.46,"low":168.16,"volume":91053075},{"date":"2024-04-12","open":174.26,"close":176.55,"high":178.36,"low":174.21,"volume":101282386},{"date":"2024-04-15","open":175.36,"close":172.69,"high":176.63,"low":172.5,"volume":70733115},{"date":"2024-04-16","open":171.75,"close":169.38,"high":173.76,"low":168.27,"volume":71583932},{"date":"2024-04-17","open":169.61,"close":168.0,"high":170.65,"low":168.0,"volume":48503680},{"date":"2024-04-18","open":168.03,"close":167.04,"high":168.64,"low":166.55,"volume":40735511},{"date":"2024-04-19","open":166.21,"close":165.0,"high":166.4,"low":164.08,"volume":66084170},{"date":"2024-04-22","open":165.52,"close":165.84,"high":167.26,"low":164.77,"volume":46488244},{"date":"2024-04-23","open":165.35,"close":166.9,"high":167.05,"low":164.92,"volume":46956672},{"date":"2024-04-24","open":166.54,"close":169.02,"high":169.3,"low":166.21,"volume":47007455},{"date":"2024-04-25","open":169.53,"close":169.89,"high":170.61,"low":168.15,"volume":48858902},{"date":"2024-04-26","open":169.88,"close":169.3,"high":171.34,"low":169.18,"volume":44014087},{"date":"2024-04-29","open":173.37,"close":173.5,"high":176.03,"low":173.1,"volume":66891905},{"date":"2024-04-30","open":173.33,"close":170.33,"high":174.99,"low":170.0,"volume":64066593},{"date":"2024-05-01","open":169.58,"close":169.3,"high":172.71,"low":169.11,"volume":48416441},{"date":"2024-05-02","open":172.51,"close":173.03,"high":173.42,"low":170.89,"volume":91402452},{"date":"2024-05-03","open":186.65,"close":183.38,"high":187.0,"low":182.66,"volume":160948084},{"date":"2024-05-06","open":182.35,"close":181.71,"high":184.2,"low":180.42,"volume":75883763},{"date":"2024-05-07","open":183.45,"close":182.4,"high":184.9,"low":181.32,"volume":74139796},{"date":"2024-05-08","open":182.85,"close":182.74,"high":183.07,"low":181.45,"volume":43762264},{"date":"2024-05-09","open":182.56,"close":184.57,"high":184.66,"low":182.11,"volume":47493785},{"date":"2024-05-10","open":184.9,"close":183.05,"high":185.09,"low":182.13,"volume":48525869},{"date":"2024-05-13","open":185.44,"close":186.28,"high":187.1,"low":184.62,"volume":68586935},{"date":"2024-05-14","open":187.51,"close":187.43,"high":188.3,"low":186.29,"volume":50551025},{"date":"2024-05-15","open":187.91,"close":189.72,"high":190.65,"low":187.37,"volume":67561123},{"date":"2024-05-16","open":190.47,"close":189.84,"high":191.1,"low":189.66,"volume":51938566},{"date":"2024-05-17","open":189.51,"close":189.87,"high":190.81,"low":189.18,"volume":39819440},{"date":"2024-05-20","open":189.33,"close":191.04,"high":191.92,"low":189.01,"volume":43637717},{"date":"2024-05-21","open":191.09,"close":192.35,"high":192.73,"low":190.92,"volume":41192656},{"date":"2024-05-22","open":192.27,"close":190.9,"high":192.82,"low":190.27,"volume":33510741},{"date":"2024-05-23","open":190.98,"close":186.88,"high":191.0,"low":186.63,"volume":48553611}],"paging":{"prev":"/tickers/AAPL/open-close?end_date=2024-08-01\u0026page=\u0026start_date=2024-01-01","next":"/tickers/AAPL/open-close?end_date=2024-08-01\u0026page=2\u0026start_date=2024-01-01","total_records":147,"current_page":1,"per_page":100,"total_pages":2},"meta":{"credits_used":1,"credits_remaining":248998}}'
-    recorded_at: Thu, 01 Aug 2024 17:21:42 GMT
-  - request:
-      method: get
-      uri: https://api.synthfinance.com/tickers/AAPL/open-close?end_date=2024-08-01&page=2&start_date=2024-01-01
-      body:
-        encoding: US-ASCII
-        string: ''
-      headers:
-        User-Agent:
-          - Faraday v2.10.0
-        Authorization:
-          - Bearer <SYNTH_API_KEY>
-        Accept-Encoding:
-          - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-        Accept:
-          - "*/*"
-    response:
-      status:
-        code: 200
-        message: OK
-      headers:
-        Date:
-          - Thu, 01 Aug 2024 17:21:44 GMT
-        Content-Type:
-          - application/json; charset=utf-8
-        Transfer-Encoding:
-          - chunked
-        Connection:
-          - keep-alive
-        Cf-Ray:
-          - 8ac78191cc326a4c-CMH
-        Cf-Cache-Status:
-          - DYNAMIC
-        Cache-Control:
-          - max-age=0, private, must-revalidate
-        Etag:
-          - W/"88e17df1f20118595ae291a4a025291f"
-        Strict-Transport-Security:
-          - max-age=63072000; includeSubDomains
-        Vary:
-          - Accept-Encoding
-        Referrer-Policy:
-          - strict-origin-when-cross-origin
-        Rndr-Id:
-          - e8700161-b44e-49ce
-        X-Content-Type-Options:
-          - nosniff
-        X-Frame-Options:
-          - SAMEORIGIN
-        X-Permitted-Cross-Domain-Policies:
-          - none
-        X-Render-Origin-Server:
-          - Render
-        X-Request-Id:
-          - 6072beb1-2e89-4ce0-95e0-72d436adc033
-        X-Runtime:
-          - '1.296361'
-        X-Xss-Protection:
-          - '0'
-        Server:
-          - cloudflare
-        Alt-Svc:
-          - h3=":443"; ma=86400
-      body:
-        encoding: ASCII-8BIT
-        string: '{"ticker":"AAPL","prices":[{"date":"2024-05-24","open":188.82,"close":189.98,"high":190.58,"low":188.04,"volume":35429737},{"date":"2024-05-28","open":191.51,"close":189.99,"high":193.0,"low":189.1,"volume":51021752},{"date":"2024-05-29","open":189.61,"close":190.29,"high":192.25,"low":189.51,"volume":51934816},{"date":"2024-05-30","open":190.76,"close":191.29,"high":192.18,"low":190.63,"volume":48211467},{"date":"2024-05-31","open":191.44,"close":192.25,"high":192.57,"low":189.91,"volume":71937580},{"date":"2024-06-03","open":192.9,"close":194.03,"high":194.99,"low":192.52,"volume":48702790},{"date":"2024-06-04","open":194.64,"close":194.35,"high":195.32,"low":193.03,"volume":46573003},{"date":"2024-06-05","open":195.4,"close":195.87,"high":196.9,"low":194.87,"volume":53100041},{"date":"2024-06-06","open":195.69,"close":194.48,"high":196.5,"low":194.17,"volume":39591471},{"date":"2024-06-07","open":194.65,"close":196.89,"high":196.94,"low":194.14,"volume":52508446},{"date":"2024-06-10","open":196.9,"close":193.12,"high":197.3,"low":192.15,"volume":95034362},{"date":"2024-06-11","open":193.65,"close":207.15,"high":207.16,"low":193.63,"volume":169677009},{"date":"2024-06-12","open":207.37,"close":213.07,"high":220.2,"low":206.9,"volume":197067068},{"date":"2024-06-13","open":214.74,"close":214.24,"high":216.75,"low":211.6,"volume":96562134},{"date":"2024-06-14","open":213.85,"close":212.49,"high":215.17,"low":211.3,"volume":69150814},{"date":"2024-06-17","open":213.37,"close":216.67,"high":218.95,"low":212.72,"volume":92964543},{"date":"2024-06-18","open":217.59,"close":214.29,"high":218.63,"low":213.0,"volume":78534656},{"date":"2024-06-20","open":213.93,"close":209.68,"high":214.24,"low":208.85,"volume":83863022},{"date":"2024-06-21","open":210.39,"close":207.49,"high":211.89,"low":207.11,"volume":204018186},{"date":"2024-06-24","open":207.72,"close":208.14,"high":212.7,"low":206.59,"volume":76303387},{"date":"2024-06-25","open":209.15,"close":209.07,"high":211.38,"low":208.61,"volume":54266550},{"date":"2024-06-26","open":211.5,"close":213.25,"high":214.86,"low":210.64,"volume":64531178},{"date":"2024-06-27","open":214.69,"close":214.1,"high":215.74,"low":212.35,"volume":48631748},{"date":"2024-06-28","open":215.77,"close":210.62,"high":216.07,"low":210.3,"volume":80927625},{"date":"2024-07-01","open":212.09,"close":216.75,"high":217.51,"low":211.92,"volume":59475152},{"date":"2024-07-02","open":216.15,"close":220.27,"high":220.38,"low":215.1,"volume":57112299},{"date":"2024-07-03","open":220.0,"close":221.55,"high":221.55,"low":219.03,"volume":36707517},{"date":"2024-07-05","open":221.65,"close":226.34,"high":226.45,"low":221.65,"volume":58287571},{"date":"2024-07-08","open":227.09,"close":227.82,"high":227.85,"low":223.25,"volume":57456163},{"date":"2024-07-09","open":227.93,"close":228.68,"high":229.4,"low":226.37,"volume":47531745},{"date":"2024-07-10","open":229.3,"close":232.98,"high":233.08,"low":229.25,"volume":61539280},{"date":"2024-07-11","open":231.39,"close":227.57,"high":232.39,"low":225.77,"volume":63197762},{"date":"2024-07-12","open":228.92,"close":230.54,"high":232.64,"low":228.68,"volume":51621443},{"date":"2024-07-15","open":236.48,"close":234.4,"high":237.23,"low":233.09,"volume":60513737},{"date":"2024-07-16","open":235.0,"close":234.82,"high":236.27,"low":232.33,"volume":38468546},{"date":"2024-07-17","open":229.45,"close":228.88,"high":231.46,"low":226.64,"volume":55878906},{"date":"2024-07-18","open":230.28,"close":224.18,"high":230.44,"low":222.27,"volume":64346030},{"date":"2024-07-19","open":224.82,"close":224.31,"high":226.8,"low":223.28,"volume":48020038},{"date":"2024-07-22","open":227.01,"close":223.96,"high":227.78,"low":223.09,"volume":44958139},{"date":"2024-07-23","open":224.37,"close":225.01,"high":226.94,"low":222.68,"volume":37919040},{"date":"2024-07-24","open":224.0,"close":218.54,"high":224.8,"low":217.13,"volume":59687424},{"date":"2024-07-25","open":218.93,"close":217.49,"high":220.85,"low":214.62,"volume":50451768},{"date":"2024-07-26","open":218.7,"close":217.96,"high":219.49,"low":216.01,"volume":39827645},{"date":"2024-07-29","open":216.96,"close":218.24,"high":219.3,"low":215.75,"volume":35153729},{"date":"2024-07-30","open":219.19,"close":218.8,"high":220.33,"low":216.12,"volume":40681625},{"date":"2024-07-31","open":221.44,"close":222.08,"high":223.82,"low":220.63,"volume":48422974},{"date":"2024-08-01","open":224.37,"high":224.81,"low":217.78,"volume":25116548}],"paging":{"prev":"/tickers/AAPL/open-close?end_date=2024-08-01\u0026page=1\u0026start_date=2024-01-01","next":"/tickers/AAPL/open-close?end_date=2024-08-01\u0026page=\u0026start_date=2024-01-01","total_records":147,"current_page":2,"per_page":100,"total_pages":2},"meta":{"credits_used":1,"credits_remaining":248997}}'
-    recorded_at: Thu, 01 Aug 2024 17:21:44 GMT
-recorded_with: VCR 6.2.0
+- request:
+    method: get
+    uri: https://api.synthfinance.com/tickers/AAPL/open-close?end_date=2024-08-01&operating_mic_code=XNAS&page=1&start_date=2024-01-01
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
+      - Bearer <SYNTH_API_KEY>
+      X-Source:
+      - maybe_app
+      X-Source-Type:
+      - managed
+      User-Agent:
+      - Faraday v2.13.1
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 16 May 2025 13:01:37 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      Etag:
+      - W/"909e48e0b9ed1f892c1a1e1b4abd3082"
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      Rndr-Id:
+      - 63af1418-59b9-4111
+      Strict-Transport-Security:
+      - max-age=63072000; includeSubDomains
+      Vary:
+      - Accept-Encoding
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Render-Origin-Server:
+      - Render
+      X-Request-Id:
+      - 74da6a68-0bbd-48fb-b52a-0c5a750bd925
+      X-Runtime:
+      - '0.044404'
+      X-Xss-Protection:
+      - '0'
+      Cf-Cache-Status:
+      - DYNAMIC
+      Report-To:
+      - '{"endpoints":[{"url":"https:\/\/a.nel.cloudflare.com\/report\/v4?s=nwA0tsfR9it%2B9%2BtfHGjyzyfiSqPdNGxQqOLNF%2BIqlTeT1wJT6gLDCtbd1WFpOc1f8UXm2Zjn%2FJDOf7jOKWmGN6SKUBBjZvFLlBq%2FWyC7DN55NJwwyO77vD%2F5nf%2FaqduWCdPx7n7m"}],"group":"cf-nel","max_age":604800}'
+      Nel:
+      - '{"success_fraction":0,"report_to":"cf-nel","max_age":604800}'
+      Speculation-Rules:
+      - '"/cdn-cgi/speculation"'
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 940b10932ec92305-ORD
+      Alt-Svc:
+      - h3=":443"; ma=86400
+      Server-Timing:
+      - cfL4;desc="?proto=TCP&rtt=27451&min_rtt=26715&rtt_var=11491&sent=5&recv=6&lost=0&retrans=0&sent_bytes=2825&recv_bytes=970&delivery_rate=88818&cwnd=249&unsent_bytes=0&cid=63105dfc059c15ef&ts=344&x=0"
+    body:
+      encoding: ASCII-8BIT
+      string: '{"ticker":"AAPL","currency":"USD","exchange":{"name":"Nasdaq/Ngs (Global
+        Select Market)","mic_code":"XNGS","operating_mic_code":"XNAS","acronym":"NGS","country":"United
+        States","country_code":"US","timezone":"America/New_York"},"prices":[{"date":"2024-01-02","open":187.15,"close":185.64,"high":188.44,"low":183.89,"volume":82488700},{"date":"2024-01-03","open":184.22,"close":184.25,"high":185.88,"low":183.43,"volume":58414500},{"date":"2024-01-04","open":182.15,"close":181.91,"high":183.09,"low":180.88,"volume":71983600},{"date":"2024-01-05","open":181.99,"close":181.18,"high":182.76,"low":180.17,"volume":62303300},{"date":"2024-01-08","open":182.09,"close":185.56,"high":185.6,"low":181.5,"volume":59144500},{"date":"2024-01-09","open":183.92,"close":185.14,"high":185.15,"low":182.73,"volume":42841800},{"date":"2024-01-10","open":184.35,"close":186.19,"high":186.4,"low":183.92,"volume":46792900},{"date":"2024-01-11","open":186.54,"close":185.59,"high":187.05,"low":183.62,"volume":49128400},{"date":"2024-01-12","open":186.06,"close":185.92,"high":186.74,"low":185.19,"volume":40444700},{"date":"2024-01-16","open":182.16,"close":183.63,"high":184.26,"low":180.93,"volume":65603000},{"date":"2024-01-17","open":181.27,"close":182.68,"high":182.93,"low":180.3,"volume":47317400},{"date":"2024-01-18","open":186.09,"close":188.63,"high":189.14,"low":185.83,"volume":78005800},{"date":"2024-01-19","open":189.33,"close":191.56,"high":191.95,"low":188.82,"volume":68741000},{"date":"2024-01-22","open":192.3,"close":193.89,"high":195.33,"low":192.26,"volume":60133900},{"date":"2024-01-23","open":195.02,"close":195.18,"high":195.75,"low":193.83,"volume":42355600},{"date":"2024-01-24","open":195.42,"close":194.5,"high":196.38,"low":194.34,"volume":53631300},{"date":"2024-01-25","open":195.22,"close":194.17,"high":196.27,"low":193.11,"volume":54822100},{"date":"2024-01-26","open":194.27,"close":192.42,"high":194.76,"low":191.94,"volume":44594000},{"date":"2024-01-29","open":192.01,"close":191.73,"high":192.2,"low":189.58,"volume":47145600},{"date":"2024-01-30","open":190.94,"close":188.04,"high":191.8,"low":187.47,"volume":55859400},{"date":"2024-01-31","open":187.04,"close":184.4,"high":187.1,"low":184.35,"volume":55467800},{"date":"2024-02-01","open":183.99,"close":186.86,"high":186.95,"low":183.82,"volume":64885400},{"date":"2024-02-02","open":179.86,"close":185.85,"high":187.33,"low":179.25,"volume":102518000},{"date":"2024-02-05","open":188.15,"close":187.68,"high":189.25,"low":185.84,"volume":69668800},{"date":"2024-02-06","open":186.86,"close":189.3,"high":189.31,"low":186.77,"volume":43490800},{"date":"2024-02-07","open":190.64,"close":189.41,"high":191.05,"low":188.61,"volume":53439000},{"date":"2024-02-08","open":189.39,"close":188.32,"high":189.54,"low":187.35,"volume":40962000},{"date":"2024-02-09","open":188.65,"close":188.85,"high":189.99,"low":188.0,"volume":45155200},{"date":"2024-02-12","open":188.42,"close":187.15,"high":188.67,"low":186.79,"volume":41781900},{"date":"2024-02-13","open":185.77,"close":185.04,"high":186.21,"low":183.51,"volume":56529500},{"date":"2024-02-14","open":185.32,"close":184.15,"high":185.53,"low":182.44,"volume":54630500},{"date":"2024-02-15","open":183.55,"close":183.86,"high":184.49,"low":181.35,"volume":65434500},{"date":"2024-02-16","open":183.42,"close":182.31,"high":184.85,"low":181.67,"volume":49701400},{"date":"2024-02-20","open":181.79,"close":181.56,"high":182.43,"low":180.0,"volume":53665600},{"date":"2024-02-21","open":181.94,"close":182.32,"high":182.89,"low":180.66,"volume":41529700},{"date":"2024-02-22","open":183.48,"close":184.37,"high":184.96,"low":182.46,"volume":52292200},{"date":"2024-02-23","open":185.01,"close":182.52,"high":185.04,"low":182.23,"volume":45119700},{"date":"2024-02-26","open":182.24,"close":181.16,"high":182.76,"low":180.65,"volume":40867400},{"date":"2024-02-27","open":181.1,"close":182.63,"high":183.92,"low":179.56,"volume":54318900},{"date":"2024-02-28","open":182.51,"close":181.42,"high":183.12,"low":180.13,"volume":48953900},{"date":"2024-02-29","open":181.27,"close":180.75,"high":182.57,"low":179.53,"volume":136682600},{"date":"2024-03-01","open":179.55,"close":179.66,"high":180.53,"low":177.38,"volume":73488000},{"date":"2024-03-04","open":176.15,"close":175.1,"high":176.9,"low":173.79,"volume":81510100},{"date":"2024-03-05","open":170.76,"close":170.12,"high":172.04,"low":169.62,"volume":95132400},{"date":"2024-03-06","open":171.06,"close":169.12,"high":171.24,"low":168.68,"volume":68587700},{"date":"2024-03-07","open":169.15,"close":169.0,"high":170.73,"low":168.49,"volume":71765100},{"date":"2024-03-08","open":169.0,"close":170.73,"high":173.7,"low":168.94,"volume":76114600},{"date":"2024-03-11","open":172.94,"close":172.75,"high":174.38,"low":172.05,"volume":60139500},{"date":"2024-03-12","open":173.15,"close":173.23,"high":174.03,"low":171.01,"volume":59825400},{"date":"2024-03-13","open":172.77,"close":171.13,"high":173.19,"low":170.76,"volume":52488700},{"date":"2024-03-14","open":172.91,"close":173.0,"high":174.31,"low":172.05,"volume":72913500},{"date":"2024-03-15","open":171.17,"close":172.62,"high":172.62,"low":170.29,"volume":121664700},{"date":"2024-03-18","open":175.57,"close":173.72,"high":177.71,"low":173.52,"volume":75604200},{"date":"2024-03-19","open":174.34,"close":176.08,"high":176.61,"low":173.03,"volume":55215200},{"date":"2024-03-20","open":175.72,"close":178.67,"high":178.67,"low":175.09,"volume":53423100},{"date":"2024-03-21","open":177.05,"close":171.37,"high":177.49,"low":170.84,"volume":106181300},{"date":"2024-03-22","open":171.76,"close":172.28,"high":173.05,"low":170.06,"volume":71106600},{"date":"2024-03-25","open":170.57,"close":170.85,"high":171.94,"low":169.45,"volume":54288300},{"date":"2024-03-26","open":170.0,"close":169.71,"high":171.42,"low":169.58,"volume":57388400},{"date":"2024-03-27","open":170.41,"close":173.31,"high":173.6,"low":170.11,"volume":60273300},{"date":"2024-03-28","open":171.75,"close":171.48,"high":172.23,"low":170.51,"volume":65672700},{"date":"2024-04-01","open":171.19,"close":170.03,"high":171.25,"low":169.48,"volume":46240500},{"date":"2024-04-02","open":169.08,"close":168.84,"high":169.34,"low":168.23,"volume":49329500},{"date":"2024-04-03","open":168.79,"close":169.65,"high":170.68,"low":168.58,"volume":47691700},{"date":"2024-04-04","open":170.29,"close":168.82,"high":171.92,"low":168.82,"volume":53704400},{"date":"2024-04-05","open":169.59,"close":169.58,"high":170.39,"low":168.95,"volume":42055200},{"date":"2024-04-08","open":169.03,"close":168.45,"high":169.2,"low":168.24,"volume":37425500},{"date":"2024-04-09","open":168.7,"close":169.67,"high":170.08,"low":168.35,"volume":42451200},{"date":"2024-04-10","open":168.8,"close":167.78,"high":169.09,"low":167.11,"volume":49709300},{"date":"2024-04-11","open":168.34,"close":175.04,"high":175.46,"low":168.16,"volume":91070300},{"date":"2024-04-12","open":174.26,"close":176.55,"high":178.36,"low":174.21,"volume":101593300},{"date":"2024-04-15","open":175.36,"close":172.69,"high":176.63,"low":172.5,"volume":73531800},{"date":"2024-04-16","open":171.75,"close":169.38,"high":173.76,"low":168.27,"volume":73711200},{"date":"2024-04-17","open":169.61,"close":168.0,"high":170.65,"low":168.0,"volume":50901200},{"date":"2024-04-18","open":168.03,"close":167.04,"high":168.64,"low":166.55,"volume":43122900},{"date":"2024-04-19","open":166.21,"close":165.0,"high":166.4,"low":164.08,"volume":67772100},{"date":"2024-04-22","open":165.52,"close":165.84,"high":167.26,"low":164.77,"volume":48116400},{"date":"2024-04-23","open":165.35,"close":166.9,"high":167.05,"low":164.92,"volume":49537800},{"date":"2024-04-24","open":166.54,"close":169.02,"high":169.3,"low":166.21,"volume":48251800},{"date":"2024-04-25","open":169.53,"close":169.89,"high":170.61,"low":168.15,"volume":50558300},{"date":"2024-04-26","open":169.88,"close":169.3,"high":171.34,"low":169.18,"volume":44838400},{"date":"2024-04-29","open":173.37,"close":173.5,"high":176.03,"low":173.1,"volume":68169400},{"date":"2024-04-30","open":173.33,"close":170.33,"high":174.99,"low":170.0,"volume":65934800},{"date":"2024-05-01","open":169.58,"close":169.3,"high":172.71,"low":169.11,"volume":50383100},{"date":"2024-05-02","open":172.51,"close":173.03,"high":173.42,"low":170.89,"volume":94214900},{"date":"2024-05-03","open":186.65,"close":183.38,"high":187.0,"low":182.66,"volume":163224100},{"date":"2024-05-06","open":182.35,"close":181.71,"high":184.2,"low":180.42,"volume":78569700},{"date":"2024-05-07","open":183.45,"close":182.4,"high":184.9,"low":181.32,"volume":77305800},{"date":"2024-05-08","open":182.85,"close":182.74,"high":183.07,"low":181.45,"volume":45057100},{"date":"2024-05-09","open":182.56,"close":184.57,"high":184.66,"low":182.11,"volume":48983000},{"date":"2024-05-10","open":184.9,"close":183.05,"high":185.09,"low":182.13,"volume":50759500},{"date":"2024-05-13","open":185.44,"close":186.28,"high":187.1,"low":184.62,"volume":72044800},{"date":"2024-05-14","open":187.51,"close":187.43,"high":188.3,"low":186.29,"volume":52393600},{"date":"2024-05-15","open":187.91,"close":189.72,"high":190.65,"low":187.37,"volume":70400000},{"date":"2024-05-16","open":190.47,"close":189.84,"high":191.1,"low":189.66,"volume":52845200},{"date":"2024-05-17","open":189.51,"close":189.87,"high":190.81,"low":189.18,"volume":41282900},{"date":"2024-05-20","open":189.33,"close":191.04,"high":191.92,"low":189.01,"volume":44361300},{"date":"2024-05-21","open":191.09,"close":192.35,"high":192.73,"low":190.92,"volume":42309400},{"date":"2024-05-22","open":192.27,"close":190.9,"high":192.82,"low":190.27,"volume":34648500},{"date":"2024-05-23","open":190.98,"close":186.88,"high":191.0,"low":186.63,"volume":51005900}],"paging":{"prev":"/tickers/AAPL/open-close?end_date=2024-08-01\u0026operating_mic_code=XNAS\u0026page=\u0026start_date=2024-01-01","next":"/tickers/AAPL/open-close?end_date=2024-08-01\u0026operating_mic_code=XNAS\u0026page=2\u0026start_date=2024-01-01","total_records":147,"current_page":1,"per_page":100,"total_pages":2},"meta":{"total_records":147,"credits_used":1,"credits_remaining":249736}}'
+  recorded_at: Fri, 16 May 2025 13:01:37 GMT
+- request:
+    method: get
+    uri: https://api.synthfinance.com/tickers/AAPL/open-close?end_date=2024-08-01&operating_mic_code=XNAS&page=2&start_date=2024-01-01
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
+      - Bearer <SYNTH_API_KEY>
+      X-Source:
+      - maybe_app
+      X-Source-Type:
+      - managed
+      User-Agent:
+      - Faraday v2.13.1
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 16 May 2025 13:01:37 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      Etag:
+      - W/"bbc82ef9591694561dd9992a9c06d491"
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      Rndr-Id:
+      - 63ebee52-f1b2-4e81
+      Strict-Transport-Security:
+      - max-age=63072000; includeSubDomains
+      Vary:
+      - Accept-Encoding
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Render-Origin-Server:
+      - Render
+      X-Request-Id:
+      - dd95cb59-aead-4d1e-b1a2-881696e742fb
+      X-Runtime:
+      - '0.031482'
+      X-Xss-Protection:
+      - '0'
+      Cf-Cache-Status:
+      - DYNAMIC
+      Report-To:
+      - '{"endpoints":[{"url":"https:\/\/a.nel.cloudflare.com\/report\/v4?s=ebrOdAId1yoCYepT0CPKImNIA%2BOe8V3W3BHYheEOkVQFLsffFpfl%2B%2BYXfEHL21wczvW5dkZSd3OrF%2FklB%2FwGGDahXpveXzf497azY1Ho4YJrtDJeghxyZV6J%2BALPYwwpGrfUpv%2F1"}],"group":"cf-nel","max_age":604800}'
+      Nel:
+      - '{"success_fraction":0,"report_to":"cf-nel","max_age":604800}'
+      Speculation-Rules:
+      - '"/cdn-cgi/speculation"'
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 940b1095ccd41156-ORD
+      Alt-Svc:
+      - h3=":443"; ma=86400
+      Server-Timing:
+      - cfL4;desc="?proto=TCP&rtt=26344&min_rtt=26162&rtt_var=10175&sent=4&recv=6&lost=0&retrans=0&sent_bytes=2825&recv_bytes=970&delivery_rate=104847&cwnd=237&unsent_bytes=0&cid=9603fe0eb1df39aa&ts=212&x=0"
+    body:
+      encoding: ASCII-8BIT
+      string: '{"ticker":"AAPL","currency":"USD","exchange":{"name":"Nasdaq/Ngs (Global
+        Select Market)","mic_code":"XNGS","operating_mic_code":"XNAS","acronym":"NGS","country":"United
+        States","country_code":"US","timezone":"America/New_York"},"prices":[{"date":"2024-05-24","open":188.82,"close":189.98,"high":190.58,"low":188.04,"volume":36294600},{"date":"2024-05-28","open":191.51,"close":189.99,"high":193.0,"low":189.1,"volume":52280100},{"date":"2024-05-29","open":189.61,"close":190.29,"high":192.25,"low":189.51,"volume":53068000},{"date":"2024-05-30","open":190.76,"close":191.29,"high":192.18,"low":190.63,"volume":49947900},{"date":"2024-05-31","open":191.44,"close":192.25,"high":192.57,"low":189.91,"volume":75158300},{"date":"2024-06-03","open":192.9,"close":194.03,"high":194.99,"low":192.52,"volume":50080500},{"date":"2024-06-04","open":194.64,"close":194.35,"high":195.32,"low":193.03,"volume":47471400},{"date":"2024-06-05","open":195.4,"close":195.87,"high":196.9,"low":194.87,"volume":54156800},{"date":"2024-06-06","open":195.69,"close":194.48,"high":196.5,"low":194.17,"volume":41181800},{"date":"2024-06-07","open":194.65,"close":196.89,"high":196.94,"low":194.14,"volume":53103900},{"date":"2024-06-10","open":196.9,"close":193.12,"high":197.3,"low":192.15,"volume":97262100},{"date":"2024-06-11","open":193.65,"close":207.15,"high":207.16,"low":193.63,"volume":172373300},{"date":"2024-06-12","open":207.37,"close":213.07,"high":220.2,"low":206.9,"volume":198134300},{"date":"2024-06-13","open":214.74,"close":214.24,"high":216.75,"low":211.6,"volume":97862700},{"date":"2024-06-14","open":213.85,"close":212.49,"high":215.17,"low":211.3,"volume":70122700},{"date":"2024-06-17","open":213.37,"close":216.67,"high":218.95,"low":212.72,"volume":93728300},{"date":"2024-06-18","open":217.59,"close":214.29,"high":218.63,"low":213.0,"volume":79943300},{"date":"2024-06-20","open":213.93,"close":209.68,"high":214.24,"low":208.85,"volume":86172500},{"date":"2024-06-21","open":210.39,"close":207.49,"high":211.89,"low":207.11,"volume":246421400},{"date":"2024-06-24","open":207.72,"close":208.14,"high":212.7,"low":206.59,"volume":80727000},{"date":"2024-06-25","open":209.15,"close":209.07,"high":211.38,"low":208.61,"volume":56713900},{"date":"2024-06-26","open":211.5,"close":213.25,"high":214.86,"low":210.64,"volume":66213200},{"date":"2024-06-27","open":214.69,"close":214.1,"high":215.74,"low":212.35,"volume":49772700},{"date":"2024-06-28","open":215.77,"close":210.62,"high":216.07,"low":210.3,"volume":82542700},{"date":"2024-07-01","open":212.09,"close":216.75,"high":217.51,"low":211.92,"volume":60402900},{"date":"2024-07-02","open":216.15,"close":220.27,"high":220.38,"low":215.1,"volume":58046200},{"date":"2024-07-03","open":220.0,"close":221.55,"high":221.55,"low":219.03,"volume":37369800},{"date":"2024-07-05","open":221.65,"close":226.34,"high":226.45,"low":221.65,"volume":60412400},{"date":"2024-07-08","open":227.09,"close":227.82,"high":227.85,"low":223.25,"volume":59085900},{"date":"2024-07-09","open":227.93,"close":228.68,"high":229.4,"low":226.37,"volume":48076100},{"date":"2024-07-10","open":229.3,"close":232.98,"high":233.08,"low":229.25,"volume":62627700},{"date":"2024-07-11","open":231.39,"close":227.57,"high":232.39,"low":225.77,"volume":64710600},{"date":"2024-07-12","open":228.92,"close":230.54,"high":232.64,"low":228.68,"volume":53046500},{"date":"2024-07-15","open":236.48,"close":234.4,"high":237.23,"low":233.09,"volume":62631300},{"date":"2024-07-16","open":235.0,"close":234.82,"high":236.27,"low":232.33,"volume":43234300},{"date":"2024-07-17","open":229.45,"close":228.88,"high":231.46,"low":226.64,"volume":57345900},{"date":"2024-07-18","open":230.28,"close":224.18,"high":230.44,"low":222.27,"volume":66034600},{"date":"2024-07-19","open":224.82,"close":224.31,"high":226.8,"low":223.28,"volume":49151500},{"date":"2024-07-22","open":227.01,"close":223.96,"high":227.78,"low":223.09,"volume":48201800},{"date":"2024-07-23","open":224.37,"close":225.01,"high":226.94,"low":222.68,"volume":39960300},{"date":"2024-07-24","open":224.0,"close":218.54,"high":224.8,"low":217.13,"volume":61777600},{"date":"2024-07-25","open":218.93,"close":217.49,"high":220.85,"low":214.62,"volume":51391200},{"date":"2024-07-26","open":218.7,"close":217.96,"high":219.49,"low":216.01,"volume":41601300},{"date":"2024-07-29","open":216.96,"close":218.24,"high":219.3,"low":215.75,"volume":36311800},{"date":"2024-07-30","open":219.19,"close":218.8,"high":220.33,"low":216.12,"volume":41643800},{"date":"2024-07-31","open":221.44,"close":222.08,"high":223.82,"low":220.63,"volume":50036300},{"date":"2024-08-01","open":224.37,"close":218.36,"high":224.48,"low":217.02,"volume":62501000}],"paging":{"prev":"/tickers/AAPL/open-close?end_date=2024-08-01\u0026operating_mic_code=XNAS\u0026page=1\u0026start_date=2024-01-01","next":"/tickers/AAPL/open-close?end_date=2024-08-01\u0026operating_mic_code=XNAS\u0026page=\u0026start_date=2024-01-01","total_records":147,"current_page":2,"per_page":100,"total_pages":2},"meta":{"total_records":147,"credits_used":1,"credits_remaining":249735}}'
+  recorded_at: Fri, 16 May 2025 13:01:37 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/synth/security_search.yml b/test/vcr_cassettes/synth/security_search.yml
new file mode 100644
index 00000000..c06c0f42
--- /dev/null
+++ b/test/vcr_cassettes/synth/security_search.yml
@@ -0,0 +1,104 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.synthfinance.com/tickers/search?country_code=US&dataset=limited&limit=25&name=AAPL
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
+      - Bearer <SYNTH_API_KEY>
+      X-Source:
+      - maybe_app
+      X-Source-Type:
+      - managed
+      User-Agent:
+      - Faraday v2.13.1
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 16 May 2025 13:01:38 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      Etag:
+      - W/"3e444869eacbaf17006766a691cc8fdc"
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      Rndr-Id:
+      - 701ae22a-18c8-4e62
+      Strict-Transport-Security:
+      - max-age=63072000; includeSubDomains
+      Vary:
+      - Accept-Encoding
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Render-Origin-Server:
+      - Render
+      X-Request-Id:
+      - edb55bc6-e3ea-470b-b7af-9b4d9883420b
+      X-Runtime:
+      - '0.355152'
+      X-Xss-Protection:
+      - '0'
+      Cf-Cache-Status:
+      - DYNAMIC
+      Report-To:
+      - '{"endpoints":[{"url":"https:\/\/a.nel.cloudflare.com\/report\/v4?s=QGeBWdYED%2F%2FgT9BzborFAnM%2FG6UiNmI0ej212XGHWdFwYXUvTJ2GyqA9hMJrpYIvgbHdQ9Ed0MsQUv3KFb57VXQq0T6UXTNPa%2BFRPepK0hsXeGDLxch04v6KnkTATqcw2M8HuYHS"}],"group":"cf-nel","max_age":604800}'
+      Nel:
+      - '{"success_fraction":0,"report_to":"cf-nel","max_age":604800}'
+      Speculation-Rules:
+      - '"/cdn-cgi/speculation"'
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 940b1097a830f856-ORD
+      Alt-Svc:
+      - h3=":443"; ma=86400
+      Server-Timing:
+      - cfL4;desc="?proto=TCP&rtt=26401&min_rtt=25556&rtt_var=11273&sent=5&recv=6&lost=0&retrans=0&sent_bytes=2825&recv_bytes=939&delivery_rate=89615&cwnd=244&unsent_bytes=0&cid=cf6d0758d165295d&ts=500&x=0"
+    body:
+      encoding: ASCII-8BIT
+      string: '{"data":[{"symbol":"AAPL","name":"Apple Inc.","logo_url":"https://logo.synthfinance.com/ticker/AAPL","currency":"USD","exchange":{"name":"Nasdaq/Ngs
+        (Global Select Market)","mic_code":"XNGS","operating_mic_code":"XNAS","acronym":"NGS","country":"United
+        States","country_code":"US","timezone":"America/New_York"}},{"symbol":"APLY","isin":"US88634T8577","name":"YieldMax
+        AAPL Option Income ETF","logo_url":"https://logo.synthfinance.com/ticker/APLY","currency":"USD","exchange":{"name":"Nyse
+        Arca","mic_code":"ARCX","operating_mic_code":"XNYS","acronym":"NYSE","country":"United
+        States","country_code":"US","timezone":"America/New_York"}},{"symbol":"AAPD","name":"Direxion
+        Daily AAPL Bear 1X ETF","logo_url":"https://logo.synthfinance.com/ticker/AAPD","currency":"USD","exchange":{"name":"Nasdaq/Nms
+        (Global Market)","mic_code":"XNMS","operating_mic_code":"XNAS","acronym":"","country":"United
+        States","country_code":"US","timezone":"America/New_York"}},{"symbol":"AAPU","isin":"US25461A8743","name":"Direxion
+        Daily AAPL Bull 2X Shares","logo_url":"https://logo.synthfinance.com/ticker/AAPU","currency":"USD","exchange":{"name":"Nasdaq/Nms
+        (Global Market)","mic_code":"XNMS","operating_mic_code":"XNAS","acronym":"","country":"United
+        States","country_code":"US","timezone":"America/New_York"}},{"symbol":"AAPB","isin":"XXXXXXXR8842","name":"GraniteShares
+        2x Long AAPL Daily ETF","logo_url":"https://logo.synthfinance.com/ticker/AAPB","currency":"USD","exchange":{"name":"Nasdaq/Ngs
+        (Global Select Market)","mic_code":"XNGS","operating_mic_code":"XNAS","acronym":"NGS","country":"United
+        States","country_code":"US","timezone":"America/New_York"}},{"symbol":"AAPD","isin":"US25461A3041","name":"Direxion
+        Daily AAPL Bear 1X Shares","logo_url":"https://logo.synthfinance.com/ticker/AAPD","currency":"USD","exchange":{"name":"Nasdaq/Ngs
+        (Global Select Market)","mic_code":"XNGS","operating_mic_code":"XNAS","acronym":"NGS","country":"United
+        States","country_code":"US","timezone":"America/New_York"}},{"symbol":"AAPU","isin":"US25461A8743","name":"Direxion
+        Daily AAPL Bull 1.5X Shares","logo_url":"https://logo.synthfinance.com/ticker/AAPU","currency":"USD","exchange":{"name":"Nasdaq/Ngs
+        (Global Select Market)","mic_code":"XNGS","operating_mic_code":"XNAS","acronym":"NGS","country":"United
+        States","country_code":"US","timezone":"America/New_York"}},{"symbol":"AAPJ","isin":"US00037T1034","name":"AAP,
+        Inc.","logo_url":"https://logo.synthfinance.com/ticker/AAPJ","currency":"USD","exchange":{"name":"Otc
+        Pink Marketplace","mic_code":"PINX","operating_mic_code":"OTCM","acronym":"","country":"United
+        States","country_code":"US","timezone":"America/New_York"}}]}'
+  recorded_at: Fri, 16 May 2025 13:01:38 GMT
+recorded_with: VCR 6.3.1
diff --git a/test/vcr_cassettes/synth/usage.yml b/test/vcr_cassettes/synth/usage.yml
new file mode 100644
index 00000000..d60922db
--- /dev/null
+++ b/test/vcr_cassettes/synth/usage.yml
@@ -0,0 +1,82 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.synthfinance.com/user
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
+      - Bearer <SYNTH_API_KEY>
+      X-Source:
+      - maybe_app
+      X-Source-Type:
+      - managed
+      User-Agent:
+      - Faraday v2.13.1
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 16 May 2025 13:01:36 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      Etag:
+      - W/"7b8c2bf0cba54bc26b78bdc6e611dcbd"
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      Rndr-Id:
+      - 1b53adf6-b391-45b2
+      Strict-Transport-Security:
+      - max-age=63072000; includeSubDomains
+      Vary:
+      - Accept-Encoding
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Render-Origin-Server:
+      - Render
+      X-Request-Id:
+      - f88670a2-81d2-48b6-8d73-a911c846e330
+      X-Runtime:
+      - '0.018749'
+      X-Xss-Protection:
+      - '0'
+      Cf-Cache-Status:
+      - DYNAMIC
+      Report-To:
+      - '{"endpoints":[{"url":"https:\/\/a.nel.cloudflare.com\/report\/v4?s=oH4OsWB6itK0jpi%2FPs%2BswVyCZIbkJGPfyJaoR4TKFtTAfmnqa8Lp6aZhv22WKzotXJuAKbh99VdYdZIOkeIPWbYTc6j4rGw%2BkQB3Hw%2Fc44QxDBJFdIo6wJNe8TGiPAZ%2BvgoBVHWn"}],"group":"cf-nel","max_age":604800}'
+      Nel:
+      - '{"success_fraction":0,"report_to":"cf-nel","max_age":604800}'
+      Speculation-Rules:
+      - '"/cdn-cgi/speculation"'
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 940b108c38f66392-ORD
+      Alt-Svc:
+      - h3=":443"; ma=86400
+      Server-Timing:
+      - cfL4;desc="?proto=TCP&rtt=33369&min_rtt=25798&rtt_var=15082&sent=5&recv=6&lost=0&retrans=0&sent_bytes=2826&recv_bytes=878&delivery_rate=112256&cwnd=205&unsent_bytes=0&cid=1b13324eb0768fd3&ts=285&x=0"
+    body:
+      encoding: ASCII-8BIT
+      string: '{"id":"user_3208c49393f54b3e974795e4bea5b864","email":"zach@maybe.co","name":"Zach
+        Gollwitzer","plan":"Business","api_calls_remaining":249738,"api_limit":250000,"credits_reset_at":"2025-06-01T00:00:00.000-04:00","current_period_start":"2025-05-01T00:00:00.000-04:00"}'
+  recorded_at: Fri, 16 May 2025 13:01:36 GMT
+recorded_with: VCR 6.3.1
diff --git a/vendor/javascript/@floating-ui--utils--dom.js b/vendor/javascript/@floating-ui--utils--dom.js
index 098e5ac3..82db906e 100644
--- a/vendor/javascript/@floating-ui--utils--dom.js
+++ b/vendor/javascript/@floating-ui--utils--dom.js
@@ -1,2 +1,4 @@
-function getNodeName(e){return isNode(e)?(e.nodeName||"").toLowerCase():"#document"}function getWindow(e){var t;return(e==null||(t=e.ownerDocument)==null?void 0:t.defaultView)||window}function getDocumentElement(e){var t;return(t=(isNode(e)?e.ownerDocument:e.document)||window.document)==null?void 0:t.documentElement}function isNode(e){return e instanceof Node||e instanceof getWindow(e).Node}function isElement(e){return e instanceof Element||e instanceof getWindow(e).Element}function isHTMLElement(e){return e instanceof HTMLElement||e instanceof getWindow(e).HTMLElement}function isShadowRoot(e){return typeof ShadowRoot!=="undefined"&&(e instanceof ShadowRoot||e instanceof getWindow(e).ShadowRoot)}function isOverflowElement(e){const{overflow:t,overflowX:n,overflowY:o,display:r}=getComputedStyle(e);return/auto|scroll|overlay|hidden|clip/.test(t+o+n)&&!["inline","contents"].includes(r)}function isTableElement(e){return["table","td","th"].includes(getNodeName(e))}function isTopLayer(e){return[":popover-open",":modal"].some((t=>{try{return e.matches(t)}catch(e){return false}}))}function isContainingBlock(e){const t=isWebKit();const n=isElement(e)?getComputedStyle(e):e;return n.transform!=="none"||n.perspective!=="none"||!!n.containerType&&n.containerType!=="normal"||!t&&!!n.backdropFilter&&n.backdropFilter!=="none"||!t&&!!n.filter&&n.filter!=="none"||["transform","perspective","filter"].some((e=>(n.willChange||"").includes(e)))||["paint","layout","strict","content"].some((e=>(n.contain||"").includes(e)))}function getContainingBlock(e){let t=getParentNode(e);while(isHTMLElement(t)&&!isLastTraversableNode(t)){if(isContainingBlock(t))return t;if(isTopLayer(t))return null;t=getParentNode(t)}return null}function isWebKit(){return!(typeof CSS==="undefined"||!CSS.supports)&&CSS.supports("-webkit-backdrop-filter","none")}function isLastTraversableNode(e){return["html","body","#document"].includes(getNodeName(e))}function getComputedStyle(e){return getWindow(e).getComputedStyle(e)}function getNodeScroll(e){return isElement(e)?{scrollLeft:e.scrollLeft,scrollTop:e.scrollTop}:{scrollLeft:e.scrollX,scrollTop:e.scrollY}}function getParentNode(e){if(getNodeName(e)==="html")return e;const t=e.assignedSlot||e.parentNode||isShadowRoot(e)&&e.host||getDocumentElement(e);return isShadowRoot(t)?t.host:t}function getNearestOverflowAncestor(e){const t=getParentNode(e);return isLastTraversableNode(t)?e.ownerDocument?e.ownerDocument.body:e.body:isHTMLElement(t)&&isOverflowElement(t)?t:getNearestOverflowAncestor(t)}function getOverflowAncestors(e,t,n){var o;t===void 0&&(t=[]);n===void 0&&(n=true);const r=getNearestOverflowAncestor(e);const i=r===((o=e.ownerDocument)==null?void 0:o.body);const l=getWindow(r);if(i){const e=getFrameElement(l);return t.concat(l,l.visualViewport||[],isOverflowElement(r)?r:[],e&&n?getOverflowAncestors(e):[])}return t.concat(r,getOverflowAncestors(r,[],n))}function getFrameElement(e){return Object.getPrototypeOf(e.parent)?e.frameElement:null}export{getComputedStyle,getContainingBlock,getDocumentElement,getFrameElement,getNearestOverflowAncestor,getNodeName,getNodeScroll,getOverflowAncestors,getParentNode,getWindow,isContainingBlock,isElement,isHTMLElement,isLastTraversableNode,isNode,isOverflowElement,isShadowRoot,isTableElement,isTopLayer,isWebKit};
+// @floating-ui/utils/dom@0.2.9 downloaded from https://ga.jspm.io/npm:@floating-ui/utils@0.2.9/dist/floating-ui.utils.dom.mjs
+
+function hasWindow(){return typeof window!=="undefined"}function getNodeName(e){return isNode(e)?(e.nodeName||"").toLowerCase():"#document"}function getWindow(e){var t;return(e==null||(t=e.ownerDocument)==null?void 0:t.defaultView)||window}function getDocumentElement(e){var t;return(t=(isNode(e)?e.ownerDocument:e.document)||window.document)==null?void 0:t.documentElement}function isNode(e){return!!hasWindow()&&(e instanceof Node||e instanceof getWindow(e).Node)}function isElement(e){return!!hasWindow()&&(e instanceof Element||e instanceof getWindow(e).Element)}function isHTMLElement(e){return!!hasWindow()&&(e instanceof HTMLElement||e instanceof getWindow(e).HTMLElement)}function isShadowRoot(e){return!(!hasWindow()||typeof ShadowRoot==="undefined")&&(e instanceof ShadowRoot||e instanceof getWindow(e).ShadowRoot)}function isOverflowElement(e){const{overflow:t,overflowX:n,overflowY:o,display:r}=getComputedStyle(e);return/auto|scroll|overlay|hidden|clip/.test(t+o+n)&&!["inline","contents"].includes(r)}function isTableElement(e){return["table","td","th"].includes(getNodeName(e))}function isTopLayer(e){return[":popover-open",":modal"].some((t=>{try{return e.matches(t)}catch(e){return false}}))}function isContainingBlock(e){const t=isWebKit();const n=isElement(e)?getComputedStyle(e):e;return["transform","translate","scale","rotate","perspective"].some((e=>!!n[e]&&n[e]!=="none"))||!!n.containerType&&n.containerType!=="normal"||!t&&!!n.backdropFilter&&n.backdropFilter!=="none"||!t&&!!n.filter&&n.filter!=="none"||["transform","translate","scale","rotate","perspective","filter"].some((e=>(n.willChange||"").includes(e)))||["paint","layout","strict","content"].some((e=>(n.contain||"").includes(e)))}function getContainingBlock(e){let t=getParentNode(e);while(isHTMLElement(t)&&!isLastTraversableNode(t)){if(isContainingBlock(t))return t;if(isTopLayer(t))return null;t=getParentNode(t)}return null}function isWebKit(){return!(typeof CSS==="undefined"||!CSS.supports)&&CSS.supports("-webkit-backdrop-filter","none")}function isLastTraversableNode(e){return["html","body","#document"].includes(getNodeName(e))}function getComputedStyle(e){return getWindow(e).getComputedStyle(e)}function getNodeScroll(e){return isElement(e)?{scrollLeft:e.scrollLeft,scrollTop:e.scrollTop}:{scrollLeft:e.scrollX,scrollTop:e.scrollY}}function getParentNode(e){if(getNodeName(e)==="html")return e;const t=e.assignedSlot||e.parentNode||isShadowRoot(e)&&e.host||getDocumentElement(e);return isShadowRoot(t)?t.host:t}function getNearestOverflowAncestor(e){const t=getParentNode(e);return isLastTraversableNode(t)?e.ownerDocument?e.ownerDocument.body:e.body:isHTMLElement(t)&&isOverflowElement(t)?t:getNearestOverflowAncestor(t)}function getOverflowAncestors(e,t,n){var o;t===void 0&&(t=[]);n===void 0&&(n=true);const r=getNearestOverflowAncestor(e);const i=r===((o=e.ownerDocument)==null?void 0:o.body);const l=getWindow(r);if(i){const e=getFrameElement(l);return t.concat(l,l.visualViewport||[],isOverflowElement(r)?r:[],e&&n?getOverflowAncestors(e):[])}return t.concat(r,getOverflowAncestors(r,[],n))}function getFrameElement(e){return e.parent&&Object.getPrototypeOf(e.parent)?e.frameElement:null}export{getComputedStyle,getContainingBlock,getDocumentElement,getFrameElement,getNearestOverflowAncestor,getNodeName,getNodeScroll,getOverflowAncestors,getParentNode,getWindow,isContainingBlock,isElement,isHTMLElement,isLastTraversableNode,isNode,isOverflowElement,isShadowRoot,isTableElement,isTopLayer,isWebKit};
 
diff --git a/vendor/javascript/@simonwep--pickr.js b/vendor/javascript/@simonwep--pickr.js
new file mode 100644
index 00000000..f0f6e0d2
--- /dev/null
+++ b/vendor/javascript/@simonwep--pickr.js
@@ -0,0 +1,4 @@
+// @simonwep/pickr@1.9.1 downloaded from https://ga.jspm.io/npm:@simonwep/pickr@1.9.1/dist/pickr.min.js
+
+var t={};!function(u,h){t=h()}(self,(()=>(()=>{var t={d:(u,h)=>{for(var d in h)t.o(h,d)&&!t.o(u,d)&&Object.defineProperty(u,d,{enumerable:!0,get:h[d]})},o:(t,u)=>Object.prototype.hasOwnProperty.call(t,u),r:t=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})}},u={};t.d(u,{default:()=>E});var h={};function n(t,u,h,d,m={}){u instanceof HTMLCollection||u instanceof NodeList?u=Array.from(u):Array.isArray(u)||(u=[u]),Array.isArray(h)||(h=[h]);for(const S of u)for(const u of h)S[t](u,d,{capture:!1,...m});return Array.prototype.slice.call(arguments,1)}t.r(h),t.d(h,{adjustableInputNumbers:()=>p,createElementFromString:()=>r,createFromTemplate:()=>a,eventPath:()=>l,off:()=>m,on:()=>d,resolveElement:()=>c});const d=n.bind(null,"addEventListener"),m=n.bind(null,"removeEventListener");function r(t){const u=document.createElement("div");return u.innerHTML=t.trim(),u.firstElementChild}function a(t){const e=(t,u)=>{const h=t.getAttribute(u);return t.removeAttribute(u),h},o=(t,u={})=>{const h=e(t,":obj"),d=e(t,":ref"),m=h?u[h]={}:u;d&&(u[d]=t);for(const u of Array.from(t.children)){const t=e(u,":arr"),h=o(u,t?{}:m);t&&(m[t]||(m[t]=[])).push(Object.keys(h).length?h:u)}return u};return o(r(t))}function l(t){let u=t.path||t.composedPath&&t.composedPath();if(u)return u;let h=t.target.parentElement;for(u=[t.target,h];h=h.parentElement;)u.push(h);return u.push(document,window),u}function c(t){return t instanceof Element?t:"string"==typeof t?t.split(/>>/g).reduce(((t,u,h,d)=>(t=t.querySelector(u),h<d.length-1?t.shadowRoot:t)),document):null}function p(t,u=(t=>t)){function o(h){const d=[.001,.01,.1][Number(h.shiftKey||2*h.ctrlKey)]*(h.deltaY<0?1:-1);let m=0,S=t.selectionStart;t.value=t.value.replace(/[\d.]+/g,((t,h)=>h<=S&&h+t.length>=S?(S=h,u(Number(t),d,m)):(m++,t))),t.focus(),t.setSelectionRange(S,S),h.preventDefault(),t.dispatchEvent(new Event("input"))}d(t,"focus",(()=>d(window,"wheel",o,{passive:!1}))),d(t,"blur",(()=>m(window,"wheel",o)))}const{min:S,max:L,floor:B,round:P}=Math;function f(t,u,h){u/=100,h/=100;const d=B(t=t/360*6),m=t-d,S=h*(1-u),L=h*(1-m*u),P=h*(1-(1-m)*u),x=d%6;return[255*[h,L,S,S,P,h][x],255*[P,h,h,L,S,S][x],255*[S,S,P,h,h,L][x]]}function v(t,u,h){const d=(2-(u/=100))*(h/=100)/2;return 0!==d&&(u=1===d?0:d<.5?u*h/(2*d):u*h/(2-2*d)),[t,100*u,100*d]}function b(t,u,h){const d=S(t/=255,u/=255,h/=255),m=L(t,u,h),B=m-d;let P,x;if(0===B)P=x=0;else{x=B/m;const d=((m-t)/6+B/2)/B,S=((m-u)/6+B/2)/B,L=((m-h)/6+B/2)/B;t===m?P=L-S:u===m?P=1/3+d-L:h===m&&(P=2/3+S-d),P<0?P+=1:P>1&&(P-=1)}return[360*P,100*x,100*m]}function y(t,u,h,d){u/=100,h/=100;return[...b(255*(1-S(1,(t/=100)*(1-(d/=100))+d)),255*(1-S(1,u*(1-d)+d)),255*(1-S(1,h*(1-d)+d)))]}function g(t,u,h){u/=100;const d=2*(u*=(h/=100)<.5?h:1-h)/(h+u)*100,m=100*(h+u);return[t,isNaN(d)?0:d,m]}function _(t){return b(...t.match(/.{2}/g).map((t=>parseInt(t,16))))}function w(t){t=t.match(/^[a-zA-Z]+$/)?function(t){if("black"===t.toLowerCase())return"#000";const u=document.createElement("canvas").getContext("2d");return u.fillStyle=t,"#000"===u.fillStyle?null:u.fillStyle}(t):t;const u={cmyk:/^cmyk\D+([\d.]+)\D+([\d.]+)\D+([\d.]+)\D+([\d.]+)/i,rgba:/^rgba?\D+([\d.]+)(%?)\D+([\d.]+)(%?)\D+([\d.]+)(%?)\D*?(([\d.]+)(%?)|$)/i,hsla:/^hsla?\D+([\d.]+)\D+([\d.]+)\D+([\d.]+)\D*?(([\d.]+)(%?)|$)/i,hsva:/^hsva?\D+([\d.]+)\D+([\d.]+)\D+([\d.]+)\D*?(([\d.]+)(%?)|$)/i,hexa:/^#?(([\dA-Fa-f]{3,4})|([\dA-Fa-f]{6})|([\dA-Fa-f]{8}))$/i},o=t=>t.map((t=>/^(|\d+)\.\d+|\d+$/.test(t)?Number(t):void 0));let h;t:for(const d in u)if(h=u[d].exec(t))switch(d){case"cmyk":{const[,t,u,m,S]=o(h);if(t>100||u>100||m>100||S>100)break t;return{values:y(t,u,m,S),type:d}}case"rgba":{let[,t,,u,,m,,,S]=o(h);if(t="%"===h[2]?t/100*255:t,u="%"===h[4]?u/100*255:u,m="%"===h[6]?m/100*255:m,S="%"===h[9]?S/100:S,t>255||u>255||m>255||S<0||S>1)break t;return{values:[...b(t,u,m),S],a:S,type:d}}case"hexa":{let[,t]=h;4!==t.length&&3!==t.length||(t=t.split("").map((t=>t+t)).join(""));const u=t.substring(0,6);let m=t.substring(6);return m=m?parseInt(m,16)/255:void 0,{values:[..._(u),m],a:m,type:d}}case"hsla":{let[,t,u,m,,S]=o(h);if(S="%"===h[6]?S/100:S,t>360||u>100||m>100||S<0||S>1)break t;return{values:[...g(t,u,m),S],a:S,type:d}}case"hsva":{let[,t,u,m,,S]=o(h);if(S="%"===h[6]?S/100:S,t>360||u>100||m>100||S<0||S>1)break t;return{values:[t,u,m,S],a:S,type:d}}}return{values:null,type:null}}function A(t=0,u=0,h=0,d=1){const i=(t,u)=>(h=-1)=>u(~h?t.map((t=>Number(t.toFixed(h)))):t),m={h:t,s:u,v:h,a:d,toHSVA(){const t=[m.h,m.s,m.v,m.a];return t.toString=i(t,(t=>`hsva(${t[0]}, ${t[1]}%, ${t[2]}%, ${m.a})`)),t},toHSLA(){const t=[...v(m.h,m.s,m.v),m.a];return t.toString=i(t,(t=>`hsla(${t[0]}, ${t[1]}%, ${t[2]}%, ${m.a})`)),t},toRGBA(){const t=[...f(m.h,m.s,m.v),m.a];return t.toString=i(t,(t=>`rgba(${t[0]}, ${t[1]}, ${t[2]}, ${m.a})`)),t},toCMYK(){const t=function(t,u,h){const d=f(t,u,h),m=d[0]/255,L=d[1]/255,B=d[2]/255,P=S(1-m,1-L,1-B);return[100*(1===P?0:(1-m-P)/(1-P)),100*(1===P?0:(1-L-P)/(1-P)),100*(1===P?0:(1-B-P)/(1-P)),100*P]}(m.h,m.s,m.v);return t.toString=i(t,(t=>`cmyk(${t[0]}%, ${t[1]}%, ${t[2]}%, ${t[3]}%)`)),t},toHEXA(){const t=function(t,u,h){return f(t,u,h).map((t=>P(t).toString(16).padStart(2,"0")))}(m.h,m.s,m.v),u=m.a>=1?"":Number((255*m.a).toFixed(0)).toString(16).toUpperCase().padStart(2,"0");return u&&t.push(u),t.toString=()=>`#${t.join("").toUpperCase()}`,t},clone:()=>A(m.h,m.s,m.v,m.a)};return m}const $=t=>Math.max(Math.min(t,1),0);function C(t){const u={options:Object.assign({lock:null,onchange:()=>0,onstop:()=>0},t),_keyboard(t){const{options:h}=u,{type:d,key:m}=t;if(document.activeElement===h.wrapper){const{lock:h}=u.options,S="ArrowUp"===m,L="ArrowRight"===m,B="ArrowDown"===m,P="ArrowLeft"===m;if("keydown"===d&&(S||L||B||P)){let d=0,m=0;"v"===h?d=S||L?1:-1:"h"===h?d=S||L?-1:1:(m=S?-1:B?1:0,d=P?-1:L?1:0),u.update($(u.cache.x+.01*d),$(u.cache.y+.01*m)),t.preventDefault()}else m.startsWith("Arrow")&&(u.options.onstop(),t.preventDefault())}},_tapstart(t){d(document,["mouseup","touchend","touchcancel"],u._tapstop),d(document,["mousemove","touchmove"],u._tapmove),t.cancelable&&t.preventDefault(),u._tapmove(t)},_tapmove(t){const{options:h,cache:d}=u,{lock:m,element:S,wrapper:L}=h,B=L.getBoundingClientRect();let P=0,x=0;if(t){const u=t&&t.touches&&t.touches[0];P=t?(u||t).clientX:0,x=t?(u||t).clientY:0,P<B.left?P=B.left:P>B.left+B.width&&(P=B.left+B.width),x<B.top?x=B.top:x>B.top+B.height&&(x=B.top+B.height),P-=B.left,x-=B.top}else d&&(P=d.x*B.width,x=d.y*B.height);"h"!==m&&(S.style.left=`calc(${P/B.width*100}% - ${S.offsetWidth/2}px)`),"v"!==m&&(S.style.top=`calc(${x/B.height*100}% - ${S.offsetHeight/2}px)`),u.cache={x:P/B.width,y:x/B.height};const R=$(P/B.width),D=$(x/B.height);switch(m){case"v":return h.onchange(R);case"h":return h.onchange(D);default:return h.onchange(R,D)}},_tapstop(){u.options.onstop(),m(document,["mouseup","touchend","touchcancel"],u._tapstop),m(document,["mousemove","touchmove"],u._tapmove)},trigger(){u._tapmove()},update(t=0,h=0){const{left:d,top:m,width:S,height:L}=u.options.wrapper.getBoundingClientRect();"h"===u.options.lock&&(h=t),u._tapmove({clientX:d+S*t,clientY:m+L*h})},destroy(){const{options:t,_tapstart:h,_keyboard:d}=u;m(document,["keydown","keyup"],d),m([t.wrapper,t.element],"mousedown",h),m([t.wrapper,t.element],"touchstart",h,{passive:!1})}},{options:h,_tapstart:S,_keyboard:L}=u;return d([h.wrapper,h.element],"mousedown",S),d([h.wrapper,h.element],"touchstart",S,{passive:!1}),d(document,["keydown","keyup"],L),u}function k(t={}){t=Object.assign({onchange:()=>0,className:"",elements:[]},t);const u=d(t.elements,"click",(u=>{t.elements.forEach((h=>h.classList[u.target===h?"add":"remove"](t.className))),t.onchange(u),u.stopPropagation()}));return{destroy:()=>m(...u)}}const x={variantFlipOrder:{start:"sme",middle:"mse",end:"ems"},positionFlipOrder:{top:"tbrl",right:"rltb",bottom:"btrl",left:"lrbt"},position:"bottom",margin:8,padding:0},O=(t,u,h)=>{const d="object"!=typeof t||t instanceof HTMLElement?{reference:t,popper:u,...h}:t;return{update(t=d){const{reference:u,popper:h}=Object.assign(d,t);if(!h||!u)throw new Error("Popper- or reference-element missing.");return((t,u,h)=>{const{container:d,arrow:m,margin:S,padding:L,position:B,variantFlipOrder:P,positionFlipOrder:R}={container:document.documentElement.getBoundingClientRect(),...x,...h},{left:D,top:H}=u.style;u.style.left="0",u.style.top="0";const j=t.getBoundingClientRect(),F=u.getBoundingClientRect(),N={t:j.top-F.height-S,b:j.bottom+S,r:j.right+S,l:j.left-F.width-S},T={vs:j.left,vm:j.left+j.width/2-F.width/2,ve:j.left+j.width-F.width,hs:j.top,hm:j.bottom-j.height/2-F.height/2,he:j.bottom-F.height},[M,U="middle"]=B.split("-"),V=R[M],z=P[U],{top:I,left:X,bottom:G,right:K}=d;for(const t of V){const h="t"===t||"b"===t;let d=N[t];const[S,B]=h?["top","left"]:["left","top"],[P,x]=h?[F.height,F.width]:[F.width,F.height],[R,D]=h?[G,K]:[K,G],[H,M]=h?[I,X]:[X,I];if(!(d<H||d+P+L>R))for(const R of z){let H=T[(h?"v":"h")+R];if(!(H<M||H+x+L>D)){if(H-=F[B],d-=F[S],u.style[B]=`${H}px`,u.style[S]=`${d}px`,m){const u=h?j.width/2:j.height/2,L=x/2,D=u>L,F=H+{s:D?L:u,m:L,e:D?L:x-u}[R],N=d+{t:P,b:0,r:0,l:P}[t];m.style[B]=`${F}px`,m.style[S]=`${N}px`}return t+R}}}return u.style.left=D,u.style.top=H,null})(u,h,d)}}};class E{static utils=h;static version="1.9.1";static I18N_DEFAULTS={"ui:dialog":"color picker dialog","btn:toggle":"toggle color picker dialog","btn:swatch":"color swatch","btn:last-color":"use previous color","btn:save":"Save","btn:cancel":"Cancel","btn:clear":"Clear","aria:btn:save":"save and close","aria:btn:cancel":"cancel and close","aria:btn:clear":"clear and close","aria:input":"color input field","aria:palette":"color selection area","aria:hue":"hue selection slider","aria:opacity":"selection slider"};static DEFAULT_OPTIONS={appClass:null,theme:"classic",useAsButton:!1,padding:8,disabled:!1,comparison:!0,closeOnScroll:!1,outputPrecision:0,lockOpacity:!1,autoReposition:!0,container:"body",components:{interaction:{}},i18n:{},swatches:null,inline:!1,sliders:null,default:"#42445a",defaultRepresentation:null,position:"bottom-middle",adjustableNumbers:!0,showAlways:!1,closeWithKey:"Escape"};_initializingActive=!0;_recalc=!0;_nanopop=null;_root=null;_color=A();_lastColor=A();_swatchColors=[];_setupAnimationFrame=null;_eventListener={init:[],save:[],hide:[],show:[],clear:[],change:[],changestop:[],cancel:[],swatchselect:[]};constructor(t){this.options=t=Object.assign({...E.DEFAULT_OPTIONS},t);const{swatches:u,components:h,theme:d,sliders:m,lockOpacity:S,padding:L}=t;["nano","monolith"].includes(d)&&!m&&(t.sliders="h"),h.interaction||(h.interaction={});const{preview:B,opacity:P,hue:x,palette:R}=h;h.opacity=!S&&P,h.palette=R||B||P||x,this._preBuild(),this._buildComponents(),this._bindEvents(),this._finalBuild(),u&&u.length&&u.forEach((t=>this.addSwatch(t)));const{button:D,app:H}=this._root;this._nanopop=O(D,H,{margin:L}),D.setAttribute("role","button"),D.setAttribute("aria-label",this._t("btn:toggle"));const j=this;this._setupAnimationFrame=requestAnimationFrame((function e(){if(!H.offsetWidth)return requestAnimationFrame(e);j.setColor(t.default),j._rePositioningPicker(),t.defaultRepresentation&&(j._representation=t.defaultRepresentation,j.setColorRepresentation(j._representation)),t.showAlways&&j.show(),j._initializingActive=!1,j._emit("init")}))}static create=t=>new E(t);_preBuild(){const{options:t}=this;for(const u of["el","container"])t[u]=c(t[u]);this._root=(t=>{const{components:u,useAsButton:h,inline:d,appClass:m,theme:S,lockOpacity:L}=t.options,l=t=>t?"":'style="display:none" hidden',c=u=>t._t(u),B=a(`\n      <div :ref="root" class="pickr">\n\n        ${h?"":'<button type="button" :ref="button" class="pcr-button"></button>'}\n\n        <div :ref="app" class="pcr-app ${m||""}" data-theme="${S}" ${d?'style="position: unset"':""} aria-label="${c("ui:dialog")}" role="window">\n          <div class="pcr-selection" ${l(u.palette)}>\n            <div :obj="preview" class="pcr-color-preview" ${l(u.preview)}>\n              <button type="button" :ref="lastColor" class="pcr-last-color" aria-label="${c("btn:last-color")}"></button>\n              <div :ref="currentColor" class="pcr-current-color"></div>\n            </div>\n\n            <div :obj="palette" class="pcr-color-palette">\n              <div :ref="picker" class="pcr-picker"></div>\n              <div :ref="palette" class="pcr-palette" tabindex="0" aria-label="${c("aria:palette")}" role="listbox"></div>\n            </div>\n\n            <div :obj="hue" class="pcr-color-chooser" ${l(u.hue)}>\n              <div :ref="picker" class="pcr-picker"></div>\n              <div :ref="slider" class="pcr-hue pcr-slider" tabindex="0" aria-label="${c("aria:hue")}" role="slider"></div>\n            </div>\n\n            <div :obj="opacity" class="pcr-color-opacity" ${l(u.opacity)}>\n              <div :ref="picker" class="pcr-picker"></div>\n              <div :ref="slider" class="pcr-opacity pcr-slider" tabindex="0" aria-label="${c("aria:opacity")}" role="slider"></div>\n            </div>\n          </div>\n\n          <div class="pcr-swatches ${u.palette?"":"pcr-last"}" :ref="swatches"></div>\n\n          <div :obj="interaction" class="pcr-interaction" ${l(Object.keys(u.interaction).length)}>\n            <input :ref="result" class="pcr-result" type="text" spellcheck="false" ${l(u.interaction.input)} aria-label="${c("aria:input")}">\n\n            <input :arr="options" class="pcr-type" data-type="HEXA" value="${L?"HEX":"HEXA"}" type="button" ${l(u.interaction.hex)}>\n            <input :arr="options" class="pcr-type" data-type="RGBA" value="${L?"RGB":"RGBA"}" type="button" ${l(u.interaction.rgba)}>\n            <input :arr="options" class="pcr-type" data-type="HSLA" value="${L?"HSL":"HSLA"}" type="button" ${l(u.interaction.hsla)}>\n            <input :arr="options" class="pcr-type" data-type="HSVA" value="${L?"HSV":"HSVA"}" type="button" ${l(u.interaction.hsva)}>\n            <input :arr="options" class="pcr-type" data-type="CMYK" value="CMYK" type="button" ${l(u.interaction.cmyk)}>\n\n            <input :ref="save" class="pcr-save" value="${c("btn:save")}" type="button" ${l(u.interaction.save)} aria-label="${c("aria:btn:save")}">\n            <input :ref="cancel" class="pcr-cancel" value="${c("btn:cancel")}" type="button" ${l(u.interaction.cancel)} aria-label="${c("aria:btn:cancel")}">\n            <input :ref="clear" class="pcr-clear" value="${c("btn:clear")}" type="button" ${l(u.interaction.clear)} aria-label="${c("aria:btn:clear")}">\n          </div>\n        </div>\n      </div>\n    `),P=B.interaction;return P.options.find((t=>!t.hidden&&!t.classList.add("active"))),P.type=()=>P.options.find((t=>t.classList.contains("active"))),B})(this),t.useAsButton&&(this._root.button=t.el),t.container.appendChild(this._root.root)}_finalBuild(){const t=this.options,u=this._root;if(t.container.removeChild(u.root),t.inline){const h=t.el.parentElement;t.el.nextSibling?h.insertBefore(u.app,t.el.nextSibling):h.appendChild(u.app)}else t.container.appendChild(u.app);t.useAsButton?t.inline&&t.el.remove():t.el.parentNode.replaceChild(u.root,t.el),t.disabled&&this.disable(),t.comparison||(u.button.style.transition="none",t.useAsButton||(u.preview.lastColor.style.transition="none")),this.hide()}_buildComponents(){const t=this,u=this.options.components,h=(t.options.sliders||"v").repeat(2),[d,m]=h.match(/^[vh]+$/g)?h:[],s=()=>this._color||(this._color=this._lastColor.clone()),S={palette:C({element:t._root.palette.picker,wrapper:t._root.palette.palette,onstop:()=>t._emit("changestop","slider",t),onchange(h,d){if(!u.palette)return;const m=s(),{_root:S,options:L}=t,{lastColor:B,currentColor:P}=S.preview;t._recalc&&(m.s=100*h,m.v=100-100*d,m.v<0&&(m.v=0),t._updateOutput("slider"));const x=m.toRGBA().toString(0);this.element.style.background=x,this.wrapper.style.background=`\n                        linear-gradient(to top, rgba(0, 0, 0, ${m.a}), transparent),\n                        linear-gradient(to left, hsla(${m.h}, 100%, 50%, ${m.a}), rgba(255, 255, 255, ${m.a}))\n                    `,L.comparison?L.useAsButton||t._lastColor||B.style.setProperty("--pcr-color",x):(S.button.style.setProperty("--pcr-color",x),S.button.classList.remove("clear"));const R=m.toHEXA().toString();for(const{el:u,color:h}of t._swatchColors)u.classList[R===h.toHEXA().toString()?"add":"remove"]("pcr-active");P.style.setProperty("--pcr-color",x)}}),hue:C({lock:"v"===m?"h":"v",element:t._root.hue.picker,wrapper:t._root.hue.slider,onstop:()=>t._emit("changestop","slider",t),onchange(h){if(!u.hue||!u.palette)return;const d=s();t._recalc&&(d.h=360*h),this.element.style.backgroundColor=`hsl(${d.h}, 100%, 50%)`,S.palette.trigger()}}),opacity:C({lock:"v"===d?"h":"v",element:t._root.opacity.picker,wrapper:t._root.opacity.slider,onstop:()=>t._emit("changestop","slider",t),onchange(h){if(!u.opacity||!u.palette)return;const d=s();t._recalc&&(d.a=Math.round(100*h)/100),this.element.style.background=`rgba(0, 0, 0, ${d.a})`,S.palette.trigger()}}),selectable:k({elements:t._root.interaction.options,className:"active",onchange(u){t._representation=u.target.getAttribute("data-type").toUpperCase(),t._recalc&&t._updateOutput("swatch")}})};this._components=S}_bindEvents(){const{_root:t,options:u}=this,h=[d(t.interaction.clear,"click",(()=>this._clearColor())),d([t.interaction.cancel,t.preview.lastColor],"click",(()=>{this.setHSVA(...(this._lastColor||this._color).toHSVA(),!0),this._emit("cancel")})),d(t.interaction.save,"click",(()=>{!this.applyColor()&&!u.showAlways&&this.hide()})),d(t.interaction.result,["keyup","input"],(t=>{this.setColor(t.target.value,!0)&&!this._initializingActive&&(this._emit("change",this._color,"input",this),this._emit("changestop","input",this)),t.stopImmediatePropagation()})),d(t.interaction.result,["focus","blur"],(t=>{this._recalc="blur"===t.type,this._recalc&&this._updateOutput(null)})),d([t.palette.palette,t.palette.picker,t.hue.slider,t.hue.picker,t.opacity.slider,t.opacity.picker],["mousedown","touchstart"],(()=>this._recalc=!0),{passive:!0})];if(!u.showAlways){const m=u.closeWithKey;h.push(d(t.button,"click",(()=>this.isOpen()?this.hide():this.show())),d(document,"keyup",(t=>this.isOpen()&&(t.key===m||t.code===m)&&this.hide())),d(document,["touchstart","mousedown"],(u=>{this.isOpen()&&!l(u).some((u=>u===t.app||u===t.button))&&this.hide()}),{capture:!0}))}if(u.adjustableNumbers){const u={rgba:[255,255,255,1],hsva:[360,100,100,1],hsla:[360,100,100,1],cmyk:[100,100,100,100]};p(t.interaction.result,((t,h,d)=>{const m=u[this.getColorRepresentation().toLowerCase()];if(m){const u=m[d],S=t+(u>=100?1e3*h:h);return S<=0?0:Number((S<u?S:u).toPrecision(3))}return t}))}if(u.autoReposition&&!u.inline){let t=null;const m=this;h.push(d(window,["scroll","resize"],(()=>{m.isOpen()&&(u.closeOnScroll&&m.hide(),null===t?(t=setTimeout((()=>t=null),100),requestAnimationFrame((function e(){m._rePositioningPicker(),null!==t&&requestAnimationFrame(e)}))):(clearTimeout(t),t=setTimeout((()=>t=null),100)))}),{capture:!0}))}this._eventBindings=h}_rePositioningPicker(){const{options:t}=this;if(!t.inline&&!this._nanopop.update({container:document.body.getBoundingClientRect(),position:t.position})){const t=this._root.app,u=t.getBoundingClientRect();t.style.top=(window.innerHeight-u.height)/2+"px",t.style.left=(window.innerWidth-u.width)/2+"px"}}_updateOutput(t){const{_root:u,_color:h,options:d}=this;if(u.interaction.type()){const t=`to${u.interaction.type().getAttribute("data-type")}`;u.interaction.result.value="function"==typeof h[t]?h[t]().toString(d.outputPrecision):""}!this._initializingActive&&this._recalc&&this._emit("change",h,t,this)}_clearColor(t=!1){const{_root:u,options:h}=this;h.useAsButton||u.button.style.setProperty("--pcr-color","rgba(0, 0, 0, 0.15)"),u.button.classList.add("clear"),h.showAlways||this.hide(),this._lastColor=null,this._initializingActive||t||(this._emit("save",null),this._emit("clear"))}_parseLocalColor(t){const{values:u,type:h,a:d}=w(t),{lockOpacity:m}=this.options,S=void 0!==d&&1!==d;return u&&3===u.length&&(u[3]=void 0),{values:!u||m&&S?null:u,type:h}}_t(t){return this.options.i18n[t]||E.I18N_DEFAULTS[t]}_emit(t,...u){this._eventListener[t].forEach((t=>t(...u,this)))}on(t,u){return this._eventListener[t].push(u),this}off(t,u){const h=this._eventListener[t]||[],d=h.indexOf(u);return~d&&h.splice(d,1),this}addSwatch(t){const{values:u}=this._parseLocalColor(t);if(u){const{_swatchColors:t,_root:h}=this,m=A(...u),S=r(`<button type="button" style="--pcr-color: ${m.toRGBA().toString(0)}" aria-label="${this._t("btn:swatch")}"/>`);return h.swatches.appendChild(S),t.push({el:S,color:m}),this._eventBindings.push(d(S,"click",(()=>{this.setHSVA(...m.toHSVA(),!0),this._emit("swatchselect",m),this._emit("change",m,"swatch",this)}))),!0}return!1}removeSwatch(t){const u=this._swatchColors[t];if(u){const{el:h}=u;return this._root.swatches.removeChild(h),this._swatchColors.splice(t,1),!0}return!1}applyColor(t=!1){const{preview:u,button:h}=this._root,d=this._color.toRGBA().toString(0);return u.lastColor.style.setProperty("--pcr-color",d),this.options.useAsButton||h.style.setProperty("--pcr-color",d),h.classList.remove("clear"),this._lastColor=this._color.clone(),this._initializingActive||t||this._emit("save",this._color),this}destroy(){cancelAnimationFrame(this._setupAnimationFrame),this._eventBindings.forEach((t=>m(...t))),Object.keys(this._components).forEach((t=>this._components[t].destroy()))}destroyAndRemove(){this.destroy();const{root:t,app:u}=this._root;t.parentElement&&t.parentElement.removeChild(t),u.parentElement.removeChild(u),Object.keys(this).forEach((t=>this[t]=null))}hide(){return!!this.isOpen()&&(this._root.app.classList.remove("visible"),this._emit("hide"),!0)}show(){return!this.options.disabled&&!this.isOpen()&&(this._root.app.classList.add("visible"),this._rePositioningPicker(),this._emit("show",this._color),this)}isOpen(){return this._root.app.classList.contains("visible")}setHSVA(t=360,u=0,h=0,d=1,m=!1){const S=this._recalc;if(this._recalc=!1,t<0||t>360||u<0||u>100||h<0||h>100||d<0||d>1)return!1;this._color=A(t,u,h,d);const{hue:L,opacity:B,palette:P}=this._components;return L.update(t/360),B.update(d),P.update(u/100,1-h/100),m||this.applyColor(),S&&this._updateOutput(),this._recalc=S,!0}setColor(t,u=!1){if(null===t)return this._clearColor(u),!0;const{values:h,type:d}=this._parseLocalColor(t);if(h){const t=d.toUpperCase(),{options:m}=this._root.interaction,S=m.find((u=>u.getAttribute("data-type")===t));if(S&&!S.hidden)for(const t of m)t.classList[t===S?"add":"remove"]("active");return!!this.setHSVA(...h,u)&&this.setColorRepresentation(t)}return!1}setColorRepresentation(t){return t=t.toUpperCase(),!!this._root.interaction.options.find((u=>u.getAttribute("data-type").startsWith(t)&&!u.click()))}getColorRepresentation(){return this._representation}getColor(){return this._color}getSelectedColor(){return this._lastColor}getRoot(){return this._root}disable(){return this.hide(),this.options.disabled=!0,this._root.button.classList.add("disabled"),this}enable(){return this.options.disabled=!1,this._root.button.classList.remove("disabled"),this}}return u.default})()));var u=t;const h=t.Pickr;export{h as Pickr,u as default};
+
diff --git a/vendor/javascript/d3-array.js b/vendor/javascript/d3-array.js
index 4b35f1e6..4b53af52 100644
--- a/vendor/javascript/d3-array.js
+++ b/vendor/javascript/d3-array.js
@@ -1,2 +1,4 @@
+// d3-array@3.2.4 downloaded from https://ga.jspm.io/npm:d3-array@3.2.4/src/index.js
+
 import{InternMap as t,InternSet as n}from"internmap";export{InternMap,InternSet}from"internmap";function ascending(t,n){return null==t||null==n?NaN:t<n?-1:t>n?1:t>=n?0:NaN}function descending(t,n){return null==t||null==n?NaN:n<t?-1:n>t?1:n>=t?0:NaN}function bisector(t){let n,e,r;if(2!==t.length){n=ascending;e=(n,e)=>ascending(t(n),e);r=(n,e)=>t(n)-e}else{n=t===ascending||t===descending?t:zero;e=t;r=t}function left(t,r,o=0,i=t.length){if(o<i){if(0!==n(r,r))return i;do{const n=o+i>>>1;e(t[n],r)<0?o=n+1:i=n}while(o<i)}return o}function right(t,r,o=0,i=t.length){if(o<i){if(0!==n(r,r))return i;do{const n=o+i>>>1;e(t[n],r)<=0?o=n+1:i=n}while(o<i)}return o}function center(t,n,e=0,o=t.length){const i=left(t,n,e,o-1);return i>e&&r(t[i-1],n)>-r(t[i],n)?i-1:i}return{left:left,center:center,right:right}}function zero(){return 0}function number(t){return null===t?NaN:+t}function*numbers(t,n){if(void 0===n)for(let n of t)null!=n&&(n=+n)>=n&&(yield n);else{let e=-1;for(let r of t)null!=(r=n(r,++e,t))&&(r=+r)>=r&&(yield r)}}const e=bisector(ascending);const r=e.right;const o=e.left;const i=bisector(number).center;function blur(t,n){if(!((n=+n)>=0))throw new RangeError("invalid r");let e=t.length;if(!((e=Math.floor(e))>=0))throw new RangeError("invalid length");if(!e||!n)return t;const r=blurf(n);const o=t.slice();r(t,o,0,e,1);r(o,t,0,e,1);r(t,o,0,e,1);return t}const f=Blur2(blurf);const u=Blur2(blurfImage);function Blur2(t){return function(n,e,r=e){if(!((e=+e)>=0))throw new RangeError("invalid rx");if(!((r=+r)>=0))throw new RangeError("invalid ry");let{data:o,width:i,height:f}=n;if(!((i=Math.floor(i))>=0))throw new RangeError("invalid width");if(!((f=Math.floor(void 0!==f?f:o.length/i))>=0))throw new RangeError("invalid height");if(!i||!f||!e&&!r)return n;const u=e&&t(e);const l=r&&t(r);const c=o.slice();if(u&&l){blurh(u,c,o,i,f);blurh(u,o,c,i,f);blurh(u,c,o,i,f);blurv(l,o,c,i,f);blurv(l,c,o,i,f);blurv(l,o,c,i,f)}else if(u){blurh(u,o,c,i,f);blurh(u,c,o,i,f);blurh(u,o,c,i,f)}else if(l){blurv(l,o,c,i,f);blurv(l,c,o,i,f);blurv(l,o,c,i,f)}return n}}function blurh(t,n,e,r,o){for(let i=0,f=r*o;i<f;)t(n,e,i,i+=r,1)}function blurv(t,n,e,r,o){for(let i=0,f=r*o;i<r;++i)t(n,e,i,i+f,r)}function blurfImage(t){const n=blurf(t);return(t,e,r,o,i)=>{r<<=2,o<<=2,i<<=2;n(t,e,r+0,o+0,i);n(t,e,r+1,o+1,i);n(t,e,r+2,o+2,i);n(t,e,r+3,o+3,i)}}function blurf(t){const n=Math.floor(t);if(n===t)return bluri(t);const e=t-n;const r=2*t+1;return(t,o,i,f,u)=>{if(!((f-=u)>=i))return;let l=n*o[i];const c=u*n;const s=c+u;for(let t=i,n=i+c;t<n;t+=u)l+=o[Math.min(f,t)];for(let n=i,a=f;n<=a;n+=u){l+=o[Math.min(f,n+c)];t[n]=(l+e*(o[Math.max(i,n-s)]+o[Math.min(f,n+s)]))/r;l-=o[Math.max(i,n-c)]}}}function bluri(t){const n=2*t+1;return(e,r,o,i,f)=>{if(!((i-=f)>=o))return;let u=t*r[o];const l=f*t;for(let t=o,n=o+l;t<n;t+=f)u+=r[Math.min(i,t)];for(let t=o,c=i;t<=c;t+=f){u+=r[Math.min(i,t+l)];e[t]=u/n;u-=r[Math.max(o,t-l)]}}}function count(t,n){let e=0;if(void 0===n)for(let n of t)null!=n&&(n=+n)>=n&&++e;else{let r=-1;for(let o of t)null!=(o=n(o,++r,t))&&(o=+o)>=o&&++e}return e}function length$1(t){return 0|t.length}function empty(t){return!(t>0)}function arrayify(t){return"object"!==typeof t||"length"in t?t:Array.from(t)}function reducer(t){return n=>t(...n)}function cross(...t){const n="function"===typeof t[t.length-1]&&reducer(t.pop());t=t.map(arrayify);const e=t.map(length$1);const r=t.length-1;const o=new Array(r+1).fill(0);const i=[];if(r<0||e.some(empty))return i;while(true){i.push(o.map(((n,e)=>t[e][n])));let f=r;while(++o[f]===e[f]){if(0===f)return n?i.map(n):i;o[f--]=0}}}function cumsum(t,n){var e=0,r=0;return Float64Array.from(t,void 0===n?t=>e+=+t||0:o=>e+=+n(o,r++,t)||0)}function variance(t,n){let e=0;let r;let o=0;let i=0;if(void 0===n){for(let n of t)if(null!=n&&(n=+n)>=n){r=n-o;o+=r/++e;i+=r*(n-o)}}else{let f=-1;for(let u of t)if(null!=(u=n(u,++f,t))&&(u=+u)>=u){r=u-o;o+=r/++e;i+=r*(u-o)}}if(e>1)return i/(e-1)}function deviation(t,n){const e=variance(t,n);return e?Math.sqrt(e):e}function extent(t,n){let e;let r;if(void 0===n){for(const n of t)if(null!=n)if(void 0===e)n>=n&&(e=r=n);else{e>n&&(e=n);r<n&&(r=n)}}else{let o=-1;for(let i of t)if(null!=(i=n(i,++o,t)))if(void 0===e)i>=i&&(e=r=i);else{e>i&&(e=i);r<i&&(r=i)}}return[e,r]}class Adder{constructor(){this._partials=new Float64Array(32);this._n=0}add(t){const n=this._partials;let e=0;for(let r=0;r<this._n&&r<32;r++){const o=n[r],i=t+o,f=Math.abs(t)<Math.abs(o)?t-(i-o):o-(i-t);f&&(n[e++]=f);t=i}n[e]=t;this._n=e+1;return this}valueOf(){const t=this._partials;let n,e,r,o=this._n,i=0;if(o>0){i=t[--o];while(o>0){n=i;e=t[--o];i=n+e;r=e-(i-n);if(r)break}if(o>0&&(r<0&&t[o-1]<0||r>0&&t[o-1]>0)){e=2*r;n=i+e;e==n-i&&(i=n)}}return i}}function fsum(t,n){const e=new Adder;if(void 0===n)for(let n of t)(n=+n)&&e.add(n);else{let r=-1;for(let o of t)(o=+n(o,++r,t))&&e.add(o)}return+e}function fcumsum(t,n){const e=new Adder;let r=-1;return Float64Array.from(t,void 0===n?t=>e.add(+t||0):o=>e.add(+n(o,++r,t)||0))}function identity(t){return t}function group(t,...n){return nest(t,identity,identity,n)}function groups(t,...n){return nest(t,Array.from,identity,n)}function flatten$1(t,n){for(let e=1,r=n.length;e<r;++e)t=t.flatMap((t=>t.pop().map((([n,e])=>[...t,n,e]))));return t}function flatGroup(t,...n){return flatten$1(groups(t,...n),n)}function flatRollup(t,n,...e){return flatten$1(rollups(t,n,...e),e)}function rollup(t,n,...e){return nest(t,identity,n,e)}function rollups(t,n,...e){return nest(t,Array.from,n,e)}function index(t,...n){return nest(t,identity,unique,n)}function indexes(t,...n){return nest(t,Array.from,unique,n)}function unique(t){if(1!==t.length)throw new Error("duplicate key");return t[0]}function nest(n,e,r,o){return function regroup(n,i){if(i>=o.length)return r(n);const f=new t;const u=o[i++];let l=-1;for(const t of n){const e=u(t,++l,n);const r=f.get(e);r?r.push(t):f.set(e,[t])}for(const[t,n]of f)f.set(t,regroup(n,i));return e(f)}(n,0)}function permute(t,n){return Array.from(n,(n=>t[n]))}function sort(t,...n){if("function"!==typeof t[Symbol.iterator])throw new TypeError("values is not iterable");t=Array.from(t);let[e]=n;if(e&&2!==e.length||n.length>1){const r=Uint32Array.from(t,((t,n)=>n));if(n.length>1){n=n.map((n=>t.map(n)));r.sort(((t,e)=>{for(const r of n){const n=ascendingDefined(r[t],r[e]);if(n)return n}}))}else{e=t.map(e);r.sort(((t,n)=>ascendingDefined(e[t],e[n])))}return permute(t,r)}return t.sort(compareDefined(e))}function compareDefined(t=ascending){if(t===ascending)return ascendingDefined;if("function"!==typeof t)throw new TypeError("compare is not a function");return(n,e)=>{const r=t(n,e);return r||0===r?r:(0===t(e,e))-(0===t(n,n))}}function ascendingDefined(t,n){return(null==t||!(t>=t))-(null==n||!(n>=n))||(t<n?-1:t>n?1:0)}function groupSort(t,n,e){return(2!==n.length?sort(rollup(t,n,e),(([t,n],[e,r])=>ascending(n,r)||ascending(t,e))):sort(group(t,e),(([t,e],[r,o])=>n(e,o)||ascending(t,r)))).map((([t])=>t))}var l=Array.prototype;var c=l.slice;l.map;function constant(t){return()=>t}const s=Math.sqrt(50),a=Math.sqrt(10),h=Math.sqrt(2);function tickSpec(t,n,e){const r=(n-t)/Math.max(0,e),o=Math.floor(Math.log10(r)),i=r/Math.pow(10,o),f=i>=s?10:i>=a?5:i>=h?2:1;let u,l,c;if(o<0){c=Math.pow(10,-o)/f;u=Math.round(t*c);l=Math.round(n*c);u/c<t&&++u;l/c>n&&--l;c=-c}else{c=Math.pow(10,o)*f;u=Math.round(t/c);l=Math.round(n/c);u*c<t&&++u;l*c>n&&--l}return l<u&&.5<=e&&e<2?tickSpec(t,n,2*e):[u,l,c]}function ticks(t,n,e){n=+n,t=+t,e=+e;if(!(e>0))return[];if(t===n)return[t];const r=n<t,[o,i,f]=r?tickSpec(n,t,e):tickSpec(t,n,e);if(!(i>=o))return[];const u=i-o+1,l=new Array(u);if(r)if(f<0)for(let t=0;t<u;++t)l[t]=(i-t)/-f;else for(let t=0;t<u;++t)l[t]=(i-t)*f;else if(f<0)for(let t=0;t<u;++t)l[t]=(o+t)/-f;else for(let t=0;t<u;++t)l[t]=(o+t)*f;return l}function tickIncrement(t,n,e){n=+n,t=+t,e=+e;return tickSpec(t,n,e)[2]}function tickStep(t,n,e){n=+n,t=+t,e=+e;const r=n<t,o=r?tickIncrement(n,t,e):tickIncrement(t,n,e);return(r?-1:1)*(o<0?1/-o:o)}function nice(t,n,e){let r;while(true){const o=tickIncrement(t,n,e);if(o===r||0===o||!isFinite(o))return[t,n];if(o>0){t=Math.floor(t/o)*o;n=Math.ceil(n/o)*o}else if(o<0){t=Math.ceil(t*o)/o;n=Math.floor(n*o)/o}r=o}}function thresholdSturges(t){return Math.max(1,Math.ceil(Math.log(count(t))/Math.LN2)+1)}function bin(){var t=identity,n=extent,e=thresholdSturges;function histogram(o){Array.isArray(o)||(o=Array.from(o));var i,f,u,l=o.length,c=new Array(l);for(i=0;i<l;++i)c[i]=t(o[i],i,o);var s=n(c),a=s[0],h=s[1],d=e(c,a,h);if(!Array.isArray(d)){const t=h,e=+d;n===extent&&([a,h]=nice(a,h,e));d=ticks(a,h,e);d[0]<=a&&(u=tickIncrement(a,h,e));if(d[d.length-1]>=h)if(t>=h&&n===extent){const t=tickIncrement(a,h,e);isFinite(t)&&(t>0?h=(Math.floor(h/t)+1)*t:t<0&&(h=(Math.ceil(h*-t)+1)/-t))}else d.pop()}var m=d.length,p=0,g=m;while(d[p]<=a)++p;while(d[g-1]>h)--g;(p||g<m)&&(d=d.slice(p,g),m=g-p);var y,w=new Array(m+1);for(i=0;i<=m;++i){y=w[i]=[];y.x0=i>0?d[i-1]:a;y.x1=i<m?d[i]:h}if(isFinite(u)){if(u>0)for(i=0;i<l;++i)null!=(f=c[i])&&a<=f&&f<=h&&w[Math.min(m,Math.floor((f-a)/u))].push(o[i]);else if(u<0)for(i=0;i<l;++i)if(null!=(f=c[i])&&a<=f&&f<=h){const t=Math.floor((a-f)*u);w[Math.min(m,t+(d[t]<=f))].push(o[i])}}else for(i=0;i<l;++i)null!=(f=c[i])&&a<=f&&f<=h&&w[r(d,f,0,m)].push(o[i]);return w}histogram.value=function(n){return arguments.length?(t="function"===typeof n?n:constant(n),histogram):t};histogram.domain=function(t){return arguments.length?(n="function"===typeof t?t:constant([t[0],t[1]]),histogram):n};histogram.thresholds=function(t){return arguments.length?(e="function"===typeof t?t:constant(Array.isArray(t)?c.call(t):t),histogram):e};return histogram}function max(t,n){let e;if(void 0===n)for(const n of t)null!=n&&(e<n||void 0===e&&n>=n)&&(e=n);else{let r=-1;for(let o of t)null!=(o=n(o,++r,t))&&(e<o||void 0===e&&o>=o)&&(e=o)}return e}function maxIndex(t,n){let e;let r=-1;let o=-1;if(void 0===n)for(const n of t){++o;null!=n&&(e<n||void 0===e&&n>=n)&&(e=n,r=o)}else for(let i of t)null!=(i=n(i,++o,t))&&(e<i||void 0===e&&i>=i)&&(e=i,r=o);return r}function min(t,n){let e;if(void 0===n)for(const n of t)null!=n&&(e>n||void 0===e&&n>=n)&&(e=n);else{let r=-1;for(let o of t)null!=(o=n(o,++r,t))&&(e>o||void 0===e&&o>=o)&&(e=o)}return e}function minIndex(t,n){let e;let r=-1;let o=-1;if(void 0===n)for(const n of t){++o;null!=n&&(e>n||void 0===e&&n>=n)&&(e=n,r=o)}else for(let i of t)null!=(i=n(i,++o,t))&&(e>i||void 0===e&&i>=i)&&(e=i,r=o);return r}function quickselect(t,n,e=0,r=Infinity,o){n=Math.floor(n);e=Math.floor(Math.max(0,e));r=Math.floor(Math.min(t.length-1,r));if(!(e<=n&&n<=r))return t;o=void 0===o?ascendingDefined:compareDefined(o);while(r>e){if(r-e>600){const i=r-e+1;const f=n-e+1;const u=Math.log(i);const l=.5*Math.exp(2*u/3);const c=.5*Math.sqrt(u*l*(i-l)/i)*(f-i/2<0?-1:1);const s=Math.max(e,Math.floor(n-f*l/i+c));const a=Math.min(r,Math.floor(n+(i-f)*l/i+c));quickselect(t,n,s,a,o)}const i=t[n];let f=e;let u=r;swap(t,e,n);o(t[r],i)>0&&swap(t,e,r);while(f<u){swap(t,f,u),++f,--u;while(o(t[f],i)<0)++f;while(o(t[u],i)>0)--u}0===o(t[e],i)?swap(t,e,u):(++u,swap(t,u,r));u<=n&&(e=u+1);n<=u&&(r=u-1)}return t}function swap(t,n,e){const r=t[n];t[n]=t[e];t[e]=r}function greatest(t,n=ascending){let e;let r=false;if(1===n.length){let o;for(const i of t){const t=n(i);if(r?ascending(t,o)>0:0===ascending(t,t)){e=i;o=t;r=true}}}else for(const o of t)if(r?n(o,e)>0:0===n(o,o)){e=o;r=true}return e}function quantile(t,n,e){t=Float64Array.from(numbers(t,e));if((r=t.length)&&!isNaN(n=+n)){if(n<=0||r<2)return min(t);if(n>=1)return max(t);var r,o=(r-1)*n,i=Math.floor(o),f=max(quickselect(t,i).subarray(0,i+1)),u=min(t.subarray(i+1));return f+(u-f)*(o-i)}}function quantileSorted(t,n,e=number){if((r=t.length)&&!isNaN(n=+n)){if(n<=0||r<2)return+e(t[0],0,t);if(n>=1)return+e(t[r-1],r-1,t);var r,o=(r-1)*n,i=Math.floor(o),f=+e(t[i],i,t),u=+e(t[i+1],i+1,t);return f+(u-f)*(o-i)}}function quantileIndex(t,n,e=number){if(!isNaN(n=+n)){r=Float64Array.from(t,((n,r)=>number(e(t[r],r,t))));if(n<=0)return minIndex(r);if(n>=1)return maxIndex(r);var r,o=Uint32Array.from(t,((t,n)=>n)),i=r.length-1,f=Math.floor(i*n);quickselect(o,f,0,i,((t,n)=>ascendingDefined(r[t],r[n])));f=greatest(o.subarray(0,f+1),(t=>r[t]));return f>=0?f:-1}}function thresholdFreedmanDiaconis(t,n,e){const r=count(t),o=quantile(t,.75)-quantile(t,.25);return r&&o?Math.ceil((e-n)/(2*o*Math.pow(r,-1/3))):1}function thresholdScott(t,n,e){const r=count(t),o=deviation(t);return r&&o?Math.ceil((e-n)*Math.cbrt(r)/(3.49*o)):1}function mean(t,n){let e=0;let r=0;if(void 0===n)for(let n of t)null!=n&&(n=+n)>=n&&(++e,r+=n);else{let o=-1;for(let i of t)null!=(i=n(i,++o,t))&&(i=+i)>=i&&(++e,r+=i)}if(e)return r/e}function median(t,n){return quantile(t,.5,n)}function medianIndex(t,n){return quantileIndex(t,.5,n)}function*flatten(t){for(const n of t)yield*n}function merge(t){return Array.from(flatten(t))}function mode(n,e){const r=new t;if(void 0===e)for(let t of n)null!=t&&t>=t&&r.set(t,(r.get(t)||0)+1);else{let t=-1;for(let o of n)null!=(o=e(o,++t,n))&&o>=o&&r.set(o,(r.get(o)||0)+1)}let o;let i=0;for(const[t,n]of r)if(n>i){i=n;o=t}return o}function pairs(t,n=pair){const e=[];let r;let o=false;for(const i of t){o&&e.push(n(r,i));r=i;o=true}return e}function pair(t,n){return[t,n]}function range(t,n,e){t=+t,n=+n,e=(o=arguments.length)<2?(n=t,t=0,1):o<3?1:+e;var r=-1,o=0|Math.max(0,Math.ceil((n-t)/e)),i=new Array(o);while(++r<o)i[r]=t+r*e;return i}function rank(t,n=ascending){if("function"!==typeof t[Symbol.iterator])throw new TypeError("values is not iterable");let e=Array.from(t);const r=new Float64Array(e.length);2!==n.length&&(e=e.map(n),n=ascending);const compareIndex=(t,r)=>n(e[t],e[r]);let o,i;t=Uint32Array.from(e,((t,n)=>n));t.sort(n===ascending?(t,n)=>ascendingDefined(e[t],e[n]):compareDefined(compareIndex));t.forEach(((t,n)=>{const e=compareIndex(t,void 0===o?t:o);if(e>=0){(void 0===o||e>0)&&(o=t,i=n);r[t]=i}else r[t]=NaN}));return r}function least(t,n=ascending){let e;let r=false;if(1===n.length){let o;for(const i of t){const t=n(i);if(r?ascending(t,o)<0:0===ascending(t,t)){e=i;o=t;r=true}}}else for(const o of t)if(r?n(o,e)<0:0===n(o,o)){e=o;r=true}return e}function leastIndex(t,n=ascending){if(1===n.length)return minIndex(t,n);let e;let r=-1;let o=-1;for(const i of t){++o;if(r<0?0===n(i,i):n(i,e)<0){e=i;r=o}}return r}function greatestIndex(t,n=ascending){if(1===n.length)return maxIndex(t,n);let e;let r=-1;let o=-1;for(const i of t){++o;if(r<0?0===n(i,i):n(i,e)>0){e=i;r=o}}return r}function scan(t,n){const e=leastIndex(t,n);return e<0?void 0:e}var d=shuffler(Math.random);function shuffler(t){return function shuffle(n,e=0,r=n.length){let o=r-(e=+e);while(o){const r=t()*o--|0,i=n[o+e];n[o+e]=n[r+e];n[r+e]=i}return n}}function sum(t,n){let e=0;if(void 0===n)for(let n of t)(n=+n)&&(e+=n);else{let r=-1;for(let o of t)(o=+n(o,++r,t))&&(e+=o)}return e}function transpose(t){if(!(o=t.length))return[];for(var n=-1,e=min(t,length),r=new Array(e);++n<e;)for(var o,i=-1,f=r[n]=new Array(o);++i<o;)f[i]=t[i][n];return r}function length(t){return t.length}function zip(){return transpose(arguments)}function every(t,n){if("function"!==typeof n)throw new TypeError("test is not a function");let e=-1;for(const r of t)if(!n(r,++e,t))return false;return true}function some(t,n){if("function"!==typeof n)throw new TypeError("test is not a function");let e=-1;for(const r of t)if(n(r,++e,t))return true;return false}function filter(t,n){if("function"!==typeof n)throw new TypeError("test is not a function");const e=[];let r=-1;for(const o of t)n(o,++r,t)&&e.push(o);return e}function map(t,n){if("function"!==typeof t[Symbol.iterator])throw new TypeError("values is not iterable");if("function"!==typeof n)throw new TypeError("mapper is not a function");return Array.from(t,((e,r)=>n(e,r,t)))}function reduce(t,n,e){if("function"!==typeof n)throw new TypeError("reducer is not a function");const r=t[Symbol.iterator]();let o,i,f=-1;if(arguments.length<3){({done:o,value:e}=r.next());if(o)return;++f}while(({done:o,value:i}=r.next()),!o)e=n(e,i,++f,t);return e}function reverse(t){if("function"!==typeof t[Symbol.iterator])throw new TypeError("values is not iterable");return Array.from(t).reverse()}function difference(t,...e){t=new n(t);for(const n of e)for(const e of n)t.delete(e);return t}function disjoint(t,e){const r=e[Symbol.iterator](),o=new n;for(const n of t){if(o.has(n))return false;let t,e;while(({value:t,done:e}=r.next())){if(e)break;if(Object.is(n,t))return false;o.add(t)}}return true}function intersection(t,...e){t=new n(t);e=e.map(set);t:for(const n of t)for(const r of e)if(!r.has(n)){t.delete(n);continue t}return t}function set(t){return t instanceof n?t:new n(t)}function superset(t,n){const e=t[Symbol.iterator](),r=new Set;for(const t of n){const n=intern(t);if(r.has(n))continue;let o,i;while(({value:o,done:i}=e.next())){if(i)return false;const t=intern(o);r.add(t);if(Object.is(n,t))break}}return true}function intern(t){return null!==t&&"object"===typeof t?t.valueOf():t}function subset(t,n){return superset(n,t)}function union(...t){const e=new n;for(const n of t)for(const t of n)e.add(t);return e}export{Adder,ascending,bin,r as bisect,i as bisectCenter,o as bisectLeft,r as bisectRight,bisector,blur,f as blur2,u as blurImage,count,cross,cumsum,descending,deviation,difference,disjoint,every,extent,fcumsum,filter,flatGroup,flatRollup,fsum,greatest,greatestIndex,group,groupSort,groups,bin as histogram,index,indexes,intersection,least,leastIndex,map,max,maxIndex,mean,median,medianIndex,merge,min,minIndex,mode,nice,pairs,permute,quantile,quantileIndex,quantileSorted,quickselect,range,rank,reduce,reverse,rollup,rollups,scan,d as shuffle,shuffler,some,sort,subset,sum,superset,thresholdFreedmanDiaconis,thresholdScott,thresholdSturges,tickIncrement,tickStep,ticks,transpose,union,variance,zip};
 
diff --git a/vendor/javascript/d3-axis.js b/vendor/javascript/d3-axis.js
index b8621a79..b541237b 100644
--- a/vendor/javascript/d3-axis.js
+++ b/vendor/javascript/d3-axis.js
@@ -1,2 +1,4 @@
+// d3-axis@3.0.0 downloaded from https://ga.jspm.io/npm:d3-axis@3.0.0/src/index.js
+
 function identity(t){return t}var t=1,n=2,r=3,i=4,e=1e-6;function translateX(t){return"translate("+t+",0)"}function translateY(t){return"translate(0,"+t+")"}function number(t){return n=>+t(n)}function center(t,n){n=Math.max(0,t.bandwidth()-2*n)/2;t.round()&&(n=Math.round(n));return r=>+t(r)+n}function entering(){return!this.__axis}function axis(a,s){var o=[],u=null,c=null,l=6,x=6,f=3,d="undefined"!==typeof window&&window.devicePixelRatio>1?0:.5,m=a===t||a===i?-1:1,h=a===i||a===n?"x":"y",g=a===t||a===r?translateX:translateY;function axis(p){var k=null==u?s.ticks?s.ticks.apply(s,o):s.domain():u,y=null==c?s.tickFormat?s.tickFormat.apply(s,o):identity:c,A=Math.max(l,0)+f,M=s.range(),v=+M[0]+d,w=+M[M.length-1]+d,_=(s.bandwidth?center:number)(s.copy(),d),b=p.selection?p.selection():p,F=b.selectAll(".domain").data([null]),V=b.selectAll(".tick").data(k,s).order(),z=V.exit(),H=V.enter().append("g").attr("class","tick"),C=V.select("line"),R=V.select("text");F=F.merge(F.enter().insert("path",".tick").attr("class","domain").attr("stroke","currentColor"));V=V.merge(H);C=C.merge(H.append("line").attr("stroke","currentColor").attr(h+"2",m*l));R=R.merge(H.append("text").attr("fill","currentColor").attr(h,m*A).attr("dy",a===t?"0em":a===r?"0.71em":"0.32em"));if(p!==b){F=F.transition(p);V=V.transition(p);C=C.transition(p);R=R.transition(p);z=z.transition(p).attr("opacity",e).attr("transform",(function(t){return isFinite(t=_(t))?g(t+d):this.getAttribute("transform")}));H.attr("opacity",e).attr("transform",(function(t){var n=this.parentNode.__axis;return g((n&&isFinite(n=n(t))?n:_(t))+d)}))}z.remove();F.attr("d",a===i||a===n?x?"M"+m*x+","+v+"H"+d+"V"+w+"H"+m*x:"M"+d+","+v+"V"+w:x?"M"+v+","+m*x+"V"+d+"H"+w+"V"+m*x:"M"+v+","+d+"H"+w);V.attr("opacity",1).attr("transform",(function(t){return g(_(t)+d)}));C.attr(h+"2",m*l);R.attr(h,m*A).text(y);b.filter(entering).attr("fill","none").attr("font-size",10).attr("font-family","sans-serif").attr("text-anchor",a===n?"start":a===i?"end":"middle");b.each((function(){this.__axis=_}))}axis.scale=function(t){return arguments.length?(s=t,axis):s};axis.ticks=function(){return o=Array.from(arguments),axis};axis.tickArguments=function(t){return arguments.length?(o=null==t?[]:Array.from(t),axis):o.slice()};axis.tickValues=function(t){return arguments.length?(u=null==t?null:Array.from(t),axis):u&&u.slice()};axis.tickFormat=function(t){return arguments.length?(c=t,axis):c};axis.tickSize=function(t){return arguments.length?(l=x=+t,axis):l};axis.tickSizeInner=function(t){return arguments.length?(l=+t,axis):l};axis.tickSizeOuter=function(t){return arguments.length?(x=+t,axis):x};axis.tickPadding=function(t){return arguments.length?(f=+t,axis):f};axis.offset=function(t){return arguments.length?(d=+t,axis):d};return axis}function axisTop(n){return axis(t,n)}function axisRight(t){return axis(n,t)}function axisBottom(t){return axis(r,t)}function axisLeft(t){return axis(i,t)}export{axisBottom,axisLeft,axisRight,axisTop};
 
diff --git a/vendor/javascript/d3-brush.js b/vendor/javascript/d3-brush.js
index 53cbc53a..d1270ace 100644
--- a/vendor/javascript/d3-brush.js
+++ b/vendor/javascript/d3-brush.js
@@ -1,2 +1,4 @@
+// d3-brush@3.0.0 downloaded from https://ga.jspm.io/npm:d3-brush@3.0.0/src/index.js
+
 import{dispatch as e}from"d3-dispatch";import{dragDisable as t,dragEnable as n}from"d3-drag";import{interpolate as r}from"d3-interpolate";import{select as u,pointer as i}from"d3-selection";import{interrupt as s}from"d3-transition";var constant=e=>()=>e;function BrushEvent(e,{sourceEvent:t,target:n,selection:r,mode:u,dispatch:i}){Object.defineProperties(this,{type:{value:e,enumerable:true,configurable:true},sourceEvent:{value:t,enumerable:true,configurable:true},target:{value:n,enumerable:true,configurable:true},selection:{value:r,enumerable:true,configurable:true},mode:{value:u,enumerable:true,configurable:true},_:{value:i}})}function nopropagation(e){e.stopImmediatePropagation()}function noevent(e){e.preventDefault();e.stopImmediatePropagation()}var o={name:"drag"},a={name:"space"},l={name:"handle"},c={name:"center"};const{abs:h,max:f,min:d}=Math;function number1(e){return[+e[0],+e[1]]}function number2(e){return[number1(e[0]),number1(e[1])]}var b={name:"x",handles:["w","e"].map(type),input:function(e,t){return null==e?null:[[+e[0],t[0][1]],[+e[1],t[1][1]]]},output:function(e){return e&&[e[0][0],e[1][0]]}};var p={name:"y",handles:["n","s"].map(type),input:function(e,t){return null==e?null:[[t[0][0],+e[0]],[t[1][0],+e[1]]]},output:function(e){return e&&[e[0][1],e[1][1]]}};var m={name:"xy",handles:["n","w","e","s","nw","ne","sw","se"].map(type),input:function(e){return null==e?null:number2(e)},output:function(e){return e}};var v={overlay:"crosshair",selection:"move",n:"ns-resize",e:"ew-resize",s:"ns-resize",w:"ew-resize",nw:"nwse-resize",ne:"nesw-resize",se:"nwse-resize",sw:"nesw-resize"};var y={e:"w",w:"e",nw:"ne",ne:"nw",se:"sw",sw:"se"};var w={n:"s",s:"n",nw:"sw",ne:"se",se:"ne",sw:"nw"};var g={overlay:1,selection:1,n:null,e:1,s:null,w:-1,nw:-1,ne:1,se:1,sw:-1};var _={overlay:1,selection:1,n:-1,e:null,s:1,w:null,nw:-1,ne:-1,se:1,sw:1};function type(e){return{type:e}}function defaultFilter(e){return!e.ctrlKey&&!e.button}function defaultExtent(){var e=this.ownerSVGElement||this;if(e.hasAttribute("viewBox")){e=e.viewBox.baseVal;return[[e.x,e.y],[e.x+e.width,e.y+e.height]]}return[[0,0],[e.width.baseVal.value,e.height.baseVal.value]]}function defaultTouchable(){return navigator.maxTouchPoints||"ontouchstart"in this}function local(e){while(!e.__brush)if(!(e=e.parentNode))return;return e.__brush}function empty(e){return e[0][0]===e[1][0]||e[0][1]===e[1][1]}function brushSelection(e){var t=e.__brush;return t?t.dim.output(t.selection):null}function brushX(){return brush$1(b)}function brushY(){return brush$1(p)}function brush(){return brush$1(m)}function brush$1(m){var k,x=defaultExtent,E=defaultFilter,z=defaultTouchable,A=true,T=e("start","brush","end"),K=6;function brush(e){var t=e.property("__brush",initialize).selectAll(".overlay").data([type("overlay")]);t.enter().append("rect").attr("class","overlay").attr("pointer-events","all").attr("cursor",v.overlay).merge(t).each((function(){var e=local(this).extent;u(this).attr("x",e[0][0]).attr("y",e[0][1]).attr("width",e[1][0]-e[0][0]).attr("height",e[1][1]-e[0][1])}));e.selectAll(".selection").data([type("selection")]).enter().append("rect").attr("class","selection").attr("cursor",v.selection).attr("fill","#777").attr("fill-opacity",.3).attr("stroke","#fff").attr("shape-rendering","crispEdges");var n=e.selectAll(".handle").data(m.handles,(function(e){return e.type}));n.exit().remove();n.enter().append("rect").attr("class",(function(e){return"handle handle--"+e.type})).attr("cursor",(function(e){return v[e.type]}));e.each(redraw).attr("fill","none").attr("pointer-events","all").on("mousedown.brush",started).filter(z).on("touchstart.brush",started).on("touchmove.brush",touchmoved).on("touchend.brush touchcancel.brush",touchended).style("touch-action","none").style("-webkit-tap-highlight-color","rgba(0,0,0,0)")}brush.move=function(e,t,n){e.tween?e.on("start.brush",(function(e){emitter(this,arguments).beforestart().start(e)})).on("interrupt.brush end.brush",(function(e){emitter(this,arguments).end(e)})).tween("brush",(function(){var e=this,n=e.__brush,u=emitter(e,arguments),i=n.selection,s=m.input("function"===typeof t?t.apply(this,arguments):t,n.extent),o=r(i,s);function tween(t){n.selection=1===t&&null===s?null:o(t);redraw.call(e);u.brush()}return null!==i&&null!==s?tween:tween(1)})):e.each((function(){var e=this,r=arguments,u=e.__brush,i=m.input("function"===typeof t?t.apply(e,r):t,u.extent),o=emitter(e,r).beforestart();s(e);u.selection=null===i?null:i;redraw.call(e);o.start(n).brush(n).end(n)}))};brush.clear=function(e,t){brush.move(e,null,t)};function redraw(){var e=u(this),t=local(this).selection;if(t){e.selectAll(".selection").style("display",null).attr("x",t[0][0]).attr("y",t[0][1]).attr("width",t[1][0]-t[0][0]).attr("height",t[1][1]-t[0][1]);e.selectAll(".handle").style("display",null).attr("x",(function(e){return"e"===e.type[e.type.length-1]?t[1][0]-K/2:t[0][0]-K/2})).attr("y",(function(e){return"s"===e.type[0]?t[1][1]-K/2:t[0][1]-K/2})).attr("width",(function(e){return"n"===e.type||"s"===e.type?t[1][0]-t[0][0]+K:K})).attr("height",(function(e){return"e"===e.type||"w"===e.type?t[1][1]-t[0][1]+K:K}))}else e.selectAll(".selection,.handle").style("display","none").attr("x",null).attr("y",null).attr("width",null).attr("height",null)}function emitter(e,t,n){var r=e.__brush.emitter;return!r||n&&r.clean?new Emitter(e,t,n):r}function Emitter(e,t,n){this.that=e;this.args=t;this.state=e.__brush;this.active=0;this.clean=n}Emitter.prototype={beforestart:function(){1===++this.active&&(this.state.emitter=this,this.starting=true);return this},start:function(e,t){this.starting?(this.starting=false,this.emit("start",e,t)):this.emit("brush",e);return this},brush:function(e,t){this.emit("brush",e,t);return this},end:function(e,t){0===--this.active&&(delete this.state.emitter,this.emit("end",e,t));return this},emit:function(e,t,n){var r=u(this.that).datum();T.call(e,this.that,new BrushEvent(e,{sourceEvent:t,target:brush,selection:m.output(this.state.selection),mode:n,dispatch:T}),r)}};function started(e){if((!k||e.touches)&&E.apply(this,arguments)){var r,x,z,T,K,B,P,S,V,$,C,F=this,I=e.target.__data__.type,M="selection"===(A&&e.metaKey?I="overlay":I)?o:A&&e.altKey?c:l,X=m===p?null:g[I],Y=m===b?null:_[I],j=local(F),D=j.extent,G=j.selection,N=D[0][0],O=D[0][1],q=D[1][0],H=D[1][1],J=0,L=0,Q=X&&Y&&A&&e.shiftKey,R=Array.from(e.touches||[e],(e=>{const t=e.identifier;e=i(e,F);e.point0=e.slice();e.identifier=t;return e}));s(F);var U=emitter(F,arguments,true).beforestart();if("overlay"===I){G&&(V=true);const t=[R[0],R[1]||R[0]];j.selection=G=[[r=m===p?N:d(t[0][0],t[1][0]),z=m===b?O:d(t[0][1],t[1][1])],[K=m===p?q:f(t[0][0],t[1][0]),P=m===b?H:f(t[0][1],t[1][1])]];R.length>1&&move(e)}else{r=G[0][0];z=G[0][1];K=G[1][0];P=G[1][1]}x=r;T=z;B=K;S=P;var W=u(F).attr("pointer-events","none");var Z=W.selectAll(".overlay").attr("cursor",v[I]);if(e.touches){U.moved=moved;U.ended=ended}else{var ee=u(e.view).on("mousemove.brush",moved,true).on("mouseup.brush",ended,true);A&&ee.on("keydown.brush",keydowned,true).on("keyup.brush",keyupped,true);t(e.view)}redraw.call(F);U.start(e,M.name)}function moved(e){for(const t of e.changedTouches||[e])for(const e of R)e.identifier===t.identifier&&(e.cur=i(t,F));if(Q&&!$&&!C&&1===R.length){const e=R[0];h(e.cur[0]-e[0])>h(e.cur[1]-e[1])?C=true:$=true}for(const e of R)e.cur&&(e[0]=e.cur[0],e[1]=e.cur[1]);V=true;noevent(e);move(e)}function move(e){const t=R[0],n=t.point0;var u;J=t[0]-n[0];L=t[1]-n[1];switch(M){case a:case o:X&&(J=f(N-r,d(q-K,J)),x=r+J,B=K+J);Y&&(L=f(O-z,d(H-P,L)),T=z+L,S=P+L);break;case l:if(R[1]){X&&(x=f(N,d(q,R[0][0])),B=f(N,d(q,R[1][0])),X=1);Y&&(T=f(O,d(H,R[0][1])),S=f(O,d(H,R[1][1])),Y=1)}else{X<0?(J=f(N-r,d(q-r,J)),x=r+J,B=K):X>0&&(J=f(N-K,d(q-K,J)),x=r,B=K+J);Y<0?(L=f(O-z,d(H-z,L)),T=z+L,S=P):Y>0&&(L=f(O-P,d(H-P,L)),T=z,S=P+L)}break;case c:X&&(x=f(N,d(q,r-J*X)),B=f(N,d(q,K+J*X)));Y&&(T=f(O,d(H,z-L*Y)),S=f(O,d(H,P+L*Y)));break}if(B<x){X*=-1;u=r,r=K,K=u;u=x,x=B,B=u;I in y&&Z.attr("cursor",v[I=y[I]])}if(S<T){Y*=-1;u=z,z=P,P=u;u=T,T=S,S=u;I in w&&Z.attr("cursor",v[I=w[I]])}j.selection&&(G=j.selection);$&&(x=G[0][0],B=G[1][0]);C&&(T=G[0][1],S=G[1][1]);if(G[0][0]!==x||G[0][1]!==T||G[1][0]!==B||G[1][1]!==S){j.selection=[[x,T],[B,S]];redraw.call(F);U.brush(e,M.name)}}function ended(e){nopropagation(e);if(e.touches){if(e.touches.length)return;k&&clearTimeout(k);k=setTimeout((function(){k=null}),500)}else{n(e.view,V);ee.on("keydown.brush keyup.brush mousemove.brush mouseup.brush",null)}W.attr("pointer-events","all");Z.attr("cursor",v.overlay);j.selection&&(G=j.selection);empty(G)&&(j.selection=null,redraw.call(F));U.end(e,M.name)}function keydowned(e){switch(e.keyCode){case 16:Q=X&&Y;break;case 18:if(M===l){X&&(K=B-J*X,r=x+J*X);Y&&(P=S-L*Y,z=T+L*Y);M=c;move(e)}break;case 32:if(M===l||M===c){X<0?K=B-J:X>0&&(r=x-J);Y<0?P=S-L:Y>0&&(z=T-L);M=a;Z.attr("cursor",v.selection);move(e)}break;default:return}noevent(e)}function keyupped(e){switch(e.keyCode){case 16:if(Q){$=C=Q=false;move(e)}break;case 18:if(M===c){X<0?K=B:X>0&&(r=x);Y<0?P=S:Y>0&&(z=T);M=l;move(e)}break;case 32:if(M===a){if(e.altKey){X&&(K=B-J*X,r=x+J*X);Y&&(P=S-L*Y,z=T+L*Y);M=c}else{X<0?K=B:X>0&&(r=x);Y<0?P=S:Y>0&&(z=T);M=l}Z.attr("cursor",v[I]);move(e)}break;default:return}noevent(e)}}function touchmoved(e){emitter(this,arguments).moved(e)}function touchended(e){emitter(this,arguments).ended(e)}function initialize(){var e=this.__brush||{selection:null};e.extent=number2(x.apply(this,arguments));e.dim=m;return e}brush.extent=function(e){return arguments.length?(x="function"===typeof e?e:constant(number2(e)),brush):x};brush.filter=function(e){return arguments.length?(E="function"===typeof e?e:constant(!!e),brush):E};brush.touchable=function(e){return arguments.length?(z="function"===typeof e?e:constant(!!e),brush):z};brush.handleSize=function(e){return arguments.length?(K=+e,brush):K};brush.keyModifiers=function(e){return arguments.length?(A=!!e,brush):A};brush.on=function(){var e=T.on.apply(T,arguments);return e===T?brush:e};return brush}export{brush,brushSelection,brushX,brushY};
 
diff --git a/vendor/javascript/d3-chord.js b/vendor/javascript/d3-chord.js
index ae586d74..8b0c622c 100644
--- a/vendor/javascript/d3-chord.js
+++ b/vendor/javascript/d3-chord.js
@@ -1,2 +1,4 @@
+// d3-chord@3.0.1 downloaded from https://ga.jspm.io/npm:d3-chord@3.0.1/src/index.js
+
 import{path as n}from"d3-path";var r=Math.abs;var t=Math.cos;var e=Math.sin;var o=Math.PI;var u=o/2;var a=2*o;var l=Math.max;var i=1e-12;function range(n,r){return Array.from({length:r-n},((r,t)=>n+t))}function compareValue(n){return function(r,t){return n(r.source.value+r.target.value,t.source.value+t.target.value)}}function chord(){return chord$1(false,false)}function chordTranspose(){return chord$1(false,true)}function chordDirected(){return chord$1(true,false)}function chord$1(n,r){var t=0,e=null,o=null,u=null;function chord(i){var c,s=i.length,f=new Array(s),d=range(0,s),g=new Array(s*s),b=new Array(s),h=0;i=Float64Array.from({length:s*s},r?(n,r)=>i[r%s][r/s|0]:(n,r)=>i[r/s|0][r%s]);for(let r=0;r<s;++r){let t=0;for(let e=0;e<s;++e)t+=i[r*s+e]+n*i[e*s+r];h+=f[r]=t}h=l(0,a-t*s)/h;c=h?t:a/s;{let r=0;e&&d.sort(((n,r)=>e(f[n],f[r])));for(const t of d){const e=r;if(n){const n=range(1+~s,s).filter((n=>n<0?i[~n*s+t]:i[t*s+n]));o&&n.sort(((n,r)=>o(n<0?-i[~n*s+t]:i[t*s+n],r<0?-i[~r*s+t]:i[t*s+r])));for(const e of n)if(e<0){const n=g[~e*s+t]||(g[~e*s+t]={source:null,target:null});n.target={index:t,startAngle:r,endAngle:r+=i[~e*s+t]*h,value:i[~e*s+t]}}else{const n=g[t*s+e]||(g[t*s+e]={source:null,target:null});n.source={index:t,startAngle:r,endAngle:r+=i[t*s+e]*h,value:i[t*s+e]}}b[t]={index:t,startAngle:e,endAngle:r,value:f[t]}}else{const n=range(0,s).filter((n=>i[t*s+n]||i[n*s+t]));o&&n.sort(((n,r)=>o(i[t*s+n],i[t*s+r])));for(const e of n){let n;if(t<e){n=g[t*s+e]||(g[t*s+e]={source:null,target:null});n.source={index:t,startAngle:r,endAngle:r+=i[t*s+e]*h,value:i[t*s+e]}}else{n=g[e*s+t]||(g[e*s+t]={source:null,target:null});n.target={index:t,startAngle:r,endAngle:r+=i[t*s+e]*h,value:i[t*s+e]};t===e&&(n.source=n.target)}if(n.source&&n.target&&n.source.value<n.target.value){const r=n.source;n.source=n.target;n.target=r}}b[t]={index:t,startAngle:e,endAngle:r,value:f[t]}}r+=c}}g=Object.values(g);g.groups=b;return u?g.sort(u):g}chord.padAngle=function(n){return arguments.length?(t=l(0,n),chord):t};chord.sortGroups=function(n){return arguments.length?(e=n,chord):e};chord.sortSubgroups=function(n){return arguments.length?(o=n,chord):o};chord.sortChords=function(n){return arguments.length?(null==n?u=null:(u=compareValue(n))._=n,chord):u&&u._};return chord}var c=Array.prototype.slice;function constant(n){return function(){return n}}function defaultSource(n){return n.source}function defaultTarget(n){return n.target}function defaultRadius(n){return n.radius}function defaultStartAngle(n){return n.startAngle}function defaultEndAngle(n){return n.endAngle}function defaultPadAngle(){return 0}function defaultArrowheadRadius(){return 10}function ribbon(o){var a=defaultSource,l=defaultTarget,s=defaultRadius,f=defaultRadius,d=defaultStartAngle,g=defaultEndAngle,b=defaultPadAngle,h=null;function ribbon(){var p,A=a.apply(this,arguments),v=l.apply(this,arguments),y=b.apply(this,arguments)/2,T=c.call(arguments),x=+s.apply(this,(T[0]=A,T)),m=d.apply(this,T)-u,R=g.apply(this,T)-u,w=+f.apply(this,(T[0]=v,T)),$=d.apply(this,T)-u,M=g.apply(this,T)-u;h||(h=p=n());if(y>i){r(R-m)>2*y+i?R>m?(m+=y,R-=y):(m-=y,R+=y):m=R=(m+R)/2;r(M-$)>2*y+i?M>$?($+=y,M-=y):($-=y,M+=y):$=M=($+M)/2}h.moveTo(x*t(m),x*e(m));h.arc(0,0,x,m,R);if(m!==$||R!==M)if(o){var S=+o.apply(this,arguments),C=w-S,P=($+M)/2;h.quadraticCurveTo(0,0,C*t($),C*e($));h.lineTo(w*t(P),w*e(P));h.lineTo(C*t(M),C*e(M))}else{h.quadraticCurveTo(0,0,w*t($),w*e($));h.arc(0,0,w,$,M)}h.quadraticCurveTo(0,0,x*t(m),x*e(m));h.closePath();if(p)return h=null,p+""||null}o&&(ribbon.headRadius=function(n){return arguments.length?(o="function"===typeof n?n:constant(+n),ribbon):o});ribbon.radius=function(n){return arguments.length?(s=f="function"===typeof n?n:constant(+n),ribbon):s};ribbon.sourceRadius=function(n){return arguments.length?(s="function"===typeof n?n:constant(+n),ribbon):s};ribbon.targetRadius=function(n){return arguments.length?(f="function"===typeof n?n:constant(+n),ribbon):f};ribbon.startAngle=function(n){return arguments.length?(d="function"===typeof n?n:constant(+n),ribbon):d};ribbon.endAngle=function(n){return arguments.length?(g="function"===typeof n?n:constant(+n),ribbon):g};ribbon.padAngle=function(n){return arguments.length?(b="function"===typeof n?n:constant(+n),ribbon):b};ribbon.source=function(n){return arguments.length?(a=n,ribbon):a};ribbon.target=function(n){return arguments.length?(l=n,ribbon):l};ribbon.context=function(n){return arguments.length?(h=null==n?null:n,ribbon):h};return ribbon}function ribbon$1(){return ribbon()}function ribbonArrow(){return ribbon(defaultArrowheadRadius)}export{chord,chordDirected,chordTranspose,ribbon$1 as ribbon,ribbonArrow};
 
diff --git a/vendor/javascript/d3-color.js b/vendor/javascript/d3-color.js
index 16068986..a8f795fe 100644
--- a/vendor/javascript/d3-color.js
+++ b/vendor/javascript/d3-color.js
@@ -1,2 +1,4 @@
+// d3-color@3.1.0 downloaded from https://ga.jspm.io/npm:d3-color@3.1.0/src/index.js
+
 function define(t,e,r){t.prototype=e.prototype=r;r.constructor=t}function extend(t,e){var r=Object.create(t.prototype);for(var n in e)r[n]=e[n];return r}function Color(){}var t=.7;var e=1/t;var r="\\s*([+-]?\\d+)\\s*",n="\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)\\s*",i="\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)%\\s*",a=/^#([0-9a-f]{3,8})$/,l=new RegExp(`^rgb\\(${r},${r},${r}\\)$`),o=new RegExp(`^rgb\\(${i},${i},${i}\\)$`),h=new RegExp(`^rgba\\(${r},${r},${r},${n}\\)$`),s=new RegExp(`^rgba\\(${i},${i},${i},${n}\\)$`),c=new RegExp(`^hsl\\(${n},${i},${i}\\)$`),b=new RegExp(`^hsla\\(${n},${i},${i},${n}\\)$`);var u={aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,rebeccapurple:6697881,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074};define(Color,color,{copy(t){return Object.assign(new this.constructor,this,t)},displayable(){return this.rgb().displayable()},hex:color_formatHex,formatHex:color_formatHex,formatHex8:color_formatHex8,formatHsl:color_formatHsl,formatRgb:color_formatRgb,toString:color_formatRgb});function color_formatHex(){return this.rgb().formatHex()}function color_formatHex8(){return this.rgb().formatHex8()}function color_formatHsl(){return hslConvert(this).formatHsl()}function color_formatRgb(){return this.rgb().formatRgb()}function color(t){var e,r;t=(t+"").trim().toLowerCase();return(e=a.exec(t))?(r=e[1].length,e=parseInt(e[1],16),6===r?rgbn(e):3===r?new Rgb(e>>8&15|e>>4&240,e>>4&15|240&e,(15&e)<<4|15&e,1):8===r?rgba(e>>24&255,e>>16&255,e>>8&255,(255&e)/255):4===r?rgba(e>>12&15|e>>8&240,e>>8&15|e>>4&240,e>>4&15|240&e,((15&e)<<4|15&e)/255):null):(e=l.exec(t))?new Rgb(e[1],e[2],e[3],1):(e=o.exec(t))?new Rgb(255*e[1]/100,255*e[2]/100,255*e[3]/100,1):(e=h.exec(t))?rgba(e[1],e[2],e[3],e[4]):(e=s.exec(t))?rgba(255*e[1]/100,255*e[2]/100,255*e[3]/100,e[4]):(e=c.exec(t))?hsla(e[1],e[2]/100,e[3]/100,1):(e=b.exec(t))?hsla(e[1],e[2]/100,e[3]/100,e[4]):u.hasOwnProperty(t)?rgbn(u[t]):"transparent"===t?new Rgb(NaN,NaN,NaN,0):null}function rgbn(t){return new Rgb(t>>16&255,t>>8&255,255&t,1)}function rgba(t,e,r,n){n<=0&&(t=e=r=NaN);return new Rgb(t,e,r,n)}function rgbConvert(t){t instanceof Color||(t=color(t));if(!t)return new Rgb;t=t.rgb();return new Rgb(t.r,t.g,t.b,t.opacity)}function rgb(t,e,r,n){return 1===arguments.length?rgbConvert(t):new Rgb(t,e,r,null==n?1:n)}function Rgb(t,e,r,n){this.r=+t;this.g=+e;this.b=+r;this.opacity=+n}define(Rgb,rgb,extend(Color,{brighter(t){t=null==t?e:Math.pow(e,t);return new Rgb(this.r*t,this.g*t,this.b*t,this.opacity)},darker(e){e=null==e?t:Math.pow(t,e);return new Rgb(this.r*e,this.g*e,this.b*e,this.opacity)},rgb(){return this},clamp(){return new Rgb(clampi(this.r),clampi(this.g),clampi(this.b),clampa(this.opacity))},displayable(){return-.5<=this.r&&this.r<255.5&&-.5<=this.g&&this.g<255.5&&-.5<=this.b&&this.b<255.5&&0<=this.opacity&&this.opacity<=1},hex:rgb_formatHex,formatHex:rgb_formatHex,formatHex8:rgb_formatHex8,formatRgb:rgb_formatRgb,toString:rgb_formatRgb}));function rgb_formatHex(){return`#${hex(this.r)}${hex(this.g)}${hex(this.b)}`}function rgb_formatHex8(){return`#${hex(this.r)}${hex(this.g)}${hex(this.b)}${hex(255*(isNaN(this.opacity)?1:this.opacity))}`}function rgb_formatRgb(){const t=clampa(this.opacity);return`${1===t?"rgb(":"rgba("}${clampi(this.r)}, ${clampi(this.g)}, ${clampi(this.b)}${1===t?")":`, ${t})`}`}function clampa(t){return isNaN(t)?1:Math.max(0,Math.min(1,t))}function clampi(t){return Math.max(0,Math.min(255,Math.round(t)||0))}function hex(t){t=clampi(t);return(t<16?"0":"")+t.toString(16)}function hsla(t,e,r,n){n<=0?t=e=r=NaN:r<=0||r>=1?t=e=NaN:e<=0&&(t=NaN);return new Hsl(t,e,r,n)}function hslConvert(t){if(t instanceof Hsl)return new Hsl(t.h,t.s,t.l,t.opacity);t instanceof Color||(t=color(t));if(!t)return new Hsl;if(t instanceof Hsl)return t;t=t.rgb();var e=t.r/255,r=t.g/255,n=t.b/255,i=Math.min(e,r,n),a=Math.max(e,r,n),l=NaN,o=a-i,h=(a+i)/2;if(o){l=e===a?(r-n)/o+6*(r<n):r===a?(n-e)/o+2:(e-r)/o+4;o/=h<.5?a+i:2-a-i;l*=60}else o=h>0&&h<1?0:l;return new Hsl(l,o,h,t.opacity)}function hsl(t,e,r,n){return 1===arguments.length?hslConvert(t):new Hsl(t,e,r,null==n?1:n)}function Hsl(t,e,r,n){this.h=+t;this.s=+e;this.l=+r;this.opacity=+n}define(Hsl,hsl,extend(Color,{brighter(t){t=null==t?e:Math.pow(e,t);return new Hsl(this.h,this.s,this.l*t,this.opacity)},darker(e){e=null==e?t:Math.pow(t,e);return new Hsl(this.h,this.s,this.l*e,this.opacity)},rgb(){var t=this.h%360+360*(this.h<0),e=isNaN(t)||isNaN(this.s)?0:this.s,r=this.l,n=r+(r<.5?r:1-r)*e,i=2*r-n;return new Rgb(hsl2rgb(t>=240?t-240:t+120,i,n),hsl2rgb(t,i,n),hsl2rgb(t<120?t+240:t-120,i,n),this.opacity)},clamp(){return new Hsl(clamph(this.h),clampt(this.s),clampt(this.l),clampa(this.opacity))},displayable(){return(0<=this.s&&this.s<=1||isNaN(this.s))&&0<=this.l&&this.l<=1&&0<=this.opacity&&this.opacity<=1},formatHsl(){const t=clampa(this.opacity);return`${1===t?"hsl(":"hsla("}${clamph(this.h)}, ${100*clampt(this.s)}%, ${100*clampt(this.l)}%${1===t?")":`, ${t})`}`}}));function clamph(t){t=(t||0)%360;return t<0?t+360:t}function clampt(t){return Math.max(0,Math.min(1,t||0))}function hsl2rgb(t,e,r){return 255*(t<60?e+(r-e)*t/60:t<180?r:t<240?e+(r-e)*(240-t)/60:e)}const g=Math.PI/180;const p=180/Math.PI;const f=18,m=.96422,d=1,y=.82521,w=4/29,x=6/29,$=3*x*x,v=x*x*x;function labConvert(t){if(t instanceof Lab)return new Lab(t.l,t.a,t.b,t.opacity);if(t instanceof Hcl)return hcl2lab(t);t instanceof Rgb||(t=rgbConvert(t));var e,r,n=rgb2lrgb(t.r),i=rgb2lrgb(t.g),a=rgb2lrgb(t.b),l=xyz2lab((.2225045*n+.7168786*i+.0606169*a)/d);if(n===i&&i===a)e=r=l;else{e=xyz2lab((.4360747*n+.3850649*i+.1430804*a)/m);r=xyz2lab((.0139322*n+.0971045*i+.7141733*a)/y)}return new Lab(116*l-16,500*(e-l),200*(l-r),t.opacity)}function gray(t,e){return new Lab(t,0,0,null==e?1:e)}function lab(t,e,r,n){return 1===arguments.length?labConvert(t):new Lab(t,e,r,null==n?1:n)}function Lab(t,e,r,n){this.l=+t;this.a=+e;this.b=+r;this.opacity=+n}define(Lab,lab,extend(Color,{brighter(t){return new Lab(this.l+f*(null==t?1:t),this.a,this.b,this.opacity)},darker(t){return new Lab(this.l-f*(null==t?1:t),this.a,this.b,this.opacity)},rgb(){var t=(this.l+16)/116,e=isNaN(this.a)?t:t+this.a/500,r=isNaN(this.b)?t:t-this.b/200;e=m*lab2xyz(e);t=d*lab2xyz(t);r=y*lab2xyz(r);return new Rgb(lrgb2rgb(3.1338561*e-1.6168667*t-.4906146*r),lrgb2rgb(-.9787684*e+1.9161415*t+.033454*r),lrgb2rgb(.0719453*e-.2289914*t+1.4052427*r),this.opacity)}}));function xyz2lab(t){return t>v?Math.pow(t,1/3):t/$+w}function lab2xyz(t){return t>x?t*t*t:$*(t-w)}function lrgb2rgb(t){return 255*(t<=.0031308?12.92*t:1.055*Math.pow(t,1/2.4)-.055)}function rgb2lrgb(t){return(t/=255)<=.04045?t/12.92:Math.pow((t+.055)/1.055,2.4)}function hclConvert(t){if(t instanceof Hcl)return new Hcl(t.h,t.c,t.l,t.opacity);t instanceof Lab||(t=labConvert(t));if(0===t.a&&0===t.b)return new Hcl(NaN,0<t.l&&t.l<100?0:NaN,t.l,t.opacity);var e=Math.atan2(t.b,t.a)*p;return new Hcl(e<0?e+360:e,Math.sqrt(t.a*t.a+t.b*t.b),t.l,t.opacity)}function lch(t,e,r,n){return 1===arguments.length?hclConvert(t):new Hcl(r,e,t,null==n?1:n)}function hcl(t,e,r,n){return 1===arguments.length?hclConvert(t):new Hcl(t,e,r,null==n?1:n)}function Hcl(t,e,r,n){this.h=+t;this.c=+e;this.l=+r;this.opacity=+n}function hcl2lab(t){if(isNaN(t.h))return new Lab(t.l,0,0,t.opacity);var e=t.h*g;return new Lab(t.l,Math.cos(e)*t.c,Math.sin(e)*t.c,t.opacity)}define(Hcl,hcl,extend(Color,{brighter(t){return new Hcl(this.h,this.c,this.l+f*(null==t?1:t),this.opacity)},darker(t){return new Hcl(this.h,this.c,this.l-f*(null==t?1:t),this.opacity)},rgb(){return hcl2lab(this).rgb()}}));var H=-.14861,N=1.78277,k=-.29227,R=-.90649,C=1.97294,M=C*R,_=C*N,L=N*k-R*H;function cubehelixConvert(t){if(t instanceof Cubehelix)return new Cubehelix(t.h,t.s,t.l,t.opacity);t instanceof Rgb||(t=rgbConvert(t));var e=t.r/255,r=t.g/255,n=t.b/255,i=(L*n+M*e-_*r)/(L+M-_),a=n-i,l=(C*(r-i)-k*a)/R,o=Math.sqrt(l*l+a*a)/(C*i*(1-i)),h=o?Math.atan2(l,a)*p-120:NaN;return new Cubehelix(h<0?h+360:h,o,i,t.opacity)}function cubehelix(t,e,r,n){return 1===arguments.length?cubehelixConvert(t):new Cubehelix(t,e,r,null==n?1:n)}function Cubehelix(t,e,r,n){this.h=+t;this.s=+e;this.l=+r;this.opacity=+n}define(Cubehelix,cubehelix,extend(Color,{brighter(t){t=null==t?e:Math.pow(e,t);return new Cubehelix(this.h,this.s,this.l*t,this.opacity)},darker(e){e=null==e?t:Math.pow(t,e);return new Cubehelix(this.h,this.s,this.l*e,this.opacity)},rgb(){var t=isNaN(this.h)?0:(this.h+120)*g,e=+this.l,r=isNaN(this.s)?0:this.s*e*(1-e),n=Math.cos(t),i=Math.sin(t);return new Rgb(255*(e+r*(H*n+N*i)),255*(e+r*(k*n+R*i)),255*(e+r*(C*n)),this.opacity)}}));export{color,cubehelix,gray,hcl,hsl,lab,lch,rgb};
 
diff --git a/vendor/javascript/d3-contour.js b/vendor/javascript/d3-contour.js
index 7dac211a..86f209c1 100644
--- a/vendor/javascript/d3-contour.js
+++ b/vendor/javascript/d3-contour.js
@@ -1,2 +1,4 @@
+// d3-contour@4.0.2 downloaded from https://ga.jspm.io/npm:d3-contour@4.0.2/src/index.js
+
 import{thresholdSturges as n,extent as t,ticks as r,nice as o,blur2 as i,max as e}from"d3-array";var a=Array.prototype;var s=a.slice;function ascending(n,t){return n-t}function area(n){var t=0,r=n.length,o=n[r-1][1]*n[0][0]-n[r-1][0]*n[0][1];while(++t<r)o+=n[t-1][1]*n[t][0]-n[t-1][0]*n[t][1];return o}var constant=n=>()=>n;function contains(n,t){var r,o=-1,i=t.length;while(++o<i)if(r=ringContains(n,t[o]))return r;return 0}function ringContains(n,t){var r=t[0],o=t[1],i=-1;for(var e=0,a=n.length,s=a-1;e<a;s=e++){var u=n[e],f=u[0],c=u[1],h=n[s],l=h[0],d=h[1];if(segmentContains(u,h,t))return 0;c>o!==d>o&&r<(l-f)*(o-c)/(d-c)+f&&(i=-i)}return i}function segmentContains(n,t,r){var o;return collinear(n,t,r)&&within(n[o=+(n[0]===t[0])],r[o],t[o])}function collinear(n,t,r){return(t[0]-n[0])*(r[1]-n[1])===(r[0]-n[0])*(t[1]-n[1])}function within(n,t,r){return n<=t&&t<=r||r<=t&&t<=n}function noop(){}var u=[[],[[[1,1.5],[.5,1]]],[[[1.5,1],[1,1.5]]],[[[1.5,1],[.5,1]]],[[[1,.5],[1.5,1]]],[[[1,1.5],[.5,1]],[[1,.5],[1.5,1]]],[[[1,.5],[1,1.5]]],[[[1,.5],[.5,1]]],[[[.5,1],[1,.5]]],[[[1,1.5],[1,.5]]],[[[.5,1],[1,.5]],[[1.5,1],[1,1.5]]],[[[1.5,1],[1,.5]]],[[[.5,1],[1.5,1]]],[[[1,1.5],[1.5,1]]],[[[.5,1],[1,1.5]]],[]];function Contours(){var i=1,e=1,a=n,f=smoothLinear;function contours(n){var i=a(n);if(Array.isArray(i))i=i.slice().sort(ascending);else{const e=t(n,finite);i=r(...o(e[0],e[1],i),i);while(i[i.length-1]>=e[1])i.pop();while(i[1]<e[0])i.shift()}return i.map((t=>contour(n,t)))}function contour(n,t){const r=null==t?NaN:+t;if(isNaN(r))throw new Error(`invalid value: ${t}`);var o=[],i=[];isorings(n,r,(function(t){f(t,n,r);area(t)>0?o.push([t]):i.push(t)}));i.forEach((function(n){for(var t,r=0,i=o.length;r<i;++r)if(-1!==contains((t=o[r])[0],n)){t.push(n);return}}));return{type:"MultiPolygon",value:t,coordinates:o}}function isorings(n,t,r){var o,a,s,f,c,h,l=new Array,d=new Array;o=a=-1;f=above(n[0],t);u[f<<1].forEach(stitch);while(++o<i-1){s=f,f=above(n[o+1],t);u[s|f<<1].forEach(stitch)}u[f<<0].forEach(stitch);while(++a<e-1){o=-1;f=above(n[a*i+i],t);c=above(n[a*i],t);u[f<<1|c<<2].forEach(stitch);while(++o<i-1){s=f,f=above(n[a*i+i+o+1],t);h=c,c=above(n[a*i+o+1],t);u[s|f<<1|c<<2|h<<3].forEach(stitch)}u[f|c<<3].forEach(stitch)}o=-1;c=n[a*i]>=t;u[c<<2].forEach(stitch);while(++o<i-1){h=c,c=above(n[a*i+o+1],t);u[c<<2|h<<3].forEach(stitch)}u[c<<3].forEach(stitch);function stitch(n){var t,i,e=[n[0][0]+o,n[0][1]+a],s=[n[1][0]+o,n[1][1]+a],u=index(e),f=index(s);if(t=d[u])if(i=l[f]){delete d[t.end];delete l[i.start];if(t===i){t.ring.push(s);r(t.ring)}else l[t.start]=d[i.end]={start:t.start,end:i.end,ring:t.ring.concat(i.ring)}}else{delete d[t.end];t.ring.push(s);d[t.end=f]=t}else if(t=l[f])if(i=d[u]){delete l[t.start];delete d[i.end];if(t===i){t.ring.push(s);r(t.ring)}else l[i.start]=d[t.end]={start:i.start,end:t.end,ring:i.ring.concat(t.ring)}}else{delete l[t.start];t.ring.unshift(e);l[t.start=u]=t}else l[u]=d[f]={start:u,end:f,ring:[e,s]}}}function index(n){return 2*n[0]+n[1]*(i+1)*4}function smoothLinear(n,t,r){n.forEach((function(n){var o=n[0],a=n[1],s=0|o,u=0|a,f=valid(t[u*i+s]);o>0&&o<i&&s===o&&(n[0]=smooth1(o,valid(t[u*i+s-1]),f,r));a>0&&a<e&&u===a&&(n[1]=smooth1(a,valid(t[(u-1)*i+s]),f,r))}))}contours.contour=contour;contours.size=function(n){if(!arguments.length)return[i,e];var t=Math.floor(n[0]),r=Math.floor(n[1]);if(!(t>=0&&r>=0))throw new Error("invalid size");return i=t,e=r,contours};contours.thresholds=function(n){return arguments.length?(a="function"===typeof n?n:Array.isArray(n)?constant(s.call(n)):constant(n),contours):a};contours.smooth=function(n){return arguments.length?(f=n?smoothLinear:noop,contours):f===smoothLinear};return contours}function finite(n){return isFinite(n)?n:NaN}function above(n,t){return null!=n&&+n>=t}function valid(n){return null==n||isNaN(n=+n)?-Infinity:n}function smooth1(n,t,r,o){const i=o-t;const e=r-t;const a=isFinite(i)||isFinite(e)?i/e:Math.sign(i)/Math.sign(e);return isNaN(a)?n:n+a-.5}function defaultX(n){return n[0]}function defaultY(n){return n[1]}function defaultWeight(){return 1}function density(){var n=defaultX,t=defaultY,o=defaultWeight,a=960,u=500,f=20,c=2,h=3*f,l=a+2*h>>c,d=u+2*h>>c,g=constant(20);function grid(r){var e=new Float32Array(l*d),a=Math.pow(2,-c),s=-1;for(const i of r){var u=(n(i,++s,r)+h)*a,g=(t(i,s,r)+h)*a,v=+o(i,s,r);if(v&&u>=0&&u<l&&g>=0&&g<d){var y=Math.floor(u),w=Math.floor(g),p=u-y-.5,m=g-w-.5;e[y+w*l]+=(1-p)*(1-m)*v;e[y+1+w*l]+=p*(1-m)*v;e[y+1+(w+1)*l]+=p*m*v;e[y+(w+1)*l]+=(1-p)*m*v}}i({data:e,width:l,height:d},f*a);return e}function density(n){var t=grid(n),o=g(t),i=Math.pow(2,2*c);Array.isArray(o)||(o=r(Number.MIN_VALUE,e(t)/i,o));return Contours().size([l,d]).thresholds(o.map((n=>n*i)))(t).map(((n,t)=>(n.value=+o[t],transform(n))))}density.contours=function(n){var t=grid(n),r=Contours().size([l,d]),o=Math.pow(2,2*c),contour=n=>{n=+n;var i=transform(r.contour(t,n*o));i.value=n;return i};Object.defineProperty(contour,"max",{get:()=>e(t)/o});return contour};function transform(n){n.coordinates.forEach(transformPolygon);return n}function transformPolygon(n){n.forEach(transformRing)}function transformRing(n){n.forEach(transformPoint)}function transformPoint(n){n[0]=n[0]*Math.pow(2,c)-h;n[1]=n[1]*Math.pow(2,c)-h}function resize(){h=3*f;l=a+2*h>>c;d=u+2*h>>c;return density}density.x=function(t){return arguments.length?(n="function"===typeof t?t:constant(+t),density):n};density.y=function(n){return arguments.length?(t="function"===typeof n?n:constant(+n),density):t};density.weight=function(n){return arguments.length?(o="function"===typeof n?n:constant(+n),density):o};density.size=function(n){if(!arguments.length)return[a,u];var t=+n[0],r=+n[1];if(!(t>=0&&r>=0))throw new Error("invalid size");return a=t,u=r,resize()};density.cellSize=function(n){if(!arguments.length)return 1<<c;if(!((n=+n)>=1))throw new Error("invalid cell size");return c=Math.floor(Math.log(n)/Math.LN2),resize()};density.thresholds=function(n){return arguments.length?(g="function"===typeof n?n:Array.isArray(n)?constant(s.call(n)):constant(n),density):g};density.bandwidth=function(n){if(!arguments.length)return Math.sqrt(f*(f+1));if(!((n=+n)>=0))throw new Error("invalid bandwidth");return f=(Math.sqrt(4*n*n+1)-1)/2,resize()};return density}export{density as contourDensity,Contours as contours};
 
diff --git a/vendor/javascript/d3-delaunay.js b/vendor/javascript/d3-delaunay.js
index a9568a9e..7d9c7243 100644
--- a/vendor/javascript/d3-delaunay.js
+++ b/vendor/javascript/d3-delaunay.js
@@ -1,2 +1,4 @@
+// d3-delaunay@6.0.4 downloaded from https://ga.jspm.io/npm:d3-delaunay@6.0.4/src/index.js
+
 import t from"delaunator";const n=1e-6;class Path{constructor(){this._x0=this._y0=this._x1=this._y1=null;this._=""}moveTo(t,n){this._+=`M${this._x0=this._x1=+t},${this._y0=this._y1=+n}`}closePath(){if(null!==this._x1){this._x1=this._x0,this._y1=this._y0;this._+="Z"}}lineTo(t,n){this._+=`L${this._x1=+t},${this._y1=+n}`}arc(t,e,i){t=+t,e=+e,i=+i;const s=t+i;const l=e;if(i<0)throw new Error("negative radius");null===this._x1?this._+=`M${s},${l}`:(Math.abs(this._x1-s)>n||Math.abs(this._y1-l)>n)&&(this._+="L"+s+","+l);i&&(this._+=`A${i},${i},0,1,1,${t-i},${e}A${i},${i},0,1,1,${this._x1=s},${this._y1=l}`)}rect(t,n,e,i){this._+=`M${this._x0=this._x1=+t},${this._y0=this._y1=+n}h${+e}v${+i}h${-e}Z`}value(){return this._||null}}class Polygon{constructor(){this._=[]}moveTo(t,n){this._.push([t,n])}closePath(){this._.push(this._[0].slice())}lineTo(t,n){this._.push([t,n])}value(){return this._.length?this._:null}}class Voronoi{constructor(t,[n,e,i,s]=[0,0,960,500]){if(!((i=+i)>=(n=+n))||!((s=+s)>=(e=+e)))throw new Error("invalid bounds");this.delaunay=t;this._circumcenters=new Float64Array(2*t.points.length);this.vectors=new Float64Array(2*t.points.length);this.xmax=i,this.xmin=n;this.ymax=s,this.ymin=e;this._init()}update(){this.delaunay.update();this._init();return this}_init(){const{delaunay:{points:t,hull:n,triangles:e},vectors:i}=this;let s,l;const h=this.circumcenters=this._circumcenters.subarray(0,e.length/3*2);for(let i,o,r=0,c=0,a=e.length;r<a;r+=3,c+=2){const a=2*e[r];const u=2*e[r+1];const g=2*e[r+2];const f=t[a];const d=t[a+1];const m=t[u];const _=t[u+1];const y=t[g];const x=t[g+1];const p=m-f;const v=_-d;const w=y-f;const P=x-d;const T=2*(p*P-v*w);if(Math.abs(T)<1e-9){if(void 0===s){s=l=0;for(const e of n)s+=t[2*e],l+=t[2*e+1];s/=n.length,l/=n.length}const e=1e9*Math.sign((s-f)*P-(l-d)*w);i=(f+y)/2-e*P;o=(d+x)/2+e*w}else{const t=1/T;const n=p*p+v*v;const e=w*w+P*P;i=f+(P*n-v*e)*t;o=d+(p*e-w*n)*t}h[c]=i;h[c+1]=o}let o=n[n.length-1];let r,c=4*o;let a,u=t[2*o];let g,f=t[2*o+1];i.fill(0);for(let e=0;e<n.length;++e){o=n[e];r=c,a=u,g=f;c=4*o,u=t[2*o],f=t[2*o+1];i[r+2]=i[c]=g-f;i[r+3]=i[c+1]=u-a}}render(t){const n=null==t?t=new Path:void 0;const{delaunay:{halfedges:e,inedges:i,hull:s},circumcenters:l,vectors:h}=this;if(s.length<=1)return null;for(let n=0,i=e.length;n<i;++n){const i=e[n];if(i<n)continue;const s=2*Math.floor(n/3);const h=2*Math.floor(i/3);const o=l[s];const r=l[s+1];const c=l[h];const a=l[h+1];this._renderSegment(o,r,c,a,t)}let o,r=s[s.length-1];for(let n=0;n<s.length;++n){o=r,r=s[n];const e=2*Math.floor(i[r]/3);const c=l[e];const a=l[e+1];const u=4*o;const g=this._project(c,a,h[u+2],h[u+3]);g&&this._renderSegment(c,a,g[0],g[1],t)}return n&&n.value()}renderBounds(t){const n=null==t?t=new Path:void 0;t.rect(this.xmin,this.ymin,this.xmax-this.xmin,this.ymax-this.ymin);return n&&n.value()}renderCell(t,n){const e=null==n?n=new Path:void 0;const i=this._clip(t);if(null===i||!i.length)return;n.moveTo(i[0],i[1]);let s=i.length;while(i[0]===i[s-2]&&i[1]===i[s-1]&&s>1)s-=2;for(let t=2;t<s;t+=2)i[t]===i[t-2]&&i[t+1]===i[t-1]||n.lineTo(i[t],i[t+1]);n.closePath();return e&&e.value()}*cellPolygons(){const{delaunay:{points:t}}=this;for(let n=0,e=t.length/2;n<e;++n){const t=this.cellPolygon(n);t&&(t.index=n,yield t)}}cellPolygon(t){const n=new Polygon;this.renderCell(t,n);return n.value()}_renderSegment(t,n,e,i,s){let l;const h=this._regioncode(t,n);const o=this._regioncode(e,i);if(0===h&&0===o){s.moveTo(t,n);s.lineTo(e,i)}else if(l=this._clipSegment(t,n,e,i,h,o)){s.moveTo(l[0],l[1]);s.lineTo(l[2],l[3])}}contains(t,n,e){return(n=+n,n===n)&&(e=+e,e===e)&&this.delaunay._step(t,n,e)===t}*neighbors(t){const n=this._clip(t);if(n)for(const e of this.delaunay.neighbors(t)){const t=this._clip(e);if(t)t:for(let i=0,s=n.length;i<s;i+=2)for(let l=0,h=t.length;l<h;l+=2)if(n[i]===t[l]&&n[i+1]===t[l+1]&&n[(i+2)%s]===t[(l+h-2)%h]&&n[(i+3)%s]===t[(l+h-1)%h]){yield e;break t}}}_cell(t){const{circumcenters:n,delaunay:{inedges:e,halfedges:i,triangles:s}}=this;const l=e[t];if(-1===l)return null;const h=[];let o=l;do{const e=Math.floor(o/3);h.push(n[2*e],n[2*e+1]);o=o%3===2?o-2:o+1;if(s[o]!==t)break;o=i[o]}while(o!==l&&-1!==o);return h}_clip(t){if(0===t&&1===this.delaunay.hull.length)return[this.xmax,this.ymin,this.xmax,this.ymax,this.xmin,this.ymax,this.xmin,this.ymin];const n=this._cell(t);if(null===n)return null;const{vectors:e}=this;const i=4*t;return this._simplify(e[i]||e[i+1]?this._clipInfinite(t,n,e[i],e[i+1],e[i+2],e[i+3]):this._clipFinite(t,n))}_clipFinite(t,n){const e=n.length;let i=null;let s,l,h=n[e-2],o=n[e-1];let r,c=this._regioncode(h,o);let a,u=0;for(let g=0;g<e;g+=2){s=h,l=o,h=n[g],o=n[g+1];r=c,c=this._regioncode(h,o);if(0===r&&0===c){a=u,u=0;i?i.push(h,o):i=[h,o]}else{let n,e,g,f,d;if(0===r){if(null===(n=this._clipSegment(s,l,h,o,r,c)))continue;[e,g,f,d]=n}else{if(null===(n=this._clipSegment(h,o,s,l,c,r)))continue;[f,d,e,g]=n;a=u,u=this._edgecode(e,g);a&&u&&this._edge(t,a,u,i,i.length);i?i.push(e,g):i=[e,g]}a=u,u=this._edgecode(f,d);a&&u&&this._edge(t,a,u,i,i.length);i?i.push(f,d):i=[f,d]}}if(i){a=u,u=this._edgecode(i[0],i[1]);a&&u&&this._edge(t,a,u,i,i.length)}else if(this.contains(t,(this.xmin+this.xmax)/2,(this.ymin+this.ymax)/2))return[this.xmax,this.ymin,this.xmax,this.ymax,this.xmin,this.ymax,this.xmin,this.ymin];return i}_clipSegment(t,n,e,i,s,l){const h=s<l;h&&([t,n,e,i,s,l]=[e,i,t,n,l,s]);while(true){if(0===s&&0===l)return h?[e,i,t,n]:[t,n,e,i];if(s&l)return null;let o,r,c=s||l;8&c?(o=t+(e-t)*(this.ymax-n)/(i-n),r=this.ymax):4&c?(o=t+(e-t)*(this.ymin-n)/(i-n),r=this.ymin):2&c?(r=n+(i-n)*(this.xmax-t)/(e-t),o=this.xmax):(r=n+(i-n)*(this.xmin-t)/(e-t),o=this.xmin);s?(t=o,n=r,s=this._regioncode(t,n)):(e=o,i=r,l=this._regioncode(e,i))}}_clipInfinite(t,n,e,i,s,l){let h,o=Array.from(n);(h=this._project(o[0],o[1],e,i))&&o.unshift(h[0],h[1]);(h=this._project(o[o.length-2],o[o.length-1],s,l))&&o.push(h[0],h[1]);if(o=this._clipFinite(t,o))for(let n,e=0,i=o.length,s=this._edgecode(o[i-2],o[i-1]);e<i;e+=2){n=s,s=this._edgecode(o[e],o[e+1]);n&&s&&(e=this._edge(t,n,s,o,e),i=o.length)}else this.contains(t,(this.xmin+this.xmax)/2,(this.ymin+this.ymax)/2)&&(o=[this.xmin,this.ymin,this.xmax,this.ymin,this.xmax,this.ymax,this.xmin,this.ymax]);return o}_edge(t,n,e,i,s){while(n!==e){let e,l;switch(n){case 5:n=4;continue;case 4:n=6,e=this.xmax,l=this.ymin;break;case 6:n=2;continue;case 2:n=10,e=this.xmax,l=this.ymax;break;case 10:n=8;continue;case 8:n=9,e=this.xmin,l=this.ymax;break;case 9:n=1;continue;case 1:n=5,e=this.xmin,l=this.ymin;break}i[s]===e&&i[s+1]===l||!this.contains(t,e,l)||(i.splice(s,0,e,l),s+=2)}return s}_project(t,n,e,i){let s,l,h,o=Infinity;if(i<0){if(n<=this.ymin)return null;(s=(this.ymin-n)/i)<o&&(h=this.ymin,l=t+(o=s)*e)}else if(i>0){if(n>=this.ymax)return null;(s=(this.ymax-n)/i)<o&&(h=this.ymax,l=t+(o=s)*e)}if(e>0){if(t>=this.xmax)return null;(s=(this.xmax-t)/e)<o&&(l=this.xmax,h=n+(o=s)*i)}else if(e<0){if(t<=this.xmin)return null;(s=(this.xmin-t)/e)<o&&(l=this.xmin,h=n+(o=s)*i)}return[l,h]}_edgecode(t,n){return(t===this.xmin?1:t===this.xmax?2:0)|(n===this.ymin?4:n===this.ymax?8:0)}_regioncode(t,n){return(t<this.xmin?1:t>this.xmax?2:0)|(n<this.ymin?4:n>this.ymax?8:0)}_simplify(t){if(t&&t.length>4){for(let n=0;n<t.length;n+=2){const e=(n+2)%t.length,i=(n+4)%t.length;(t[n]===t[e]&&t[e]===t[i]||t[n+1]===t[e+1]&&t[e+1]===t[i+1])&&(t.splice(e,2),n-=2)}t.length||(t=null)}return t}}const e=2*Math.PI,i=Math.pow;function pointX(t){return t[0]}function pointY(t){return t[1]}function collinear(t){const{triangles:n,coords:e}=t;for(let t=0;t<n.length;t+=3){const i=2*n[t],s=2*n[t+1],l=2*n[t+2],h=(e[l]-e[i])*(e[s+1]-e[i+1])-(e[s]-e[i])*(e[l+1]-e[i+1]);if(h>1e-10)return false}return true}function jitter(t,n,e){return[t+Math.sin(t+n)*e,n+Math.cos(t-n)*e]}class Delaunay{static from(t,n=pointX,e=pointY,i){return new Delaunay("length"in t?flatArray(t,n,e,i):Float64Array.from(flatIterable(t,n,e,i)))}constructor(n){this._delaunator=new t(n);this.inedges=new Int32Array(n.length/2);this._hullIndex=new Int32Array(n.length/2);this.points=this._delaunator.coords;this._init()}update(){this._delaunator.update();this._init();return this}_init(){const n=this._delaunator,e=this.points;if(n.hull&&n.hull.length>2&&collinear(n)){this.collinear=Int32Array.from({length:e.length/2},((t,n)=>n)).sort(((t,n)=>e[2*t]-e[2*n]||e[2*t+1]-e[2*n+1]));const n=this.collinear[0],i=this.collinear[this.collinear.length-1],s=[e[2*n],e[2*n+1],e[2*i],e[2*i+1]],l=1e-8*Math.hypot(s[3]-s[1],s[2]-s[0]);for(let t=0,n=e.length/2;t<n;++t){const n=jitter(e[2*t],e[2*t+1],l);e[2*t]=n[0];e[2*t+1]=n[1]}this._delaunator=new t(e)}else delete this.collinear;const i=this.halfedges=this._delaunator.halfedges;const s=this.hull=this._delaunator.hull;const l=this.triangles=this._delaunator.triangles;const h=this.inedges.fill(-1);const o=this._hullIndex.fill(-1);for(let t=0,n=i.length;t<n;++t){const n=l[t%3===2?t-2:t+1];-1!==i[t]&&-1!==h[n]||(h[n]=t)}for(let t=0,n=s.length;t<n;++t)o[s[t]]=t;if(s.length<=2&&s.length>0){this.triangles=new Int32Array(3).fill(-1);this.halfedges=new Int32Array(3).fill(-1);this.triangles[0]=s[0];h[s[0]]=1;if(2===s.length){h[s[1]]=0;this.triangles[1]=s[1];this.triangles[2]=s[1]}}}voronoi(t){return new Voronoi(this,t)}*neighbors(t){const{inedges:n,hull:e,_hullIndex:i,halfedges:s,triangles:l,collinear:h}=this;if(h){const n=h.indexOf(t);n>0&&(yield h[n-1]);n<h.length-1&&(yield h[n+1]);return}const o=n[t];if(-1===o)return;let r=o,c=-1;do{yield c=l[r];r=r%3===2?r-2:r+1;if(l[r]!==t)return;r=s[r];if(-1===r){const n=e[(i[t]+1)%e.length];n!==c&&(yield n);return}}while(r!==o)}find(t,n,e=0){if((t=+t,t!==t)||(n=+n,n!==n))return-1;const i=e;let s;while((s=this._step(e,t,n))>=0&&s!==e&&s!==i)e=s;return s}_step(t,n,e){const{inedges:s,hull:l,_hullIndex:h,halfedges:o,triangles:r,points:c}=this;if(-1===s[t]||!c.length)return(t+1)%(c.length>>1);let a=t;let u=i(n-c[2*t],2)+i(e-c[2*t+1],2);const g=s[t];let f=g;do{let s=r[f];const g=i(n-c[2*s],2)+i(e-c[2*s+1],2);g<u&&(u=g,a=s);f=f%3===2?f-2:f+1;if(r[f]!==t)break;f=o[f];if(-1===f){f=l[(h[t]+1)%l.length];if(f!==s&&i(n-c[2*f],2)+i(e-c[2*f+1],2)<u)return f;break}}while(f!==g);return a}render(t){const n=null==t?t=new Path:void 0;const{points:e,halfedges:i,triangles:s}=this;for(let n=0,l=i.length;n<l;++n){const l=i[n];if(l<n)continue;const h=2*s[n];const o=2*s[l];t.moveTo(e[h],e[h+1]);t.lineTo(e[o],e[o+1])}this.renderHull(t);return n&&n.value()}renderPoints(t,n){void 0!==n||t&&"function"===typeof t.moveTo||(n=t,t=null);n=void 0==n?2:+n;const i=null==t?t=new Path:void 0;const{points:s}=this;for(let i=0,l=s.length;i<l;i+=2){const l=s[i],h=s[i+1];t.moveTo(l+n,h);t.arc(l,h,n,0,e)}return i&&i.value()}renderHull(t){const n=null==t?t=new Path:void 0;const{hull:e,points:i}=this;const s=2*e[0],l=e.length;t.moveTo(i[s],i[s+1]);for(let n=1;n<l;++n){const s=2*e[n];t.lineTo(i[s],i[s+1])}t.closePath();return n&&n.value()}hullPolygon(){const t=new Polygon;this.renderHull(t);return t.value()}renderTriangle(t,n){const e=null==n?n=new Path:void 0;const{points:i,triangles:s}=this;const l=2*s[t*=3];const h=2*s[t+1];const o=2*s[t+2];n.moveTo(i[l],i[l+1]);n.lineTo(i[h],i[h+1]);n.lineTo(i[o],i[o+1]);n.closePath();return e&&e.value()}*trianglePolygons(){const{triangles:t}=this;for(let n=0,e=t.length/3;n<e;++n)yield this.trianglePolygon(n)}trianglePolygon(t){const n=new Polygon;this.renderTriangle(t,n);return n.value()}}function flatArray(t,n,e,i){const s=t.length;const l=new Float64Array(2*s);for(let h=0;h<s;++h){const s=t[h];l[2*h]=n.call(i,s,h,t);l[2*h+1]=e.call(i,s,h,t)}return l}function*flatIterable(t,n,e,i){let s=0;for(const l of t){yield n.call(i,l,s,t);yield e.call(i,l,s,t);++s}}export{Delaunay,Voronoi};
 
diff --git a/vendor/javascript/d3-dispatch.js b/vendor/javascript/d3-dispatch.js
index 901da3ab..114bbd02 100644
--- a/vendor/javascript/d3-dispatch.js
+++ b/vendor/javascript/d3-dispatch.js
@@ -1,2 +1,4 @@
+// d3-dispatch@3.0.1 downloaded from https://ga.jspm.io/npm:d3-dispatch@3.0.1/src/index.js
+
 var n={value:()=>{}};function dispatch(){for(var n,t=0,e=arguments.length,r={};t<e;++t){if(!(n=arguments[t]+"")||n in r||/[\s.]/.test(n))throw new Error("illegal type: "+n);r[n]=[]}return new Dispatch(r)}function Dispatch(n){this._=n}function parseTypenames(n,t){return n.trim().split(/^|\s+/).map((function(n){var e="",r=n.indexOf(".");r>=0&&(e=n.slice(r+1),n=n.slice(0,r));if(n&&!t.hasOwnProperty(n))throw new Error("unknown type: "+n);return{type:n,name:e}}))}Dispatch.prototype=dispatch.prototype={constructor:Dispatch,on:function(n,t){var e,r=this._,i=parseTypenames(n+"",r),a=-1,o=i.length;if(!(arguments.length<2)){if(null!=t&&"function"!==typeof t)throw new Error("invalid callback: "+t);while(++a<o)if(e=(n=i[a]).type)r[e]=set(r[e],n.name,t);else if(null==t)for(e in r)r[e]=set(r[e],n.name,null);return this}while(++a<o)if((e=(n=i[a]).type)&&(e=get(r[e],n.name)))return e},copy:function(){var n={},t=this._;for(var e in t)n[e]=t[e].slice();return new Dispatch(n)},call:function(n,t){if((e=arguments.length-2)>0)for(var e,r,i=new Array(e),a=0;a<e;++a)i[a]=arguments[a+2];if(!this._.hasOwnProperty(n))throw new Error("unknown type: "+n);for(r=this._[n],a=0,e=r.length;a<e;++a)r[a].value.apply(t,i)},apply:function(n,t,e){if(!this._.hasOwnProperty(n))throw new Error("unknown type: "+n);for(var r=this._[n],i=0,a=r.length;i<a;++i)r[i].value.apply(t,e)}};function get(n,t){for(var e,r=0,i=n.length;r<i;++r)if((e=n[r]).name===t)return e.value}function set(t,e,r){for(var i=0,a=t.length;i<a;++i)if(t[i].name===e){t[i]=n,t=t.slice(0,i).concat(t.slice(i+1));break}null!=r&&t.push({name:e,value:r});return t}export{dispatch};
 
diff --git a/vendor/javascript/d3-drag.js b/vendor/javascript/d3-drag.js
index 530dca12..8f4ad0b0 100644
--- a/vendor/javascript/d3-drag.js
+++ b/vendor/javascript/d3-drag.js
@@ -1,2 +1,4 @@
+// d3-drag@3.0.0 downloaded from https://ga.jspm.io/npm:d3-drag@3.0.0/src/index.js
+
 import{dispatch as e}from"d3-dispatch";import{select as t,pointer as n}from"d3-selection";const r={passive:false};const a={capture:true,passive:false};function nopropagation(e){e.stopImmediatePropagation()}function noevent(e){e.preventDefault();e.stopImmediatePropagation()}function nodrag(e){var n=e.document.documentElement,r=t(e).on("dragstart.drag",noevent,a);if("onselectstart"in n)r.on("selectstart.drag",noevent,a);else{n.__noselect=n.style.MozUserSelect;n.style.MozUserSelect="none"}}function yesdrag(e,n){var r=e.document.documentElement,o=t(e).on("dragstart.drag",null);if(n){o.on("click.drag",noevent,a);setTimeout((function(){o.on("click.drag",null)}),0)}if("onselectstart"in r)o.on("selectstart.drag",null);else{r.style.MozUserSelect=r.__noselect;delete r.__noselect}}var constant=e=>()=>e;function DragEvent(e,{sourceEvent:t,subject:n,target:r,identifier:a,active:o,x:u,y:i,dx:c,dy:l,dispatch:d}){Object.defineProperties(this,{type:{value:e,enumerable:true,configurable:true},sourceEvent:{value:t,enumerable:true,configurable:true},subject:{value:n,enumerable:true,configurable:true},target:{value:r,enumerable:true,configurable:true},identifier:{value:a,enumerable:true,configurable:true},active:{value:o,enumerable:true,configurable:true},x:{value:u,enumerable:true,configurable:true},y:{value:i,enumerable:true,configurable:true},dx:{value:c,enumerable:true,configurable:true},dy:{value:l,enumerable:true,configurable:true},_:{value:d}})}DragEvent.prototype.on=function(){var e=this._.on.apply(this._,arguments);return e===this._?this:e};function defaultFilter(e){return!e.ctrlKey&&!e.button}function defaultContainer(){return this.parentNode}function defaultSubject(e,t){return null==t?{x:e.x,y:e.y}:t}function defaultTouchable(){return navigator.maxTouchPoints||"ontouchstart"in this}function drag(){var o,u,i,c,l=defaultFilter,d=defaultContainer,s=defaultSubject,f=defaultTouchable,g={},v=e("start","drag","end"),h=0,m=0;function drag(e){e.on("mousedown.drag",mousedowned).filter(f).on("touchstart.drag",touchstarted).on("touchmove.drag",touchmoved,r).on("touchend.drag touchcancel.drag",touchended).style("touch-action","none").style("-webkit-tap-highlight-color","rgba(0,0,0,0)")}function mousedowned(e,n){if(!c&&l.call(this,e,n)){var r=beforestart(this,d.call(this,e,n),e,n,"mouse");if(r){t(e.view).on("mousemove.drag",mousemoved,a).on("mouseup.drag",mouseupped,a);nodrag(e.view);nopropagation(e);i=false;o=e.clientX;u=e.clientY;r("start",e)}}}function mousemoved(e){noevent(e);if(!i){var t=e.clientX-o,n=e.clientY-u;i=t*t+n*n>m}g.mouse("drag",e)}function mouseupped(e){t(e.view).on("mousemove.drag mouseup.drag",null);yesdrag(e.view,i);noevent(e);g.mouse("end",e)}function touchstarted(e,t){if(l.call(this,e,t)){var n,r,a=e.changedTouches,o=d.call(this,e,t),u=a.length;for(n=0;n<u;++n)if(r=beforestart(this,o,e,t,a[n].identifier,a[n])){nopropagation(e);r("start",e,a[n])}}}function touchmoved(e){var t,n,r=e.changedTouches,a=r.length;for(t=0;t<a;++t)if(n=g[r[t].identifier]){noevent(e);n("drag",e,r[t])}}function touchended(e){var t,n,r=e.changedTouches,a=r.length;c&&clearTimeout(c);c=setTimeout((function(){c=null}),500);for(t=0;t<a;++t)if(n=g[r[t].identifier]){nopropagation(e);n("end",e,r[t])}}function beforestart(e,t,r,a,o,u){var i,c,l,d=v.copy(),f=n(u||r,t);if(null!=(l=s.call(e,new DragEvent("beforestart",{sourceEvent:r,target:drag,identifier:o,active:h,x:f[0],y:f[1],dx:0,dy:0,dispatch:d}),a))){i=l.x-f[0]||0;c=l.y-f[1]||0;return function gesture(r,u,s){var v,m=f;switch(r){case"start":g[o]=gesture,v=h++;break;case"end":delete g[o],--h;case"drag":f=n(s||u,t),v=h;break}d.call(r,e,new DragEvent(r,{sourceEvent:u,subject:l,target:drag,identifier:o,active:v,x:f[0]+i,y:f[1]+c,dx:f[0]-m[0],dy:f[1]-m[1],dispatch:d}),a)}}}drag.filter=function(e){return arguments.length?(l="function"===typeof e?e:constant(!!e),drag):l};drag.container=function(e){return arguments.length?(d="function"===typeof e?e:constant(e),drag):d};drag.subject=function(e){return arguments.length?(s="function"===typeof e?e:constant(e),drag):s};drag.touchable=function(e){return arguments.length?(f="function"===typeof e?e:constant(!!e),drag):f};drag.on=function(){var e=v.on.apply(v,arguments);return e===v?drag:e};drag.clickDistance=function(e){return arguments.length?(m=(e=+e)*e,drag):Math.sqrt(m)};return drag}export{drag,nodrag as dragDisable,yesdrag as dragEnable};
 
diff --git a/vendor/javascript/d3-dsv.js b/vendor/javascript/d3-dsv.js
index 84ad5f48..884e16a7 100644
--- a/vendor/javascript/d3-dsv.js
+++ b/vendor/javascript/d3-dsv.js
@@ -1,2 +1,4 @@
+// d3-dsv@3.0.1 downloaded from https://ga.jspm.io/npm:d3-dsv@3.0.1/src/index.js
+
 var r={},e={},t=34,a=10,o=13;function objectConverter(r){return new Function("d","return {"+r.map((function(r,e){return JSON.stringify(r)+": d["+e+'] || ""'})).join(",")+"}")}function customConverter(r,e){var t=objectConverter(r);return function(a,o){return e(t(a),o,r)}}function inferColumns(r){var e=Object.create(null),t=[];r.forEach((function(r){for(var a in r)a in e||t.push(e[a]=a)}));return t}function pad(r,e){var t=r+"",a=t.length;return a<e?new Array(e-a+1).join(0)+t:t}function formatYear(r){return r<0?"-"+pad(-r,6):r>9999?"+"+pad(r,6):pad(r,4)}function formatDate(r){var e=r.getUTCHours(),t=r.getUTCMinutes(),a=r.getUTCSeconds(),o=r.getUTCMilliseconds();return isNaN(r)?"Invalid Date":formatYear(r.getUTCFullYear(),4)+"-"+pad(r.getUTCMonth()+1,2)+"-"+pad(r.getUTCDate(),2)+(o?"T"+pad(e,2)+":"+pad(t,2)+":"+pad(a,2)+"."+pad(o,3)+"Z":a?"T"+pad(e,2)+":"+pad(t,2)+":"+pad(a,2)+"Z":t||e?"T"+pad(e,2)+":"+pad(t,2)+"Z":"")}function dsv(n){var u=new RegExp('["'+n+"\n\r]"),f=n.charCodeAt(0);function parse(r,e){var t,a,o=parseRows(r,(function(r,o){if(t)return t(r,o-1);a=r,t=e?customConverter(r,e):objectConverter(r)}));o.columns=a||[];return o}function parseRows(n,u){var i,s=[],c=n.length,l=0,d=0,m=c<=0,p=false;n.charCodeAt(c-1)===a&&--c;n.charCodeAt(c-1)===o&&--c;function token(){if(m)return e;if(p)return p=false,r;var u,i,s=l;if(n.charCodeAt(s)===t){while(l++<c&&n.charCodeAt(l)!==t||n.charCodeAt(++l)===t);if((u=l)>=c)m=true;else if((i=n.charCodeAt(l++))===a)p=true;else if(i===o){p=true;n.charCodeAt(l)===a&&++l}return n.slice(s+1,u-1).replace(/""/g,'"')}while(l<c){if((i=n.charCodeAt(u=l++))===a)p=true;else if(i===o){p=true;n.charCodeAt(l)===a&&++l}else if(i!==f)continue;return n.slice(s,u)}return m=true,n.slice(s,c)}while((i=token())!==e){var v=[];while(i!==r&&i!==e)v.push(i),i=token();u&&null==(v=u(v,d++))||s.push(v)}return s}function preformatBody(r,e){return r.map((function(r){return e.map((function(e){return formatValue(r[e])})).join(n)}))}function format(r,e){null==e&&(e=inferColumns(r));return[e.map(formatValue).join(n)].concat(preformatBody(r,e)).join("\n")}function formatBody(r,e){null==e&&(e=inferColumns(r));return preformatBody(r,e).join("\n")}function formatRows(r){return r.map(formatRow).join("\n")}function formatRow(r){return r.map(formatValue).join(n)}function formatValue(r){return null==r?"":r instanceof Date?formatDate(r):u.test(r+="")?'"'+r.replace(/"/g,'""')+'"':r}return{parse:parse,parseRows:parseRows,format:format,formatBody:formatBody,formatRows:formatRows,formatRow:formatRow,formatValue:formatValue}}var n=dsv(",");var u=n.parse;var f=n.parseRows;var i=n.format;var s=n.formatBody;var c=n.formatRows;var l=n.formatRow;var d=n.formatValue;var m=dsv("\t");var p=m.parse;var v=m.parseRows;var w=m.format;var C=m.formatBody;var h=m.formatRows;var R=m.formatRow;var g=m.formatValue;function autoType(r){for(var e in r){var t,a,o=r[e].trim();if(o)if("true"===o)o=true;else if("false"===o)o=false;else if("NaN"===o)o=NaN;else if(isNaN(t=+o)){if(!(a=o.match(/^([-+]\d{2})?\d{4}(-\d{2}(-\d{2})?)?(T\d{2}:\d{2}(:\d{2}(\.\d{3})?)?(Z|[-+]\d{2}:\d{2})?)?$/)))continue;!T||!a[4]||a[7]||(o=o.replace(/-/g,"/").replace(/T/," "));o=new Date(o)}else o=t;else o=null;r[e]=o}return r}const T=new Date("2019-01-01T00:00").getHours()||new Date("2019-07-01T00:00").getHours();export{autoType,i as csvFormat,s as csvFormatBody,l as csvFormatRow,c as csvFormatRows,d as csvFormatValue,u as csvParse,f as csvParseRows,dsv as dsvFormat,w as tsvFormat,C as tsvFormatBody,R as tsvFormatRow,h as tsvFormatRows,g as tsvFormatValue,p as tsvParse,v as tsvParseRows};
 
diff --git a/vendor/javascript/d3-ease.js b/vendor/javascript/d3-ease.js
index 34b65f3d..703ffd05 100644
--- a/vendor/javascript/d3-ease.js
+++ b/vendor/javascript/d3-ease.js
@@ -1,2 +1,4 @@
+// d3-ease@3.0.1 downloaded from https://ga.jspm.io/npm:d3-ease@3.0.1/src/index.js
+
 const linear=t=>+t;function quadIn(t){return t*t}function quadOut(t){return t*(2-t)}function quadInOut(t){return((t*=2)<=1?t*t:--t*(2-t)+1)/2}function cubicIn(t){return t*t*t}function cubicOut(t){return--t*t*t+1}function cubicInOut(t){return((t*=2)<=1?t*t*t:(t-=2)*t*t+2)/2}var t=3;var n=function custom(t){t=+t;function polyIn(n){return Math.pow(n,t)}polyIn.exponent=custom;return polyIn}(t);var u=function custom(t){t=+t;function polyOut(n){return 1-Math.pow(1-n,t)}polyOut.exponent=custom;return polyOut}(t);var e=function custom(t){t=+t;function polyInOut(n){return((n*=2)<=1?Math.pow(n,t):2-Math.pow(2-n,t))/2}polyInOut.exponent=custom;return polyInOut}(t);var a=Math.PI,c=a/2;function sinIn(t){return 1===+t?1:1-Math.cos(t*c)}function sinOut(t){return Math.sin(t*c)}function sinInOut(t){return(1-Math.cos(a*t))/2}function tpmt(t){return 1.0009775171065494*(Math.pow(2,-10*t)-.0009765625)}function expIn(t){return tpmt(1-+t)}function expOut(t){return 1-tpmt(t)}function expInOut(t){return((t*=2)<=1?tpmt(1-t):2-tpmt(t-1))/2}function circleIn(t){return 1-Math.sqrt(1-t*t)}function circleOut(t){return Math.sqrt(1- --t*t)}function circleInOut(t){return((t*=2)<=1?1-Math.sqrt(1-t*t):Math.sqrt(1-(t-=2)*t)+1)/2}var s=4/11,r=6/11,o=8/11,i=3/4,O=9/11,I=10/11,p=15/16,f=21/22,l=63/64,m=1/s/s;function bounceIn(t){return 1-bounceOut(1-t)}function bounceOut(t){return(t=+t)<s?m*t*t:t<o?m*(t-=r)*t+i:t<I?m*(t-=O)*t+p:m*(t-=f)*t+l}function bounceInOut(t){return((t*=2)<=1?1-bounceOut(1-t):bounceOut(t-1)+1)/2}var b=1.70158;var h=function custom(t){t=+t;function backIn(n){return(n=+n)*n*(t*(n-1)+n)}backIn.overshoot=custom;return backIn}(b);var M=function custom(t){t=+t;function backOut(n){return--n*n*((n+1)*t+n)+1}backOut.overshoot=custom;return backOut}(b);var v=function custom(t){t=+t;function backInOut(n){return((n*=2)<1?n*n*((t+1)*n-t):(n-=2)*n*((t+1)*n+t)+2)/2}backInOut.overshoot=custom;return backInOut}(b);var x=2*Math.PI,d=1,k=.3;var y=function custom(t,n){var u=Math.asin(1/(t=Math.max(1,t)))*(n/=x);function elasticIn(e){return t*tpmt(- --e)*Math.sin((u-e)/n)}elasticIn.amplitude=function(t){return custom(t,n*x)};elasticIn.period=function(n){return custom(t,n)};return elasticIn}(d,k);var q=function custom(t,n){var u=Math.asin(1/(t=Math.max(1,t)))*(n/=x);function elasticOut(e){return 1-t*tpmt(e=+e)*Math.sin((e+u)/n)}elasticOut.amplitude=function(t){return custom(t,n*x)};elasticOut.period=function(n){return custom(t,n)};return elasticOut}(d,k);var B=function custom(t,n){var u=Math.asin(1/(t=Math.max(1,t)))*(n/=x);function elasticInOut(e){return((e=2*e-1)<0?t*tpmt(-e)*Math.sin((u-e)/n):2-t*tpmt(e)*Math.sin((u+e)/n))/2}elasticInOut.amplitude=function(t){return custom(t,n*x)};elasticInOut.period=function(n){return custom(t,n)};return elasticInOut}(d,k);export{v as easeBack,h as easeBackIn,v as easeBackInOut,M as easeBackOut,bounceOut as easeBounce,bounceIn as easeBounceIn,bounceInOut as easeBounceInOut,bounceOut as easeBounceOut,circleInOut as easeCircle,circleIn as easeCircleIn,circleInOut as easeCircleInOut,circleOut as easeCircleOut,cubicInOut as easeCubic,cubicIn as easeCubicIn,cubicInOut as easeCubicInOut,cubicOut as easeCubicOut,q as easeElastic,y as easeElasticIn,B as easeElasticInOut,q as easeElasticOut,expInOut as easeExp,expIn as easeExpIn,expInOut as easeExpInOut,expOut as easeExpOut,linear as easeLinear,e as easePoly,n as easePolyIn,e as easePolyInOut,u as easePolyOut,quadInOut as easeQuad,quadIn as easeQuadIn,quadInOut as easeQuadInOut,quadOut as easeQuadOut,sinInOut as easeSin,sinIn as easeSinIn,sinInOut as easeSinInOut,sinOut as easeSinOut};
 
diff --git a/vendor/javascript/d3-fetch.js b/vendor/javascript/d3-fetch.js
index ec449551..68c9f3a8 100644
--- a/vendor/javascript/d3-fetch.js
+++ b/vendor/javascript/d3-fetch.js
@@ -1,2 +1,4 @@
+// d3-fetch@3.0.1 downloaded from https://ga.jspm.io/npm:d3-fetch@3.0.1/src/index.js
+
 import{dsvFormat as r,csvParse as t,tsvParse as e}from"d3-dsv";function responseBlob(r){if(!r.ok)throw new Error(r.status+" "+r.statusText);return r.blob()}function blob(r,t){return fetch(r,t).then(responseBlob)}function responseArrayBuffer(r){if(!r.ok)throw new Error(r.status+" "+r.statusText);return r.arrayBuffer()}function buffer(r,t){return fetch(r,t).then(responseArrayBuffer)}function responseText(r){if(!r.ok)throw new Error(r.status+" "+r.statusText);return r.text()}function text(r,t){return fetch(r,t).then(responseText)}function dsvParse(r){return function(t,e,n){2===arguments.length&&"function"===typeof e&&(n=e,e=void 0);return text(t,e).then((function(t){return r(t,n)}))}}function dsv(t,e,n,o){3===arguments.length&&"function"===typeof n&&(o=n,n=void 0);var s=r(t);return text(e,n).then((function(r){return s.parse(r,o)}))}var n=dsvParse(t);var o=dsvParse(e);function image(r,t){return new Promise((function(e,n){var o=new Image;for(var s in t)o[s]=t[s];o.onerror=n;o.onload=function(){e(o)};o.src=r}))}function responseJson(r){if(!r.ok)throw new Error(r.status+" "+r.statusText);if(204!==r.status&&205!==r.status)return r.json()}function json(r,t){return fetch(r,t).then(responseJson)}function parser(r){return(t,e)=>text(t,e).then((t=>(new DOMParser).parseFromString(t,r)))}var s=parser("application/xml");var u=parser("text/html");var f=parser("image/svg+xml");export{blob,buffer,n as csv,dsv,u as html,image,json,f as svg,text,o as tsv,s as xml};
 
diff --git a/vendor/javascript/d3-force.js b/vendor/javascript/d3-force.js
index ece9edd8..e1a17d2d 100644
--- a/vendor/javascript/d3-force.js
+++ b/vendor/javascript/d3-force.js
@@ -1,2 +1,4 @@
+// d3-force@3.0.0 downloaded from https://ga.jspm.io/npm:d3-force@3.0.0/src/index.js
+
 import{quadtree as n}from"d3-quadtree";import{dispatch as t}from"d3-dispatch";import{timer as e}from"d3-timer";function center(n,t){var e,i=1;null==n&&(n=0);null==t&&(t=0);function force(){var r,o,f=e.length,c=0,a=0;for(r=0;r<f;++r)o=e[r],c+=o.x,a+=o.y;for(c=(c/f-n)*i,a=(a/f-t)*i,r=0;r<f;++r)o=e[r],o.x-=c,o.y-=a}force.initialize=function(n){e=n};force.x=function(t){return arguments.length?(n=+t,force):n};force.y=function(n){return arguments.length?(t=+n,force):t};force.strength=function(n){return arguments.length?(i=+n,force):i};return force}function constant(n){return function(){return n}}function jiggle(n){return 1e-6*(n()-.5)}function x$2(n){return n.x+n.vx}function y$2(n){return n.y+n.vy}function collide(t){var e,i,r,o=1,f=1;"function"!==typeof t&&(t=constant(null==t?1:+t));function force(){var t,c,a,u,l,s,g,h=e.length;for(var v=0;v<f;++v){c=n(e,x$2,y$2).visitAfter(prepare);for(t=0;t<h;++t){a=e[t];s=i[a.index],g=s*s;u=a.x+a.vx;l=a.y+a.vy;c.visit(apply)}}function apply(n,t,e,i,f){var c=n.data,h=n.r,v=s+h;if(!c)return t>u+v||i<u-v||e>l+v||f<l-v;if(c.index>a.index){var d=u-c.x-c.vx,p=l-c.y-c.vy,z=d*d+p*p;if(z<v*v){0===d&&(d=jiggle(r),z+=d*d);0===p&&(p=jiggle(r),z+=p*p);z=(v-(z=Math.sqrt(z)))/z*o;a.vx+=(d*=z)*(v=(h*=h)/(g+h));a.vy+=(p*=z)*v;c.vx-=d*(v=1-v);c.vy-=p*v}}}}function prepare(n){if(n.data)return n.r=i[n.data.index];for(var t=n.r=0;t<4;++t)n[t]&&n[t].r>n.r&&(n.r=n[t].r)}function initialize(){if(e){var n,r,o=e.length;i=new Array(o);for(n=0;n<o;++n)r=e[n],i[r.index]=+t(r,n,e)}}force.initialize=function(n,t){e=n;r=t;initialize()};force.iterations=function(n){return arguments.length?(f=+n,force):f};force.strength=function(n){return arguments.length?(o=+n,force):o};force.radius=function(n){return arguments.length?(t="function"===typeof n?n:constant(+n),initialize(),force):t};return force}function index(n){return n.index}function find(n,t){var e=n.get(t);if(!e)throw new Error("node not found: "+t);return e}function link(n){var t,e,i,r,o,f,c=index,a=defaultStrength,u=constant(30),l=1;null==n&&(n=[]);function defaultStrength(n){return 1/Math.min(r[n.source.index],r[n.target.index])}function force(i){for(var r=0,c=n.length;r<l;++r)for(var a,u,s,g,h,v,d,p=0;p<c;++p){a=n[p],u=a.source,s=a.target;g=s.x+s.vx-u.x-u.vx||jiggle(f);h=s.y+s.vy-u.y-u.vy||jiggle(f);v=Math.sqrt(g*g+h*h);v=(v-e[p])/v*i*t[p];g*=v,h*=v;s.vx-=g*(d=o[p]);s.vy-=h*d;u.vx+=g*(d=1-d);u.vy+=h*d}}function initialize(){if(i){var f,a,u=i.length,l=n.length,s=new Map(i.map(((n,t)=>[c(n,t,i),n])));for(f=0,r=new Array(u);f<l;++f){a=n[f],a.index=f;"object"!==typeof a.source&&(a.source=find(s,a.source));"object"!==typeof a.target&&(a.target=find(s,a.target));r[a.source.index]=(r[a.source.index]||0)+1;r[a.target.index]=(r[a.target.index]||0)+1}for(f=0,o=new Array(l);f<l;++f)a=n[f],o[f]=r[a.source.index]/(r[a.source.index]+r[a.target.index]);t=new Array(l),initializeStrength();e=new Array(l),initializeDistance()}}function initializeStrength(){if(i)for(var e=0,r=n.length;e<r;++e)t[e]=+a(n[e],e,n)}function initializeDistance(){if(i)for(var t=0,r=n.length;t<r;++t)e[t]=+u(n[t],t,n)}force.initialize=function(n,t){i=n;f=t;initialize()};force.links=function(t){return arguments.length?(n=t,initialize(),force):n};force.id=function(n){return arguments.length?(c=n,force):c};force.iterations=function(n){return arguments.length?(l=+n,force):l};force.strength=function(n){return arguments.length?(a="function"===typeof n?n:constant(+n),initializeStrength(),force):a};force.distance=function(n){return arguments.length?(u="function"===typeof n?n:constant(+n),initializeDistance(),force):u};return force}const i=1664525;const r=1013904223;const o=4294967296;function lcg(){let n=1;return()=>(n=(i*n+r)%o)/o}function x$1(n){return n.x}function y$1(n){return n.y}var f=10,c=Math.PI*(3-Math.sqrt(5));function simulation(n){var i,r=1,o=.001,a=1-Math.pow(o,1/300),u=0,l=.6,s=new Map,g=e(step),h=t("tick","end"),v=lcg();null==n&&(n=[]);function step(){tick();h.call("tick",i);if(r<o){g.stop();h.call("end",i)}}function tick(t){var e,o,f=n.length;void 0===t&&(t=1);for(var c=0;c<t;++c){r+=(u-r)*a;s.forEach((function(n){n(r)}));for(e=0;e<f;++e){o=n[e];null==o.fx?o.x+=o.vx*=l:(o.x=o.fx,o.vx=0);null==o.fy?o.y+=o.vy*=l:(o.y=o.fy,o.vy=0)}}return i}function initializeNodes(){for(var t,e=0,i=n.length;e<i;++e){t=n[e],t.index=e;null!=t.fx&&(t.x=t.fx);null!=t.fy&&(t.y=t.fy);if(isNaN(t.x)||isNaN(t.y)){var r=f*Math.sqrt(.5+e),o=e*c;t.x=r*Math.cos(o);t.y=r*Math.sin(o)}(isNaN(t.vx)||isNaN(t.vy))&&(t.vx=t.vy=0)}}function initializeForce(t){t.initialize&&t.initialize(n,v);return t}initializeNodes();return i={tick:tick,restart:function(){return g.restart(step),i},stop:function(){return g.stop(),i},nodes:function(t){return arguments.length?(n=t,initializeNodes(),s.forEach(initializeForce),i):n},alpha:function(n){return arguments.length?(r=+n,i):r},alphaMin:function(n){return arguments.length?(o=+n,i):o},alphaDecay:function(n){return arguments.length?(a=+n,i):+a},alphaTarget:function(n){return arguments.length?(u=+n,i):u},velocityDecay:function(n){return arguments.length?(l=1-n,i):1-l},randomSource:function(n){return arguments.length?(v=n,s.forEach(initializeForce),i):v},force:function(n,t){return arguments.length>1?(null==t?s.delete(n):s.set(n,initializeForce(t)),i):s.get(n)},find:function(t,e,i){var r,o,f,c,a,u=0,l=n.length;null==i?i=Infinity:i*=i;for(u=0;u<l;++u){c=n[u];r=t-c.x;o=e-c.y;f=r*r+o*o;f<i&&(a=c,i=f)}return a},on:function(n,t){return arguments.length>1?(h.on(n,t),i):h.on(n)}}}function manyBody(){var t,e,i,r,o,f=constant(-30),c=1,a=Infinity,u=.81;function force(i){var o,f=t.length,c=n(t,x$1,y$1).visitAfter(accumulate);for(r=i,o=0;o<f;++o)e=t[o],c.visit(apply)}function initialize(){if(t){var n,e,i=t.length;o=new Array(i);for(n=0;n<i;++n)e=t[n],o[e.index]=+f(e,n,t)}}function accumulate(n){var t,e,i,r,f,c=0,a=0;if(n.length){for(i=r=f=0;f<4;++f)(t=n[f])&&(e=Math.abs(t.value))&&(c+=t.value,a+=e,i+=e*t.x,r+=e*t.y);n.x=i/a;n.y=r/a}else{t=n;t.x=t.data.x;t.y=t.data.y;do{c+=o[t.data.index]}while(t=t.next)}n.value=c}function apply(n,t,f,l){if(!n.value)return true;var s=n.x-e.x,g=n.y-e.y,h=l-t,v=s*s+g*g;if(h*h/u<v){if(v<a){0===s&&(s=jiggle(i),v+=s*s);0===g&&(g=jiggle(i),v+=g*g);v<c&&(v=Math.sqrt(c*v));e.vx+=s*n.value*r/v;e.vy+=g*n.value*r/v}return true}if(!(n.length||v>=a)){if(n.data!==e||n.next){0===s&&(s=jiggle(i),v+=s*s);0===g&&(g=jiggle(i),v+=g*g);v<c&&(v=Math.sqrt(c*v))}do{if(n.data!==e){h=o[n.data.index]*r/v;e.vx+=s*h;e.vy+=g*h}}while(n=n.next)}}force.initialize=function(n,e){t=n;i=e;initialize()};force.strength=function(n){return arguments.length?(f="function"===typeof n?n:constant(+n),initialize(),force):f};force.distanceMin=function(n){return arguments.length?(c=n*n,force):Math.sqrt(c)};force.distanceMax=function(n){return arguments.length?(a=n*n,force):Math.sqrt(a)};force.theta=function(n){return arguments.length?(u=n*n,force):Math.sqrt(u)};return force}function radial(n,t,e){var i,r,o,f=constant(.1);"function"!==typeof n&&(n=constant(+n));null==t&&(t=0);null==e&&(e=0);function force(n){for(var f=0,c=i.length;f<c;++f){var a=i[f],u=a.x-t||1e-6,l=a.y-e||1e-6,s=Math.sqrt(u*u+l*l),g=(o[f]-s)*r[f]*n/s;a.vx+=u*g;a.vy+=l*g}}function initialize(){if(i){var t,e=i.length;r=new Array(e);o=new Array(e);for(t=0;t<e;++t){o[t]=+n(i[t],t,i);r[t]=isNaN(o[t])?0:+f(i[t],t,i)}}}force.initialize=function(n){i=n,initialize()};force.strength=function(n){return arguments.length?(f="function"===typeof n?n:constant(+n),initialize(),force):f};force.radius=function(t){return arguments.length?(n="function"===typeof t?t:constant(+t),initialize(),force):n};force.x=function(n){return arguments.length?(t=+n,force):t};force.y=function(n){return arguments.length?(e=+n,force):e};return force}function x(n){var t,e,i,r=constant(.1);"function"!==typeof n&&(n=constant(null==n?0:+n));function force(n){for(var r,o=0,f=t.length;o<f;++o)r=t[o],r.vx+=(i[o]-r.x)*e[o]*n}function initialize(){if(t){var o,f=t.length;e=new Array(f);i=new Array(f);for(o=0;o<f;++o)e[o]=isNaN(i[o]=+n(t[o],o,t))?0:+r(t[o],o,t)}}force.initialize=function(n){t=n;initialize()};force.strength=function(n){return arguments.length?(r="function"===typeof n?n:constant(+n),initialize(),force):r};force.x=function(t){return arguments.length?(n="function"===typeof t?t:constant(+t),initialize(),force):n};return force}function y(n){var t,e,i,r=constant(.1);"function"!==typeof n&&(n=constant(null==n?0:+n));function force(n){for(var r,o=0,f=t.length;o<f;++o)r=t[o],r.vy+=(i[o]-r.y)*e[o]*n}function initialize(){if(t){var o,f=t.length;e=new Array(f);i=new Array(f);for(o=0;o<f;++o)e[o]=isNaN(i[o]=+n(t[o],o,t))?0:+r(t[o],o,t)}}force.initialize=function(n){t=n;initialize()};force.strength=function(n){return arguments.length?(r="function"===typeof n?n:constant(+n),initialize(),force):r};force.y=function(t){return arguments.length?(n="function"===typeof t?t:constant(+t),initialize(),force):n};return force}export{center as forceCenter,collide as forceCollide,link as forceLink,manyBody as forceManyBody,radial as forceRadial,simulation as forceSimulation,x as forceX,y as forceY};
 
diff --git a/vendor/javascript/d3-format.js b/vendor/javascript/d3-format.js
index f72685f3..fae35b42 100644
--- a/vendor/javascript/d3-format.js
+++ b/vendor/javascript/d3-format.js
@@ -1,2 +1,4 @@
+// d3-format@3.1.0 downloaded from https://ga.jspm.io/npm:d3-format@3.1.0/src/index.js
+
 function formatDecimal(t){return Math.abs(t=Math.round(t))>=1e21?t.toLocaleString("en").replace(/,/g,""):t.toString(10)}function formatDecimalParts(t,r){if((i=(t=r?t.toExponential(r-1):t.toExponential()).indexOf("e"))<0)return null;var i,e=t.slice(0,i);return[e.length>1?e[0]+e.slice(2):e,+t.slice(i+1)]}function exponent(t){return t=formatDecimalParts(Math.abs(t)),t?t[1]:NaN}function formatGroup(t,r){return function(i,e){var n=i.length,a=[],o=0,c=t[0],f=0;while(n>0&&c>0){f+c+1>e&&(c=Math.max(1,e-f));a.push(i.substring(n-=c,n+c));if((f+=c+1)>e)break;c=t[o=(o+1)%t.length]}return a.reverse().join(r)}}function formatNumerals(t){return function(r){return r.replace(/[0-9]/g,(function(r){return t[+r]}))}}var t=/^(?:(.)?([<>=^]))?([+\-( ])?([$#])?(0)?(\d+)?(,)?(\.\d+)?(~)?([a-z%])?$/i;function formatSpecifier(r){if(!(i=t.exec(r)))throw new Error("invalid format: "+r);var i;return new FormatSpecifier({fill:i[1],align:i[2],sign:i[3],symbol:i[4],zero:i[5],width:i[6],comma:i[7],precision:i[8]&&i[8].slice(1),trim:i[9],type:i[10]})}formatSpecifier.prototype=FormatSpecifier.prototype;function FormatSpecifier(t){this.fill=void 0===t.fill?" ":t.fill+"";this.align=void 0===t.align?">":t.align+"";this.sign=void 0===t.sign?"-":t.sign+"";this.symbol=void 0===t.symbol?"":t.symbol+"";this.zero=!!t.zero;this.width=void 0===t.width?void 0:+t.width;this.comma=!!t.comma;this.precision=void 0===t.precision?void 0:+t.precision;this.trim=!!t.trim;this.type=void 0===t.type?"":t.type+""}FormatSpecifier.prototype.toString=function(){return this.fill+this.align+this.sign+this.symbol+(this.zero?"0":"")+(void 0===this.width?"":Math.max(1,0|this.width))+(this.comma?",":"")+(void 0===this.precision?"":"."+Math.max(0,0|this.precision))+(this.trim?"~":"")+this.type};function formatTrim(t){t:for(var r,i=t.length,e=1,n=-1;e<i;++e)switch(t[e]){case".":n=r=e;break;case"0":0===n&&(n=e);r=e;break;default:if(!+t[e])break t;n>0&&(n=0);break}return n>0?t.slice(0,n)+t.slice(r+1):t}var r;function formatPrefixAuto(t,i){var e=formatDecimalParts(t,i);if(!e)return t+"";var n=e[0],a=e[1],o=a-(r=3*Math.max(-8,Math.min(8,Math.floor(a/3))))+1,c=n.length;return o===c?n:o>c?n+new Array(o-c+1).join("0"):o>0?n.slice(0,o)+"."+n.slice(o):"0."+new Array(1-o).join("0")+formatDecimalParts(t,Math.max(0,i+o-1))[0]}function formatRounded(t,r){var i=formatDecimalParts(t,r);if(!i)return t+"";var e=i[0],n=i[1];return n<0?"0."+new Array(-n).join("0")+e:e.length>n+1?e.slice(0,n+1)+"."+e.slice(n+1):e+new Array(n-e.length+2).join("0")}var i={"%":(t,r)=>(100*t).toFixed(r),b:t=>Math.round(t).toString(2),c:t=>t+"",d:formatDecimal,e:(t,r)=>t.toExponential(r),f:(t,r)=>t.toFixed(r),g:(t,r)=>t.toPrecision(r),o:t=>Math.round(t).toString(8),p:(t,r)=>formatRounded(100*t,r),r:formatRounded,s:formatPrefixAuto,X:t=>Math.round(t).toString(16).toUpperCase(),x:t=>Math.round(t).toString(16)};function identity(t){return t}var e=Array.prototype.map,n=["y","z","a","f","p","n","µ","m","","k","M","G","T","P","E","Z","Y"];function formatLocale(t){var a=void 0===t.grouping||void 0===t.thousands?identity:formatGroup(e.call(t.grouping,Number),t.thousands+""),o=void 0===t.currency?"":t.currency[0]+"",c=void 0===t.currency?"":t.currency[1]+"",f=void 0===t.decimal?".":t.decimal+"",s=void 0===t.numerals?identity:formatNumerals(e.call(t.numerals,String)),m=void 0===t.percent?"%":t.percent+"",l=void 0===t.minus?"−":t.minus+"",u=void 0===t.nan?"NaN":t.nan+"";function newFormat(t){t=formatSpecifier(t);var e=t.fill,h=t.align,p=t.sign,d=t.symbol,g=t.zero,v=t.width,x=t.comma,y=t.precision,M=t.trim,b=t.type;"n"===b?(x=true,b="g"):i[b]||(void 0===y&&(y=12),M=true,b="g");(g||"0"===e&&"="===h)&&(g=true,e="0",h="=");var w="$"===d?o:"#"===d&&/[boxX]/.test(b)?"0"+b.toLowerCase():"",S="$"===d?c:/[%p]/.test(b)?m:"";var P=i[b],F=/[defgprs%]/.test(b);y=void 0===y?6:/[gprs]/.test(b)?Math.max(1,Math.min(21,y)):Math.max(0,Math.min(20,y));function format(t){var i,o,c,m=w,d=S;if("c"===b){d=P(t)+d;t=""}else{t=+t;var k=t<0||1/t<0;t=isNaN(t)?u:P(Math.abs(t),y);M&&(t=formatTrim(t));k&&0===+t&&"+"!==p&&(k=false);m=(k?"("===p?p:l:"-"===p||"("===p?"":p)+m;d=("s"===b?n[8+r/3]:"")+d+(k&&"("===p?")":"");if(F){i=-1,o=t.length;while(++i<o)if(c=t.charCodeAt(i),48>c||c>57){d=(46===c?f+t.slice(i+1):t.slice(i))+d;t=t.slice(0,i);break}}}x&&!g&&(t=a(t,Infinity));var A=m.length+t.length+d.length,L=A<v?new Array(v-A+1).join(e):"";x&&g&&(t=a(L+t,L.length?v-d.length:Infinity),L="");switch(h){case"<":t=m+t+d+L;break;case"=":t=m+L+t+d;break;case"^":t=L.slice(0,A=L.length>>1)+m+t+d+L.slice(A);break;default:t=L+m+t+d;break}return s(t)}format.toString=function(){return t+""};return format}function formatPrefix(t,r){var i=newFormat((t=formatSpecifier(t),t.type="f",t)),e=3*Math.max(-8,Math.min(8,Math.floor(exponent(r)/3))),a=Math.pow(10,-e),o=n[8+e/3];return function(t){return i(a*t)+o}}return{format:newFormat,formatPrefix:formatPrefix}}var a;var o;var c;defaultLocale({thousands:",",grouping:[3],currency:["$",""]});function defaultLocale(t){a=formatLocale(t);o=a.format;c=a.formatPrefix;return a}function precisionFixed(t){return Math.max(0,-exponent(Math.abs(t)))}function precisionPrefix(t,r){return Math.max(0,3*Math.max(-8,Math.min(8,Math.floor(exponent(r)/3)))-exponent(Math.abs(t)))}function precisionRound(t,r){t=Math.abs(t),r=Math.abs(r)-t;return Math.max(0,exponent(r)-exponent(t))+1}export{FormatSpecifier,o as format,defaultLocale as formatDefaultLocale,formatLocale,c as formatPrefix,formatSpecifier,precisionFixed,precisionPrefix,precisionRound};
 
diff --git a/vendor/javascript/d3-geo.js b/vendor/javascript/d3-geo.js
index 016b8564..fb3cbb77 100644
--- a/vendor/javascript/d3-geo.js
+++ b/vendor/javascript/d3-geo.js
@@ -1,2 +1,4 @@
-import{Adder as n,merge as t,range as r}from"d3-array";var e=1e-6;var i=1e-12;var o=Math.PI;var a=o/2;var c=o/4;var u=2*o;var l=180/o;var s=o/180;var f=Math.abs;var p=Math.atan;var g=Math.atan2;var h=Math.cos;var d=Math.ceil;var v=Math.exp;Math.floor;var m=Math.hypot;var E=Math.log;var S=Math.pow;var y=Math.sin;var R=Math.sign||function(n){return n>0?1:n<0?-1:0};var w=Math.sqrt;var P=Math.tan;function acos(n){return n>1?0:n<-1?o:Math.acos(n)}function asin(n){return n>1?a:n<-1?-a:Math.asin(n)}function haversin(n){return(n=y(n/2))*n}function noop(){}function streamGeometry(n,t){n&&M.hasOwnProperty(n.type)&&M[n.type](n,t)}var j={Feature:function(n,t){streamGeometry(n.geometry,t)},FeatureCollection:function(n,t){var r=n.features,e=-1,i=r.length;while(++e<i)streamGeometry(r[e].geometry,t)}};var M={Sphere:function(n,t){t.sphere()},Point:function(n,t){n=n.coordinates;t.point(n[0],n[1],n[2])},MultiPoint:function(n,t){var r=n.coordinates,e=-1,i=r.length;while(++e<i)n=r[e],t.point(n[0],n[1],n[2])},LineString:function(n,t){streamLine(n.coordinates,t,0)},MultiLineString:function(n,t){var r=n.coordinates,e=-1,i=r.length;while(++e<i)streamLine(r[e],t,0)},Polygon:function(n,t){streamPolygon(n.coordinates,t)},MultiPolygon:function(n,t){var r=n.coordinates,e=-1,i=r.length;while(++e<i)streamPolygon(r[e],t)},GeometryCollection:function(n,t){var r=n.geometries,e=-1,i=r.length;while(++e<i)streamGeometry(r[e],t)}};function streamLine(n,t,r){var e,i=-1,o=n.length-r;t.lineStart();while(++i<o)e=n[i],t.point(e[0],e[1],e[2]);t.lineEnd()}function streamPolygon(n,t){var r=-1,e=n.length;t.polygonStart();while(++r<e)streamLine(n[r],t,1);t.polygonEnd()}function geoStream(n,t){n&&j.hasOwnProperty(n.type)?j[n.type](n,t):streamGeometry(n,t)}var b=new n;var L,x,C,q,$,_=new n;var N={point:noop,lineStart:noop,lineEnd:noop,polygonStart:function(){b=new n;N.lineStart=areaRingStart$1;N.lineEnd=areaRingEnd$1},polygonEnd:function(){var n=+b;_.add(n<0?u+n:n);this.lineStart=this.lineEnd=this.point=noop},sphere:function(){_.add(u)}};function areaRingStart$1(){N.point=areaPointFirst$1}function areaRingEnd$1(){areaPoint$1(L,x)}function areaPointFirst$1(n,t){N.point=areaPoint$1;L=n,x=t;n*=s,t*=s;C=n,q=h(t=t/2+c),$=y(t)}function areaPoint$1(n,t){n*=s,t*=s;t=t/2+c;var r=n-C,e=r>=0?1:-1,i=e*r,o=h(t),a=y(t),u=$*a,l=q*o+u*h(i),f=u*e*y(i);b.add(g(f,l));C=n,q=o,$=a}function area(t){_=new n;geoStream(t,N);return 2*_}function spherical(n){return[g(n[1],n[0]),asin(n[2])]}function cartesian(n){var t=n[0],r=n[1],e=h(r);return[e*h(t),e*y(t),y(r)]}function cartesianDot(n,t){return n[0]*t[0]+n[1]*t[1]+n[2]*t[2]}function cartesianCross(n,t){return[n[1]*t[2]-n[2]*t[1],n[2]*t[0]-n[0]*t[2],n[0]*t[1]-n[1]*t[0]]}function cartesianAddInPlace(n,t){n[0]+=t[0],n[1]+=t[1],n[2]+=t[2]}function cartesianScale(n,t){return[n[0]*t,n[1]*t,n[2]*t]}function cartesianNormalizeInPlace(n){var t=w(n[0]*n[0]+n[1]*n[1]+n[2]*n[2]);n[0]/=t,n[1]/=t,n[2]/=t}var I,A,z,F,T,U,G,k,H,W,D;var O={point:boundsPoint$1,lineStart:boundsLineStart,lineEnd:boundsLineEnd,polygonStart:function(){O.point=boundsRingPoint;O.lineStart=boundsRingStart;O.lineEnd=boundsRingEnd;H=new n;N.polygonStart()},polygonEnd:function(){N.polygonEnd();O.point=boundsPoint$1;O.lineStart=boundsLineStart;O.lineEnd=boundsLineEnd;b<0?(I=-(z=180),A=-(F=90)):H>e?F=90:H<-e&&(A=-90);D[0]=I,D[1]=z},sphere:function(){I=-(z=180),A=-(F=90)}};function boundsPoint$1(n,t){W.push(D=[I=n,z=n]);t<A&&(A=t);t>F&&(F=t)}function linePoint(n,t){var r=cartesian([n*s,t*s]);if(k){var e=cartesianCross(k,r),i=[e[1],-e[0],0],o=cartesianCross(i,e);cartesianNormalizeInPlace(o);o=spherical(o);var a,c=n-T,u=c>0?1:-1,p=o[0]*l*u,g=f(c)>180;if(g^(u*T<p&&p<u*n)){a=o[1]*l;a>F&&(F=a)}else if(p=(p+360)%360-180,g^(u*T<p&&p<u*n)){a=-o[1]*l;a<A&&(A=a)}else{t<A&&(A=t);t>F&&(F=t)}if(g)n<T?angle(I,n)>angle(I,z)&&(z=n):angle(n,z)>angle(I,z)&&(I=n);else if(z>=I){n<I&&(I=n);n>z&&(z=n)}else n>T?angle(I,n)>angle(I,z)&&(z=n):angle(n,z)>angle(I,z)&&(I=n)}else W.push(D=[I=n,z=n]);t<A&&(A=t);t>F&&(F=t);k=r,T=n}function boundsLineStart(){O.point=linePoint}function boundsLineEnd(){D[0]=I,D[1]=z;O.point=boundsPoint$1;k=null}function boundsRingPoint(n,t){if(k){var r=n-T;H.add(f(r)>180?r+(r>0?360:-360):r)}else U=n,G=t;N.point(n,t);linePoint(n,t)}function boundsRingStart(){N.lineStart()}function boundsRingEnd(){boundsRingPoint(U,G);N.lineEnd();f(H)>e&&(I=-(z=180));D[0]=I,D[1]=z;k=null}function angle(n,t){return(t-=n)<0?t+360:t}function rangeCompare(n,t){return n[0]-t[0]}function rangeContains(n,t){return n[0]<=n[1]?n[0]<=t&&t<=n[1]:t<n[0]||n[1]<t}function bounds(n){var t,r,e,i,o,a,c;F=z=-(I=A=Infinity);W=[];geoStream(n,O);if(r=W.length){W.sort(rangeCompare);for(t=1,e=W[0],o=[e];t<r;++t){i=W[t];if(rangeContains(e,i[0])||rangeContains(e,i[1])){angle(e[0],i[1])>angle(e[0],e[1])&&(e[1]=i[1]);angle(i[0],e[1])>angle(e[0],e[1])&&(e[0]=i[0])}else o.push(e=i)}for(a=-Infinity,r=o.length-1,t=0,e=o[r];t<=r;e=i,++t){i=o[t];(c=angle(e[1],i[0]))>a&&(a=c,I=i[0],z=e[1])}}W=D=null;return Infinity===I||Infinity===A?[[NaN,NaN],[NaN,NaN]]:[[I,A],[z,F]]}var X,Y,B,Z,J,K,Q,V,nn,tn,rn,en,on,an,cn,un;var ln={sphere:noop,point:centroidPoint$1,lineStart:centroidLineStart$1,lineEnd:centroidLineEnd$1,polygonStart:function(){ln.lineStart=centroidRingStart$1;ln.lineEnd=centroidRingEnd$1},polygonEnd:function(){ln.lineStart=centroidLineStart$1;ln.lineEnd=centroidLineEnd$1}};function centroidPoint$1(n,t){n*=s,t*=s;var r=h(t);centroidPointCartesian(r*h(n),r*y(n),y(t))}function centroidPointCartesian(n,t,r){++X;B+=(n-B)/X;Z+=(t-Z)/X;J+=(r-J)/X}function centroidLineStart$1(){ln.point=centroidLinePointFirst}function centroidLinePointFirst(n,t){n*=s,t*=s;var r=h(t);an=r*h(n);cn=r*y(n);un=y(t);ln.point=centroidLinePoint;centroidPointCartesian(an,cn,un)}function centroidLinePoint(n,t){n*=s,t*=s;var r=h(t),e=r*h(n),i=r*y(n),o=y(t),a=g(w((a=cn*o-un*i)*a+(a=un*e-an*o)*a+(a=an*i-cn*e)*a),an*e+cn*i+un*o);Y+=a;K+=a*(an+(an=e));Q+=a*(cn+(cn=i));V+=a*(un+(un=o));centroidPointCartesian(an,cn,un)}function centroidLineEnd$1(){ln.point=centroidPoint$1}function centroidRingStart$1(){ln.point=centroidRingPointFirst}function centroidRingEnd$1(){centroidRingPoint(en,on);ln.point=centroidPoint$1}function centroidRingPointFirst(n,t){en=n,on=t;n*=s,t*=s;ln.point=centroidRingPoint;var r=h(t);an=r*h(n);cn=r*y(n);un=y(t);centroidPointCartesian(an,cn,un)}function centroidRingPoint(n,t){n*=s,t*=s;var r=h(t),e=r*h(n),i=r*y(n),o=y(t),a=cn*o-un*i,c=un*e-an*o,u=an*i-cn*e,l=m(a,c,u),f=asin(l),p=l&&-f/l;nn.add(p*a);tn.add(p*c);rn.add(p*u);Y+=f;K+=f*(an+(an=e));Q+=f*(cn+(cn=i));V+=f*(un+(un=o));centroidPointCartesian(an,cn,un)}function centroid(t){X=Y=B=Z=J=K=Q=V=0;nn=new n;tn=new n;rn=new n;geoStream(t,ln);var r=+nn,o=+tn,a=+rn,c=m(r,o,a);if(c<i){r=K,o=Q,a=V;Y<e&&(r=B,o=Z,a=J);c=m(r,o,a);if(c<i)return[NaN,NaN]}return[g(o,r)*l,asin(a/c)*l]}function constant(n){return function(){return n}}function compose(n,t){function compose(r,e){return r=n(r,e),t(r[0],r[1])}n.invert&&t.invert&&(compose.invert=function(r,e){return r=t.invert(r,e),r&&n.invert(r[0],r[1])});return compose}function rotationIdentity(n,t){f(n)>o&&(n-=Math.round(n/u)*u);return[n,t]}rotationIdentity.invert=rotationIdentity;function rotateRadians(n,t,r){return(n%=u)?t||r?compose(rotationLambda(n),rotationPhiGamma(t,r)):rotationLambda(n):t||r?rotationPhiGamma(t,r):rotationIdentity}function forwardRotationLambda(n){return function(t,r){t+=n;f(t)>o&&(t-=Math.round(t/u)*u);return[t,r]}}function rotationLambda(n){var t=forwardRotationLambda(n);t.invert=forwardRotationLambda(-n);return t}function rotationPhiGamma(n,t){var r=h(n),e=y(n),i=h(t),o=y(t);function rotation(n,t){var a=h(t),c=h(n)*a,u=y(n)*a,l=y(t),s=l*r+c*e;return[g(u*i-s*o,c*r-l*e),asin(s*i+u*o)]}rotation.invert=function(n,t){var a=h(t),c=h(n)*a,u=y(n)*a,l=y(t),s=l*i-u*o;return[g(u*i+l*o,c*r+s*e),asin(s*r-c*e)]};return rotation}function rotation(n){n=rotateRadians(n[0]*s,n[1]*s,n.length>2?n[2]*s:0);function forward(t){t=n(t[0]*s,t[1]*s);return t[0]*=l,t[1]*=l,t}forward.invert=function(t){t=n.invert(t[0]*s,t[1]*s);return t[0]*=l,t[1]*=l,t};return forward}function circleStream(n,t,r,e,i,o){if(r){var a=h(t),c=y(t),l=e*r;if(null==i){i=t+e*u;o=t-l/2}else{i=circleRadius(a,i);o=circleRadius(a,o);(e>0?i<o:i>o)&&(i+=e*u)}for(var s,f=i;e>0?f>o:f<o;f-=l){s=spherical([a,-c*h(f),-c*y(f)]);n.point(s[0],s[1])}}}function circleRadius(n,t){t=cartesian(t),t[0]-=n;cartesianNormalizeInPlace(t);var r=acos(-t[1]);return((-t[2]<0?-r:r)+u-e)%u}function circle(){var n,t,r=constant([0,0]),e=constant(90),i=constant(6),o={point:point};function point(r,e){n.push(r=t(r,e));r[0]*=l,r[1]*=l}function circle(){var a=r.apply(this,arguments),c=e.apply(this,arguments)*s,u=i.apply(this,arguments)*s;n=[];t=rotateRadians(-a[0]*s,-a[1]*s,0).invert;circleStream(o,c,u,1);a={type:"Polygon",coordinates:[n]};n=t=null;return a}circle.center=function(n){return arguments.length?(r="function"===typeof n?n:constant([+n[0],+n[1]]),circle):r};circle.radius=function(n){return arguments.length?(e="function"===typeof n?n:constant(+n),circle):e};circle.precision=function(n){return arguments.length?(i="function"===typeof n?n:constant(+n),circle):i};return circle}function clipBuffer(){var n,t=[];return{point:function(t,r,e){n.push([t,r,e])},lineStart:function(){t.push(n=[])},lineEnd:noop,rejoin:function(){t.length>1&&t.push(t.pop().concat(t.shift()))},result:function(){var r=t;t=[];n=null;return r}}}function pointEqual(n,t){return f(n[0]-t[0])<e&&f(n[1]-t[1])<e}function Intersection(n,t,r,e){this.x=n;this.z=t;this.o=r;this.e=e;this.v=false;this.n=this.p=null}function clipRejoin(n,t,r,i,o){var a,c,u=[],l=[];n.forEach((function(n){if(!((t=n.length-1)<=0)){var t,r,i=n[0],c=n[t];if(pointEqual(i,c)){if(!i[2]&&!c[2]){o.lineStart();for(a=0;a<t;++a)o.point((i=n[a])[0],i[1]);o.lineEnd();return}c[0]+=2*e}u.push(r=new Intersection(i,n,null,true));l.push(r.o=new Intersection(i,null,r,false));u.push(r=new Intersection(c,n,null,false));l.push(r.o=new Intersection(c,null,r,true))}}));if(u.length){l.sort(t);link(u);link(l);for(a=0,c=l.length;a<c;++a)l[a].e=r=!r;var s,f,p=u[0];while(1){var g=p,h=true;while(g.v)if((g=g.n)===p)return;s=g.z;o.lineStart();do{g.v=g.o.v=true;if(g.e){if(h)for(a=0,c=s.length;a<c;++a)o.point((f=s[a])[0],f[1]);else i(g.x,g.n.x,1,o);g=g.n}else{if(h){s=g.p.z;for(a=s.length-1;a>=0;--a)o.point((f=s[a])[0],f[1])}else i(g.x,g.p.x,-1,o);g=g.p}g=g.o;s=g.z;h=!h}while(!g.v);o.lineEnd()}}}function link(n){if(t=n.length){var t,r,e=0,i=n[0];while(++e<t){i.n=r=n[e];r.p=i;i=r}i.n=r=n[0];r.p=i}}function longitude(n){return f(n[0])<=o?n[0]:R(n[0])*((f(n[0])+o)%u-o)}function polygonContains(t,r){var l=longitude(r),s=r[1],f=y(s),p=[y(l),-h(l),0],d=0,v=0;var m=new n;1===f?s=a+e:-1===f&&(s=-a-e);for(var E=0,S=t.length;E<S;++E)if(w=(R=t[E]).length){var R,w,P=R[w-1],j=longitude(P),M=P[1]/2+c,b=y(M),L=h(M);for(var x=0;x<w;++x,j=q,b=_,L=N,P=C){var C=R[x],q=longitude(C),$=C[1]/2+c,_=y($),N=h($),I=q-j,A=I>=0?1:-1,z=A*I,F=z>o,T=b*_;m.add(g(T*A*y(z),L*N+T*h(z)));d+=F?I+A*u:I;if(F^j>=l^q>=l){var U=cartesianCross(cartesian(P),cartesian(C));cartesianNormalizeInPlace(U);var G=cartesianCross(p,U);cartesianNormalizeInPlace(G);var k=(F^I>=0?-1:1)*asin(G[2]);(s>k||s===k&&(U[0]||U[1]))&&(v+=F^I>=0?1:-1)}}}return(d<-e||d<e&&m<-i)^1&v}function clip(n,r,e,i){return function(o){var a,c,u,l=r(o),s=clipBuffer(),f=r(s),p=false;var g={point:point,lineStart:lineStart,lineEnd:lineEnd,polygonStart:function(){g.point=pointRing;g.lineStart=ringStart;g.lineEnd=ringEnd;c=[];a=[]},polygonEnd:function(){g.point=point;g.lineStart=lineStart;g.lineEnd=lineEnd;c=t(c);var n=polygonContains(a,i);if(c.length){p||(o.polygonStart(),p=true);clipRejoin(c,compareIntersection,n,e,o)}else if(n){p||(o.polygonStart(),p=true);o.lineStart();e(null,null,1,o);o.lineEnd()}p&&(o.polygonEnd(),p=false);c=a=null},sphere:function(){o.polygonStart();o.lineStart();e(null,null,1,o);o.lineEnd();o.polygonEnd()}};function point(t,r){n(t,r)&&o.point(t,r)}function pointLine(n,t){l.point(n,t)}function lineStart(){g.point=pointLine;l.lineStart()}function lineEnd(){g.point=point;l.lineEnd()}function pointRing(n,t){u.push([n,t]);f.point(n,t)}function ringStart(){f.lineStart();u=[]}function ringEnd(){pointRing(u[0][0],u[0][1]);f.lineEnd();var n,t,r,e,i=f.clean(),l=s.result(),g=l.length;u.pop();a.push(u);u=null;if(g)if(1&i){r=l[0];if((t=r.length-1)>0){p||(o.polygonStart(),p=true);o.lineStart();for(n=0;n<t;++n)o.point((e=r[n])[0],e[1]);o.lineEnd()}}else{g>1&&2&i&&l.push(l.pop().concat(l.shift()));c.push(l.filter(validSegment))}}return g}}function validSegment(n){return n.length>1}function compareIntersection(n,t){return((n=n.x)[0]<0?n[1]-a-e:a-n[1])-((t=t.x)[0]<0?t[1]-a-e:a-t[1])}var sn=clip((function(){return true}),clipAntimeridianLine,clipAntimeridianInterpolate,[-o,-a]);function clipAntimeridianLine(n){var t,r=NaN,i=NaN,c=NaN;return{lineStart:function(){n.lineStart();t=1},point:function(u,l){var s=u>0?o:-o,p=f(u-r);if(f(p-o)<e){n.point(r,i=(i+l)/2>0?a:-a);n.point(c,i);n.lineEnd();n.lineStart();n.point(s,i);n.point(u,i);t=0}else if(c!==s&&p>=o){f(r-c)<e&&(r-=c*e);f(u-s)<e&&(u-=s*e);i=clipAntimeridianIntersect(r,i,u,l);n.point(c,i);n.lineEnd();n.lineStart();n.point(s,i);t=0}n.point(r=u,i=l);c=s},lineEnd:function(){n.lineEnd();r=i=NaN},clean:function(){return 2-t}}}function clipAntimeridianIntersect(n,t,r,i){var o,a,c=y(n-r);return f(c)>e?p((y(t)*(a=h(i))*y(r)-y(i)*(o=h(t))*y(n))/(o*a*c)):(t+i)/2}function clipAntimeridianInterpolate(n,t,r,i){var c;if(null==n){c=r*a;i.point(-o,c);i.point(0,c);i.point(o,c);i.point(o,0);i.point(o,-c);i.point(0,-c);i.point(-o,-c);i.point(-o,0);i.point(-o,c)}else if(f(n[0]-t[0])>e){var u=n[0]<t[0]?o:-o;c=r*u/2;i.point(-u,c);i.point(0,c);i.point(u,c)}else i.point(t[0],t[1])}function clipCircle(n){var t=h(n),r=6*s,i=t>0,a=f(t)>e;function interpolate(t,e,i,o){circleStream(o,n,r,i,t,e)}function visible(n,r){return h(n)*h(r)>t}function clipLine(n){var t,r,e,c,u;return{lineStart:function(){c=e=false;u=1},point:function(l,s){var f,p=[l,s],g=visible(l,s),h=i?g?0:code(l,s):g?code(l+(l<0?o:-o),s):0;!t&&(c=e=g)&&n.lineStart();if(g!==e){f=intersect(t,p);(!f||pointEqual(t,f)||pointEqual(p,f))&&(p[2]=1)}if(g!==e){u=0;if(g){n.lineStart();f=intersect(p,t);n.point(f[0],f[1])}else{f=intersect(t,p);n.point(f[0],f[1],2);n.lineEnd()}t=f}else if(a&&t&&i^g){var d;if(!(h&r)&&(d=intersect(p,t,true))){u=0;if(i){n.lineStart();n.point(d[0][0],d[0][1]);n.point(d[1][0],d[1][1]);n.lineEnd()}else{n.point(d[1][0],d[1][1]);n.lineEnd();n.lineStart();n.point(d[0][0],d[0][1],3)}}}!g||t&&pointEqual(t,p)||n.point(p[0],p[1]);t=p,e=g,r=h},lineEnd:function(){e&&n.lineEnd();t=null},clean:function(){return u|(c&&e)<<1}}}function intersect(n,r,i){var a=cartesian(n),c=cartesian(r);var u=[1,0,0],l=cartesianCross(a,c),s=cartesianDot(l,l),p=l[0],g=s-p*p;if(!g)return!i&&n;var h=t*s/g,d=-t*p/g,v=cartesianCross(u,l),m=cartesianScale(u,h),E=cartesianScale(l,d);cartesianAddInPlace(m,E);var S=v,y=cartesianDot(m,S),R=cartesianDot(S,S),P=y*y-R*(cartesianDot(m,m)-1);if(!(P<0)){var j=w(P),M=cartesianScale(S,(-y-j)/R);cartesianAddInPlace(M,m);M=spherical(M);if(!i)return M;var b,L=n[0],x=r[0],C=n[1],q=r[1];x<L&&(b=L,L=x,x=b);var $=x-L,_=f($-o)<e,N=_||$<e;!_&&q<C&&(b=C,C=q,q=b);if(N?_?C+q>0^M[1]<(f(M[0]-L)<e?C:q):C<=M[1]&&M[1]<=q:$>o^(L<=M[0]&&M[0]<=x)){var I=cartesianScale(S,(-y+j)/R);cartesianAddInPlace(I,m);return[M,spherical(I)]}}}function code(t,r){var e=i?n:o-n,a=0;t<-e?a|=1:t>e&&(a|=2);r<-e?a|=4:r>e&&(a|=8);return a}return clip(visible,clipLine,interpolate,i?[0,-n]:[-o,n-o])}function clipLine(n,t,r,e,i,o){var a,c=n[0],u=n[1],l=t[0],s=t[1],f=0,p=1,g=l-c,h=s-u;a=r-c;if(g||!(a>0)){a/=g;if(g<0){if(a<f)return;a<p&&(p=a)}else if(g>0){if(a>p)return;a>f&&(f=a)}a=i-c;if(g||!(a<0)){a/=g;if(g<0){if(a>p)return;a>f&&(f=a)}else if(g>0){if(a<f)return;a<p&&(p=a)}a=e-u;if(h||!(a>0)){a/=h;if(h<0){if(a<f)return;a<p&&(p=a)}else if(h>0){if(a>p)return;a>f&&(f=a)}a=o-u;if(h||!(a<0)){a/=h;if(h<0){if(a>p)return;a>f&&(f=a)}else if(h>0){if(a<f)return;a<p&&(p=a)}f>0&&(n[0]=c+f*g,n[1]=u+f*h);p<1&&(t[0]=c+p*g,t[1]=u+p*h);return true}}}}}var fn=1e9,pn=-fn;function clipRectangle(n,r,i,o){function visible(t,e){return n<=t&&t<=i&&r<=e&&e<=o}function interpolate(t,e,a,c){var u=0,l=0;if(null==t||(u=corner(t,a))!==(l=corner(e,a))||comparePoint(t,e)<0^a>0)do{c.point(0===u||3===u?n:i,u>1?o:r)}while((u=(u+a+4)%4)!==l);else c.point(e[0],e[1])}function corner(t,o){return f(t[0]-n)<e?o>0?0:3:f(t[0]-i)<e?o>0?2:1:f(t[1]-r)<e?o>0?1:0:o>0?3:2}function compareIntersection(n,t){return comparePoint(n.x,t.x)}function comparePoint(n,t){var r=corner(n,1),e=corner(t,1);return r!==e?r-e:0===r?t[1]-n[1]:1===r?n[0]-t[0]:2===r?n[1]-t[1]:t[0]-n[0]}return function(e){var a,c,u,l,s,f,p,g,h,d,v,m=e,E=clipBuffer();var S={point:point,lineStart:lineStart,lineEnd:lineEnd,polygonStart:polygonStart,polygonEnd:polygonEnd};function point(n,t){visible(n,t)&&m.point(n,t)}function polygonInside(){var t=0;for(var r=0,e=c.length;r<e;++r)for(var i,a,u=c[r],l=1,s=u.length,f=u[0],p=f[0],g=f[1];l<s;++l){i=p,a=g,f=u[l],p=f[0],g=f[1];a<=o?g>o&&(p-i)*(o-a)>(g-a)*(n-i)&&++t:g<=o&&(p-i)*(o-a)<(g-a)*(n-i)&&--t}return t}function polygonStart(){m=E,a=[],c=[],v=true}function polygonEnd(){var n=polygonInside(),r=v&&n,i=(a=t(a)).length;if(r||i){e.polygonStart();if(r){e.lineStart();interpolate(null,null,1,e);e.lineEnd()}i&&clipRejoin(a,compareIntersection,n,interpolate,e);e.polygonEnd()}m=e,a=c=u=null}function lineStart(){S.point=linePoint;c&&c.push(u=[]);d=true;h=false;p=g=NaN}function lineEnd(){if(a){linePoint(l,s);f&&h&&E.rejoin();a.push(E.result())}S.point=point;h&&m.lineEnd()}function linePoint(t,e){var a=visible(t,e);c&&u.push([t,e]);if(d){l=t,s=e,f=a;d=false;if(a){m.lineStart();m.point(t,e)}}else if(a&&h)m.point(t,e);else{var E=[p=Math.max(pn,Math.min(fn,p)),g=Math.max(pn,Math.min(fn,g))],S=[t=Math.max(pn,Math.min(fn,t)),e=Math.max(pn,Math.min(fn,e))];if(clipLine(E,S,n,r,i,o)){if(!h){m.lineStart();m.point(E[0],E[1])}m.point(S[0],S[1]);a||m.lineEnd();v=false}else if(a){m.lineStart();m.point(t,e);v=false}}p=t,g=e,h=a}return S}}function extent(){var n,t,r,e=0,i=0,o=960,a=500;return r={stream:function(r){return n&&t===r?n:n=clipRectangle(e,i,o,a)(t=r)},extent:function(c){return arguments.length?(e=+c[0][0],i=+c[0][1],o=+c[1][0],a=+c[1][1],n=t=null,r):[[e,i],[o,a]]}}}var gn,hn,dn,vn;var mn={sphere:noop,point:noop,lineStart:lengthLineStart,lineEnd:noop,polygonStart:noop,polygonEnd:noop};function lengthLineStart(){mn.point=lengthPointFirst$1;mn.lineEnd=lengthLineEnd}function lengthLineEnd(){mn.point=mn.lineEnd=noop}function lengthPointFirst$1(n,t){n*=s,t*=s;hn=n,dn=y(t),vn=h(t);mn.point=lengthPoint$1}function lengthPoint$1(n,t){n*=s,t*=s;var r=y(t),e=h(t),i=f(n-hn),o=h(i),a=y(i),c=e*a,u=vn*r-dn*e*o,l=dn*r+vn*e*o;gn.add(g(w(c*c+u*u),l));hn=n,dn=r,vn=e}function length(t){gn=new n;geoStream(t,mn);return+gn}var En=[null,null],Sn={type:"LineString",coordinates:En};function distance(n,t){En[0]=n;En[1]=t;return length(Sn)}var yn={Feature:function(n,t){return containsGeometry(n.geometry,t)},FeatureCollection:function(n,t){var r=n.features,e=-1,i=r.length;while(++e<i)if(containsGeometry(r[e].geometry,t))return true;return false}};var Rn={Sphere:function(){return true},Point:function(n,t){return containsPoint(n.coordinates,t)},MultiPoint:function(n,t){var r=n.coordinates,e=-1,i=r.length;while(++e<i)if(containsPoint(r[e],t))return true;return false},LineString:function(n,t){return containsLine(n.coordinates,t)},MultiLineString:function(n,t){var r=n.coordinates,e=-1,i=r.length;while(++e<i)if(containsLine(r[e],t))return true;return false},Polygon:function(n,t){return containsPolygon(n.coordinates,t)},MultiPolygon:function(n,t){var r=n.coordinates,e=-1,i=r.length;while(++e<i)if(containsPolygon(r[e],t))return true;return false},GeometryCollection:function(n,t){var r=n.geometries,e=-1,i=r.length;while(++e<i)if(containsGeometry(r[e],t))return true;return false}};function containsGeometry(n,t){return!(!n||!Rn.hasOwnProperty(n.type))&&Rn[n.type](n,t)}function containsPoint(n,t){return 0===distance(n,t)}function containsLine(n,t){var r,e,o;for(var a=0,c=n.length;a<c;a++){e=distance(n[a],t);if(0===e)return true;if(a>0){o=distance(n[a],n[a-1]);if(o>0&&r<=o&&e<=o&&(r+e-o)*(1-Math.pow((r-e)/o,2))<i*o)return true}r=e}return false}function containsPolygon(n,t){return!!polygonContains(n.map(ringRadians),pointRadians(t))}function ringRadians(n){return n=n.map(pointRadians),n.pop(),n}function pointRadians(n){return[n[0]*s,n[1]*s]}function contains(n,t){return(n&&yn.hasOwnProperty(n.type)?yn[n.type]:containsGeometry)(n,t)}function graticuleX(n,t,i){var o=r(n,t-e,i).concat(t);return function(n){return o.map((function(t){return[n,t]}))}}function graticuleY(n,t,i){var o=r(n,t-e,i).concat(t);return function(n){return o.map((function(t){return[t,n]}))}}function graticule(){var n,t,i,o,a,c,u,l,s,p,g,h,v=10,m=v,E=90,S=360,y=2.5;function graticule(){return{type:"MultiLineString",coordinates:lines()}}function lines(){return r(d(o/E)*E,i,E).map(g).concat(r(d(l/S)*S,u,S).map(h)).concat(r(d(t/v)*v,n,v).filter((function(n){return f(n%E)>e})).map(s)).concat(r(d(c/m)*m,a,m).filter((function(n){return f(n%S)>e})).map(p))}graticule.lines=function(){return lines().map((function(n){return{type:"LineString",coordinates:n}}))};graticule.outline=function(){return{type:"Polygon",coordinates:[g(o).concat(h(u).slice(1),g(i).reverse().slice(1),h(l).reverse().slice(1))]}};graticule.extent=function(n){return arguments.length?graticule.extentMajor(n).extentMinor(n):graticule.extentMinor()};graticule.extentMajor=function(n){if(!arguments.length)return[[o,l],[i,u]];o=+n[0][0],i=+n[1][0];l=+n[0][1],u=+n[1][1];o>i&&(n=o,o=i,i=n);l>u&&(n=l,l=u,u=n);return graticule.precision(y)};graticule.extentMinor=function(r){if(!arguments.length)return[[t,c],[n,a]];t=+r[0][0],n=+r[1][0];c=+r[0][1],a=+r[1][1];t>n&&(r=t,t=n,n=r);c>a&&(r=c,c=a,a=r);return graticule.precision(y)};graticule.step=function(n){return arguments.length?graticule.stepMajor(n).stepMinor(n):graticule.stepMinor()};graticule.stepMajor=function(n){if(!arguments.length)return[E,S];E=+n[0],S=+n[1];return graticule};graticule.stepMinor=function(n){if(!arguments.length)return[v,m];v=+n[0],m=+n[1];return graticule};graticule.precision=function(r){if(!arguments.length)return y;y=+r;s=graticuleX(c,a,90);p=graticuleY(t,n,y);g=graticuleX(l,u,90);h=graticuleY(o,i,y);return graticule};return graticule.extentMajor([[-180,-90+e],[180,90-e]]).extentMinor([[-180,-80-e],[180,80+e]])}function graticule10(){return graticule()()}function interpolate(n,t){var r=n[0]*s,e=n[1]*s,i=t[0]*s,o=t[1]*s,a=h(e),c=y(e),u=h(o),f=y(o),p=a*h(r),d=a*y(r),v=u*h(i),m=u*y(i),E=2*asin(w(haversin(o-e)+a*u*haversin(i-r))),S=y(E);var R=E?function(n){var t=y(n*=E)/S,r=y(E-n)/S,e=r*p+t*v,i=r*d+t*m,o=r*c+t*f;return[g(i,e)*l,g(o,w(e*e+i*i))*l]}:function(){return[r*l,e*l]};R.distance=E;return R}var identity$1=n=>n;var wn,Pn,jn,Mn,bn=new n,Ln=new n;var xn={point:noop,lineStart:noop,lineEnd:noop,polygonStart:function(){xn.lineStart=areaRingStart;xn.lineEnd=areaRingEnd},polygonEnd:function(){xn.lineStart=xn.lineEnd=xn.point=noop;bn.add(f(Ln));Ln=new n},result:function(){var t=bn/2;bn=new n;return t}};function areaRingStart(){xn.point=areaPointFirst}function areaPointFirst(n,t){xn.point=areaPoint;wn=jn=n,Pn=Mn=t}function areaPoint(n,t){Ln.add(Mn*n-jn*t);jn=n,Mn=t}function areaRingEnd(){areaPoint(wn,Pn)}var Cn=Infinity,qn=Cn,$n=-Cn,_n=$n;var Nn={point:boundsPoint,lineStart:noop,lineEnd:noop,polygonStart:noop,polygonEnd:noop,result:function(){var n=[[Cn,qn],[$n,_n]];$n=_n=-(qn=Cn=Infinity);return n}};function boundsPoint(n,t){n<Cn&&(Cn=n);n>$n&&($n=n);t<qn&&(qn=t);t>_n&&(_n=t)}var In,An,zn,Fn,Tn=0,Un=0,Gn=0,kn=0,Hn=0,Wn=0,Dn=0,On=0,Xn=0;var Yn={point:centroidPoint,lineStart:centroidLineStart,lineEnd:centroidLineEnd,polygonStart:function(){Yn.lineStart=centroidRingStart;Yn.lineEnd=centroidRingEnd},polygonEnd:function(){Yn.point=centroidPoint;Yn.lineStart=centroidLineStart;Yn.lineEnd=centroidLineEnd},result:function(){var n=Xn?[Dn/Xn,On/Xn]:Wn?[kn/Wn,Hn/Wn]:Gn?[Tn/Gn,Un/Gn]:[NaN,NaN];Tn=Un=Gn=kn=Hn=Wn=Dn=On=Xn=0;return n}};function centroidPoint(n,t){Tn+=n;Un+=t;++Gn}function centroidLineStart(){Yn.point=centroidPointFirstLine}function centroidPointFirstLine(n,t){Yn.point=centroidPointLine;centroidPoint(zn=n,Fn=t)}function centroidPointLine(n,t){var r=n-zn,e=t-Fn,i=w(r*r+e*e);kn+=i*(zn+n)/2;Hn+=i*(Fn+t)/2;Wn+=i;centroidPoint(zn=n,Fn=t)}function centroidLineEnd(){Yn.point=centroidPoint}function centroidRingStart(){Yn.point=centroidPointFirstRing}function centroidRingEnd(){centroidPointRing(In,An)}function centroidPointFirstRing(n,t){Yn.point=centroidPointRing;centroidPoint(In=zn=n,An=Fn=t)}function centroidPointRing(n,t){var r=n-zn,e=t-Fn,i=w(r*r+e*e);kn+=i*(zn+n)/2;Hn+=i*(Fn+t)/2;Wn+=i;i=Fn*n-zn*t;Dn+=i*(zn+n);On+=i*(Fn+t);Xn+=3*i;centroidPoint(zn=n,Fn=t)}function PathContext(n){this._context=n}PathContext.prototype={_radius:4.5,pointRadius:function(n){return this._radius=n,this},polygonStart:function(){this._line=0},polygonEnd:function(){this._line=NaN},lineStart:function(){this._point=0},lineEnd:function(){0===this._line&&this._context.closePath();this._point=NaN},point:function(n,t){switch(this._point){case 0:this._context.moveTo(n,t);this._point=1;break;case 1:this._context.lineTo(n,t);break;default:this._context.moveTo(n+this._radius,t);this._context.arc(n,t,this._radius,0,u);break}},result:noop};var Bn,Zn,Jn,Kn,Qn,Vn=new n;var nt={point:noop,lineStart:function(){nt.point=lengthPointFirst},lineEnd:function(){Bn&&lengthPoint(Zn,Jn);nt.point=noop},polygonStart:function(){Bn=true},polygonEnd:function(){Bn=null},result:function(){var t=+Vn;Vn=new n;return t}};function lengthPointFirst(n,t){nt.point=lengthPoint;Zn=Kn=n,Jn=Qn=t}function lengthPoint(n,t){Kn-=n,Qn-=t;Vn.add(w(Kn*Kn+Qn*Qn));Kn=n,Qn=t}let tt,rt,et,it;class PathString{constructor(n){this._append=null==n?append:appendRound(n);this._radius=4.5;this._=""}pointRadius(n){this._radius=+n;return this}polygonStart(){this._line=0}polygonEnd(){this._line=NaN}lineStart(){this._point=0}lineEnd(){0===this._line&&(this._+="Z");this._point=NaN}point(n,t){switch(this._point){case 0:this._append`M${n},${t}`;this._point=1;break;case 1:this._append`L${n},${t}`;break;default:this._append`M${n},${t}`;if(this._radius!==et||this._append!==rt){const n=this._radius;const t=this._;this._="";this._append`m0,${n}a${n},${n} 0 1,1 0,${-2*n}a${n},${n} 0 1,1 0,${2*n}z`;et=n;rt=this._append;it=this._;this._=t}this._+=it;break}}result(){const n=this._;this._="";return n.length?n:null}}function append(n){let t=1;this._+=n[0];for(const r=n.length;t<r;++t)this._+=arguments[t]+n[t]}function appendRound(n){const t=Math.floor(n);if(!(t>=0))throw new RangeError(`invalid digits: ${n}`);if(t>15)return append;if(t!==tt){const n=10**t;tt=t;rt=function append(t){let r=1;this._+=t[0];for(const e=t.length;r<e;++r)this._+=Math.round(arguments[r]*n)/n+t[r]}}return rt}function index(n,t){let r,e,i=3,o=4.5;function path(n){if(n){"function"===typeof o&&e.pointRadius(+o.apply(this,arguments));geoStream(n,r(e))}return e.result()}path.area=function(n){geoStream(n,r(xn));return xn.result()};path.measure=function(n){geoStream(n,r(nt));return nt.result()};path.bounds=function(n){geoStream(n,r(Nn));return Nn.result()};path.centroid=function(n){geoStream(n,r(Yn));return Yn.result()};path.projection=function(t){if(!arguments.length)return n;r=null==t?(n=null,identity$1):(n=t).stream;return path};path.context=function(n){if(!arguments.length)return t;e=null==n?(t=null,new PathString(i)):new PathContext(t=n);"function"!==typeof o&&e.pointRadius(o);return path};path.pointRadius=function(n){if(!arguments.length)return o;o="function"===typeof n?n:(e.pointRadius(+n),+n);return path};path.digits=function(n){if(!arguments.length)return i;if(null==n)i=null;else{const t=Math.floor(n);if(!(t>=0))throw new RangeError(`invalid digits: ${n}`);i=t}null===t&&(e=new PathString(i));return path};return path.projection(n).digits(i).context(t)}function transform(n){return{stream:transformer(n)}}function transformer(n){return function(t){var r=new TransformStream;for(var e in n)r[e]=n[e];r.stream=t;return r}}function TransformStream(){}TransformStream.prototype={constructor:TransformStream,point:function(n,t){this.stream.point(n,t)},sphere:function(){this.stream.sphere()},lineStart:function(){this.stream.lineStart()},lineEnd:function(){this.stream.lineEnd()},polygonStart:function(){this.stream.polygonStart()},polygonEnd:function(){this.stream.polygonEnd()}};function fit(n,t,r){var e=n.clipExtent&&n.clipExtent();n.scale(150).translate([0,0]);null!=e&&n.clipExtent(null);geoStream(r,n.stream(Nn));t(Nn.result());null!=e&&n.clipExtent(e);return n}function fitExtent(n,t,r){return fit(n,(function(r){var e=t[1][0]-t[0][0],i=t[1][1]-t[0][1],o=Math.min(e/(r[1][0]-r[0][0]),i/(r[1][1]-r[0][1])),a=+t[0][0]+(e-o*(r[1][0]+r[0][0]))/2,c=+t[0][1]+(i-o*(r[1][1]+r[0][1]))/2;n.scale(150*o).translate([a,c])}),r)}function fitSize(n,t,r){return fitExtent(n,[[0,0],t],r)}function fitWidth(n,t,r){return fit(n,(function(r){var e=+t,i=e/(r[1][0]-r[0][0]),o=(e-i*(r[1][0]+r[0][0]))/2,a=-i*r[0][1];n.scale(150*i).translate([o,a])}),r)}function fitHeight(n,t,r){return fit(n,(function(r){var e=+t,i=e/(r[1][1]-r[0][1]),o=-i*r[0][0],a=(e-i*(r[1][1]+r[0][1]))/2;n.scale(150*i).translate([o,a])}),r)}var ot=16,at=h(30*s);function resample(n,t){return+t?resample$1(n,t):resampleNone(n)}function resampleNone(n){return transformer({point:function(t,r){t=n(t,r);this.stream.point(t[0],t[1])}})}function resample$1(n,t){function resampleLineTo(r,i,o,a,c,u,l,s,p,h,d,v,m,E){var S=l-r,y=s-i,R=S*S+y*y;if(R>4*t&&m--){var P=a+h,j=c+d,M=u+v,b=w(P*P+j*j+M*M),L=asin(M/=b),x=f(f(M)-1)<e||f(o-p)<e?(o+p)/2:g(j,P),C=n(x,L),q=C[0],$=C[1],_=q-r,N=$-i,I=y*_-S*N;if(I*I/R>t||f((S*_+y*N)/R-.5)>.3||a*h+c*d+u*v<at){resampleLineTo(r,i,o,a,c,u,q,$,x,P/=b,j/=b,M,m,E);E.point(q,$);resampleLineTo(q,$,x,P,j,M,l,s,p,h,d,v,m,E)}}}return function(t){var r,e,i,o,a,c,u,l,s,f,p,g;var h={point:point,lineStart:lineStart,lineEnd:lineEnd,polygonStart:function(){t.polygonStart();h.lineStart=ringStart},polygonEnd:function(){t.polygonEnd();h.lineStart=lineStart}};function point(r,e){r=n(r,e);t.point(r[0],r[1])}function lineStart(){l=NaN;h.point=linePoint;t.lineStart()}function linePoint(r,e){var i=cartesian([r,e]),o=n(r,e);resampleLineTo(l,s,u,f,p,g,l=o[0],s=o[1],u=r,f=i[0],p=i[1],g=i[2],ot,t);t.point(l,s)}function lineEnd(){h.point=point;t.lineEnd()}function ringStart(){lineStart();h.point=ringPoint;h.lineEnd=ringEnd}function ringPoint(n,t){linePoint(r=n,t),e=l,i=s,o=f,a=p,c=g;h.point=linePoint}function ringEnd(){resampleLineTo(l,s,u,f,p,g,e,i,r,o,a,c,ot,t);h.lineEnd=lineEnd;lineEnd()}return h}}var ct=transformer({point:function(n,t){this.stream.point(n*s,t*s)}});function transformRotate(n){return transformer({point:function(t,r){var e=n(t,r);return this.stream.point(e[0],e[1])}})}function scaleTranslate(n,t,r,e,i){function transform(o,a){o*=e;a*=i;return[t+n*o,r-n*a]}transform.invert=function(o,a){return[(o-t)/n*e,(r-a)/n*i]};return transform}function scaleTranslateRotate(n,t,r,e,i,o){if(!o)return scaleTranslate(n,t,r,e,i);var a=h(o),c=y(o),u=a*n,l=c*n,s=a/n,f=c/n,p=(c*r-a*t)/n,g=(c*t+a*r)/n;function transform(n,o){n*=e;o*=i;return[u*n-l*o+t,r-l*n-u*o]}transform.invert=function(n,t){return[e*(s*n-f*t+p),i*(g-f*n-s*t)]};return transform}function projection(n){return projectionMutator((function(){return n}))()}function projectionMutator(n){var t,r,e,i,o,a,c,u,f,p,g=150,h=480,d=250,v=0,m=0,E=0,S=0,y=0,R=0,P=1,j=1,M=null,b=sn,L=null,x=identity$1,C=.5;function projection(n){return u(n[0]*s,n[1]*s)}function invert(n){n=u.invert(n[0],n[1]);return n&&[n[0]*l,n[1]*l]}projection.stream=function(n){return f&&p===n?f:f=ct(transformRotate(r)(b(a(x(p=n)))))};projection.preclip=function(n){return arguments.length?(b=n,M=void 0,reset()):b};projection.postclip=function(n){return arguments.length?(x=n,L=e=i=o=null,reset()):x};projection.clipAngle=function(n){return arguments.length?(b=+n?clipCircle(M=n*s):(M=null,sn),reset()):M*l};projection.clipExtent=function(n){return arguments.length?(x=null==n?(L=e=i=o=null,identity$1):clipRectangle(L=+n[0][0],e=+n[0][1],i=+n[1][0],o=+n[1][1]),reset()):null==L?null:[[L,e],[i,o]]};projection.scale=function(n){return arguments.length?(g=+n,recenter()):g};projection.translate=function(n){return arguments.length?(h=+n[0],d=+n[1],recenter()):[h,d]};projection.center=function(n){return arguments.length?(v=n[0]%360*s,m=n[1]%360*s,recenter()):[v*l,m*l]};projection.rotate=function(n){return arguments.length?(E=n[0]%360*s,S=n[1]%360*s,y=n.length>2?n[2]%360*s:0,recenter()):[E*l,S*l,y*l]};projection.angle=function(n){return arguments.length?(R=n%360*s,recenter()):R*l};projection.reflectX=function(n){return arguments.length?(P=n?-1:1,recenter()):P<0};projection.reflectY=function(n){return arguments.length?(j=n?-1:1,recenter()):j<0};projection.precision=function(n){return arguments.length?(a=resample(c,C=n*n),reset()):w(C)};projection.fitExtent=function(n,t){return fitExtent(projection,n,t)};projection.fitSize=function(n,t){return fitSize(projection,n,t)};projection.fitWidth=function(n,t){return fitWidth(projection,n,t)};projection.fitHeight=function(n,t){return fitHeight(projection,n,t)};function recenter(){var n=scaleTranslateRotate(g,0,0,P,j,R).apply(null,t(v,m)),e=scaleTranslateRotate(g,h-n[0],d-n[1],P,j,R);r=rotateRadians(E,S,y);c=compose(t,e);u=compose(r,c);a=resample(c,C);return reset()}function reset(){f=p=null;return projection}return function(){t=n.apply(this,arguments);projection.invert=t.invert&&invert;return recenter()}}function conicProjection(n){var t=0,r=o/3,e=projectionMutator(n),i=e(t,r);i.parallels=function(n){return arguments.length?e(t=n[0]*s,r=n[1]*s):[t*l,r*l]};return i}function cylindricalEqualAreaRaw(n){var t=h(n);function forward(n,r){return[n*t,y(r)/t]}forward.invert=function(n,r){return[n/t,asin(r*t)]};return forward}function conicEqualAreaRaw(n,t){var r=y(n),i=(r+y(t))/2;if(f(i)<e)return cylindricalEqualAreaRaw(n);var a=1+r*(2*i-r),c=w(a)/i;function project(n,t){var r=w(a-2*i*y(t))/i;return[r*y(n*=i),c-r*h(n)]}project.invert=function(n,t){var r=c-t,e=g(n,f(r))*R(r);r*i<0&&(e-=o*R(n)*R(r));return[e/i,asin((a-(n*n+r*r)*i*i)/(2*i))]};return project}function conicEqualArea(){return conicProjection(conicEqualAreaRaw).scale(155.424).center([0,33.6442])}function albers(){return conicEqualArea().parallels([29.5,45.5]).scale(1070).translate([480,250]).rotate([96,0]).center([-.6,38.7])}function multiplex(n){var t=n.length;return{point:function(r,e){var i=-1;while(++i<t)n[i].point(r,e)},sphere:function(){var r=-1;while(++r<t)n[r].sphere()},lineStart:function(){var r=-1;while(++r<t)n[r].lineStart()},lineEnd:function(){var r=-1;while(++r<t)n[r].lineEnd()},polygonStart:function(){var r=-1;while(++r<t)n[r].polygonStart()},polygonEnd:function(){var r=-1;while(++r<t)n[r].polygonEnd()}}}function albersUsa(){var n,t,r,i,o,a,c=albers(),u=conicEqualArea().rotate([154,0]).center([-2,58.5]).parallels([55,65]),l=conicEqualArea().rotate([157,0]).center([-3,19.9]).parallels([8,18]),s={point:function(n,t){a=[n,t]}};function albersUsa(n){var t=n[0],e=n[1];return a=null,(r.point(t,e),a)||(i.point(t,e),a)||(o.point(t,e),a)}albersUsa.invert=function(n){var t=c.scale(),r=c.translate(),e=(n[0]-r[0])/t,i=(n[1]-r[1])/t;return(i>=.12&&i<.234&&e>=-.425&&e<-.214?u:i>=.166&&i<.234&&e>=-.214&&e<-.115?l:c).invert(n)};albersUsa.stream=function(r){return n&&t===r?n:n=multiplex([c.stream(t=r),u.stream(r),l.stream(r)])};albersUsa.precision=function(n){if(!arguments.length)return c.precision();c.precision(n),u.precision(n),l.precision(n);return reset()};albersUsa.scale=function(n){if(!arguments.length)return c.scale();c.scale(n),u.scale(.35*n),l.scale(n);return albersUsa.translate(c.translate())};albersUsa.translate=function(n){if(!arguments.length)return c.translate();var t=c.scale(),a=+n[0],f=+n[1];r=c.translate(n).clipExtent([[a-.455*t,f-.238*t],[a+.455*t,f+.238*t]]).stream(s);i=u.translate([a-.307*t,f+.201*t]).clipExtent([[a-.425*t+e,f+.12*t+e],[a-.214*t-e,f+.234*t-e]]).stream(s);o=l.translate([a-.205*t,f+.212*t]).clipExtent([[a-.214*t+e,f+.166*t+e],[a-.115*t-e,f+.234*t-e]]).stream(s);return reset()};albersUsa.fitExtent=function(n,t){return fitExtent(albersUsa,n,t)};albersUsa.fitSize=function(n,t){return fitSize(albersUsa,n,t)};albersUsa.fitWidth=function(n,t){return fitWidth(albersUsa,n,t)};albersUsa.fitHeight=function(n,t){return fitHeight(albersUsa,n,t)};function reset(){n=t=null;return albersUsa}return albersUsa.scale(1070)}function azimuthalRaw(n){return function(t,r){var e=h(t),i=h(r),o=n(e*i);return Infinity===o?[2,0]:[o*i*y(t),o*y(r)]}}function azimuthalInvert(n){return function(t,r){var e=w(t*t+r*r),i=n(e),o=y(i),a=h(i);return[g(t*o,e*a),asin(e&&r*o/e)]}}var ut=azimuthalRaw((function(n){return w(2/(1+n))}));ut.invert=azimuthalInvert((function(n){return 2*asin(n/2)}));function azimuthalEqualArea(){return projection(ut).scale(124.75).clipAngle(179.999)}var lt=azimuthalRaw((function(n){return(n=acos(n))&&n/y(n)}));lt.invert=azimuthalInvert((function(n){return n}));function azimuthalEquidistant(){return projection(lt).scale(79.4188).clipAngle(179.999)}function mercatorRaw(n,t){return[n,E(P((a+t)/2))]}mercatorRaw.invert=function(n,t){return[n,2*p(v(t))-a]};function mercator(){return mercatorProjection(mercatorRaw).scale(961/u)}function mercatorProjection(n){var t,r,e,i=projection(n),a=i.center,c=i.scale,u=i.translate,l=i.clipExtent,s=null;i.scale=function(n){return arguments.length?(c(n),reclip()):c()};i.translate=function(n){return arguments.length?(u(n),reclip()):u()};i.center=function(n){return arguments.length?(a(n),reclip()):a()};i.clipExtent=function(n){return arguments.length?(null==n?s=t=r=e=null:(s=+n[0][0],t=+n[0][1],r=+n[1][0],e=+n[1][1]),reclip()):null==s?null:[[s,t],[r,e]]};function reclip(){var a=o*c(),u=i(rotation(i.rotate()).invert([0,0]));return l(null==s?[[u[0]-a,u[1]-a],[u[0]+a,u[1]+a]]:n===mercatorRaw?[[Math.max(u[0]-a,s),t],[Math.min(u[0]+a,r),e]]:[[s,Math.max(u[1]-a,t)],[r,Math.min(u[1]+a,e)]])}return reclip()}function tany(n){return P((a+n)/2)}function conicConformalRaw(n,t){var r=h(n),i=n===t?y(n):E(r/h(t))/E(tany(t)/tany(n)),c=r*S(tany(n),i)/i;if(!i)return mercatorRaw;function project(n,t){c>0?t<-a+e&&(t=-a+e):t>a-e&&(t=a-e);var r=c/S(tany(t),i);return[r*y(i*n),c-r*h(i*n)]}project.invert=function(n,t){var r=c-t,e=R(i)*w(n*n+r*r),u=g(n,f(r))*R(r);r*i<0&&(u-=o*R(n)*R(r));return[u/i,2*p(S(c/e,1/i))-a]};return project}function conicConformal(){return conicProjection(conicConformalRaw).scale(109.5).parallels([30,30])}function equirectangularRaw(n,t){return[n,t]}equirectangularRaw.invert=equirectangularRaw;function equirectangular(){return projection(equirectangularRaw).scale(152.63)}function conicEquidistantRaw(n,t){var r=h(n),i=n===t?y(n):(r-h(t))/(t-n),a=r/i+n;if(f(i)<e)return equirectangularRaw;function project(n,t){var r=a-t,e=i*n;return[r*y(e),a-r*h(e)]}project.invert=function(n,t){var r=a-t,e=g(n,f(r))*R(r);r*i<0&&(e-=o*R(n)*R(r));return[e/i,a-R(i)*w(n*n+r*r)]};return project}function conicEquidistant(){return conicProjection(conicEquidistantRaw).scale(131.154).center([0,13.9389])}var st=1.340264,ft=-.081106,pt=893e-6,gt=.003796,ht=w(3)/2,dt=12;function equalEarthRaw(n,t){var r=asin(ht*y(t)),e=r*r,i=e*e*e;return[n*h(r)/(ht*(st+3*ft*e+i*(7*pt+9*gt*e))),r*(st+ft*e+i*(pt+gt*e))]}equalEarthRaw.invert=function(n,t){var r=t,e=r*r,o=e*e*e;for(var a,c,u,l=0;l<dt;++l){c=r*(st+ft*e+o*(pt+gt*e))-t;u=st+3*ft*e+o*(7*pt+9*gt*e);r-=a=c/u,e=r*r,o=e*e*e;if(f(a)<i)break}return[ht*n*(st+3*ft*e+o*(7*pt+9*gt*e))/h(r),asin(y(r)/ht)]};function equalEarth(){return projection(equalEarthRaw).scale(177.158)}function gnomonicRaw(n,t){var r=h(t),e=h(n)*r;return[r*y(n)/e,y(t)/e]}gnomonicRaw.invert=azimuthalInvert(p);function gnomonic(){return projection(gnomonicRaw).scale(144.049).clipAngle(60)}function identity(){var n,t,r,e,i,o,a,c=1,u=0,f=0,p=1,g=1,d=0,v=null,m=1,E=1,S=transformer({point:function(n,t){var r=projection([n,t]);this.stream.point(r[0],r[1])}}),R=identity$1;function reset(){m=c*p;E=c*g;o=a=null;return projection}function projection(r){var e=r[0]*m,i=r[1]*E;if(d){var o=i*n-e*t;e=e*n+i*t;i=o}return[e+u,i+f]}projection.invert=function(r){var e=r[0]-u,i=r[1]-f;if(d){var o=i*n+e*t;e=e*n-i*t;i=o}return[e/m,i/E]};projection.stream=function(n){return o&&a===n?o:o=S(R(a=n))};projection.postclip=function(n){return arguments.length?(R=n,v=r=e=i=null,reset()):R};projection.clipExtent=function(n){return arguments.length?(R=null==n?(v=r=e=i=null,identity$1):clipRectangle(v=+n[0][0],r=+n[0][1],e=+n[1][0],i=+n[1][1]),reset()):null==v?null:[[v,r],[e,i]]};projection.scale=function(n){return arguments.length?(c=+n,reset()):c};projection.translate=function(n){return arguments.length?(u=+n[0],f=+n[1],reset()):[u,f]};projection.angle=function(r){return arguments.length?(d=r%360*s,t=y(d),n=h(d),reset()):d*l};projection.reflectX=function(n){return arguments.length?(p=n?-1:1,reset()):p<0};projection.reflectY=function(n){return arguments.length?(g=n?-1:1,reset()):g<0};projection.fitExtent=function(n,t){return fitExtent(projection,n,t)};projection.fitSize=function(n,t){return fitSize(projection,n,t)};projection.fitWidth=function(n,t){return fitWidth(projection,n,t)};projection.fitHeight=function(n,t){return fitHeight(projection,n,t)};return projection}function naturalEarth1Raw(n,t){var r=t*t,e=r*r;return[n*(.8707-.131979*r+e*(e*(.003971*r-.001529*e)-.013791)),t*(1.007226+r*(.015085+e*(.028874*r-.044475-.005916*e)))]}naturalEarth1Raw.invert=function(n,t){var r,i=t,o=25;do{var a=i*i,c=a*a;i-=r=(i*(1.007226+a*(.015085+c*(.028874*a-.044475-.005916*c)))-t)/(1.007226+a*(.045255+c*(.259866*a-.311325-.005916*11*c)))}while(f(r)>e&&--o>0);return[n/(.8707+(a=i*i)*(a*(a*a*a*(.003971-.001529*a)-.013791)-.131979)),i]};function naturalEarth1(){return projection(naturalEarth1Raw).scale(175.295)}function orthographicRaw(n,t){return[h(t)*y(n),y(t)]}orthographicRaw.invert=azimuthalInvert(asin);function orthographic(){return projection(orthographicRaw).scale(249.5).clipAngle(90+e)}function stereographicRaw(n,t){var r=h(t),e=1+h(n)*r;return[r*y(n)/e,y(t)/e]}stereographicRaw.invert=azimuthalInvert((function(n){return 2*p(n)}));function stereographic(){return projection(stereographicRaw).scale(250).clipAngle(142)}function transverseMercatorRaw(n,t){return[E(P((a+t)/2)),-n]}transverseMercatorRaw.invert=function(n,t){return[-t,2*p(v(n))-a]};function transverseMercator(){var n=mercatorProjection(transverseMercatorRaw),t=n.center,r=n.rotate;n.center=function(n){return arguments.length?t([-n[1],n[0]]):(n=t(),[n[1],-n[0]])};n.rotate=function(n){return arguments.length?r([n[0],n[1],n.length>2?n[2]+90:90]):(n=r(),[n[0],n[1],n[2]-90])};return r([0,0,90]).scale(159.155)}export{albers as geoAlbers,albersUsa as geoAlbersUsa,area as geoArea,azimuthalEqualArea as geoAzimuthalEqualArea,ut as geoAzimuthalEqualAreaRaw,azimuthalEquidistant as geoAzimuthalEquidistant,lt as geoAzimuthalEquidistantRaw,bounds as geoBounds,centroid as geoCentroid,circle as geoCircle,sn as geoClipAntimeridian,clipCircle as geoClipCircle,extent as geoClipExtent,clipRectangle as geoClipRectangle,conicConformal as geoConicConformal,conicConformalRaw as geoConicConformalRaw,conicEqualArea as geoConicEqualArea,conicEqualAreaRaw as geoConicEqualAreaRaw,conicEquidistant as geoConicEquidistant,conicEquidistantRaw as geoConicEquidistantRaw,contains as geoContains,distance as geoDistance,equalEarth as geoEqualEarth,equalEarthRaw as geoEqualEarthRaw,equirectangular as geoEquirectangular,equirectangularRaw as geoEquirectangularRaw,gnomonic as geoGnomonic,gnomonicRaw as geoGnomonicRaw,graticule as geoGraticule,graticule10 as geoGraticule10,identity as geoIdentity,interpolate as geoInterpolate,length as geoLength,mercator as geoMercator,mercatorRaw as geoMercatorRaw,naturalEarth1 as geoNaturalEarth1,naturalEarth1Raw as geoNaturalEarth1Raw,orthographic as geoOrthographic,orthographicRaw as geoOrthographicRaw,index as geoPath,projection as geoProjection,projectionMutator as geoProjectionMutator,rotation as geoRotation,stereographic as geoStereographic,stereographicRaw as geoStereographicRaw,geoStream,transform as geoTransform,transverseMercator as geoTransverseMercator,transverseMercatorRaw as geoTransverseMercatorRaw};
+// d3-geo@3.1.1 downloaded from https://ga.jspm.io/npm:d3-geo@3.1.1/src/index.js
+
+import{Adder as n,merge as t,range as r}from"d3-array";var e=1e-6;var i=1e-12;var o=Math.PI;var a=o/2;var c=o/4;var u=o*2;var l=180/o;var s=o/180;var f=Math.abs;var p=Math.atan;var g=Math.atan2;var h=Math.cos;var d=Math.ceil;var v=Math.exp;Math.floor;var m=Math.hypot;var E=Math.log;var S=Math.pow;var y=Math.sin;var R=Math.sign||function(n){return n>0?1:n<0?-1:0};var w=Math.sqrt;var P=Math.tan;function acos(n){return n>1?0:n<-1?o:Math.acos(n)}function asin(n){return n>1?a:n<-1?-a:Math.asin(n)}function haversin(n){return(n=y(n/2))*n}function noop(){}function streamGeometry(n,t){n&&M.hasOwnProperty(n.type)&&M[n.type](n,t)}var j={Feature:function(n,t){streamGeometry(n.geometry,t)},FeatureCollection:function(n,t){var r=n.features,e=-1,i=r.length;while(++e<i)streamGeometry(r[e].geometry,t)}};var M={Sphere:function(n,t){t.sphere()},Point:function(n,t){n=n.coordinates;t.point(n[0],n[1],n[2])},MultiPoint:function(n,t){var r=n.coordinates,e=-1,i=r.length;while(++e<i)n=r[e],t.point(n[0],n[1],n[2])},LineString:function(n,t){streamLine(n.coordinates,t,0)},MultiLineString:function(n,t){var r=n.coordinates,e=-1,i=r.length;while(++e<i)streamLine(r[e],t,0)},Polygon:function(n,t){streamPolygon(n.coordinates,t)},MultiPolygon:function(n,t){var r=n.coordinates,e=-1,i=r.length;while(++e<i)streamPolygon(r[e],t)},GeometryCollection:function(n,t){var r=n.geometries,e=-1,i=r.length;while(++e<i)streamGeometry(r[e],t)}};function streamLine(n,t,r){var e,i=-1,o=n.length-r;t.lineStart();while(++i<o)e=n[i],t.point(e[0],e[1],e[2]);t.lineEnd()}function streamPolygon(n,t){var r=-1,e=n.length;t.polygonStart();while(++r<e)streamLine(n[r],t,1);t.polygonEnd()}function geoStream(n,t){n&&j.hasOwnProperty(n.type)?j[n.type](n,t):streamGeometry(n,t)}var b=new n;var L,x,C,q,$,_=new n;var N={point:noop,lineStart:noop,lineEnd:noop,polygonStart:function(){b=new n;N.lineStart=areaRingStart$1;N.lineEnd=areaRingEnd$1},polygonEnd:function(){var n=+b;_.add(n<0?u+n:n);this.lineStart=this.lineEnd=this.point=noop},sphere:function(){_.add(u)}};function areaRingStart$1(){N.point=areaPointFirst$1}function areaRingEnd$1(){areaPoint$1(L,x)}function areaPointFirst$1(n,t){N.point=areaPoint$1;L=n,x=t;n*=s,t*=s;C=n,q=h(t=t/2+c),$=y(t)}function areaPoint$1(n,t){n*=s,t*=s;t=t/2+c;var r=n-C,e=r>=0?1:-1,i=e*r,o=h(t),a=y(t),u=$*a,l=q*o+u*h(i),f=u*e*y(i);b.add(g(f,l));C=n,q=o,$=a}function area(t){_=new n;geoStream(t,N);return _*2}function spherical(n){return[g(n[1],n[0]),asin(n[2])]}function cartesian(n){var t=n[0],r=n[1],e=h(r);return[e*h(t),e*y(t),y(r)]}function cartesianDot(n,t){return n[0]*t[0]+n[1]*t[1]+n[2]*t[2]}function cartesianCross(n,t){return[n[1]*t[2]-n[2]*t[1],n[2]*t[0]-n[0]*t[2],n[0]*t[1]-n[1]*t[0]]}function cartesianAddInPlace(n,t){n[0]+=t[0],n[1]+=t[1],n[2]+=t[2]}function cartesianScale(n,t){return[n[0]*t,n[1]*t,n[2]*t]}function cartesianNormalizeInPlace(n){var t=w(n[0]*n[0]+n[1]*n[1]+n[2]*n[2]);n[0]/=t,n[1]/=t,n[2]/=t}var I,A,z,F,T,U,G,k,H,W,D;var O={point:boundsPoint$1,lineStart:boundsLineStart,lineEnd:boundsLineEnd,polygonStart:function(){O.point=boundsRingPoint;O.lineStart=boundsRingStart;O.lineEnd=boundsRingEnd;H=new n;N.polygonStart()},polygonEnd:function(){N.polygonEnd();O.point=boundsPoint$1;O.lineStart=boundsLineStart;O.lineEnd=boundsLineEnd;b<0?(I=-(z=180),A=-(F=90)):H>e?F=90:H<-e&&(A=-90);D[0]=I,D[1]=z},sphere:function(){I=-(z=180),A=-(F=90)}};function boundsPoint$1(n,t){W.push(D=[I=n,z=n]);t<A&&(A=t);t>F&&(F=t)}function linePoint(n,t){var r=cartesian([n*s,t*s]);if(k){var e=cartesianCross(k,r),i=[e[1],-e[0],0],o=cartesianCross(i,e);cartesianNormalizeInPlace(o);o=spherical(o);var a,c=n-T,u=c>0?1:-1,p=o[0]*l*u,g=f(c)>180;if(g^(u*T<p&&p<u*n)){a=o[1]*l;a>F&&(F=a)}else if(p=(p+360)%360-180,g^(u*T<p&&p<u*n)){a=-o[1]*l;a<A&&(A=a)}else{t<A&&(A=t);t>F&&(F=t)}if(g)n<T?angle(I,n)>angle(I,z)&&(z=n):angle(n,z)>angle(I,z)&&(I=n);else if(z>=I){n<I&&(I=n);n>z&&(z=n)}else n>T?angle(I,n)>angle(I,z)&&(z=n):angle(n,z)>angle(I,z)&&(I=n)}else W.push(D=[I=n,z=n]);t<A&&(A=t);t>F&&(F=t);k=r,T=n}function boundsLineStart(){O.point=linePoint}function boundsLineEnd(){D[0]=I,D[1]=z;O.point=boundsPoint$1;k=null}function boundsRingPoint(n,t){if(k){var r=n-T;H.add(f(r)>180?r+(r>0?360:-360):r)}else U=n,G=t;N.point(n,t);linePoint(n,t)}function boundsRingStart(){N.lineStart()}function boundsRingEnd(){boundsRingPoint(U,G);N.lineEnd();f(H)>e&&(I=-(z=180));D[0]=I,D[1]=z;k=null}function angle(n,t){return(t-=n)<0?t+360:t}function rangeCompare(n,t){return n[0]-t[0]}function rangeContains(n,t){return n[0]<=n[1]?n[0]<=t&&t<=n[1]:t<n[0]||n[1]<t}function bounds(n){var t,r,e,i,o,a,c;F=z=-(I=A=Infinity);W=[];geoStream(n,O);if(r=W.length){W.sort(rangeCompare);for(t=1,e=W[0],o=[e];t<r;++t){i=W[t];if(rangeContains(e,i[0])||rangeContains(e,i[1])){angle(e[0],i[1])>angle(e[0],e[1])&&(e[1]=i[1]);angle(i[0],e[1])>angle(e[0],e[1])&&(e[0]=i[0])}else o.push(e=i)}for(a=-Infinity,r=o.length-1,t=0,e=o[r];t<=r;e=i,++t){i=o[t];(c=angle(e[1],i[0]))>a&&(a=c,I=i[0],z=e[1])}}W=D=null;return I===Infinity||A===Infinity?[[NaN,NaN],[NaN,NaN]]:[[I,A],[z,F]]}var X,Y,B,Z,J,K,Q,V,nn,tn,rn,en,on,an,cn,un;var ln={sphere:noop,point:centroidPoint$1,lineStart:centroidLineStart$1,lineEnd:centroidLineEnd$1,polygonStart:function(){ln.lineStart=centroidRingStart$1;ln.lineEnd=centroidRingEnd$1},polygonEnd:function(){ln.lineStart=centroidLineStart$1;ln.lineEnd=centroidLineEnd$1}};function centroidPoint$1(n,t){n*=s,t*=s;var r=h(t);centroidPointCartesian(r*h(n),r*y(n),y(t))}function centroidPointCartesian(n,t,r){++X;B+=(n-B)/X;Z+=(t-Z)/X;J+=(r-J)/X}function centroidLineStart$1(){ln.point=centroidLinePointFirst}function centroidLinePointFirst(n,t){n*=s,t*=s;var r=h(t);an=r*h(n);cn=r*y(n);un=y(t);ln.point=centroidLinePoint;centroidPointCartesian(an,cn,un)}function centroidLinePoint(n,t){n*=s,t*=s;var r=h(t),e=r*h(n),i=r*y(n),o=y(t),a=g(w((a=cn*o-un*i)*a+(a=un*e-an*o)*a+(a=an*i-cn*e)*a),an*e+cn*i+un*o);Y+=a;K+=a*(an+(an=e));Q+=a*(cn+(cn=i));V+=a*(un+(un=o));centroidPointCartesian(an,cn,un)}function centroidLineEnd$1(){ln.point=centroidPoint$1}function centroidRingStart$1(){ln.point=centroidRingPointFirst}function centroidRingEnd$1(){centroidRingPoint(en,on);ln.point=centroidPoint$1}function centroidRingPointFirst(n,t){en=n,on=t;n*=s,t*=s;ln.point=centroidRingPoint;var r=h(t);an=r*h(n);cn=r*y(n);un=y(t);centroidPointCartesian(an,cn,un)}function centroidRingPoint(n,t){n*=s,t*=s;var r=h(t),e=r*h(n),i=r*y(n),o=y(t),a=cn*o-un*i,c=un*e-an*o,u=an*i-cn*e,l=m(a,c,u),f=asin(l),p=l&&-f/l;nn.add(p*a);tn.add(p*c);rn.add(p*u);Y+=f;K+=f*(an+(an=e));Q+=f*(cn+(cn=i));V+=f*(un+(un=o));centroidPointCartesian(an,cn,un)}function centroid(t){X=Y=B=Z=J=K=Q=V=0;nn=new n;tn=new n;rn=new n;geoStream(t,ln);var r=+nn,o=+tn,a=+rn,c=m(r,o,a);if(c<i){r=K,o=Q,a=V;Y<e&&(r=B,o=Z,a=J);c=m(r,o,a);if(c<i)return[NaN,NaN]}return[g(o,r)*l,asin(a/c)*l]}function constant(n){return function(){return n}}function compose(n,t){function compose(r,e){return r=n(r,e),t(r[0],r[1])}n.invert&&t.invert&&(compose.invert=function(r,e){return r=t.invert(r,e),r&&n.invert(r[0],r[1])});return compose}function rotationIdentity(n,t){f(n)>o&&(n-=Math.round(n/u)*u);return[n,t]}rotationIdentity.invert=rotationIdentity;function rotateRadians(n,t,r){return(n%=u)?t||r?compose(rotationLambda(n),rotationPhiGamma(t,r)):rotationLambda(n):t||r?rotationPhiGamma(t,r):rotationIdentity}function forwardRotationLambda(n){return function(t,r){t+=n;f(t)>o&&(t-=Math.round(t/u)*u);return[t,r]}}function rotationLambda(n){var t=forwardRotationLambda(n);t.invert=forwardRotationLambda(-n);return t}function rotationPhiGamma(n,t){var r=h(n),e=y(n),i=h(t),o=y(t);function rotation(n,t){var a=h(t),c=h(n)*a,u=y(n)*a,l=y(t),s=l*r+c*e;return[g(u*i-s*o,c*r-l*e),asin(s*i+u*o)]}rotation.invert=function(n,t){var a=h(t),c=h(n)*a,u=y(n)*a,l=y(t),s=l*i-u*o;return[g(u*i+l*o,c*r+s*e),asin(s*r-c*e)]};return rotation}function rotation(n){n=rotateRadians(n[0]*s,n[1]*s,n.length>2?n[2]*s:0);function forward(t){t=n(t[0]*s,t[1]*s);return t[0]*=l,t[1]*=l,t}forward.invert=function(t){t=n.invert(t[0]*s,t[1]*s);return t[0]*=l,t[1]*=l,t};return forward}function circleStream(n,t,r,e,i,o){if(r){var a=h(t),c=y(t),l=e*r;if(i==null){i=t+e*u;o=t-l/2}else{i=circleRadius(a,i);o=circleRadius(a,o);(e>0?i<o:i>o)&&(i+=e*u)}for(var s,f=i;e>0?f>o:f<o;f-=l){s=spherical([a,-c*h(f),-c*y(f)]);n.point(s[0],s[1])}}}function circleRadius(n,t){t=cartesian(t),t[0]-=n;cartesianNormalizeInPlace(t);var r=acos(-t[1]);return((-t[2]<0?-r:r)+u-e)%u}function circle(){var n,t,r=constant([0,0]),e=constant(90),i=constant(2),o={point:point};function point(r,e){n.push(r=t(r,e));r[0]*=l,r[1]*=l}function circle(){var a=r.apply(this,arguments),c=e.apply(this,arguments)*s,u=i.apply(this,arguments)*s;n=[];t=rotateRadians(-a[0]*s,-a[1]*s,0).invert;circleStream(o,c,u,1);a={type:"Polygon",coordinates:[n]};n=t=null;return a}circle.center=function(n){return arguments.length?(r=typeof n==="function"?n:constant([+n[0],+n[1]]),circle):r};circle.radius=function(n){return arguments.length?(e=typeof n==="function"?n:constant(+n),circle):e};circle.precision=function(n){return arguments.length?(i=typeof n==="function"?n:constant(+n),circle):i};return circle}function clipBuffer(){var n,t=[];return{point:function(t,r,e){n.push([t,r,e])},lineStart:function(){t.push(n=[])},lineEnd:noop,rejoin:function(){t.length>1&&t.push(t.pop().concat(t.shift()))},result:function(){var r=t;t=[];n=null;return r}}}function pointEqual(n,t){return f(n[0]-t[0])<e&&f(n[1]-t[1])<e}function Intersection(n,t,r,e){this.x=n;this.z=t;this.o=r;this.e=e;this.v=false;this.n=this.p=null}function clipRejoin(n,t,r,i,o){var a,c,u=[],l=[];n.forEach((function(n){if(!((t=n.length-1)<=0)){var t,r,i=n[0],c=n[t];if(pointEqual(i,c)){if(!i[2]&&!c[2]){o.lineStart();for(a=0;a<t;++a)o.point((i=n[a])[0],i[1]);o.lineEnd();return}c[0]+=2*e}u.push(r=new Intersection(i,n,null,true));l.push(r.o=new Intersection(i,null,r,false));u.push(r=new Intersection(c,n,null,false));l.push(r.o=new Intersection(c,null,r,true))}}));if(u.length){l.sort(t);link(u);link(l);for(a=0,c=l.length;a<c;++a)l[a].e=r=!r;var s,f,p=u[0];while(1){var g=p,h=true;while(g.v)if((g=g.n)===p)return;s=g.z;o.lineStart();do{g.v=g.o.v=true;if(g.e){if(h)for(a=0,c=s.length;a<c;++a)o.point((f=s[a])[0],f[1]);else i(g.x,g.n.x,1,o);g=g.n}else{if(h){s=g.p.z;for(a=s.length-1;a>=0;--a)o.point((f=s[a])[0],f[1])}else i(g.x,g.p.x,-1,o);g=g.p}g=g.o;s=g.z;h=!h}while(!g.v);o.lineEnd()}}}function link(n){if(t=n.length){var t,r,e=0,i=n[0];while(++e<t){i.n=r=n[e];r.p=i;i=r}i.n=r=n[0];r.p=i}}function longitude(n){return f(n[0])<=o?n[0]:R(n[0])*((f(n[0])+o)%u-o)}function polygonContains(t,r){var l=longitude(r),s=r[1],f=y(s),p=[y(l),-h(l),0],d=0,v=0;var m=new n;f===1?s=a+e:f===-1&&(s=-a-e);for(var E=0,S=t.length;E<S;++E)if(w=(R=t[E]).length){var R,w,P=R[w-1],j=longitude(P),M=P[1]/2+c,b=y(M),L=h(M);for(var x=0;x<w;++x,j=q,b=_,L=N,P=C){var C=R[x],q=longitude(C),$=C[1]/2+c,_=y($),N=h($),I=q-j,A=I>=0?1:-1,z=A*I,F=z>o,T=b*_;m.add(g(T*A*y(z),L*N+T*h(z)));d+=F?I+A*u:I;if(F^j>=l^q>=l){var U=cartesianCross(cartesian(P),cartesian(C));cartesianNormalizeInPlace(U);var G=cartesianCross(p,U);cartesianNormalizeInPlace(G);var k=(F^I>=0?-1:1)*asin(G[2]);(s>k||s===k&&(U[0]||U[1]))&&(v+=F^I>=0?1:-1)}}}return(d<-e||d<e&&m<-i)^v&1}function clip(n,r,e,i){return function(o){var a,c,u,l=r(o),s=clipBuffer(),f=r(s),p=false;var g={point:point,lineStart:lineStart,lineEnd:lineEnd,polygonStart:function(){g.point=pointRing;g.lineStart=ringStart;g.lineEnd=ringEnd;c=[];a=[]},polygonEnd:function(){g.point=point;g.lineStart=lineStart;g.lineEnd=lineEnd;c=t(c);var n=polygonContains(a,i);if(c.length){p||(o.polygonStart(),p=true);clipRejoin(c,compareIntersection,n,e,o)}else if(n){p||(o.polygonStart(),p=true);o.lineStart();e(null,null,1,o);o.lineEnd()}p&&(o.polygonEnd(),p=false);c=a=null},sphere:function(){o.polygonStart();o.lineStart();e(null,null,1,o);o.lineEnd();o.polygonEnd()}};function point(t,r){n(t,r)&&o.point(t,r)}function pointLine(n,t){l.point(n,t)}function lineStart(){g.point=pointLine;l.lineStart()}function lineEnd(){g.point=point;l.lineEnd()}function pointRing(n,t){u.push([n,t]);f.point(n,t)}function ringStart(){f.lineStart();u=[]}function ringEnd(){pointRing(u[0][0],u[0][1]);f.lineEnd();var n,t,r,e,i=f.clean(),l=s.result(),g=l.length;u.pop();a.push(u);u=null;if(g)if(i&1){r=l[0];if((t=r.length-1)>0){p||(o.polygonStart(),p=true);o.lineStart();for(n=0;n<t;++n)o.point((e=r[n])[0],e[1]);o.lineEnd()}}else{g>1&&i&2&&l.push(l.pop().concat(l.shift()));c.push(l.filter(validSegment))}}return g}}function validSegment(n){return n.length>1}function compareIntersection(n,t){return((n=n.x)[0]<0?n[1]-a-e:a-n[1])-((t=t.x)[0]<0?t[1]-a-e:a-t[1])}var sn=clip((function(){return true}),clipAntimeridianLine,clipAntimeridianInterpolate,[-o,-a]);function clipAntimeridianLine(n){var t,r=NaN,i=NaN,c=NaN;return{lineStart:function(){n.lineStart();t=1},point:function(u,l){var s=u>0?o:-o,p=f(u-r);if(f(p-o)<e){n.point(r,i=(i+l)/2>0?a:-a);n.point(c,i);n.lineEnd();n.lineStart();n.point(s,i);n.point(u,i);t=0}else if(c!==s&&p>=o){f(r-c)<e&&(r-=c*e);f(u-s)<e&&(u-=s*e);i=clipAntimeridianIntersect(r,i,u,l);n.point(c,i);n.lineEnd();n.lineStart();n.point(s,i);t=0}n.point(r=u,i=l);c=s},lineEnd:function(){n.lineEnd();r=i=NaN},clean:function(){return 2-t}}}function clipAntimeridianIntersect(n,t,r,i){var o,a,c=y(n-r);return f(c)>e?p((y(t)*(a=h(i))*y(r)-y(i)*(o=h(t))*y(n))/(o*a*c)):(t+i)/2}function clipAntimeridianInterpolate(n,t,r,i){var c;if(n==null){c=r*a;i.point(-o,c);i.point(0,c);i.point(o,c);i.point(o,0);i.point(o,-c);i.point(0,-c);i.point(-o,-c);i.point(-o,0);i.point(-o,c)}else if(f(n[0]-t[0])>e){var u=n[0]<t[0]?o:-o;c=r*u/2;i.point(-u,c);i.point(0,c);i.point(u,c)}else i.point(t[0],t[1])}function clipCircle(n){var t=h(n),r=2*s,i=t>0,a=f(t)>e;function interpolate(t,e,i,o){circleStream(o,n,r,i,t,e)}function visible(n,r){return h(n)*h(r)>t}function clipLine(n){var t,r,e,c,u;return{lineStart:function(){c=e=false;u=1},point:function(l,s){var f,p=[l,s],g=visible(l,s),h=i?g?0:code(l,s):g?code(l+(l<0?o:-o),s):0;!t&&(c=e=g)&&n.lineStart();if(g!==e){f=intersect(t,p);(!f||pointEqual(t,f)||pointEqual(p,f))&&(p[2]=1)}if(g!==e){u=0;if(g){n.lineStart();f=intersect(p,t);n.point(f[0],f[1])}else{f=intersect(t,p);n.point(f[0],f[1],2);n.lineEnd()}t=f}else if(a&&t&&i^g){var d;if(!(h&r)&&(d=intersect(p,t,true))){u=0;if(i){n.lineStart();n.point(d[0][0],d[0][1]);n.point(d[1][0],d[1][1]);n.lineEnd()}else{n.point(d[1][0],d[1][1]);n.lineEnd();n.lineStart();n.point(d[0][0],d[0][1],3)}}}!g||t&&pointEqual(t,p)||n.point(p[0],p[1]);t=p,e=g,r=h},lineEnd:function(){e&&n.lineEnd();t=null},clean:function(){return u|(c&&e)<<1}}}function intersect(n,r,i){var a=cartesian(n),c=cartesian(r);var u=[1,0,0],l=cartesianCross(a,c),s=cartesianDot(l,l),p=l[0],g=s-p*p;if(!g)return!i&&n;var h=t*s/g,d=-t*p/g,v=cartesianCross(u,l),m=cartesianScale(u,h),E=cartesianScale(l,d);cartesianAddInPlace(m,E);var S=v,y=cartesianDot(m,S),R=cartesianDot(S,S),P=y*y-R*(cartesianDot(m,m)-1);if(!(P<0)){var j=w(P),M=cartesianScale(S,(-y-j)/R);cartesianAddInPlace(M,m);M=spherical(M);if(!i)return M;var b,L=n[0],x=r[0],C=n[1],q=r[1];x<L&&(b=L,L=x,x=b);var $=x-L,_=f($-o)<e,N=_||$<e;!_&&q<C&&(b=C,C=q,q=b);if(N?_?C+q>0^M[1]<(f(M[0]-L)<e?C:q):C<=M[1]&&M[1]<=q:$>o^(L<=M[0]&&M[0]<=x)){var I=cartesianScale(S,(-y+j)/R);cartesianAddInPlace(I,m);return[M,spherical(I)]}}}function code(t,r){var e=i?n:o-n,a=0;t<-e?a|=1:t>e&&(a|=2);r<-e?a|=4:r>e&&(a|=8);return a}return clip(visible,clipLine,interpolate,i?[0,-n]:[-o,n-o])}function clipLine(n,t,r,e,i,o){var a,c=n[0],u=n[1],l=t[0],s=t[1],f=0,p=1,g=l-c,h=s-u;a=r-c;if(g||!(a>0)){a/=g;if(g<0){if(a<f)return;a<p&&(p=a)}else if(g>0){if(a>p)return;a>f&&(f=a)}a=i-c;if(g||!(a<0)){a/=g;if(g<0){if(a>p)return;a>f&&(f=a)}else if(g>0){if(a<f)return;a<p&&(p=a)}a=e-u;if(h||!(a>0)){a/=h;if(h<0){if(a<f)return;a<p&&(p=a)}else if(h>0){if(a>p)return;a>f&&(f=a)}a=o-u;if(h||!(a<0)){a/=h;if(h<0){if(a>p)return;a>f&&(f=a)}else if(h>0){if(a<f)return;a<p&&(p=a)}f>0&&(n[0]=c+f*g,n[1]=u+f*h);p<1&&(t[0]=c+p*g,t[1]=u+p*h);return true}}}}}var fn=1e9,pn=-fn;function clipRectangle(n,r,i,o){function visible(t,e){return n<=t&&t<=i&&r<=e&&e<=o}function interpolate(t,e,a,c){var u=0,l=0;if(t==null||(u=corner(t,a))!==(l=corner(e,a))||comparePoint(t,e)<0^a>0)do{c.point(u===0||u===3?n:i,u>1?o:r)}while((u=(u+a+4)%4)!==l);else c.point(e[0],e[1])}function corner(t,o){return f(t[0]-n)<e?o>0?0:3:f(t[0]-i)<e?o>0?2:1:f(t[1]-r)<e?o>0?1:0:o>0?3:2}function compareIntersection(n,t){return comparePoint(n.x,t.x)}function comparePoint(n,t){var r=corner(n,1),e=corner(t,1);return r!==e?r-e:r===0?t[1]-n[1]:r===1?n[0]-t[0]:r===2?n[1]-t[1]:t[0]-n[0]}return function(e){var a,c,u,l,s,f,p,g,h,d,v,m=e,E=clipBuffer();var S={point:point,lineStart:lineStart,lineEnd:lineEnd,polygonStart:polygonStart,polygonEnd:polygonEnd};function point(n,t){visible(n,t)&&m.point(n,t)}function polygonInside(){var t=0;for(var r=0,e=c.length;r<e;++r)for(var i,a,u=c[r],l=1,s=u.length,f=u[0],p=f[0],g=f[1];l<s;++l){i=p,a=g,f=u[l],p=f[0],g=f[1];a<=o?g>o&&(p-i)*(o-a)>(g-a)*(n-i)&&++t:g<=o&&(p-i)*(o-a)<(g-a)*(n-i)&&--t}return t}function polygonStart(){m=E,a=[],c=[],v=true}function polygonEnd(){var n=polygonInside(),r=v&&n,i=(a=t(a)).length;if(r||i){e.polygonStart();if(r){e.lineStart();interpolate(null,null,1,e);e.lineEnd()}i&&clipRejoin(a,compareIntersection,n,interpolate,e);e.polygonEnd()}m=e,a=c=u=null}function lineStart(){S.point=linePoint;c&&c.push(u=[]);d=true;h=false;p=g=NaN}function lineEnd(){if(a){linePoint(l,s);f&&h&&E.rejoin();a.push(E.result())}S.point=point;h&&m.lineEnd()}function linePoint(t,e){var a=visible(t,e);c&&u.push([t,e]);if(d){l=t,s=e,f=a;d=false;if(a){m.lineStart();m.point(t,e)}}else if(a&&h)m.point(t,e);else{var E=[p=Math.max(pn,Math.min(fn,p)),g=Math.max(pn,Math.min(fn,g))],S=[t=Math.max(pn,Math.min(fn,t)),e=Math.max(pn,Math.min(fn,e))];if(clipLine(E,S,n,r,i,o)){if(!h){m.lineStart();m.point(E[0],E[1])}m.point(S[0],S[1]);a||m.lineEnd();v=false}else if(a){m.lineStart();m.point(t,e);v=false}}p=t,g=e,h=a}return S}}function extent(){var n,t,r,e=0,i=0,o=960,a=500;return r={stream:function(r){return n&&t===r?n:n=clipRectangle(e,i,o,a)(t=r)},extent:function(c){return arguments.length?(e=+c[0][0],i=+c[0][1],o=+c[1][0],a=+c[1][1],n=t=null,r):[[e,i],[o,a]]}}}var gn,hn,dn,vn;var mn={sphere:noop,point:noop,lineStart:lengthLineStart,lineEnd:noop,polygonStart:noop,polygonEnd:noop};function lengthLineStart(){mn.point=lengthPointFirst$1;mn.lineEnd=lengthLineEnd}function lengthLineEnd(){mn.point=mn.lineEnd=noop}function lengthPointFirst$1(n,t){n*=s,t*=s;hn=n,dn=y(t),vn=h(t);mn.point=lengthPoint$1}function lengthPoint$1(n,t){n*=s,t*=s;var r=y(t),e=h(t),i=f(n-hn),o=h(i),a=y(i),c=e*a,u=vn*r-dn*e*o,l=dn*r+vn*e*o;gn.add(g(w(c*c+u*u),l));hn=n,dn=r,vn=e}function length(t){gn=new n;geoStream(t,mn);return+gn}var En=[null,null],Sn={type:"LineString",coordinates:En};function distance(n,t){En[0]=n;En[1]=t;return length(Sn)}var yn={Feature:function(n,t){return containsGeometry(n.geometry,t)},FeatureCollection:function(n,t){var r=n.features,e=-1,i=r.length;while(++e<i)if(containsGeometry(r[e].geometry,t))return true;return false}};var Rn={Sphere:function(){return true},Point:function(n,t){return containsPoint(n.coordinates,t)},MultiPoint:function(n,t){var r=n.coordinates,e=-1,i=r.length;while(++e<i)if(containsPoint(r[e],t))return true;return false},LineString:function(n,t){return containsLine(n.coordinates,t)},MultiLineString:function(n,t){var r=n.coordinates,e=-1,i=r.length;while(++e<i)if(containsLine(r[e],t))return true;return false},Polygon:function(n,t){return containsPolygon(n.coordinates,t)},MultiPolygon:function(n,t){var r=n.coordinates,e=-1,i=r.length;while(++e<i)if(containsPolygon(r[e],t))return true;return false},GeometryCollection:function(n,t){var r=n.geometries,e=-1,i=r.length;while(++e<i)if(containsGeometry(r[e],t))return true;return false}};function containsGeometry(n,t){return!(!n||!Rn.hasOwnProperty(n.type))&&Rn[n.type](n,t)}function containsPoint(n,t){return distance(n,t)===0}function containsLine(n,t){var r,e,o;for(var a=0,c=n.length;a<c;a++){e=distance(n[a],t);if(e===0)return true;if(a>0){o=distance(n[a],n[a-1]);if(o>0&&r<=o&&e<=o&&(r+e-o)*(1-Math.pow((r-e)/o,2))<i*o)return true}r=e}return false}function containsPolygon(n,t){return!!polygonContains(n.map(ringRadians),pointRadians(t))}function ringRadians(n){return n=n.map(pointRadians),n.pop(),n}function pointRadians(n){return[n[0]*s,n[1]*s]}function contains(n,t){return(n&&yn.hasOwnProperty(n.type)?yn[n.type]:containsGeometry)(n,t)}function graticuleX(n,t,i){var o=r(n,t-e,i).concat(t);return function(n){return o.map((function(t){return[n,t]}))}}function graticuleY(n,t,i){var o=r(n,t-e,i).concat(t);return function(n){return o.map((function(t){return[t,n]}))}}function graticule(){var n,t,i,o,a,c,u,l,s,p,g,h,v=10,m=v,E=90,S=360,y=2.5;function graticule(){return{type:"MultiLineString",coordinates:lines()}}function lines(){return r(d(o/E)*E,i,E).map(g).concat(r(d(l/S)*S,u,S).map(h)).concat(r(d(t/v)*v,n,v).filter((function(n){return f(n%E)>e})).map(s)).concat(r(d(c/m)*m,a,m).filter((function(n){return f(n%S)>e})).map(p))}graticule.lines=function(){return lines().map((function(n){return{type:"LineString",coordinates:n}}))};graticule.outline=function(){return{type:"Polygon",coordinates:[g(o).concat(h(u).slice(1),g(i).reverse().slice(1),h(l).reverse().slice(1))]}};graticule.extent=function(n){return arguments.length?graticule.extentMajor(n).extentMinor(n):graticule.extentMinor()};graticule.extentMajor=function(n){if(!arguments.length)return[[o,l],[i,u]];o=+n[0][0],i=+n[1][0];l=+n[0][1],u=+n[1][1];o>i&&(n=o,o=i,i=n);l>u&&(n=l,l=u,u=n);return graticule.precision(y)};graticule.extentMinor=function(r){if(!arguments.length)return[[t,c],[n,a]];t=+r[0][0],n=+r[1][0];c=+r[0][1],a=+r[1][1];t>n&&(r=t,t=n,n=r);c>a&&(r=c,c=a,a=r);return graticule.precision(y)};graticule.step=function(n){return arguments.length?graticule.stepMajor(n).stepMinor(n):graticule.stepMinor()};graticule.stepMajor=function(n){if(!arguments.length)return[E,S];E=+n[0],S=+n[1];return graticule};graticule.stepMinor=function(n){if(!arguments.length)return[v,m];v=+n[0],m=+n[1];return graticule};graticule.precision=function(r){if(!arguments.length)return y;y=+r;s=graticuleX(c,a,90);p=graticuleY(t,n,y);g=graticuleX(l,u,90);h=graticuleY(o,i,y);return graticule};return graticule.extentMajor([[-180,-90+e],[180,90-e]]).extentMinor([[-180,-80-e],[180,80+e]])}function graticule10(){return graticule()()}function interpolate(n,t){var r=n[0]*s,e=n[1]*s,i=t[0]*s,o=t[1]*s,a=h(e),c=y(e),u=h(o),f=y(o),p=a*h(r),d=a*y(r),v=u*h(i),m=u*y(i),E=2*asin(w(haversin(o-e)+a*u*haversin(i-r))),S=y(E);var R=E?function(n){var t=y(n*=E)/S,r=y(E-n)/S,e=r*p+t*v,i=r*d+t*m,o=r*c+t*f;return[g(i,e)*l,g(o,w(e*e+i*i))*l]}:function(){return[r*l,e*l]};R.distance=E;return R}var identity$1=n=>n;var wn,Pn,jn,Mn,bn=new n,Ln=new n;var xn={point:noop,lineStart:noop,lineEnd:noop,polygonStart:function(){xn.lineStart=areaRingStart;xn.lineEnd=areaRingEnd},polygonEnd:function(){xn.lineStart=xn.lineEnd=xn.point=noop;bn.add(f(Ln));Ln=new n},result:function(){var t=bn/2;bn=new n;return t}};function areaRingStart(){xn.point=areaPointFirst}function areaPointFirst(n,t){xn.point=areaPoint;wn=jn=n,Pn=Mn=t}function areaPoint(n,t){Ln.add(Mn*n-jn*t);jn=n,Mn=t}function areaRingEnd(){areaPoint(wn,Pn)}var Cn=Infinity,qn=Cn,$n=-Cn,_n=$n;var Nn={point:boundsPoint,lineStart:noop,lineEnd:noop,polygonStart:noop,polygonEnd:noop,result:function(){var n=[[Cn,qn],[$n,_n]];$n=_n=-(qn=Cn=Infinity);return n}};function boundsPoint(n,t){n<Cn&&(Cn=n);n>$n&&($n=n);t<qn&&(qn=t);t>_n&&(_n=t)}var In,An,zn,Fn,Tn=0,Un=0,Gn=0,kn=0,Hn=0,Wn=0,Dn=0,On=0,Xn=0;var Yn={point:centroidPoint,lineStart:centroidLineStart,lineEnd:centroidLineEnd,polygonStart:function(){Yn.lineStart=centroidRingStart;Yn.lineEnd=centroidRingEnd},polygonEnd:function(){Yn.point=centroidPoint;Yn.lineStart=centroidLineStart;Yn.lineEnd=centroidLineEnd},result:function(){var n=Xn?[Dn/Xn,On/Xn]:Wn?[kn/Wn,Hn/Wn]:Gn?[Tn/Gn,Un/Gn]:[NaN,NaN];Tn=Un=Gn=kn=Hn=Wn=Dn=On=Xn=0;return n}};function centroidPoint(n,t){Tn+=n;Un+=t;++Gn}function centroidLineStart(){Yn.point=centroidPointFirstLine}function centroidPointFirstLine(n,t){Yn.point=centroidPointLine;centroidPoint(zn=n,Fn=t)}function centroidPointLine(n,t){var r=n-zn,e=t-Fn,i=w(r*r+e*e);kn+=i*(zn+n)/2;Hn+=i*(Fn+t)/2;Wn+=i;centroidPoint(zn=n,Fn=t)}function centroidLineEnd(){Yn.point=centroidPoint}function centroidRingStart(){Yn.point=centroidPointFirstRing}function centroidRingEnd(){centroidPointRing(In,An)}function centroidPointFirstRing(n,t){Yn.point=centroidPointRing;centroidPoint(In=zn=n,An=Fn=t)}function centroidPointRing(n,t){var r=n-zn,e=t-Fn,i=w(r*r+e*e);kn+=i*(zn+n)/2;Hn+=i*(Fn+t)/2;Wn+=i;i=Fn*n-zn*t;Dn+=i*(zn+n);On+=i*(Fn+t);Xn+=i*3;centroidPoint(zn=n,Fn=t)}function PathContext(n){this._context=n}PathContext.prototype={_radius:4.5,pointRadius:function(n){return this._radius=n,this},polygonStart:function(){this._line=0},polygonEnd:function(){this._line=NaN},lineStart:function(){this._point=0},lineEnd:function(){this._line===0&&this._context.closePath();this._point=NaN},point:function(n,t){switch(this._point){case 0:this._context.moveTo(n,t);this._point=1;break;case 1:this._context.lineTo(n,t);break;default:this._context.moveTo(n+this._radius,t);this._context.arc(n,t,this._radius,0,u);break}},result:noop};var Bn,Zn,Jn,Kn,Qn,Vn=new n;var nt={point:noop,lineStart:function(){nt.point=lengthPointFirst},lineEnd:function(){Bn&&lengthPoint(Zn,Jn);nt.point=noop},polygonStart:function(){Bn=true},polygonEnd:function(){Bn=null},result:function(){var t=+Vn;Vn=new n;return t}};function lengthPointFirst(n,t){nt.point=lengthPoint;Zn=Kn=n,Jn=Qn=t}function lengthPoint(n,t){Kn-=n,Qn-=t;Vn.add(w(Kn*Kn+Qn*Qn));Kn=n,Qn=t}let tt,rt,et,it;class PathString{constructor(n){this._append=n==null?append:appendRound(n);this._radius=4.5;this._=""}pointRadius(n){this._radius=+n;return this}polygonStart(){this._line=0}polygonEnd(){this._line=NaN}lineStart(){this._point=0}lineEnd(){this._line===0&&(this._+="Z");this._point=NaN}point(n,t){switch(this._point){case 0:this._append`M${n},${t}`;this._point=1;break;case 1:this._append`L${n},${t}`;break;default:this._append`M${n},${t}`;if(this._radius!==et||this._append!==rt){const n=this._radius;const t=this._;this._="";this._append`m0,${n}a${n},${n} 0 1,1 0,${-2*n}a${n},${n} 0 1,1 0,${2*n}z`;et=n;rt=this._append;it=this._;this._=t}this._+=it;break}}result(){const n=this._;this._="";return n.length?n:null}}function append(n){let t=1;this._+=n[0];for(const r=n.length;t<r;++t)this._+=arguments[t]+n[t]}function appendRound(n){const t=Math.floor(n);if(!(t>=0))throw new RangeError(`invalid digits: ${n}`);if(t>15)return append;if(t!==tt){const n=10**t;tt=t;rt=function append(t){let r=1;this._+=t[0];for(const e=t.length;r<e;++r)this._+=Math.round(arguments[r]*n)/n+t[r]}}return rt}function index(n,t){let r,e,i=3,o=4.5;function path(n){if(n){typeof o==="function"&&e.pointRadius(+o.apply(this,arguments));geoStream(n,r(e))}return e.result()}path.area=function(n){geoStream(n,r(xn));return xn.result()};path.measure=function(n){geoStream(n,r(nt));return nt.result()};path.bounds=function(n){geoStream(n,r(Nn));return Nn.result()};path.centroid=function(n){geoStream(n,r(Yn));return Yn.result()};path.projection=function(t){if(!arguments.length)return n;r=t==null?(n=null,identity$1):(n=t).stream;return path};path.context=function(n){if(!arguments.length)return t;e=n==null?(t=null,new PathString(i)):new PathContext(t=n);typeof o!=="function"&&e.pointRadius(o);return path};path.pointRadius=function(n){if(!arguments.length)return o;o=typeof n==="function"?n:(e.pointRadius(+n),+n);return path};path.digits=function(n){if(!arguments.length)return i;if(n==null)i=null;else{const t=Math.floor(n);if(!(t>=0))throw new RangeError(`invalid digits: ${n}`);i=t}t===null&&(e=new PathString(i));return path};return path.projection(n).digits(i).context(t)}function transform(n){return{stream:transformer(n)}}function transformer(n){return function(t){var r=new TransformStream;for(var e in n)r[e]=n[e];r.stream=t;return r}}function TransformStream(){}TransformStream.prototype={constructor:TransformStream,point:function(n,t){this.stream.point(n,t)},sphere:function(){this.stream.sphere()},lineStart:function(){this.stream.lineStart()},lineEnd:function(){this.stream.lineEnd()},polygonStart:function(){this.stream.polygonStart()},polygonEnd:function(){this.stream.polygonEnd()}};function fit(n,t,r){var e=n.clipExtent&&n.clipExtent();n.scale(150).translate([0,0]);e!=null&&n.clipExtent(null);geoStream(r,n.stream(Nn));t(Nn.result());e!=null&&n.clipExtent(e);return n}function fitExtent(n,t,r){return fit(n,(function(r){var e=t[1][0]-t[0][0],i=t[1][1]-t[0][1],o=Math.min(e/(r[1][0]-r[0][0]),i/(r[1][1]-r[0][1])),a=+t[0][0]+(e-o*(r[1][0]+r[0][0]))/2,c=+t[0][1]+(i-o*(r[1][1]+r[0][1]))/2;n.scale(150*o).translate([a,c])}),r)}function fitSize(n,t,r){return fitExtent(n,[[0,0],t],r)}function fitWidth(n,t,r){return fit(n,(function(r){var e=+t,i=e/(r[1][0]-r[0][0]),o=(e-i*(r[1][0]+r[0][0]))/2,a=-i*r[0][1];n.scale(150*i).translate([o,a])}),r)}function fitHeight(n,t,r){return fit(n,(function(r){var e=+t,i=e/(r[1][1]-r[0][1]),o=-i*r[0][0],a=(e-i*(r[1][1]+r[0][1]))/2;n.scale(150*i).translate([o,a])}),r)}var ot=16,at=h(30*s);function resample(n,t){return+t?resample$1(n,t):resampleNone(n)}function resampleNone(n){return transformer({point:function(t,r){t=n(t,r);this.stream.point(t[0],t[1])}})}function resample$1(n,t){function resampleLineTo(r,i,o,a,c,u,l,s,p,h,d,v,m,E){var S=l-r,y=s-i,R=S*S+y*y;if(R>4*t&&m--){var P=a+h,j=c+d,M=u+v,b=w(P*P+j*j+M*M),L=asin(M/=b),x=f(f(M)-1)<e||f(o-p)<e?(o+p)/2:g(j,P),C=n(x,L),q=C[0],$=C[1],_=q-r,N=$-i,I=y*_-S*N;if(I*I/R>t||f((S*_+y*N)/R-.5)>.3||a*h+c*d+u*v<at){resampleLineTo(r,i,o,a,c,u,q,$,x,P/=b,j/=b,M,m,E);E.point(q,$);resampleLineTo(q,$,x,P,j,M,l,s,p,h,d,v,m,E)}}}return function(t){var r,e,i,o,a,c,u,l,s,f,p,g;var h={point:point,lineStart:lineStart,lineEnd:lineEnd,polygonStart:function(){t.polygonStart();h.lineStart=ringStart},polygonEnd:function(){t.polygonEnd();h.lineStart=lineStart}};function point(r,e){r=n(r,e);t.point(r[0],r[1])}function lineStart(){l=NaN;h.point=linePoint;t.lineStart()}function linePoint(r,e){var i=cartesian([r,e]),o=n(r,e);resampleLineTo(l,s,u,f,p,g,l=o[0],s=o[1],u=r,f=i[0],p=i[1],g=i[2],ot,t);t.point(l,s)}function lineEnd(){h.point=point;t.lineEnd()}function ringStart(){lineStart();h.point=ringPoint;h.lineEnd=ringEnd}function ringPoint(n,t){linePoint(r=n,t),e=l,i=s,o=f,a=p,c=g;h.point=linePoint}function ringEnd(){resampleLineTo(l,s,u,f,p,g,e,i,r,o,a,c,ot,t);h.lineEnd=lineEnd;lineEnd()}return h}}var ct=transformer({point:function(n,t){this.stream.point(n*s,t*s)}});function transformRotate(n){return transformer({point:function(t,r){var e=n(t,r);return this.stream.point(e[0],e[1])}})}function scaleTranslate(n,t,r,e,i){function transform(o,a){o*=e;a*=i;return[t+n*o,r-n*a]}transform.invert=function(o,a){return[(o-t)/n*e,(r-a)/n*i]};return transform}function scaleTranslateRotate(n,t,r,e,i,o){if(!o)return scaleTranslate(n,t,r,e,i);var a=h(o),c=y(o),u=a*n,l=c*n,s=a/n,f=c/n,p=(c*r-a*t)/n,g=(c*t+a*r)/n;function transform(n,o){n*=e;o*=i;return[u*n-l*o+t,r-l*n-u*o]}transform.invert=function(n,t){return[e*(s*n-f*t+p),i*(g-f*n-s*t)]};return transform}function projection(n){return projectionMutator((function(){return n}))()}function projectionMutator(n){var t,r,e,i,o,a,c,u,f,p,g=150,h=480,d=250,v=0,m=0,E=0,S=0,y=0,R=0,P=1,j=1,M=null,b=sn,L=null,x=identity$1,C=.5;function projection(n){return u(n[0]*s,n[1]*s)}function invert(n){n=u.invert(n[0],n[1]);return n&&[n[0]*l,n[1]*l]}projection.stream=function(n){return f&&p===n?f:f=ct(transformRotate(r)(b(a(x(p=n)))))};projection.preclip=function(n){return arguments.length?(b=n,M=void 0,reset()):b};projection.postclip=function(n){return arguments.length?(x=n,L=e=i=o=null,reset()):x};projection.clipAngle=function(n){return arguments.length?(b=+n?clipCircle(M=n*s):(M=null,sn),reset()):M*l};projection.clipExtent=function(n){return arguments.length?(x=n==null?(L=e=i=o=null,identity$1):clipRectangle(L=+n[0][0],e=+n[0][1],i=+n[1][0],o=+n[1][1]),reset()):L==null?null:[[L,e],[i,o]]};projection.scale=function(n){return arguments.length?(g=+n,recenter()):g};projection.translate=function(n){return arguments.length?(h=+n[0],d=+n[1],recenter()):[h,d]};projection.center=function(n){return arguments.length?(v=n[0]%360*s,m=n[1]%360*s,recenter()):[v*l,m*l]};projection.rotate=function(n){return arguments.length?(E=n[0]%360*s,S=n[1]%360*s,y=n.length>2?n[2]%360*s:0,recenter()):[E*l,S*l,y*l]};projection.angle=function(n){return arguments.length?(R=n%360*s,recenter()):R*l};projection.reflectX=function(n){return arguments.length?(P=n?-1:1,recenter()):P<0};projection.reflectY=function(n){return arguments.length?(j=n?-1:1,recenter()):j<0};projection.precision=function(n){return arguments.length?(a=resample(c,C=n*n),reset()):w(C)};projection.fitExtent=function(n,t){return fitExtent(projection,n,t)};projection.fitSize=function(n,t){return fitSize(projection,n,t)};projection.fitWidth=function(n,t){return fitWidth(projection,n,t)};projection.fitHeight=function(n,t){return fitHeight(projection,n,t)};function recenter(){var n=scaleTranslateRotate(g,0,0,P,j,R).apply(null,t(v,m)),e=scaleTranslateRotate(g,h-n[0],d-n[1],P,j,R);r=rotateRadians(E,S,y);c=compose(t,e);u=compose(r,c);a=resample(c,C);return reset()}function reset(){f=p=null;return projection}return function(){t=n.apply(this,arguments);projection.invert=t.invert&&invert;return recenter()}}function conicProjection(n){var t=0,r=o/3,e=projectionMutator(n),i=e(t,r);i.parallels=function(n){return arguments.length?e(t=n[0]*s,r=n[1]*s):[t*l,r*l]};return i}function cylindricalEqualAreaRaw(n){var t=h(n);function forward(n,r){return[n*t,y(r)/t]}forward.invert=function(n,r){return[n/t,asin(r*t)]};return forward}function conicEqualAreaRaw(n,t){var r=y(n),i=(r+y(t))/2;if(f(i)<e)return cylindricalEqualAreaRaw(n);var a=1+r*(2*i-r),c=w(a)/i;function project(n,t){var r=w(a-2*i*y(t))/i;return[r*y(n*=i),c-r*h(n)]}project.invert=function(n,t){var r=c-t,e=g(n,f(r))*R(r);r*i<0&&(e-=o*R(n)*R(r));return[e/i,asin((a-(n*n+r*r)*i*i)/(2*i))]};return project}function conicEqualArea(){return conicProjection(conicEqualAreaRaw).scale(155.424).center([0,33.6442])}function albers(){return conicEqualArea().parallels([29.5,45.5]).scale(1070).translate([480,250]).rotate([96,0]).center([-.6,38.7])}function multiplex(n){var t=n.length;return{point:function(r,e){var i=-1;while(++i<t)n[i].point(r,e)},sphere:function(){var r=-1;while(++r<t)n[r].sphere()},lineStart:function(){var r=-1;while(++r<t)n[r].lineStart()},lineEnd:function(){var r=-1;while(++r<t)n[r].lineEnd()},polygonStart:function(){var r=-1;while(++r<t)n[r].polygonStart()},polygonEnd:function(){var r=-1;while(++r<t)n[r].polygonEnd()}}}function albersUsa(){var n,t,r,i,o,a,c=albers(),u=conicEqualArea().rotate([154,0]).center([-2,58.5]).parallels([55,65]),l=conicEqualArea().rotate([157,0]).center([-3,19.9]).parallels([8,18]),s={point:function(n,t){a=[n,t]}};function albersUsa(n){var t=n[0],e=n[1];return a=null,(r.point(t,e),a)||(i.point(t,e),a)||(o.point(t,e),a)}albersUsa.invert=function(n){var t=c.scale(),r=c.translate(),e=(n[0]-r[0])/t,i=(n[1]-r[1])/t;return(i>=.12&&i<.234&&e>=-.425&&e<-.214?u:i>=.166&&i<.234&&e>=-.214&&e<-.115?l:c).invert(n)};albersUsa.stream=function(r){return n&&t===r?n:n=multiplex([c.stream(t=r),u.stream(r),l.stream(r)])};albersUsa.precision=function(n){if(!arguments.length)return c.precision();c.precision(n),u.precision(n),l.precision(n);return reset()};albersUsa.scale=function(n){if(!arguments.length)return c.scale();c.scale(n),u.scale(n*.35),l.scale(n);return albersUsa.translate(c.translate())};albersUsa.translate=function(n){if(!arguments.length)return c.translate();var t=c.scale(),a=+n[0],f=+n[1];r=c.translate(n).clipExtent([[a-.455*t,f-.238*t],[a+.455*t,f+.238*t]]).stream(s);i=u.translate([a-.307*t,f+.201*t]).clipExtent([[a-.425*t+e,f+.12*t+e],[a-.214*t-e,f+.234*t-e]]).stream(s);o=l.translate([a-.205*t,f+.212*t]).clipExtent([[a-.214*t+e,f+.166*t+e],[a-.115*t-e,f+.234*t-e]]).stream(s);return reset()};albersUsa.fitExtent=function(n,t){return fitExtent(albersUsa,n,t)};albersUsa.fitSize=function(n,t){return fitSize(albersUsa,n,t)};albersUsa.fitWidth=function(n,t){return fitWidth(albersUsa,n,t)};albersUsa.fitHeight=function(n,t){return fitHeight(albersUsa,n,t)};function reset(){n=t=null;return albersUsa}return albersUsa.scale(1070)}function azimuthalRaw(n){return function(t,r){var e=h(t),i=h(r),o=n(e*i);return o===Infinity?[2,0]:[o*i*y(t),o*y(r)]}}function azimuthalInvert(n){return function(t,r){var e=w(t*t+r*r),i=n(e),o=y(i),a=h(i);return[g(t*o,e*a),asin(e&&r*o/e)]}}var ut=azimuthalRaw((function(n){return w(2/(1+n))}));ut.invert=azimuthalInvert((function(n){return 2*asin(n/2)}));function azimuthalEqualArea(){return projection(ut).scale(124.75).clipAngle(179.999)}var lt=azimuthalRaw((function(n){return(n=acos(n))&&n/y(n)}));lt.invert=azimuthalInvert((function(n){return n}));function azimuthalEquidistant(){return projection(lt).scale(79.4188).clipAngle(179.999)}function mercatorRaw(n,t){return[n,E(P((a+t)/2))]}mercatorRaw.invert=function(n,t){return[n,2*p(v(t))-a]};function mercator(){return mercatorProjection(mercatorRaw).scale(961/u)}function mercatorProjection(n){var t,r,e,i=projection(n),a=i.center,c=i.scale,u=i.translate,l=i.clipExtent,s=null;i.scale=function(n){return arguments.length?(c(n),reclip()):c()};i.translate=function(n){return arguments.length?(u(n),reclip()):u()};i.center=function(n){return arguments.length?(a(n),reclip()):a()};i.clipExtent=function(n){return arguments.length?(n==null?s=t=r=e=null:(s=+n[0][0],t=+n[0][1],r=+n[1][0],e=+n[1][1]),reclip()):s==null?null:[[s,t],[r,e]]};function reclip(){var a=o*c(),u=i(rotation(i.rotate()).invert([0,0]));return l(s==null?[[u[0]-a,u[1]-a],[u[0]+a,u[1]+a]]:n===mercatorRaw?[[Math.max(u[0]-a,s),t],[Math.min(u[0]+a,r),e]]:[[s,Math.max(u[1]-a,t)],[r,Math.min(u[1]+a,e)]])}return reclip()}function tany(n){return P((a+n)/2)}function conicConformalRaw(n,t){var r=h(n),i=n===t?y(n):E(r/h(t))/E(tany(t)/tany(n)),c=r*S(tany(n),i)/i;if(!i)return mercatorRaw;function project(n,t){c>0?t<-a+e&&(t=-a+e):t>a-e&&(t=a-e);var r=c/S(tany(t),i);return[r*y(i*n),c-r*h(i*n)]}project.invert=function(n,t){var r=c-t,e=R(i)*w(n*n+r*r),u=g(n,f(r))*R(r);r*i<0&&(u-=o*R(n)*R(r));return[u/i,2*p(S(c/e,1/i))-a]};return project}function conicConformal(){return conicProjection(conicConformalRaw).scale(109.5).parallels([30,30])}function equirectangularRaw(n,t){return[n,t]}equirectangularRaw.invert=equirectangularRaw;function equirectangular(){return projection(equirectangularRaw).scale(152.63)}function conicEquidistantRaw(n,t){var r=h(n),i=n===t?y(n):(r-h(t))/(t-n),a=r/i+n;if(f(i)<e)return equirectangularRaw;function project(n,t){var r=a-t,e=i*n;return[r*y(e),a-r*h(e)]}project.invert=function(n,t){var r=a-t,e=g(n,f(r))*R(r);r*i<0&&(e-=o*R(n)*R(r));return[e/i,a-R(i)*w(n*n+r*r)]};return project}function conicEquidistant(){return conicProjection(conicEquidistantRaw).scale(131.154).center([0,13.9389])}var st=1.340264,ft=-.081106,pt=893e-6,gt=.003796,ht=w(3)/2,dt=12;function equalEarthRaw(n,t){var r=asin(ht*y(t)),e=r*r,i=e*e*e;return[n*h(r)/(ht*(st+3*ft*e+i*(7*pt+9*gt*e))),r*(st+ft*e+i*(pt+gt*e))]}equalEarthRaw.invert=function(n,t){var r=t,e=r*r,o=e*e*e;for(var a,c,u,l=0;l<dt;++l){c=r*(st+ft*e+o*(pt+gt*e))-t;u=st+3*ft*e+o*(7*pt+9*gt*e);r-=a=c/u,e=r*r,o=e*e*e;if(f(a)<i)break}return[ht*n*(st+3*ft*e+o*(7*pt+9*gt*e))/h(r),asin(y(r)/ht)]};function equalEarth(){return projection(equalEarthRaw).scale(177.158)}function gnomonicRaw(n,t){var r=h(t),e=h(n)*r;return[r*y(n)/e,y(t)/e]}gnomonicRaw.invert=azimuthalInvert(p);function gnomonic(){return projection(gnomonicRaw).scale(144.049).clipAngle(60)}function identity(){var n,t,r,e,i,o,a,c=1,u=0,f=0,p=1,g=1,d=0,v=null,m=1,E=1,S=transformer({point:function(n,t){var r=projection([n,t]);this.stream.point(r[0],r[1])}}),R=identity$1;function reset(){m=c*p;E=c*g;o=a=null;return projection}function projection(r){var e=r[0]*m,i=r[1]*E;if(d){var o=i*n-e*t;e=e*n+i*t;i=o}return[e+u,i+f]}projection.invert=function(r){var e=r[0]-u,i=r[1]-f;if(d){var o=i*n+e*t;e=e*n-i*t;i=o}return[e/m,i/E]};projection.stream=function(n){return o&&a===n?o:o=S(R(a=n))};projection.postclip=function(n){return arguments.length?(R=n,v=r=e=i=null,reset()):R};projection.clipExtent=function(n){return arguments.length?(R=n==null?(v=r=e=i=null,identity$1):clipRectangle(v=+n[0][0],r=+n[0][1],e=+n[1][0],i=+n[1][1]),reset()):v==null?null:[[v,r],[e,i]]};projection.scale=function(n){return arguments.length?(c=+n,reset()):c};projection.translate=function(n){return arguments.length?(u=+n[0],f=+n[1],reset()):[u,f]};projection.angle=function(r){return arguments.length?(d=r%360*s,t=y(d),n=h(d),reset()):d*l};projection.reflectX=function(n){return arguments.length?(p=n?-1:1,reset()):p<0};projection.reflectY=function(n){return arguments.length?(g=n?-1:1,reset()):g<0};projection.fitExtent=function(n,t){return fitExtent(projection,n,t)};projection.fitSize=function(n,t){return fitSize(projection,n,t)};projection.fitWidth=function(n,t){return fitWidth(projection,n,t)};projection.fitHeight=function(n,t){return fitHeight(projection,n,t)};return projection}function naturalEarth1Raw(n,t){var r=t*t,e=r*r;return[n*(.8707-.131979*r+e*(e*(.003971*r-.001529*e)-.013791)),t*(1.007226+r*(.015085+e*(.028874*r-.044475-.005916*e)))]}naturalEarth1Raw.invert=function(n,t){var r,i=t,o=25;do{var a=i*i,c=a*a;i-=r=(i*(1.007226+a*(.015085+c*(.028874*a-.044475-.005916*c)))-t)/(1.007226+a*(.045255+c*(.259866*a-.311325-.005916*11*c)))}while(f(r)>e&&--o>0);return[n/(.8707+(a=i*i)*(a*(a*a*a*(.003971-.001529*a)-.013791)-.131979)),i]};function naturalEarth1(){return projection(naturalEarth1Raw).scale(175.295)}function orthographicRaw(n,t){return[h(t)*y(n),y(t)]}orthographicRaw.invert=azimuthalInvert(asin);function orthographic(){return projection(orthographicRaw).scale(249.5).clipAngle(90+e)}function stereographicRaw(n,t){var r=h(t),e=1+h(n)*r;return[r*y(n)/e,y(t)/e]}stereographicRaw.invert=azimuthalInvert((function(n){return 2*p(n)}));function stereographic(){return projection(stereographicRaw).scale(250).clipAngle(142)}function transverseMercatorRaw(n,t){return[E(P((a+t)/2)),-n]}transverseMercatorRaw.invert=function(n,t){return[-t,2*p(v(n))-a]};function transverseMercator(){var n=mercatorProjection(transverseMercatorRaw),t=n.center,r=n.rotate;n.center=function(n){return arguments.length?t([-n[1],n[0]]):(n=t(),[n[1],-n[0]])};n.rotate=function(n){return arguments.length?r([n[0],n[1],n.length>2?n[2]+90:90]):(n=r(),[n[0],n[1],n[2]-90])};return r([0,0,90]).scale(159.155)}export{albers as geoAlbers,albersUsa as geoAlbersUsa,area as geoArea,azimuthalEqualArea as geoAzimuthalEqualArea,ut as geoAzimuthalEqualAreaRaw,azimuthalEquidistant as geoAzimuthalEquidistant,lt as geoAzimuthalEquidistantRaw,bounds as geoBounds,centroid as geoCentroid,circle as geoCircle,sn as geoClipAntimeridian,clipCircle as geoClipCircle,extent as geoClipExtent,clipRectangle as geoClipRectangle,conicConformal as geoConicConformal,conicConformalRaw as geoConicConformalRaw,conicEqualArea as geoConicEqualArea,conicEqualAreaRaw as geoConicEqualAreaRaw,conicEquidistant as geoConicEquidistant,conicEquidistantRaw as geoConicEquidistantRaw,contains as geoContains,distance as geoDistance,equalEarth as geoEqualEarth,equalEarthRaw as geoEqualEarthRaw,equirectangular as geoEquirectangular,equirectangularRaw as geoEquirectangularRaw,gnomonic as geoGnomonic,gnomonicRaw as geoGnomonicRaw,graticule as geoGraticule,graticule10 as geoGraticule10,identity as geoIdentity,interpolate as geoInterpolate,length as geoLength,mercator as geoMercator,mercatorRaw as geoMercatorRaw,naturalEarth1 as geoNaturalEarth1,naturalEarth1Raw as geoNaturalEarth1Raw,orthographic as geoOrthographic,orthographicRaw as geoOrthographicRaw,index as geoPath,projection as geoProjection,projectionMutator as geoProjectionMutator,rotation as geoRotation,stereographic as geoStereographic,stereographicRaw as geoStereographicRaw,geoStream,transform as geoTransform,transverseMercator as geoTransverseMercator,transverseMercatorRaw as geoTransverseMercatorRaw};
 
diff --git a/vendor/javascript/d3-hierarchy.js b/vendor/javascript/d3-hierarchy.js
index 1d69d374..ab7f2f9d 100644
--- a/vendor/javascript/d3-hierarchy.js
+++ b/vendor/javascript/d3-hierarchy.js
@@ -1,2 +1,4 @@
+// d3-hierarchy@3.1.2 downloaded from https://ga.jspm.io/npm:d3-hierarchy@3.1.2/src/index.js
+
 function defaultSeparation$1(e,n){return e.parent===n.parent?1:2}function meanX(e){return e.reduce(meanXReduce,0)/e.length}function meanXReduce(e,n){return e+n.x}function maxY(e){return 1+e.reduce(maxYReduce,0)}function maxYReduce(e,n){return Math.max(e,n.y)}function leafLeft(e){var n;while(n=e.children)e=n[0];return e}function leafRight(e){var n;while(n=e.children)e=n[n.length-1];return e}function cluster(){var e=defaultSeparation$1,n=1,t=1,r=false;function cluster(i){var a,o=0;i.eachAfter((function(n){var t=n.children;if(t){n.x=meanX(t);n.y=maxY(t)}else{n.x=a?o+=e(n,a):0;n.y=0;a=n}}));var u=leafLeft(i),c=leafRight(i),l=u.x-e(u,c)/2,s=c.x+e(c,u)/2;return i.eachAfter(r?function(e){e.x=(e.x-i.x)*n;e.y=(i.y-e.y)*t}:function(e){e.x=(e.x-l)/(s-l)*n;e.y=(1-(i.y?e.y/i.y:1))*t})}cluster.separation=function(n){return arguments.length?(e=n,cluster):e};cluster.size=function(e){return arguments.length?(r=false,n=+e[0],t=+e[1],cluster):r?null:[n,t]};cluster.nodeSize=function(e){return arguments.length?(r=true,n=+e[0],t=+e[1],cluster):r?[n,t]:null};return cluster}function count(e){var n=0,t=e.children,r=t&&t.length;if(r)while(--r>=0)n+=t[r].value;else n=1;e.value=n}function node_count(){return this.eachAfter(count)}function node_each(e,n){let t=-1;for(const r of this)e.call(n,r,++t,this);return this}function node_eachBefore(e,n){var t,r,i=this,a=[i],o=-1;while(i=a.pop()){e.call(n,i,++o,this);if(t=i.children)for(r=t.length-1;r>=0;--r)a.push(t[r])}return this}function node_eachAfter(e,n){var t,r,i,a=this,o=[a],u=[],c=-1;while(a=o.pop()){u.push(a);if(t=a.children)for(r=0,i=t.length;r<i;++r)o.push(t[r])}while(a=u.pop())e.call(n,a,++c,this);return this}function node_find(e,n){let t=-1;for(const r of this)if(e.call(n,r,++t,this))return r}function node_sum(e){return this.eachAfter((function(n){var t=+e(n.data)||0,r=n.children,i=r&&r.length;while(--i>=0)t+=r[i].value;n.value=t}))}function node_sort(e){return this.eachBefore((function(n){n.children&&n.children.sort(e)}))}function node_path(e){var n=this,t=leastCommonAncestor(n,e),r=[n];while(n!==t){n=n.parent;r.push(n)}var i=r.length;while(e!==t){r.splice(i,0,e);e=e.parent}return r}function leastCommonAncestor(e,n){if(e===n)return e;var t=e.ancestors(),r=n.ancestors(),i=null;e=t.pop();n=r.pop();while(e===n){i=e;e=t.pop();n=r.pop()}return i}function node_ancestors(){var e=this,n=[e];while(e=e.parent)n.push(e);return n}function node_descendants(){return Array.from(this)}function node_leaves(){var e=[];this.eachBefore((function(n){n.children||e.push(n)}));return e}function node_links(){var e=this,n=[];e.each((function(t){t!==e&&n.push({source:t.parent,target:t})}));return n}function*node_iterator(){var e,n,t,r,i=this,a=[i];do{e=a.reverse(),a=[];while(i=e.pop()){yield i;if(n=i.children)for(t=0,r=n.length;t<r;++t)a.push(n[t])}}while(a.length)}function hierarchy(e,n){if(e instanceof Map){e=[void 0,e];void 0===n&&(n=mapChildren)}else void 0===n&&(n=objectChildren);var t,r,i,a,o,u=new Node$1(e),c=[u];while(t=c.pop())if((i=n(t.data))&&(o=(i=Array.from(i)).length)){t.children=i;for(a=o-1;a>=0;--a){c.push(r=i[a]=new Node$1(i[a]));r.parent=t;r.depth=t.depth+1}}return u.eachBefore(computeHeight)}function node_copy(){return hierarchy(this).eachBefore(copyData)}function objectChildren(e){return e.children}function mapChildren(e){return Array.isArray(e)?e[1]:null}function copyData(e){void 0!==e.data.value&&(e.value=e.data.value);e.data=e.data.data}function computeHeight(e){var n=0;do{e.height=n}while((e=e.parent)&&e.height<++n)}function Node$1(e){this.data=e;this.depth=this.height=0;this.parent=null}Node$1.prototype=hierarchy.prototype={constructor:Node$1,count:node_count,each:node_each,eachAfter:node_eachAfter,eachBefore:node_eachBefore,find:node_find,sum:node_sum,sort:node_sort,path:node_path,ancestors:node_ancestors,descendants:node_descendants,leaves:node_leaves,links:node_links,copy:node_copy,[Symbol.iterator]:node_iterator};function optional(e){return null==e?null:required(e)}function required(e){if("function"!==typeof e)throw new Error;return e}function constantZero(){return 0}function constant(e){return function(){return e}}const e=1664525;const n=1013904223;const t=4294967296;function lcg(){let r=1;return()=>(r=(e*r+n)%t)/t}function array(e){return"object"===typeof e&&"length"in e?e:Array.from(e)}function shuffle(e,n){let t,r,i=e.length;while(i){r=n()*i--|0;t=e[i];e[i]=e[r];e[r]=t}return e}function enclose(e){return packEncloseRandom(e,lcg())}function packEncloseRandom(e,n){var t,r,i=0,a=(e=shuffle(Array.from(e),n)).length,o=[];while(i<a){t=e[i];r&&enclosesWeak(r,t)?++i:(r=encloseBasis(o=extendBasis(o,t)),i=0)}return r}function extendBasis(e,n){var t,r;if(enclosesWeakAll(n,e))return[n];for(t=0;t<e.length;++t)if(enclosesNot(n,e[t])&&enclosesWeakAll(encloseBasis2(e[t],n),e))return[e[t],n];for(t=0;t<e.length-1;++t)for(r=t+1;r<e.length;++r)if(enclosesNot(encloseBasis2(e[t],e[r]),n)&&enclosesNot(encloseBasis2(e[t],n),e[r])&&enclosesNot(encloseBasis2(e[r],n),e[t])&&enclosesWeakAll(encloseBasis3(e[t],e[r],n),e))return[e[t],e[r],n];throw new Error}function enclosesNot(e,n){var t=e.r-n.r,r=n.x-e.x,i=n.y-e.y;return t<0||t*t<r*r+i*i}function enclosesWeak(e,n){var t=e.r-n.r+1e-9*Math.max(e.r,n.r,1),r=n.x-e.x,i=n.y-e.y;return t>0&&t*t>r*r+i*i}function enclosesWeakAll(e,n){for(var t=0;t<n.length;++t)if(!enclosesWeak(e,n[t]))return false;return true}function encloseBasis(e){switch(e.length){case 1:return encloseBasis1(e[0]);case 2:return encloseBasis2(e[0],e[1]);case 3:return encloseBasis3(e[0],e[1],e[2])}}function encloseBasis1(e){return{x:e.x,y:e.y,r:e.r}}function encloseBasis2(e,n){var t=e.x,r=e.y,i=e.r,a=n.x,o=n.y,u=n.r,c=a-t,l=o-r,s=u-i,f=Math.sqrt(c*c+l*l);return{x:(t+a+c/f*s)/2,y:(r+o+l/f*s)/2,r:(f+i+u)/2}}function encloseBasis3(e,n,t){var r=e.x,i=e.y,a=e.r,o=n.x,u=n.y,c=n.r,l=t.x,s=t.y,f=t.r,h=r-o,d=r-l,p=i-u,y=i-s,x=c-a,m=f-a,v=r*r+i*i-a*a,g=v-o*o-u*u+c*c,w=v-l*l-s*s+f*f,_=d*p-h*y,B=(p*w-y*g)/(2*_)-r,k=(y*x-p*m)/_,N=(d*g-h*w)/(2*_)-i,A=(h*m-d*x)/_,R=k*k+A*A-1,z=2*(a+B*k+N*A),M=B*B+N*N-a*a,S=-(Math.abs(R)>1e-6?(z+Math.sqrt(z*z-4*R*M))/(2*R):M/z);return{x:r+B+k*S,y:i+N+A*S,r:S}}function place(e,n,t){var r,i,a,o,u=e.x-n.x,c=e.y-n.y,l=u*u+c*c;if(l){i=n.r+t.r,i*=i;o=e.r+t.r,o*=o;if(i>o){r=(l+o-i)/(2*l);a=Math.sqrt(Math.max(0,o/l-r*r));t.x=e.x-r*u-a*c;t.y=e.y-r*c+a*u}else{r=(l+i-o)/(2*l);a=Math.sqrt(Math.max(0,i/l-r*r));t.x=n.x+r*u-a*c;t.y=n.y+r*c+a*u}}else{t.x=n.x+t.r;t.y=n.y}}function intersects(e,n){var t=e.r+n.r-1e-6,r=n.x-e.x,i=n.y-e.y;return t>0&&t*t>r*r+i*i}function score(e){var n=e._,t=e.next._,r=n.r+t.r,i=(n.x*t.r+t.x*n.r)/r,a=(n.y*t.r+t.y*n.r)/r;return i*i+a*a}function Node(e){this._=e;this.next=null;this.previous=null}function packSiblingsRandom(e,n){if(!(a=(e=array(e)).length))return 0;var t,r,i,a,o,u,c,l,s,f,h;t=e[0],t.x=0,t.y=0;if(!(a>1))return t.r;r=e[1],t.x=-r.r,r.x=t.r,r.y=0;if(!(a>2))return t.r+r.r;place(r,t,i=e[2]);t=new Node(t),r=new Node(r),i=new Node(i);t.next=i.previous=r;r.next=t.previous=i;i.next=r.previous=t;e:for(c=3;c<a;++c){place(t._,r._,i=e[c]),i=new Node(i);l=r.next,s=t.previous,f=r._.r,h=t._.r;do{if(f<=h){if(intersects(l._,i._)){r=l,t.next=r,r.previous=t,--c;continue e}f+=l._.r,l=l.next}else{if(intersects(s._,i._)){t=s,t.next=r,r.previous=t,--c;continue e}h+=s._.r,s=s.previous}}while(l!==s.next);i.previous=t,i.next=r,t.next=r.previous=r=i;o=score(t);while((i=i.next)!==r)(u=score(i))<o&&(t=i,o=u);r=t.next}t=[r._],i=r;while((i=i.next)!==r)t.push(i._);i=packEncloseRandom(t,n);for(c=0;c<a;++c)t=e[c],t.x-=i.x,t.y-=i.y;return i.r}function siblings(e){packSiblingsRandom(e,lcg());return e}function defaultRadius(e){return Math.sqrt(e.value)}function index$1(){var e=null,n=1,t=1,r=constantZero;function pack(i){const a=lcg();i.x=n/2,i.y=t/2;e?i.eachBefore(radiusLeaf(e)).eachAfter(packChildrenRandom(r,.5,a)).eachBefore(translateChild(1)):i.eachBefore(radiusLeaf(defaultRadius)).eachAfter(packChildrenRandom(constantZero,1,a)).eachAfter(packChildrenRandom(r,i.r/Math.min(n,t),a)).eachBefore(translateChild(Math.min(n,t)/(2*i.r)));return i}pack.radius=function(n){return arguments.length?(e=optional(n),pack):e};pack.size=function(e){return arguments.length?(n=+e[0],t=+e[1],pack):[n,t]};pack.padding=function(e){return arguments.length?(r="function"===typeof e?e:constant(+e),pack):r};return pack}function radiusLeaf(e){return function(n){n.children||(n.r=Math.max(0,+e(n)||0))}}function packChildrenRandom(e,n,t){return function(r){if(i=r.children){var i,a,o,u=i.length,c=e(r)*n||0;if(c)for(a=0;a<u;++a)i[a].r+=c;o=packSiblingsRandom(i,t);if(c)for(a=0;a<u;++a)i[a].r-=c;r.r=o+c}}}function translateChild(e){return function(n){var t=n.parent;n.r*=e;if(t){n.x=t.x+e*n.x;n.y=t.y+e*n.y}}}function roundNode(e){e.x0=Math.round(e.x0);e.y0=Math.round(e.y0);e.x1=Math.round(e.x1);e.y1=Math.round(e.y1)}function treemapDice(e,n,t,r,i){var a,o=e.children,u=-1,c=o.length,l=e.value&&(r-n)/e.value;while(++u<c){a=o[u],a.y0=t,a.y1=i;a.x0=n,a.x1=n+=a.value*l}}function partition(){var e=1,n=1,t=0,r=false;function partition(i){var a=i.height+1;i.x0=i.y0=t;i.x1=e;i.y1=n/a;i.eachBefore(positionNode(n,a));r&&i.eachBefore(roundNode);return i}function positionNode(e,n){return function(r){r.children&&treemapDice(r,r.x0,e*(r.depth+1)/n,r.x1,e*(r.depth+2)/n);var i=r.x0,a=r.y0,o=r.x1-t,u=r.y1-t;o<i&&(i=o=(i+o)/2);u<a&&(a=u=(a+u)/2);r.x0=i;r.y0=a;r.x1=o;r.y1=u}}partition.round=function(e){return arguments.length?(r=!!e,partition):r};partition.size=function(t){return arguments.length?(e=+t[0],n=+t[1],partition):[e,n]};partition.padding=function(e){return arguments.length?(t=+e,partition):t};return partition}var r={depth:-1},i={},a={};function defaultId(e){return e.id}function defaultParentId(e){return e.parentId}function stratify(){var e,n=defaultId,t=defaultParentId;function stratify(o){var u,c,l,s,f,h,d,p,y=Array.from(o),x=n,m=t,v=new Map;if(null!=e){const n=y.map(((n,t)=>normalize(e(n,t,o))));const t=n.map(parentof);const r=new Set(n).add("");for(const e of t)if(!r.has(e)){r.add(e);n.push(e);t.push(parentof(e));y.push(a)}x=(e,t)=>n[t];m=(e,n)=>t[n]}for(l=0,u=y.length;l<u;++l){c=y[l],h=y[l]=new Node$1(c);if(null!=(d=x(c,l,o))&&(d+="")){p=h.id=d;v.set(p,v.has(p)?i:h)}null!=(d=m(c,l,o))&&(d+="")&&(h.parent=d)}for(l=0;l<u;++l){h=y[l];if(d=h.parent){f=v.get(d);if(!f)throw new Error("missing: "+d);if(f===i)throw new Error("ambiguous: "+d);f.children?f.children.push(h):f.children=[h];h.parent=f}else{if(s)throw new Error("multiple roots");s=h}}if(!s)throw new Error("no root");if(null!=e){while(s.data===a&&1===s.children.length)s=s.children[0],--u;for(let e=y.length-1;e>=0;--e){h=y[e];if(h.data!==a)break;h.data=null}}s.parent=r;s.eachBefore((function(e){e.depth=e.parent.depth+1;--u})).eachBefore(computeHeight);s.parent=null;if(u>0)throw new Error("cycle");return s}stratify.id=function(e){return arguments.length?(n=optional(e),stratify):n};stratify.parentId=function(e){return arguments.length?(t=optional(e),stratify):t};stratify.path=function(n){return arguments.length?(e=optional(n),stratify):e};return stratify}function normalize(e){e=`${e}`;let n=e.length;slash(e,n-1)&&!slash(e,n-2)&&(e=e.slice(0,-1));return"/"===e[0]?e:`/${e}`}function parentof(e){let n=e.length;if(n<2)return"";while(--n>1)if(slash(e,n))break;return e.slice(0,n)}function slash(e,n){if("/"===e[n]){let t=0;while(n>0&&"\\"===e[--n])++t;if(0===(1&t))return true}return false}function defaultSeparation(e,n){return e.parent===n.parent?1:2}function nextLeft(e){var n=e.children;return n?n[0]:e.t}function nextRight(e){var n=e.children;return n?n[n.length-1]:e.t}function moveSubtree(e,n,t){var r=t/(n.i-e.i);n.c-=r;n.s+=t;e.c+=r;n.z+=t;n.m+=t}function executeShifts(e){var n,t=0,r=0,i=e.children,a=i.length;while(--a>=0){n=i[a];n.z+=t;n.m+=t;t+=n.s+(r+=n.c)}}function nextAncestor(e,n,t){return e.a.parent===n.parent?e.a:t}function TreeNode(e,n){this._=e;this.parent=null;this.children=null;this.A=null;this.a=this;this.z=0;this.m=0;this.c=0;this.s=0;this.t=null;this.i=n}TreeNode.prototype=Object.create(Node$1.prototype);function treeRoot(e){var n,t,r,i,a,o=new TreeNode(e,0),u=[o];while(n=u.pop())if(r=n._.children){n.children=new Array(a=r.length);for(i=a-1;i>=0;--i){u.push(t=n.children[i]=new TreeNode(r[i],i));t.parent=n}}(o.parent=new TreeNode(null,0)).children=[o];return o}function tree(){var e=defaultSeparation,n=1,t=1,r=null;function tree(i){var a=treeRoot(i);a.eachAfter(firstWalk),a.parent.m=-a.z;a.eachBefore(secondWalk);if(r)i.eachBefore(sizeNode);else{var o=i,u=i,c=i;i.eachBefore((function(e){e.x<o.x&&(o=e);e.x>u.x&&(u=e);e.depth>c.depth&&(c=e)}));var l=o===u?1:e(o,u)/2,s=l-o.x,f=n/(u.x+l+s),h=t/(c.depth||1);i.eachBefore((function(e){e.x=(e.x+s)*f;e.y=e.depth*h}))}return i}function firstWalk(n){var t=n.children,r=n.parent.children,i=n.i?r[n.i-1]:null;if(t){executeShifts(n);var a=(t[0].z+t[t.length-1].z)/2;if(i){n.z=i.z+e(n._,i._);n.m=n.z-a}else n.z=a}else i&&(n.z=i.z+e(n._,i._));n.parent.A=apportion(n,i,n.parent.A||r[0])}function secondWalk(e){e._.x=e.z+e.parent.m;e.m+=e.parent.m}function apportion(n,t,r){if(t){var i,a=n,o=n,u=t,c=a.parent.children[0],l=a.m,s=o.m,f=u.m,h=c.m;while(u=nextRight(u),a=nextLeft(a),u&&a){c=nextLeft(c);o=nextRight(o);o.a=n;i=u.z+f-a.z-l+e(u._,a._);if(i>0){moveSubtree(nextAncestor(u,n,r),n,i);l+=i;s+=i}f+=u.m;l+=a.m;h+=c.m;s+=o.m}if(u&&!nextRight(o)){o.t=u;o.m+=f-s}if(a&&!nextLeft(c)){c.t=a;c.m+=l-h;r=n}}return r}function sizeNode(e){e.x*=n;e.y=e.depth*t}tree.separation=function(n){return arguments.length?(e=n,tree):e};tree.size=function(e){return arguments.length?(r=false,n=+e[0],t=+e[1],tree):r?null:[n,t]};tree.nodeSize=function(e){return arguments.length?(r=true,n=+e[0],t=+e[1],tree):r?[n,t]:null};return tree}function treemapSlice(e,n,t,r,i){var a,o=e.children,u=-1,c=o.length,l=e.value&&(i-t)/e.value;while(++u<c){a=o[u],a.x0=n,a.x1=r;a.y0=t,a.y1=t+=a.value*l}}var o=(1+Math.sqrt(5))/2;function squarifyRatio(e,n,t,r,i,a){var o,u,c,l,s,f,h,d,p,y,x,m=[],v=n.children,g=0,w=0,_=v.length,B=n.value;while(g<_){c=i-t,l=a-r;do{s=v[w++].value}while(!s&&w<_);f=h=s;y=Math.max(l/c,c/l)/(B*e);x=s*s*y;p=Math.max(h/x,x/f);for(;w<_;++w){s+=u=v[w].value;u<f&&(f=u);u>h&&(h=u);x=s*s*y;d=Math.max(h/x,x/f);if(d>p){s-=u;break}p=d}m.push(o={value:s,dice:c<l,children:v.slice(g,w)});o.dice?treemapDice(o,t,r,i,B?r+=l*s/B:a):treemapSlice(o,t,r,B?t+=c*s/B:i,a);B-=s,g=w}return m}var u=function custom(e){function squarify(n,t,r,i,a){squarifyRatio(e,n,t,r,i,a)}squarify.ratio=function(e){return custom((e=+e)>1?e:1)};return squarify}(o);function index(){var e=u,n=false,t=1,r=1,i=[0],a=constantZero,o=constantZero,c=constantZero,l=constantZero,s=constantZero;function treemap(e){e.x0=e.y0=0;e.x1=t;e.y1=r;e.eachBefore(positionNode);i=[0];n&&e.eachBefore(roundNode);return e}function positionNode(n){var t=i[n.depth],r=n.x0+t,u=n.y0+t,f=n.x1-t,h=n.y1-t;f<r&&(r=f=(r+f)/2);h<u&&(u=h=(u+h)/2);n.x0=r;n.y0=u;n.x1=f;n.y1=h;if(n.children){t=i[n.depth+1]=a(n)/2;r+=s(n)-t;u+=o(n)-t;f-=c(n)-t;h-=l(n)-t;f<r&&(r=f=(r+f)/2);h<u&&(u=h=(u+h)/2);e(n,r,u,f,h)}}treemap.round=function(e){return arguments.length?(n=!!e,treemap):n};treemap.size=function(e){return arguments.length?(t=+e[0],r=+e[1],treemap):[t,r]};treemap.tile=function(n){return arguments.length?(e=required(n),treemap):e};treemap.padding=function(e){return arguments.length?treemap.paddingInner(e).paddingOuter(e):treemap.paddingInner()};treemap.paddingInner=function(e){return arguments.length?(a="function"===typeof e?e:constant(+e),treemap):a};treemap.paddingOuter=function(e){return arguments.length?treemap.paddingTop(e).paddingRight(e).paddingBottom(e).paddingLeft(e):treemap.paddingTop()};treemap.paddingTop=function(e){return arguments.length?(o="function"===typeof e?e:constant(+e),treemap):o};treemap.paddingRight=function(e){return arguments.length?(c="function"===typeof e?e:constant(+e),treemap):c};treemap.paddingBottom=function(e){return arguments.length?(l="function"===typeof e?e:constant(+e),treemap):l};treemap.paddingLeft=function(e){return arguments.length?(s="function"===typeof e?e:constant(+e),treemap):s};return treemap}function binary(e,n,t,r,i){var a,o,u=e.children,c=u.length,l=new Array(c+1);for(l[0]=o=a=0;a<c;++a)l[a+1]=o+=u[a].value;partition(0,c,e.value,n,t,r,i);function partition(e,n,t,r,i,a,o){if(e>=n-1){var c=u[e];c.x0=r,c.y0=i;c.x1=a,c.y1=o}else{var s=l[e],f=t/2+s,h=e+1,d=n-1;while(h<d){var p=h+d>>>1;l[p]<f?h=p+1:d=p}f-l[h-1]<l[h]-f&&e+1<h&&--h;var y=l[h]-s,x=t-y;if(a-r>o-i){var m=t?(r*x+a*y)/t:a;partition(e,h,y,r,i,m,o);partition(h,n,x,m,i,a,o)}else{var v=t?(i*x+o*y)/t:o;partition(e,h,y,r,i,a,v);partition(h,n,x,r,v,a,o)}}}}function sliceDice(e,n,t,r,i){(1&e.depth?treemapSlice:treemapDice)(e,n,t,r,i)}var c=function custom(e){function resquarify(n,t,r,i,a){if((o=n._squarify)&&o.ratio===e){var o,u,c,l,s,f=-1,h=o.length,d=n.value;while(++f<h){u=o[f],c=u.children;for(l=u.value=0,s=c.length;l<s;++l)u.value+=c[l].value;u.dice?treemapDice(u,t,r,i,d?r+=(a-r)*u.value/d:a):treemapSlice(u,t,r,d?t+=(i-t)*u.value/d:i,a);d-=u.value}}else{n._squarify=o=squarifyRatio(e,n,t,r,i,a);o.ratio=e}}resquarify.ratio=function(e){return custom((e=+e)>1?e:1)};return resquarify}(o);export{Node$1 as Node,cluster,hierarchy,index$1 as pack,enclose as packEnclose,siblings as packSiblings,partition,stratify,tree,index as treemap,binary as treemapBinary,treemapDice,c as treemapResquarify,treemapSlice,sliceDice as treemapSliceDice,u as treemapSquarify};
 
diff --git a/vendor/javascript/d3-interpolate.js b/vendor/javascript/d3-interpolate.js
index 9822fa1f..626ad6fd 100644
--- a/vendor/javascript/d3-interpolate.js
+++ b/vendor/javascript/d3-interpolate.js
@@ -1,2 +1,4 @@
+// d3-interpolate@3.0.1 downloaded from https://ga.jspm.io/npm:d3-interpolate@3.0.1/src/index.js
+
 import{rgb as n,color as r,hsl as t,lab as e,hcl as a,cubehelix as o}from"d3-color";function basis(n,r,t,e,a){var o=n*n,u=o*n;return((1-3*n+3*o-u)*r+(4-6*o+3*u)*t+(1+3*n+3*o-3*u)*e+u*a)/6}function basis$1(n){var r=n.length-1;return function(t){var e=t<=0?t=0:t>=1?(t=1,r-1):Math.floor(t*r),a=n[e],o=n[e+1],u=e>0?n[e-1]:2*a-o,i=e<r-1?n[e+2]:2*o-a;return basis((t-e/r)*r,u,a,o,i)}}function basisClosed(n){var r=n.length;return function(t){var e=Math.floor(((t%=1)<0?++t:t)*r),a=n[(e+r-1)%r],o=n[e%r],u=n[(e+1)%r],i=n[(e+2)%r];return basis((t-e/r)*r,a,o,u,i)}}var constant=n=>()=>n;function linear(n,r){return function(t){return n+t*r}}function exponential(n,r,t){return n=Math.pow(n,t),r=Math.pow(r,t)-n,t=1/t,function(e){return Math.pow(n+e*r,t)}}function hue$1(n,r){var t=r-n;return t?linear(n,t>180||t<-180?t-360*Math.round(t/360):t):constant(isNaN(n)?r:n)}function gamma(n){return 1===(n=+n)?nogamma:function(r,t){return t-r?exponential(r,t,n):constant(isNaN(r)?t:r)}}function nogamma(n,r){var t=r-n;return t?linear(n,t):constant(isNaN(n)?r:n)}var u=function rgbGamma(r){var t=gamma(r);function rgb(r,e){var a=t((r=n(r)).r,(e=n(e)).r),o=t(r.g,e.g),u=t(r.b,e.b),i=nogamma(r.opacity,e.opacity);return function(n){r.r=a(n);r.g=o(n);r.b=u(n);r.opacity=i(n);return r+""}}rgb.gamma=rgbGamma;return rgb}(1);function rgbSpline(r){return function(t){var e,a,o=t.length,u=new Array(o),i=new Array(o),s=new Array(o);for(e=0;e<o;++e){a=n(t[e]);u[e]=a.r||0;i[e]=a.g||0;s[e]=a.b||0}u=r(u);i=r(i);s=r(s);a.opacity=1;return function(n){a.r=u(n);a.g=i(n);a.b=s(n);return a+""}}}var i=rgbSpline(basis$1);var s=rgbSpline(basisClosed);function numberArray(n,r){r||(r=[]);var t,e=n?Math.min(r.length,n.length):0,a=r.slice();return function(o){for(t=0;t<e;++t)a[t]=n[t]*(1-o)+r[t]*o;return a}}function isNumberArray(n){return ArrayBuffer.isView(n)&&!(n instanceof DataView)}function array(n,r){return(isNumberArray(r)?numberArray:genericArray)(n,r)}function genericArray(n,r){var t,e=r?r.length:0,a=n?Math.min(e,n.length):0,o=new Array(a),u=new Array(e);for(t=0;t<a;++t)o[t]=value(n[t],r[t]);for(;t<e;++t)u[t]=r[t];return function(n){for(t=0;t<a;++t)u[t]=o[t](n);return u}}function date(n,r){var t=new Date;return n=+n,r=+r,function(e){return t.setTime(n*(1-e)+r*e),t}}function number(n,r){return n=+n,r=+r,function(t){return n*(1-t)+r*t}}function object(n,r){var t,e={},a={};null!==n&&"object"===typeof n||(n={});null!==r&&"object"===typeof r||(r={});for(t in r)t in n?e[t]=value(n[t],r[t]):a[t]=r[t];return function(n){for(t in e)a[t]=e[t](n);return a}}var l=/[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,c=new RegExp(l.source,"g");function zero(n){return function(){return n}}function one(n){return function(r){return n(r)+""}}function string(n,r){var t,e,a,o=l.lastIndex=c.lastIndex=0,u=-1,i=[],s=[];n+="",r+="";while((t=l.exec(n))&&(e=c.exec(r))){if((a=e.index)>o){a=r.slice(o,a);i[u]?i[u]+=a:i[++u]=a}if((t=t[0])===(e=e[0]))i[u]?i[u]+=e:i[++u]=e;else{i[++u]=null;s.push({i:u,x:number(t,e)})}o=c.lastIndex}if(o<r.length){a=r.slice(o);i[u]?i[u]+=a:i[++u]=a}return i.length<2?s[0]?one(s[0].x):zero(r):(r=s.length,function(n){for(var t,e=0;e<r;++e)i[(t=s[e]).i]=t.x(n);return i.join("")})}function value(n,t){var e,a=typeof t;return null==t||"boolean"===a?constant(t):("number"===a?number:"string"===a?(e=r(t))?(t=e,u):string:t instanceof r?u:t instanceof Date?date:isNumberArray(t)?numberArray:Array.isArray(t)?genericArray:"function"!==typeof t.valueOf&&"function"!==typeof t.toString||isNaN(t)?object:number)(n,t)}function discrete(n){var r=n.length;return function(t){return n[Math.max(0,Math.min(r-1,Math.floor(t*r)))]}}function hue(n,r){var t=hue$1(+n,+r);return function(n){var r=t(n);return r-360*Math.floor(r/360)}}function round(n,r){return n=+n,r=+r,function(t){return Math.round(n*(1-t)+r*t)}}var f=180/Math.PI;var h={translateX:0,translateY:0,rotate:0,skewX:0,scaleX:1,scaleY:1};function decompose(n,r,t,e,a,o){var u,i,s;(u=Math.sqrt(n*n+r*r))&&(n/=u,r/=u);(s=n*t+r*e)&&(t-=n*s,e-=r*s);(i=Math.sqrt(t*t+e*e))&&(t/=i,e/=i,s/=i);n*e<r*t&&(n=-n,r=-r,s=-s,u=-u);return{translateX:a,translateY:o,rotate:Math.atan2(r,n)*f,skewX:Math.atan(s)*f,scaleX:u,scaleY:i}}var p;function parseCss(n){const r=new("function"===typeof DOMMatrix?DOMMatrix:WebKitCSSMatrix)(n+"");return r.isIdentity?h:decompose(r.a,r.b,r.c,r.d,r.e,r.f)}function parseSvg(n){if(null==n)return h;p||(p=document.createElementNS("http://www.w3.org/2000/svg","g"));p.setAttribute("transform",n);if(!(n=p.transform.baseVal.consolidate()))return h;n=n.matrix;return decompose(n.a,n.b,n.c,n.d,n.e,n.f)}function interpolateTransform(n,r,t,e){function pop(n){return n.length?n.pop()+" ":""}function translate(n,e,a,o,u,i){if(n!==a||e!==o){var s=u.push("translate(",null,r,null,t);i.push({i:s-4,x:number(n,a)},{i:s-2,x:number(e,o)})}else(a||o)&&u.push("translate("+a+r+o+t)}function rotate(n,r,t,a){if(n!==r){n-r>180?r+=360:r-n>180&&(n+=360);a.push({i:t.push(pop(t)+"rotate(",null,e)-2,x:number(n,r)})}else r&&t.push(pop(t)+"rotate("+r+e)}function skewX(n,r,t,a){n!==r?a.push({i:t.push(pop(t)+"skewX(",null,e)-2,x:number(n,r)}):r&&t.push(pop(t)+"skewX("+r+e)}function scale(n,r,t,e,a,o){if(n!==t||r!==e){var u=a.push(pop(a)+"scale(",null,",",null,")");o.push({i:u-4,x:number(n,t)},{i:u-2,x:number(r,e)})}else 1===t&&1===e||a.push(pop(a)+"scale("+t+","+e+")")}return function(r,t){var e=[],a=[];r=n(r),t=n(t);translate(r.translateX,r.translateY,t.translateX,t.translateY,e,a);rotate(r.rotate,t.rotate,e,a);skewX(r.skewX,t.skewX,e,a);scale(r.scaleX,r.scaleY,t.scaleX,t.scaleY,e,a);r=t=null;return function(n){var r,t=-1,o=a.length;while(++t<o)e[(r=a[t]).i]=r.x(n);return e.join("")}}}var m=interpolateTransform(parseCss,"px, ","px)","deg)");var g=interpolateTransform(parseSvg,", ",")",")");var b=1e-12;function cosh(n){return((n=Math.exp(n))+1/n)/2}function sinh(n){return((n=Math.exp(n))-1/n)/2}function tanh(n){return((n=Math.exp(2*n))-1)/(n+1)}var v=function zoomRho(n,r,t){function zoom(e,a){var o,u,i=e[0],s=e[1],l=e[2],c=a[0],f=a[1],h=a[2],p=c-i,m=f-s,g=p*p+m*m;if(g<b){u=Math.log(h/l)/n;o=function(r){return[i+r*p,s+r*m,l*Math.exp(n*r*u)]}}else{var v=Math.sqrt(g),y=(h*h-l*l+t*g)/(2*l*r*v),x=(h*h-l*l-t*g)/(2*h*r*v),M=Math.log(Math.sqrt(y*y+1)-y),d=Math.log(Math.sqrt(x*x+1)-x);u=(d-M)/n;o=function(t){var e=t*u,a=cosh(M),o=l/(r*v)*(a*tanh(n*e+M)-sinh(M));return[i+o*p,s+o*m,l*a/cosh(n*e+M)]}}o.duration=1e3*u*n/Math.SQRT2;return o}zoom.rho=function(n){var r=Math.max(.001,+n),t=r*r,e=t*t;return zoomRho(r,t,e)};return zoom}(Math.SQRT2,2,4);function hsl(n){return function(r,e){var a=n((r=t(r)).h,(e=t(e)).h),o=nogamma(r.s,e.s),u=nogamma(r.l,e.l),i=nogamma(r.opacity,e.opacity);return function(n){r.h=a(n);r.s=o(n);r.l=u(n);r.opacity=i(n);return r+""}}}var y=hsl(hue$1);var x=hsl(nogamma);function lab(n,r){var t=nogamma((n=e(n)).l,(r=e(r)).l),a=nogamma(n.a,r.a),o=nogamma(n.b,r.b),u=nogamma(n.opacity,r.opacity);return function(r){n.l=t(r);n.a=a(r);n.b=o(r);n.opacity=u(r);return n+""}}function hcl(n){return function(r,t){var e=n((r=a(r)).h,(t=a(t)).h),o=nogamma(r.c,t.c),u=nogamma(r.l,t.l),i=nogamma(r.opacity,t.opacity);return function(n){r.h=e(n);r.c=o(n);r.l=u(n);r.opacity=i(n);return r+""}}}var M=hcl(hue$1);var d=hcl(nogamma);function cubehelix(n){return function cubehelixGamma(r){r=+r;function cubehelix(t,e){var a=n((t=o(t)).h,(e=o(e)).h),u=nogamma(t.s,e.s),i=nogamma(t.l,e.l),s=nogamma(t.opacity,e.opacity);return function(n){t.h=a(n);t.s=u(n);t.l=i(Math.pow(n,r));t.opacity=s(n);return t+""}}cubehelix.gamma=cubehelixGamma;return cubehelix}(1)}var w=cubehelix(hue$1);var A=cubehelix(nogamma);function piecewise(n,r){void 0===r&&(r=n,n=value);var t=0,e=r.length-1,a=r[0],o=new Array(e<0?0:e);while(t<e)o[t]=n(a,a=r[++t]);return function(n){var r=Math.max(0,Math.min(e-1,Math.floor(n*=e)));return o[r](n-r)}}function quantize(n,r){var t=new Array(r);for(var e=0;e<r;++e)t[e]=n(e/(r-1));return t}export{value as interpolate,array as interpolateArray,basis$1 as interpolateBasis,basisClosed as interpolateBasisClosed,w as interpolateCubehelix,A as interpolateCubehelixLong,date as interpolateDate,discrete as interpolateDiscrete,M as interpolateHcl,d as interpolateHclLong,y as interpolateHsl,x as interpolateHslLong,hue as interpolateHue,lab as interpolateLab,number as interpolateNumber,numberArray as interpolateNumberArray,object as interpolateObject,u as interpolateRgb,i as interpolateRgbBasis,s as interpolateRgbBasisClosed,round as interpolateRound,string as interpolateString,m as interpolateTransformCss,g as interpolateTransformSvg,v as interpolateZoom,piecewise,quantize};
 
diff --git a/vendor/javascript/d3-path.js b/vendor/javascript/d3-path.js
index df5c591b..b3d4022c 100644
--- a/vendor/javascript/d3-path.js
+++ b/vendor/javascript/d3-path.js
@@ -1,2 +1,4 @@
-const t=Math.PI,h=2*t,i=1e-6,s=h-i;function append(t){this._+=t[0];for(let h=1,i=t.length;h<i;++h)this._+=arguments[h]+t[h]}function appendRound(t){let h=Math.floor(t);if(!(h>=0))throw new Error(`invalid digits: ${t}`);if(h>15)return append;const i=10**h;return function(t){this._+=t[0];for(let h=1,s=t.length;h<s;++h)this._+=Math.round(arguments[h]*i)/i+t[h]}}class Path{constructor(t){this._x0=this._y0=this._x1=this._y1=null;this._="";this._append=null==t?append:appendRound(t)}moveTo(t,h){this._append`M${this._x0=this._x1=+t},${this._y0=this._y1=+h}`}closePath(){if(null!==this._x1){this._x1=this._x0,this._y1=this._y0;this._append`Z`}}lineTo(t,h){this._append`L${this._x1=+t},${this._y1=+h}`}quadraticCurveTo(t,h,i,s){this._append`Q${+t},${+h},${this._x1=+i},${this._y1=+s}`}bezierCurveTo(t,h,i,s,n,a){this._append`C${+t},${+h},${+i},${+s},${this._x1=+n},${this._y1=+a}`}arcTo(h,s,n,a,e){h=+h,s=+s,n=+n,a=+a,e=+e;if(e<0)throw new Error(`negative radius: ${e}`);let _=this._x1,$=this._y1,p=n-h,r=a-s,o=_-h,d=$-s,l=o*o+d*d;if(null===this._x1)this._append`M${this._x1=h},${this._y1=s}`;else if(l>i)if(Math.abs(d*p-r*o)>i&&e){let u=n-_,x=a-$,y=p*p+r*r,M=u*u+x*x,c=Math.sqrt(y),f=Math.sqrt(l),w=e*Math.tan((t-Math.acos((y+l-M)/(2*c*f)))/2),v=w/f,P=w/c;Math.abs(v-1)>i&&this._append`L${h+v*o},${s+v*d}`;this._append`A${e},${e},0,0,${+(d*u>o*x)},${this._x1=h+P*p},${this._y1=s+P*r}`}else this._append`L${this._x1=h},${this._y1=s}`;else;}arc(n,a,e,_,$,p){n=+n,a=+a,e=+e,p=!!p;if(e<0)throw new Error(`negative radius: ${e}`);let r=e*Math.cos(_),o=e*Math.sin(_),d=n+r,l=a+o,u=1^p,x=p?_-$:$-_;null===this._x1?this._append`M${d},${l}`:(Math.abs(this._x1-d)>i||Math.abs(this._y1-l)>i)&&this._append`L${d},${l}`;if(e){x<0&&(x=x%h+h);x>s?this._append`A${e},${e},0,1,${u},${n-r},${a-o}A${e},${e},0,1,${u},${this._x1=d},${this._y1=l}`:x>i&&this._append`A${e},${e},0,${+(x>=t)},${u},${this._x1=n+e*Math.cos($)},${this._y1=a+e*Math.sin($)}`}}rect(t,h,i,s){this._append`M${this._x0=this._x1=+t},${this._y0=this._y1=+h}h${i=+i}v${+s}h${-i}Z`}toString(){return this._}}function path(){return new Path}path.prototype=Path.prototype;function pathRound(t=3){return new Path(+t)}export{Path,path,pathRound};
+// d3-path@1.0.9 downloaded from https://ga.jspm.io/npm:d3-path@1.0.9/dist/d3-path.js
+
+var t="undefined"!==typeof globalThis?globalThis:"undefined"!==typeof self?self:global;var i={};(function(t,h){h(i)})(i,(function(i){var h=Math.PI,s=2*h,_=1e-6,n=s-_;function Path(){(this||t)._x0=(this||t)._y0=(this||t)._x1=(this||t)._y1=null;(this||t)._=""}function path(){return new Path}Path.prototype=path.prototype={constructor:Path,moveTo:function(i,h){(this||t)._+="M"+((this||t)._x0=(this||t)._x1=+i)+","+((this||t)._y0=(this||t)._y1=+h)},closePath:function(){if(null!==(this||t)._x1){(this||t)._x1=(this||t)._x0,(this||t)._y1=(this||t)._y0;(this||t)._+="Z"}},lineTo:function(i,h){(this||t)._+="L"+((this||t)._x1=+i)+","+((this||t)._y1=+h)},quadraticCurveTo:function(i,h,s,_){(this||t)._+="Q"+ +i+","+ +h+","+((this||t)._x1=+s)+","+((this||t)._y1=+_)},bezierCurveTo:function(i,h,s,_,n,a){(this||t)._+="C"+ +i+","+ +h+","+ +s+","+ +_+","+((this||t)._x1=+n)+","+((this||t)._y1=+a)},arcTo:function(i,s,n,a,e){i=+i,s=+s,n=+n,a=+a,e=+e;var o=(this||t)._x1,r=(this||t)._y1,u=n-i,f=a-s,c=o-i,l=r-s,x=c*c+l*l;if(e<0)throw new Error("negative radius: "+e);if(null===(this||t)._x1)(this||t)._+="M"+((this||t)._x1=i)+","+((this||t)._y1=s);else if(x>_)if(Math.abs(l*u-f*c)>_&&e){var y=n-o,M=a-r,p=u*u+f*f,v=y*y+M*M,d=Math.sqrt(p),b=Math.sqrt(x),P=e*Math.tan((h-Math.acos((p+x-v)/(2*d*b)))/2),T=P/b,g=P/d;Math.abs(T-1)>_&&((this||t)._+="L"+(i+T*c)+","+(s+T*l));(this||t)._+="A"+e+","+e+",0,0,"+ +(l*y>c*M)+","+((this||t)._x1=i+g*u)+","+((this||t)._y1=s+g*f)}else(this||t)._+="L"+((this||t)._x1=i)+","+((this||t)._y1=s);else;},arc:function(i,a,e,o,r,u){i=+i,a=+a,e=+e,u=!!u;var f=e*Math.cos(o),c=e*Math.sin(o),l=i+f,x=a+c,y=1^u,M=u?o-r:r-o;if(e<0)throw new Error("negative radius: "+e);null===(this||t)._x1?(this||t)._+="M"+l+","+x:(Math.abs((this||t)._x1-l)>_||Math.abs((this||t)._y1-x)>_)&&((this||t)._+="L"+l+","+x);if(e){M<0&&(M=M%s+s);M>n?(this||t)._+="A"+e+","+e+",0,1,"+y+","+(i-f)+","+(a-c)+"A"+e+","+e+",0,1,"+y+","+((this||t)._x1=l)+","+((this||t)._y1=x):M>_&&((this||t)._+="A"+e+","+e+",0,"+ +(M>=h)+","+y+","+((this||t)._x1=i+e*Math.cos(r))+","+((this||t)._y1=a+e*Math.sin(r)))}},rect:function(i,h,s,_){(this||t)._+="M"+((this||t)._x0=(this||t)._x1=+i)+","+((this||t)._y0=(this||t)._y1=+h)+"h"+ +s+"v"+ +_+"h"+-s+"Z"},toString:function(){return(this||t)._}};i.path=path;Object.defineProperty(i,"__esModule",{value:true})}));const h=i.path,s=i.__esModule;export default i;export{s as __esModule,h as path};
 
diff --git a/vendor/javascript/d3-polygon.js b/vendor/javascript/d3-polygon.js
index 4ec6cc5c..f9371c51 100644
--- a/vendor/javascript/d3-polygon.js
+++ b/vendor/javascript/d3-polygon.js
@@ -1,2 +1,4 @@
+// d3-polygon@3.0.1 downloaded from https://ga.jspm.io/npm:d3-polygon@3.0.1/src/index.js
+
 function area(n){var r,e=-1,t=n.length,o=n[t-1],l=0;while(++e<t){r=o;o=n[e];l+=r[1]*o[0]-r[0]*o[1]}return l/2}function centroid(n){var r,e,t=-1,o=n.length,l=0,u=0,a=n[o-1],h=0;while(++t<o){r=a;a=n[t];h+=e=r[0]*a[1]-a[0]*r[1];l+=(r[0]+a[0])*e;u+=(r[1]+a[1])*e}return h*=3,[l/h,u/h]}function cross(n,r,e){return(r[0]-n[0])*(e[1]-n[1])-(r[1]-n[1])*(e[0]-n[0])}function lexicographicOrder(n,r){return n[0]-r[0]||n[1]-r[1]}function computeUpperHullIndexes(n){const r=n.length,e=[0,1];let t,o=2;for(t=2;t<r;++t){while(o>1&&cross(n[e[o-2]],n[e[o-1]],n[t])<=0)--o;e[o++]=t}return e.slice(0,o)}function hull(n){if((e=n.length)<3)return null;var r,e,t=new Array(e),o=new Array(e);for(r=0;r<e;++r)t[r]=[+n[r][0],+n[r][1],r];t.sort(lexicographicOrder);for(r=0;r<e;++r)o[r]=[t[r][0],-t[r][1]];var l=computeUpperHullIndexes(t),u=computeUpperHullIndexes(o);var a=u[0]===l[0],h=u[u.length-1]===l[l.length-1],i=[];for(r=l.length-1;r>=0;--r)i.push(n[t[l[r]][2]]);for(r=+a;r<u.length-h;++r)i.push(n[t[u[r]][2]]);return i}function contains(n,r){var e,t,o=n.length,l=n[o-1],u=r[0],a=r[1],h=l[0],i=l[1],c=false;for(var s=0;s<o;++s){l=n[s],e=l[0],t=l[1];t>a!==i>a&&u<(h-e)*(a-t)/(i-t)+e&&(c=!c);h=e,i=t}return c}function length(n){var r,e,t=-1,o=n.length,l=n[o-1],u=l[0],a=l[1],h=0;while(++t<o){r=u;e=a;l=n[t];u=l[0];a=l[1];r-=u;e-=a;h+=Math.hypot(r,e)}return h}export{area as polygonArea,centroid as polygonCentroid,contains as polygonContains,hull as polygonHull,length as polygonLength};
 
diff --git a/vendor/javascript/d3-quadtree.js b/vendor/javascript/d3-quadtree.js
index 611034db..e696f06b 100644
--- a/vendor/javascript/d3-quadtree.js
+++ b/vendor/javascript/d3-quadtree.js
@@ -1,2 +1,4 @@
+// d3-quadtree@3.0.1 downloaded from https://ga.jspm.io/npm:d3-quadtree@3.0.1/src/index.js
+
 function tree_add(t){const e=+this._x.call(null,t),i=+this._y.call(null,t);return add(this.cover(e,i),e,i,t)}function add(t,e,i,r){if(isNaN(e)||isNaN(i))return t;var n,h,s,a,o,u,l,_,d,f=t._root,y={data:r},x=t._x0,c=t._y0,v=t._x1,w=t._y1;if(!f)return t._root=y,t;while(f.length){(u=e>=(h=(x+v)/2))?x=h:v=h;(l=i>=(s=(c+w)/2))?c=s:w=s;if(n=f,!(f=f[_=l<<1|u]))return n[_]=y,t}a=+t._x.call(null,f.data);o=+t._y.call(null,f.data);if(e===a&&i===o)return y.next=f,n?n[_]=y:t._root=y,t;do{n=n?n[_]=new Array(4):t._root=new Array(4);(u=e>=(h=(x+v)/2))?x=h:v=h;(l=i>=(s=(c+w)/2))?c=s:w=s}while((_=l<<1|u)===(d=(o>=s)<<1|a>=h));return n[d]=f,n[_]=y,t}function addAll(t){var e,i,r,n,h=t.length,s=new Array(h),a=new Array(h),o=Infinity,u=Infinity,l=-Infinity,_=-Infinity;for(i=0;i<h;++i)if(!isNaN(r=+this._x.call(null,e=t[i]))&&!isNaN(n=+this._y.call(null,e))){s[i]=r;a[i]=n;r<o&&(o=r);r>l&&(l=r);n<u&&(u=n);n>_&&(_=n)}if(o>l||u>_)return this;this.cover(o,u).cover(l,_);for(i=0;i<h;++i)add(this,s[i],a[i],t[i]);return this}function tree_cover(t,e){if(isNaN(t=+t)||isNaN(e=+e))return this;var i=this._x0,r=this._y0,n=this._x1,h=this._y1;if(isNaN(i)){n=(i=Math.floor(t))+1;h=(r=Math.floor(e))+1}else{var s,a,o=n-i||1,u=this._root;while(i>t||t>=n||r>e||e>=h){a=(e<r)<<1|t<i;s=new Array(4),s[a]=u,u=s,o*=2;switch(a){case 0:n=i+o,h=r+o;break;case 1:i=n-o,h=r+o;break;case 2:n=i+o,r=h-o;break;case 3:i=n-o,r=h-o;break}}this._root&&this._root.length&&(this._root=u)}this._x0=i;this._y0=r;this._x1=n;this._y1=h;return this}function tree_data(){var t=[];this.visit((function(e){if(!e.length)do{t.push(e.data)}while(e=e.next)}));return t}function tree_extent(t){return arguments.length?this.cover(+t[0][0],+t[0][1]).cover(+t[1][0],+t[1][1]):isNaN(this._x0)?void 0:[[this._x0,this._y0],[this._x1,this._y1]]}function Quad(t,e,i,r,n){this.node=t;this.x0=e;this.y0=i;this.x1=r;this.y1=n}function tree_find(t,e,i){var r,n,h,s,a,o,u,l=this._x0,_=this._y0,d=this._x1,f=this._y1,y=[],x=this._root;x&&y.push(new Quad(x,l,_,d,f));if(null==i)i=Infinity;else{l=t-i,_=e-i;d=t+i,f=e+i;i*=i}while(o=y.pop())if(!(!(x=o.node)||(n=o.x0)>d||(h=o.y0)>f||(s=o.x1)<l||(a=o.y1)<_))if(x.length){var c=(n+s)/2,v=(h+a)/2;y.push(new Quad(x[3],c,v,s,a),new Quad(x[2],n,v,c,a),new Quad(x[1],c,h,s,v),new Quad(x[0],n,h,c,v));if(u=(e>=v)<<1|t>=c){o=y[y.length-1];y[y.length-1]=y[y.length-1-u];y[y.length-1-u]=o}}else{var w=t-+this._x.call(null,x.data),p=e-+this._y.call(null,x.data),N=w*w+p*p;if(N<i){var g=Math.sqrt(i=N);l=t-g,_=e-g;d=t+g,f=e+g;r=x.data}}return r}function tree_remove(t){if(isNaN(h=+this._x.call(null,t))||isNaN(s=+this._y.call(null,t)))return this;var e,i,r,n,h,s,a,o,u,l,_,d,f=this._root,y=this._x0,x=this._y0,c=this._x1,v=this._y1;if(!f)return this;if(f.length)while(true){(u=h>=(a=(y+c)/2))?y=a:c=a;(l=s>=(o=(x+v)/2))?x=o:v=o;if(!(e=f,f=f[_=l<<1|u]))return this;if(!f.length)break;(e[_+1&3]||e[_+2&3]||e[_+3&3])&&(i=e,d=_)}while(f.data!==t)if(!(r=f,f=f.next))return this;(n=f.next)&&delete f.next;if(r)return n?r.next=n:delete r.next,this;if(!e)return this._root=n,this;n?e[_]=n:delete e[_];(f=e[0]||e[1]||e[2]||e[3])&&f===(e[3]||e[2]||e[1]||e[0])&&!f.length&&(i?i[d]=f:this._root=f);return this}function removeAll(t){for(var e=0,i=t.length;e<i;++e)this.remove(t[e]);return this}function tree_root(){return this._root}function tree_size(){var t=0;this.visit((function(e){if(!e.length)do{++t}while(e=e.next)}));return t}function tree_visit(t){var e,i,r,n,h,s,a=[],o=this._root;o&&a.push(new Quad(o,this._x0,this._y0,this._x1,this._y1));while(e=a.pop())if(!t(o=e.node,r=e.x0,n=e.y0,h=e.x1,s=e.y1)&&o.length){var u=(r+h)/2,l=(n+s)/2;(i=o[3])&&a.push(new Quad(i,u,l,h,s));(i=o[2])&&a.push(new Quad(i,r,l,u,s));(i=o[1])&&a.push(new Quad(i,u,n,h,l));(i=o[0])&&a.push(new Quad(i,r,n,u,l))}return this}function tree_visitAfter(t){var e,i=[],r=[];this._root&&i.push(new Quad(this._root,this._x0,this._y0,this._x1,this._y1));while(e=i.pop()){var n=e.node;if(n.length){var h,s=e.x0,a=e.y0,o=e.x1,u=e.y1,l=(s+o)/2,_=(a+u)/2;(h=n[0])&&i.push(new Quad(h,s,a,l,_));(h=n[1])&&i.push(new Quad(h,l,a,o,_));(h=n[2])&&i.push(new Quad(h,s,_,l,u));(h=n[3])&&i.push(new Quad(h,l,_,o,u))}r.push(e)}while(e=r.pop())t(e.node,e.x0,e.y0,e.x1,e.y1);return this}function defaultX(t){return t[0]}function tree_x(t){return arguments.length?(this._x=t,this):this._x}function defaultY(t){return t[1]}function tree_y(t){return arguments.length?(this._y=t,this):this._y}function quadtree(t,e,i){var r=new Quadtree(null==e?defaultX:e,null==i?defaultY:i,NaN,NaN,NaN,NaN);return null==t?r:r.addAll(t)}function Quadtree(t,e,i,r,n,h){this._x=t;this._y=e;this._x0=i;this._y0=r;this._x1=n;this._y1=h;this._root=void 0}function leaf_copy(t){var e={data:t.data},i=e;while(t=t.next)i=i.next={data:t.data};return e}var t=quadtree.prototype=Quadtree.prototype;t.copy=function(){var t,e,i=new Quadtree(this._x,this._y,this._x0,this._y0,this._x1,this._y1),r=this._root;if(!r)return i;if(!r.length)return i._root=leaf_copy(r),i;t=[{source:r,target:i._root=new Array(4)}];while(r=t.pop())for(var n=0;n<4;++n)(e=r.source[n])&&(e.length?t.push({source:e,target:r.target[n]=new Array(4)}):r.target[n]=leaf_copy(e));return i};t.add=tree_add;t.addAll=addAll;t.cover=tree_cover;t.data=tree_data;t.extent=tree_extent;t.find=tree_find;t.remove=tree_remove;t.removeAll=removeAll;t.root=tree_root;t.size=tree_size;t.visit=tree_visit;t.visitAfter=tree_visitAfter;t.x=tree_x;t.y=tree_y;export{quadtree};
 
diff --git a/vendor/javascript/d3-random.js b/vendor/javascript/d3-random.js
index 539ca4a0..cb70e241 100644
--- a/vendor/javascript/d3-random.js
+++ b/vendor/javascript/d3-random.js
@@ -1,2 +1,4 @@
+// d3-random@3.0.1 downloaded from https://ga.jspm.io/npm:d3-random@3.0.1/src/index.js
+
 var r=Math.random;var n=function sourceRandomUniform(r){function randomUniform(n,o){n=null==n?0:+n;o=null==o?1:+o;1===arguments.length?(o=n,n=0):o-=n;return function(){return r()*o+n}}randomUniform.source=sourceRandomUniform;return randomUniform}(r);var o=function sourceRandomInt(r){function randomInt(n,o){arguments.length<2&&(o=n,n=0);n=Math.floor(n);o=Math.floor(o)-n;return function(){return Math.floor(r()*o+n)}}randomInt.source=sourceRandomInt;return randomInt}(r);var a=function sourceRandomNormal(r){function randomNormal(n,o){var a,u;n=null==n?0:+n;o=null==o?1:+o;return function(){var t;if(null!=a)t=a,a=null;else do{a=2*r()-1;t=2*r()-1;u=a*a+t*t}while(!u||u>1);return n+o*t*Math.sqrt(-2*Math.log(u)/u)}}randomNormal.source=sourceRandomNormal;return randomNormal}(r);var u=function sourceRandomLogNormal(r){var n=a.source(r);function randomLogNormal(){var r=n.apply(this,arguments);return function(){return Math.exp(r())}}randomLogNormal.source=sourceRandomLogNormal;return randomLogNormal}(r);var t=function sourceRandomIrwinHall(r){function randomIrwinHall(n){return(n=+n)<=0?()=>0:function(){for(var o=0,a=n;a>1;--a)o+=r();return o+a*r()}}randomIrwinHall.source=sourceRandomIrwinHall;return randomIrwinHall}(r);var e=function sourceRandomBates(r){var n=t.source(r);function randomBates(o){if(0===(o=+o))return r;var a=n(o);return function(){return a()/o}}randomBates.source=sourceRandomBates;return randomBates}(r);var i=function sourceRandomExponential(r){function randomExponential(n){return function(){return-Math.log1p(-r())/n}}randomExponential.source=sourceRandomExponential;return randomExponential}(r);var m=function sourceRandomPareto(r){function randomPareto(n){if((n=+n)<0)throw new RangeError("invalid alpha");n=1/-n;return function(){return Math.pow(1-r(),n)}}randomPareto.source=sourceRandomPareto;return randomPareto}(r);var c=function sourceRandomBernoulli(r){function randomBernoulli(n){if((n=+n)<0||n>1)throw new RangeError("invalid p");return function(){return Math.floor(r()+n)}}randomBernoulli.source=sourceRandomBernoulli;return randomBernoulli}(r);var l=function sourceRandomGeometric(r){function randomGeometric(n){if((n=+n)<0||n>1)throw new RangeError("invalid p");if(0===n)return()=>Infinity;if(1===n)return()=>1;n=Math.log1p(-n);return function(){return 1+Math.floor(Math.log1p(-r())/n)}}randomGeometric.source=sourceRandomGeometric;return randomGeometric}(r);var d=function sourceRandomGamma(r){var n=a.source(r)();function randomGamma(o,a){if((o=+o)<0)throw new RangeError("invalid k");if(0===o)return()=>0;a=null==a?1:+a;if(1===o)return()=>-Math.log1p(-r())*a;var u=(o<1?o+1:o)-1/3,t=1/(3*Math.sqrt(u)),e=o<1?()=>Math.pow(r(),1/o):()=>1;return function(){do{do{var o=n(),i=1+t*o}while(i<=0);i*=i*i;var m=1-r()}while(m>=1-.0331*o*o*o*o&&Math.log(m)>=.5*o*o+u*(1-i+Math.log(i)));return u*i*e()*a}}randomGamma.source=sourceRandomGamma;return randomGamma}(r);var s=function sourceRandomBeta(r){var n=d.source(r);function randomBeta(r,o){var a=n(r),u=n(o);return function(){var r=a();return 0===r?0:r/(r+u())}}randomBeta.source=sourceRandomBeta;return randomBeta}(r);var f=function sourceRandomBinomial(r){var n=l.source(r),o=s.source(r);function randomBinomial(r,a){r=+r;return(a=+a)>=1?()=>r:a<=0?()=>0:function(){var u=0,t=r,e=a;while(t*e>16&&t*(1-e)>16){var i=Math.floor((t+1)*e),m=o(i,t-i+1)();if(m<=e){u+=i;t-=i;e=(e-m)/(1-m)}else{t=i-1;e/=m}}var c=e<.5,l=c?e:1-e,d=n(l);for(var s=d(),f=0;s<=t;++f)s+=d();return u+(c?f:t-f)}}randomBinomial.source=sourceRandomBinomial;return randomBinomial}(r);var h=function sourceRandomWeibull(r){function randomWeibull(n,o,a){var u;if(0===(n=+n))u=r=>-Math.log(r);else{n=1/n;u=r=>Math.pow(r,n)}o=null==o?0:+o;a=null==a?1:+a;return function(){return o+a*u(-Math.log1p(-r()))}}randomWeibull.source=sourceRandomWeibull;return randomWeibull}(r);var v=function sourceRandomCauchy(r){function randomCauchy(n,o){n=null==n?0:+n;o=null==o?1:+o;return function(){return n+o*Math.tan(Math.PI*r())}}randomCauchy.source=sourceRandomCauchy;return randomCauchy}(r);var R=function sourceRandomLogistic(r){function randomLogistic(n,o){n=null==n?0:+n;o=null==o?1:+o;return function(){var a=r();return n+o*Math.log(a/(1-a))}}randomLogistic.source=sourceRandomLogistic;return randomLogistic}(r);var g=function sourceRandomPoisson(r){var n=d.source(r),o=f.source(r);function randomPoisson(a){return function(){var u=0,t=a;while(t>16){var e=Math.floor(.875*t),i=n(e)();if(i>t)return u+o(e-1,t/i)();u+=e;t-=i}for(var m=-Math.log1p(-r()),c=0;m<=t;++c)m-=Math.log1p(-r());return u+c}}randomPoisson.source=sourceRandomPoisson;return randomPoisson}(r);const M=1664525;const B=1013904223;const p=1/4294967296;function lcg(r=Math.random()){let n=0|(0<=r&&r<1?r/p:Math.abs(r));return()=>(n=M*n+B|0,p*(n>>>0))}export{e as randomBates,c as randomBernoulli,s as randomBeta,f as randomBinomial,v as randomCauchy,i as randomExponential,d as randomGamma,l as randomGeometric,o as randomInt,t as randomIrwinHall,lcg as randomLcg,u as randomLogNormal,R as randomLogistic,a as randomNormal,m as randomPareto,g as randomPoisson,n as randomUniform,h as randomWeibull};
 
diff --git a/vendor/javascript/d3-sankey.js b/vendor/javascript/d3-sankey.js
new file mode 100644
index 00000000..704a8471
--- /dev/null
+++ b/vendor/javascript/d3-sankey.js
@@ -0,0 +1,4 @@
+// d3-sankey@0.12.3 downloaded from https://ga.jspm.io/npm:d3-sankey@0.12.3/dist/d3-sankey.js
+
+import e from"d3-array";import t from"d3-shape";var n={};(function(o,r){r(n,e,t)})(n,(function(e,t,n){function targetDepth(e){return e.target.depth}function left(e){return e.depth}function right(e,t){return t-1-e.height}function justify(e,t){return e.sourceLinks.length?e.depth:t-1}function center(e){return e.targetLinks.length?e.depth:e.sourceLinks.length?t.min(e.sourceLinks,targetDepth)-1:0}function constant(e){return function(){return e}}function ascendingSourceBreadth(e,t){return ascendingBreadth(e.source,t.source)||e.index-t.index}function ascendingTargetBreadth(e,t){return ascendingBreadth(e.target,t.target)||e.index-t.index}function ascendingBreadth(e,t){return e.y0-t.y0}function value(e){return e.value}function defaultId(e){return e.index}function defaultNodes(e){return e.nodes}function defaultLinks(e){return e.links}function find(e,t){const n=e.get(t);if(!n)throw new Error("missing: "+t);return n}function computeLinkBreadths({nodes:e}){for(const t of e){let e=t.y0;let n=e;for(const n of t.sourceLinks){n.y0=e+n.width/2;e+=n.width}for(const e of t.targetLinks){e.y1=n+e.width/2;n+=e.width}}}function Sankey(){let e=0,n=0,o=1,r=1;let s=24;let i=8,a;let u=defaultId;let c=justify;let f;let l;let d=defaultNodes;let k=defaultLinks;let h=6;function sankey(){const e={nodes:d.apply(null,arguments),links:k.apply(null,arguments)};computeNodeLinks(e);computeNodeValues(e);computeNodeDepths(e);computeNodeHeights(e);computeNodeBreadths(e);computeLinkBreadths(e);return e}sankey.update=function(e){computeLinkBreadths(e);return e};sankey.nodeId=function(e){return arguments.length?(u="function"===typeof e?e:constant(e),sankey):u};sankey.nodeAlign=function(e){return arguments.length?(c="function"===typeof e?e:constant(e),sankey):c};sankey.nodeSort=function(e){return arguments.length?(f=e,sankey):f};sankey.nodeWidth=function(e){return arguments.length?(s=+e,sankey):s};sankey.nodePadding=function(e){return arguments.length?(i=a=+e,sankey):i};sankey.nodes=function(e){return arguments.length?(d="function"===typeof e?e:constant(e),sankey):d};sankey.links=function(e){return arguments.length?(k="function"===typeof e?e:constant(e),sankey):k};sankey.linkSort=function(e){return arguments.length?(l=e,sankey):l};sankey.size=function(t){return arguments.length?(e=n=0,o=+t[0],r=+t[1],sankey):[o-e,r-n]};sankey.extent=function(t){return arguments.length?(e=+t[0][0],o=+t[1][0],n=+t[0][1],r=+t[1][1],sankey):[[e,n],[o,r]]};sankey.iterations=function(e){return arguments.length?(h=+e,sankey):h};function computeNodeLinks({nodes:e,links:t}){for(const[t,n]of e.entries()){n.index=t;n.sourceLinks=[];n.targetLinks=[]}const n=new Map(e.map((t,n)=>[u(t,n,e),t]));for(const[e,o]of t.entries()){o.index=e;let{source:t,target:r}=o;"object"!==typeof t&&(t=o.source=find(n,t));"object"!==typeof r&&(r=o.target=find(n,r));t.sourceLinks.push(o);r.targetLinks.push(o)}if(null!=l)for(const{sourceLinks:t,targetLinks:n}of e){t.sort(l);n.sort(l)}}function computeNodeValues({nodes:e}){for(const n of e)n.value=void 0===n.fixedValue?Math.max(t.sum(n.sourceLinks,value),t.sum(n.targetLinks,value)):n.fixedValue}function computeNodeDepths({nodes:e}){const t=e.length;let n=new Set(e);let o=new Set;let r=0;while(n.size){for(const e of n){e.depth=r;for(const{target:t}of e.sourceLinks)o.add(t)}if(++r>t)throw new Error("circular link");n=o;o=new Set}}function computeNodeHeights({nodes:e}){const t=e.length;let n=new Set(e);let o=new Set;let r=0;while(n.size){for(const e of n){e.height=r;for(const{source:t}of e.targetLinks)o.add(t)}if(++r>t)throw new Error("circular link");n=o;o=new Set}}function computeNodeLayers({nodes:n}){const r=t.max(n,e=>e.depth)+1;const i=(o-e-s)/(r-1);const a=new Array(r);for(const t of n){const n=Math.max(0,Math.min(r-1,Math.floor(c.call(null,t,r))));t.layer=n;t.x0=e+n*i;t.x1=t.x0+s;a[n]?a[n].push(t):a[n]=[t]}if(f)for(const e of a)e.sort(f);return a}function initializeNodeBreadths(e){const o=t.min(e,e=>(r-n-(e.length-1)*a)/t.sum(e,value));for(const t of e){let e=n;for(const n of t){n.y0=e;n.y1=e+n.value*o;e=n.y1+a;for(const e of n.sourceLinks)e.width=e.value*o}e=(r-e+a)/(t.length+1);for(let n=0;n<t.length;++n){const o=t[n];o.y0+=e*(n+1);o.y1+=e*(n+1)}reorderLinks(t)}}function computeNodeBreadths(e){const o=computeNodeLayers(e);a=Math.min(i,(r-n)/(t.max(o,e=>e.length)-1));initializeNodeBreadths(o);for(let e=0;e<h;++e){const t=Math.pow(.99,e);const n=Math.max(1-t,(e+1)/h);relaxRightToLeft(o,t,n);relaxLeftToRight(o,t,n)}}function relaxLeftToRight(e,t,n){for(let o=1,r=e.length;o<r;++o){const r=e[o];for(const e of r){let n=0;let o=0;for(const{source:t,value:r}of e.targetLinks){let s=r*(e.layer-t.layer);n+=targetTop(t,e)*s;o+=s}if(!(o>0))continue;let r=(n/o-e.y0)*t;e.y0+=r;e.y1+=r;reorderNodeLinks(e)}void 0===f&&r.sort(ascendingBreadth);resolveCollisions(r,n)}}function relaxRightToLeft(e,t,n){for(let o=e.length,r=o-2;r>=0;--r){const o=e[r];for(const e of o){let n=0;let o=0;for(const{target:t,value:r}of e.sourceLinks){let s=r*(t.layer-e.layer);n+=sourceTop(e,t)*s;o+=s}if(!(o>0))continue;let r=(n/o-e.y0)*t;e.y0+=r;e.y1+=r;reorderNodeLinks(e)}void 0===f&&o.sort(ascendingBreadth);resolveCollisions(o,n)}}function resolveCollisions(e,t){const o=e.length>>1;const s=e[o];resolveCollisionsBottomToTop(e,s.y0-a,o-1,t);resolveCollisionsTopToBottom(e,s.y1+a,o+1,t);resolveCollisionsBottomToTop(e,r,e.length-1,t);resolveCollisionsTopToBottom(e,n,0,t)}function resolveCollisionsTopToBottom(e,t,n,o){for(;n<e.length;++n){const r=e[n];const s=(t-r.y0)*o;s>1e-6&&(r.y0+=s,r.y1+=s);t=r.y1+a}}function resolveCollisionsBottomToTop(e,t,n,o){for(;n>=0;--n){const r=e[n];const s=(r.y1-t)*o;s>1e-6&&(r.y0-=s,r.y1-=s);t=r.y0-a}}function reorderNodeLinks({sourceLinks:e,targetLinks:t}){if(void 0===l){for(const{source:{sourceLinks:e}}of t)e.sort(ascendingTargetBreadth);for(const{target:{targetLinks:t}}of e)t.sort(ascendingSourceBreadth)}}function reorderLinks(e){if(void 0===l)for(const{sourceLinks:t,targetLinks:n}of e){t.sort(ascendingTargetBreadth);n.sort(ascendingSourceBreadth)}}function targetTop(e,t){let n=e.y0-(e.sourceLinks.length-1)*a/2;for(const{target:o,width:r}of e.sourceLinks){if(o===t)break;n+=r+a}for(const{source:o,width:r}of t.targetLinks){if(o===e)break;n-=r}return n}function sourceTop(e,t){let n=t.y0-(t.targetLinks.length-1)*a/2;for(const{source:o,width:r}of t.targetLinks){if(o===e)break;n+=r+a}for(const{target:o,width:r}of e.sourceLinks){if(o===t)break;n-=r}return n}return sankey}function horizontalSource(e){return[e.source.x1,e.y0]}function horizontalTarget(e){return[e.target.x0,e.y1]}function sankeyLinkHorizontal(){return n.linkHorizontal().source(horizontalSource).target(horizontalTarget)}e.sankey=Sankey;e.sankeyCenter=center;e.sankeyJustify=justify;e.sankeyLeft=left;e.sankeyLinkHorizontal=sankeyLinkHorizontal;e.sankeyRight=right;Object.defineProperty(e,"__esModule",{value:true})}));const o=n.sankey,r=n.sankeyCenter,s=n.sankeyJustify,i=n.sankeyLeft,a=n.sankeyLinkHorizontal,u=n.sankeyRight,c=n.__esModule;export default n;export{c as __esModule,o as sankey,r as sankeyCenter,s as sankeyJustify,i as sankeyLeft,a as sankeyLinkHorizontal,u as sankeyRight};
+
diff --git a/vendor/javascript/d3-scale-chromatic.js b/vendor/javascript/d3-scale-chromatic.js
index 6f6d4230..d3df76ab 100644
--- a/vendor/javascript/d3-scale-chromatic.js
+++ b/vendor/javascript/d3-scale-chromatic.js
@@ -1,2 +1,4 @@
-import{interpolateRgbBasis as f,interpolateCubehelixLong as e}from"d3-interpolate";import{cubehelix as a,rgb as d}from"d3-color";function colors(f){var e=f.length/6|0,a=new Array(e),d=0;while(d<e)a[d]="#"+f.slice(6*d,6*++d);return a}var c=colors("1f77b4ff7f0e2ca02cd627289467bd8c564be377c27f7f7fbcbd2217becf");var b=colors("7fc97fbeaed4fdc086ffff99386cb0f0027fbf5b17666666");var r=colors("1b9e77d95f027570b3e7298a66a61ee6ab02a6761d666666");var o=colors("a6cee31f78b4b2df8a33a02cfb9a99e31a1cfdbf6fff7f00cab2d66a3d9affff99b15928");var s=colors("fbb4aeb3cde3ccebc5decbe4fed9a6ffffcce5d8bdfddaecf2f2f2");var t=colors("b3e2cdfdcdaccbd5e8f4cae4e6f5c9fff2aef1e2cccccccc");var n=colors("e41a1c377eb84daf4a984ea3ff7f00ffff33a65628f781bf999999");var l=colors("66c2a5fc8d628da0cbe78ac3a6d854ffd92fe5c494b3b3b3");var m=colors("8dd3c7ffffb3bebadafb807280b1d3fdb462b3de69fccde5d9d9d9bc80bdccebc5ffed6f");var i=colors("4e79a7f28e2ce1575976b7b259a14fedc949af7aa1ff9da79c755fbab0ab");var ramp$1=e=>f(e[e.length-1]);var v=new Array(3).concat("d8b365f5f5f55ab4ac","a6611adfc27d80cdc1018571","a6611adfc27df5f5f580cdc1018571","8c510ad8b365f6e8c3c7eae55ab4ac01665e","8c510ad8b365f6e8c3f5f5f5c7eae55ab4ac01665e","8c510abf812ddfc27df6e8c3c7eae580cdc135978f01665e","8c510abf812ddfc27df6e8c3f5f5f5c7eae580cdc135978f01665e","5430058c510abf812ddfc27df6e8c3c7eae580cdc135978f01665e003c30","5430058c510abf812ddfc27df6e8c3f5f5f5c7eae580cdc135978f01665e003c30").map(colors);var p=ramp$1(v);var h=new Array(3).concat("af8dc3f7f7f77fbf7b","7b3294c2a5cfa6dba0008837","7b3294c2a5cff7f7f7a6dba0008837","762a83af8dc3e7d4e8d9f0d37fbf7b1b7837","762a83af8dc3e7d4e8f7f7f7d9f0d37fbf7b1b7837","762a839970abc2a5cfe7d4e8d9f0d3a6dba05aae611b7837","762a839970abc2a5cfe7d4e8f7f7f7d9f0d3a6dba05aae611b7837","40004b762a839970abc2a5cfe7d4e8d9f0d3a6dba05aae611b783700441b","40004b762a839970abc2a5cfe7d4e8f7f7f7d9f0d3a6dba05aae611b783700441b").map(colors);var u=ramp$1(h);var w=new Array(3).concat("e9a3c9f7f7f7a1d76a","d01c8bf1b6dab8e1864dac26","d01c8bf1b6daf7f7f7b8e1864dac26","c51b7de9a3c9fde0efe6f5d0a1d76a4d9221","c51b7de9a3c9fde0eff7f7f7e6f5d0a1d76a4d9221","c51b7dde77aef1b6dafde0efe6f5d0b8e1867fbc414d9221","c51b7dde77aef1b6dafde0eff7f7f7e6f5d0b8e1867fbc414d9221","8e0152c51b7dde77aef1b6dafde0efe6f5d0b8e1867fbc414d9221276419","8e0152c51b7dde77aef1b6dafde0eff7f7f7e6f5d0b8e1867fbc414d9221276419").map(colors);var M=ramp$1(w);var y=new Array(3).concat("998ec3f7f7f7f1a340","5e3c99b2abd2fdb863e66101","5e3c99b2abd2f7f7f7fdb863e66101","542788998ec3d8daebfee0b6f1a340b35806","542788998ec3d8daebf7f7f7fee0b6f1a340b35806","5427888073acb2abd2d8daebfee0b6fdb863e08214b35806","5427888073acb2abd2d8daebf7f7f7fee0b6fdb863e08214b35806","2d004b5427888073acb2abd2d8daebfee0b6fdb863e08214b358067f3b08","2d004b5427888073acb2abd2d8daebf7f7f7fee0b6fdb863e08214b358067f3b08").map(colors);var A=ramp$1(y);var P=new Array(3).concat("ef8a62f7f7f767a9cf","ca0020f4a58292c5de0571b0","ca0020f4a582f7f7f792c5de0571b0","b2182bef8a62fddbc7d1e5f067a9cf2166ac","b2182bef8a62fddbc7f7f7f7d1e5f067a9cf2166ac","b2182bd6604df4a582fddbc7d1e5f092c5de4393c32166ac","b2182bd6604df4a582fddbc7f7f7f7d1e5f092c5de4393c32166ac","67001fb2182bd6604df4a582fddbc7d1e5f092c5de4393c32166ac053061","67001fb2182bd6604df4a582fddbc7f7f7f7d1e5f092c5de4393c32166ac053061").map(colors);var B=ramp$1(P);var G=new Array(3).concat("ef8a62ffffff999999","ca0020f4a582bababa404040","ca0020f4a582ffffffbababa404040","b2182bef8a62fddbc7e0e0e09999994d4d4d","b2182bef8a62fddbc7ffffffe0e0e09999994d4d4d","b2182bd6604df4a582fddbc7e0e0e0bababa8787874d4d4d","b2182bd6604df4a582fddbc7ffffffe0e0e0bababa8787874d4d4d","67001fb2182bd6604df4a582fddbc7e0e0e0bababa8787874d4d4d1a1a1a","67001fb2182bd6604df4a582fddbc7ffffffe0e0e0bababa8787874d4d4d1a1a1a").map(colors);var R=ramp$1(G);var Y=new Array(3).concat("fc8d59ffffbf91bfdb","d7191cfdae61abd9e92c7bb6","d7191cfdae61ffffbfabd9e92c7bb6","d73027fc8d59fee090e0f3f891bfdb4575b4","d73027fc8d59fee090ffffbfe0f3f891bfdb4575b4","d73027f46d43fdae61fee090e0f3f8abd9e974add14575b4","d73027f46d43fdae61fee090ffffbfe0f3f8abd9e974add14575b4","a50026d73027f46d43fdae61fee090e0f3f8abd9e974add14575b4313695","a50026d73027f46d43fdae61fee090ffffbfe0f3f8abd9e974add14575b4313695").map(colors);var x=ramp$1(Y);var g=new Array(3).concat("fc8d59ffffbf91cf60","d7191cfdae61a6d96a1a9641","d7191cfdae61ffffbfa6d96a1a9641","d73027fc8d59fee08bd9ef8b91cf601a9850","d73027fc8d59fee08bffffbfd9ef8b91cf601a9850","d73027f46d43fdae61fee08bd9ef8ba6d96a66bd631a9850","d73027f46d43fdae61fee08bffffbfd9ef8ba6d96a66bd631a9850","a50026d73027f46d43fdae61fee08bd9ef8ba6d96a66bd631a9850006837","a50026d73027f46d43fdae61fee08bffffbfd9ef8ba6d96a66bd631a9850006837").map(colors);var O=ramp$1(g);var S=new Array(3).concat("fc8d59ffffbf99d594","d7191cfdae61abdda42b83ba","d7191cfdae61ffffbfabdda42b83ba","d53e4ffc8d59fee08be6f59899d5943288bd","d53e4ffc8d59fee08bffffbfe6f59899d5943288bd","d53e4ff46d43fdae61fee08be6f598abdda466c2a53288bd","d53e4ff46d43fdae61fee08bffffbfe6f598abdda466c2a53288bd","9e0142d53e4ff46d43fdae61fee08be6f598abdda466c2a53288bd5e4fa2","9e0142d53e4ff46d43fdae61fee08bffffbfe6f598abdda466c2a53288bd5e4fa2").map(colors);var C=ramp$1(S);var I=new Array(3).concat("e5f5f999d8c92ca25f","edf8fbb2e2e266c2a4238b45","edf8fbb2e2e266c2a42ca25f006d2c","edf8fbccece699d8c966c2a42ca25f006d2c","edf8fbccece699d8c966c2a441ae76238b45005824","f7fcfde5f5f9ccece699d8c966c2a441ae76238b45005824","f7fcfde5f5f9ccece699d8c966c2a441ae76238b45006d2c00441b").map(colors);var D=ramp$1(I);var T=new Array(3).concat("e0ecf49ebcda8856a7","edf8fbb3cde38c96c688419d","edf8fbb3cde38c96c68856a7810f7c","edf8fbbfd3e69ebcda8c96c68856a7810f7c","edf8fbbfd3e69ebcda8c96c68c6bb188419d6e016b","f7fcfde0ecf4bfd3e69ebcda8c96c68c6bb188419d6e016b","f7fcfde0ecf4bfd3e69ebcda8c96c68c6bb188419d810f7c4d004b").map(colors);var k=ramp$1(T);var V=new Array(3).concat("e0f3dba8ddb543a2ca","f0f9e8bae4bc7bccc42b8cbe","f0f9e8bae4bc7bccc443a2ca0868ac","f0f9e8ccebc5a8ddb57bccc443a2ca0868ac","f0f9e8ccebc5a8ddb57bccc44eb3d32b8cbe08589e","f7fcf0e0f3dbccebc5a8ddb57bccc44eb3d32b8cbe08589e","f7fcf0e0f3dbccebc5a8ddb57bccc44eb3d32b8cbe0868ac084081").map(colors);var W=ramp$1(V);var j=new Array(3).concat("fee8c8fdbb84e34a33","fef0d9fdcc8afc8d59d7301f","fef0d9fdcc8afc8d59e34a33b30000","fef0d9fdd49efdbb84fc8d59e34a33b30000","fef0d9fdd49efdbb84fc8d59ef6548d7301f990000","fff7ecfee8c8fdd49efdbb84fc8d59ef6548d7301f990000","fff7ecfee8c8fdd49efdbb84fc8d59ef6548d7301fb300007f0000").map(colors);var q=ramp$1(j);var z=new Array(3).concat("ece2f0a6bddb1c9099","f6eff7bdc9e167a9cf02818a","f6eff7bdc9e167a9cf1c9099016c59","f6eff7d0d1e6a6bddb67a9cf1c9099016c59","f6eff7d0d1e6a6bddb67a9cf3690c002818a016450","fff7fbece2f0d0d1e6a6bddb67a9cf3690c002818a016450","fff7fbece2f0d0d1e6a6bddb67a9cf3690c002818a016c59014636").map(colors);var E=ramp$1(z);var F=new Array(3).concat("ece7f2a6bddb2b8cbe","f1eef6bdc9e174a9cf0570b0","f1eef6bdc9e174a9cf2b8cbe045a8d","f1eef6d0d1e6a6bddb74a9cf2b8cbe045a8d","f1eef6d0d1e6a6bddb74a9cf3690c00570b0034e7b","fff7fbece7f2d0d1e6a6bddb74a9cf3690c00570b0034e7b","fff7fbece7f2d0d1e6a6bddb74a9cf3690c00570b0045a8d023858").map(colors);var H=ramp$1(F);var J=new Array(3).concat("e7e1efc994c7dd1c77","f1eef6d7b5d8df65b0ce1256","f1eef6d7b5d8df65b0dd1c77980043","f1eef6d4b9dac994c7df65b0dd1c77980043","f1eef6d4b9dac994c7df65b0e7298ace125691003f","f7f4f9e7e1efd4b9dac994c7df65b0e7298ace125691003f","f7f4f9e7e1efd4b9dac994c7df65b0e7298ace125698004367001f").map(colors);var K=ramp$1(J);var L=new Array(3).concat("fde0ddfa9fb5c51b8a","feebe2fbb4b9f768a1ae017e","feebe2fbb4b9f768a1c51b8a7a0177","feebe2fcc5c0fa9fb5f768a1c51b8a7a0177","feebe2fcc5c0fa9fb5f768a1dd3497ae017e7a0177","fff7f3fde0ddfcc5c0fa9fb5f768a1dd3497ae017e7a0177","fff7f3fde0ddfcc5c0fa9fb5f768a1dd3497ae017e7a017749006a").map(colors);var N=ramp$1(L);var Q=new Array(3).concat("edf8b17fcdbb2c7fb8","ffffcca1dab441b6c4225ea8","ffffcca1dab441b6c42c7fb8253494","ffffccc7e9b47fcdbb41b6c42c7fb8253494","ffffccc7e9b47fcdbb41b6c41d91c0225ea80c2c84","ffffd9edf8b1c7e9b47fcdbb41b6c41d91c0225ea80c2c84","ffffd9edf8b1c7e9b47fcdbb41b6c41d91c0225ea8253494081d58").map(colors);var U=ramp$1(Q);var X=new Array(3).concat("f7fcb9addd8e31a354","ffffccc2e69978c679238443","ffffccc2e69978c67931a354006837","ffffccd9f0a3addd8e78c67931a354006837","ffffccd9f0a3addd8e78c67941ab5d238443005a32","ffffe5f7fcb9d9f0a3addd8e78c67941ab5d238443005a32","ffffe5f7fcb9d9f0a3addd8e78c67941ab5d238443006837004529").map(colors);var Z=ramp$1(X);var $=new Array(3).concat("fff7bcfec44fd95f0e","ffffd4fed98efe9929cc4c02","ffffd4fed98efe9929d95f0e993404","ffffd4fee391fec44ffe9929d95f0e993404","ffffd4fee391fec44ffe9929ec7014cc4c028c2d04","ffffe5fff7bcfee391fec44ffe9929ec7014cc4c028c2d04","ffffe5fff7bcfee391fec44ffe9929ec7014cc4c02993404662506").map(colors);var _=ramp$1($);var ff=new Array(3).concat("ffeda0feb24cf03b20","ffffb2fecc5cfd8d3ce31a1c","ffffb2fecc5cfd8d3cf03b20bd0026","ffffb2fed976feb24cfd8d3cf03b20bd0026","ffffb2fed976feb24cfd8d3cfc4e2ae31a1cb10026","ffffccffeda0fed976feb24cfd8d3cfc4e2ae31a1cb10026","ffffccffeda0fed976feb24cfd8d3cfc4e2ae31a1cbd0026800026").map(colors);var ef=ramp$1(ff);var af=new Array(3).concat("deebf79ecae13182bd","eff3ffbdd7e76baed62171b5","eff3ffbdd7e76baed63182bd08519c","eff3ffc6dbef9ecae16baed63182bd08519c","eff3ffc6dbef9ecae16baed64292c62171b5084594","f7fbffdeebf7c6dbef9ecae16baed64292c62171b5084594","f7fbffdeebf7c6dbef9ecae16baed64292c62171b508519c08306b").map(colors);var df=ramp$1(af);var cf=new Array(3).concat("e5f5e0a1d99b31a354","edf8e9bae4b374c476238b45","edf8e9bae4b374c47631a354006d2c","edf8e9c7e9c0a1d99b74c47631a354006d2c","edf8e9c7e9c0a1d99b74c47641ab5d238b45005a32","f7fcf5e5f5e0c7e9c0a1d99b74c47641ab5d238b45005a32","f7fcf5e5f5e0c7e9c0a1d99b74c47641ab5d238b45006d2c00441b").map(colors);var bf=ramp$1(cf);var rf=new Array(3).concat("f0f0f0bdbdbd636363","f7f7f7cccccc969696525252","f7f7f7cccccc969696636363252525","f7f7f7d9d9d9bdbdbd969696636363252525","f7f7f7d9d9d9bdbdbd969696737373525252252525","fffffff0f0f0d9d9d9bdbdbd969696737373525252252525","fffffff0f0f0d9d9d9bdbdbd969696737373525252252525000000").map(colors);var of=ramp$1(rf);var sf=new Array(3).concat("efedf5bcbddc756bb1","f2f0f7cbc9e29e9ac86a51a3","f2f0f7cbc9e29e9ac8756bb154278f","f2f0f7dadaebbcbddc9e9ac8756bb154278f","f2f0f7dadaebbcbddc9e9ac8807dba6a51a34a1486","fcfbfdefedf5dadaebbcbddc9e9ac8807dba6a51a34a1486","fcfbfdefedf5dadaebbcbddc9e9ac8807dba6a51a354278f3f007d").map(colors);var tf=ramp$1(sf);var nf=new Array(3).concat("fee0d2fc9272de2d26","fee5d9fcae91fb6a4acb181d","fee5d9fcae91fb6a4ade2d26a50f15","fee5d9fcbba1fc9272fb6a4ade2d26a50f15","fee5d9fcbba1fc9272fb6a4aef3b2ccb181d99000d","fff5f0fee0d2fcbba1fc9272fb6a4aef3b2ccb181d99000d","fff5f0fee0d2fcbba1fc9272fb6a4aef3b2ccb181da50f1567000d").map(colors);var lf=ramp$1(nf);var mf=new Array(3).concat("fee6cefdae6be6550d","feeddefdbe85fd8d3cd94701","feeddefdbe85fd8d3ce6550da63603","feeddefdd0a2fdae6bfd8d3ce6550da63603","feeddefdd0a2fdae6bfd8d3cf16913d948018c2d04","fff5ebfee6cefdd0a2fdae6bfd8d3cf16913d948018c2d04","fff5ebfee6cefdd0a2fdae6bfd8d3cf16913d94801a636037f2704").map(colors);var vf=ramp$1(mf);function cividis(f){f=Math.max(0,Math.min(1,f));return"rgb("+Math.max(0,Math.min(255,Math.round(-4.54-f*(35.34-f*(2381.73-f*(6402.7-f*(7024.72-2710.57*f)))))))+", "+Math.max(0,Math.min(255,Math.round(32.49+f*(170.73+f*(52.82-f*(131.46-f*(176.58-67.37*f)))))))+", "+Math.max(0,Math.min(255,Math.round(81.24+f*(442.36-f*(2482.43-f*(6167.24-f*(6614.94-2475.67*f)))))))+")"}var pf=e(a(300,.5,0),a(-240,.5,1));var hf=e(a(-100,.75,.35),a(80,1.5,.8));var uf=e(a(260,.75,.35),a(80,1.5,.8));var wf=a();function rainbow(f){(f<0||f>1)&&(f-=Math.floor(f));var e=Math.abs(f-.5);wf.h=360*f-100;wf.s=1.5-1.5*e;wf.l=.8-.9*e;return wf+""}var Mf=d(),yf=Math.PI/3,Af=2*Math.PI/3;function sinebow(f){var e;f=(.5-f)*Math.PI;Mf.r=255*(e=Math.sin(f))*e;Mf.g=255*(e=Math.sin(f+yf))*e;Mf.b=255*(e=Math.sin(f+Af))*e;return Mf+""}function turbo(f){f=Math.max(0,Math.min(1,f));return"rgb("+Math.max(0,Math.min(255,Math.round(34.61+f*(1172.33-f*(10793.56-f*(33300.12-f*(38394.49-14825.05*f)))))))+", "+Math.max(0,Math.min(255,Math.round(23.31+f*(557.33+f*(1225.33-f*(3574.96-f*(1073.77+707.56*f)))))))+", "+Math.max(0,Math.min(255,Math.round(27.2+f*(3211.1-f*(15327.97-f*(27814-f*(22569.18-6838.66*f)))))))+")"}function ramp(f){var e=f.length;return function(a){return f[Math.max(0,Math.min(e-1,Math.floor(a*e)))]}}var Pf=ramp(colors("44015444025645045745055946075a46085c460a5d460b5e470d60470e6147106347116447136548146748166848176948186a481a6c481b6d481c6e481d6f481f70482071482173482374482475482576482677482878482979472a7a472c7a472d7b472e7c472f7d46307e46327e46337f463480453581453781453882443983443a83443b84433d84433e85423f854240864241864142874144874045884046883f47883f48893e49893e4a893e4c8a3d4d8a3d4e8a3c4f8a3c508b3b518b3b528b3a538b3a548c39558c39568c38588c38598c375a8c375b8d365c8d365d8d355e8d355f8d34608d34618d33628d33638d32648e32658e31668e31678e31688e30698e306a8e2f6b8e2f6c8e2e6d8e2e6e8e2e6f8e2d708e2d718e2c718e2c728e2c738e2b748e2b758e2a768e2a778e2a788e29798e297a8e297b8e287c8e287d8e277e8e277f8e27808e26818e26828e26828e25838e25848e25858e24868e24878e23888e23898e238a8d228b8d228c8d228d8d218e8d218f8d21908d21918c20928c20928c20938c1f948c1f958b1f968b1f978b1f988b1f998a1f9a8a1e9b8a1e9c891e9d891f9e891f9f881fa0881fa1881fa1871fa28720a38620a48621a58521a68522a78522a88423a98324aa8325ab8225ac8226ad8127ad8128ae8029af7f2ab07f2cb17e2db27d2eb37c2fb47c31b57b32b67a34b67935b77937b87838b9773aba763bbb753dbc743fbc7340bd7242be7144bf7046c06f48c16e4ac16d4cc26c4ec36b50c46a52c56954c56856c66758c7655ac8645cc8635ec96260ca6063cb5f65cb5e67cc5c69cd5b6ccd5a6ece5870cf5773d05675d05477d1537ad1517cd2507fd34e81d34d84d44b86d54989d5488bd6468ed64590d74393d74195d84098d83e9bd93c9dd93ba0da39a2da37a5db36a8db34aadc32addc30b0dd2fb2dd2db5de2bb8de29bade28bddf26c0df25c2df23c5e021c8e020cae11fcde11dd0e11cd2e21bd5e21ad8e219dae319dde318dfe318e2e418e5e419e7e419eae51aece51befe51cf1e51df4e61ef6e620f8e621fbe723fde725"));var Bf=ramp(colors("00000401000501010601010802010902020b02020d03030f03031204041405041606051806051a07061c08071e0907200a08220b09240c09260d0a290e0b2b100b2d110c2f120d31130d34140e36150e38160f3b180f3d19103f1a10421c10441d11471e114920114b21114e22115024125325125527125829115a2a115c2c115f2d11612f116331116533106734106936106b38106c390f6e3b0f703d0f713f0f72400f74420f75440f764510774710784910784a10794c117a4e117b4f127b51127c52137c54137d56147d57157e59157e5a167e5c167f5d177f5f187f601880621980641a80651a80671b80681c816a1c816b1d816d1d816e1e81701f81721f817320817521817621817822817922827b23827c23827e24828025828125818326818426818627818827818928818b29818c29818e2a81902a81912b81932b80942c80962c80982d80992d809b2e7f9c2e7f9e2f7fa02f7fa1307ea3307ea5317ea6317da8327daa337dab337cad347cae347bb0357bb2357bb3367ab5367ab73779b83779ba3878bc3978bd3977bf3a77c03a76c23b75c43c75c53c74c73d73c83e73ca3e72cc3f71cd4071cf4070d0416fd2426fd3436ed5446dd6456cd8456cd9466bdb476adc4869de4968df4a68e04c67e24d66e34e65e44f64e55064e75263e85362e95462ea5661eb5760ec5860ed5a5fee5b5eef5d5ef05f5ef1605df2625df2645cf3655cf4675cf4695cf56b5cf66c5cf66e5cf7705cf7725cf8745cf8765cf9785df9795df97b5dfa7d5efa7f5efa815ffb835ffb8560fb8761fc8961fc8a62fc8c63fc8e64fc9065fd9266fd9467fd9668fd9869fd9a6afd9b6bfe9d6cfe9f6dfea16efea36ffea571fea772fea973feaa74feac76feae77feb078feb27afeb47bfeb67cfeb77efeb97ffebb81febd82febf84fec185fec287fec488fec68afec88cfeca8dfecc8ffecd90fecf92fed194fed395fed597fed799fed89afdda9cfddc9efddea0fde0a1fde2a3fde3a5fde5a7fde7a9fde9aafdebacfcecaefceeb0fcf0b2fcf2b4fcf4b6fcf6b8fcf7b9fcf9bbfcfbbdfcfdbf"));var Gf=ramp(colors("00000401000501010601010802010a02020c02020e03021004031204031405041706041907051b08051d09061f0a07220b07240c08260d08290e092b10092d110a30120a32140b34150b37160b39180c3c190c3e1b0c411c0c431e0c451f0c48210c4a230c4c240c4f260c51280b53290b552b0b572d0b592f0a5b310a5c320a5e340a5f3609613809623909633b09643d09653e0966400a67420a68440a68450a69470b6a490b6a4a0c6b4c0c6b4d0d6c4f0d6c510e6c520e6d540f6d550f6d57106e59106e5a116e5c126e5d126e5f136e61136e62146e64156e65156e67166e69166e6a176e6c186e6d186e6f196e71196e721a6e741a6e751b6e771c6d781c6d7a1d6d7c1d6d7d1e6d7f1e6c801f6c82206c84206b85216b87216b88226a8a226a8c23698d23698f24699025689225689326679526679727669827669a28659b29649d29649f2a63a02a63a22b62a32c61a52c60a62d60a82e5fa92e5eab2f5ead305dae305cb0315bb1325ab3325ab43359b63458b73557b93556ba3655bc3754bd3853bf3952c03a51c13a50c33b4fc43c4ec63d4dc73e4cc83f4bca404acb4149cc4248ce4347cf4446d04545d24644d34743d44842d54a41d74b3fd84c3ed94d3dda4e3cdb503bdd513ade5238df5337e05536e15635e25734e35933e45a31e55c30e65d2fe75e2ee8602de9612bea632aeb6429eb6628ec6726ed6925ee6a24ef6c23ef6e21f06f20f1711ff1731df2741cf3761bf37819f47918f57b17f57d15f67e14f68013f78212f78410f8850ff8870ef8890cf98b0bf98c0af98e09fa9008fa9207fa9407fb9606fb9706fb9906fb9b06fb9d07fc9f07fca108fca309fca50afca60cfca80dfcaa0ffcac11fcae12fcb014fcb216fcb418fbb61afbb81dfbba1ffbbc21fbbe23fac026fac228fac42afac62df9c72ff9c932f9cb35f8cd37f8cf3af7d13df7d340f6d543f6d746f5d949f5db4cf4dd4ff4df53f4e156f3e35af3e55df2e661f2e865f2ea69f1ec6df1ed71f1ef75f1f179f2f27df2f482f3f586f3f68af4f88ef5f992f6fa96f8fb9af9fc9dfafda1fcffa4"));var Rf=ramp(colors("0d088710078813078916078a19068c1b068d1d068e20068f2206902406912605912805922a05932c05942e05952f059631059733059735049837049938049a3a049a3c049b3e049c3f049c41049d43039e44039e46039f48039f4903a04b03a14c02a14e02a25002a25102a35302a35502a45601a45801a45901a55b01a55c01a65e01a66001a66100a76300a76400a76600a76700a86900a86a00a86c00a86e00a86f00a87100a87201a87401a87501a87701a87801a87a02a87b02a87d03a87e03a88004a88104a78305a78405a78606a68707a68808a68a09a58b0aa58d0ba58e0ca48f0da4910ea3920fa39410a29511a19613a19814a099159f9a169f9c179e9d189d9e199da01a9ca11b9ba21d9aa31e9aa51f99a62098a72197a82296aa2395ab2494ac2694ad2793ae2892b02991b12a90b22b8fb32c8eb42e8db52f8cb6308bb7318ab83289ba3388bb3488bc3587bd3786be3885bf3984c03a83c13b82c23c81c33d80c43e7fc5407ec6417dc7427cc8437bc9447aca457acb4679cc4778cc4977cd4a76ce4b75cf4c74d04d73d14e72d24f71d35171d45270d5536fd5546ed6556dd7566cd8576bd9586ada5a6ada5b69db5c68dc5d67dd5e66de5f65de6164df6263e06363e16462e26561e26660e3685fe4695ee56a5de56b5de66c5ce76e5be76f5ae87059e97158e97257ea7457eb7556eb7655ec7754ed7953ed7a52ee7b51ef7c51ef7e50f07f4ff0804ef1814df1834cf2844bf3854bf3874af48849f48948f58b47f58c46f68d45f68f44f79044f79143f79342f89441f89540f9973ff9983ef99a3efa9b3dfa9c3cfa9e3bfb9f3afba139fba238fca338fca537fca636fca835fca934fdab33fdac33fdae32fdaf31fdb130fdb22ffdb42ffdb52efeb72dfeb82cfeba2cfebb2bfebd2afebe2afec029fdc229fdc328fdc527fdc627fdc827fdca26fdcb26fccd25fcce25fcd025fcd225fbd324fbd524fbd724fad824fada24f9dc24f9dd25f8df25f8e125f7e225f7e425f6e626f6e826f5e926f5eb27f4ed27f3ee27f3f027f2f227f1f426f1f525f0f724f0f921"));export{df as interpolateBlues,p as interpolateBrBG,D as interpolateBuGn,k as interpolateBuPu,cividis as interpolateCividis,uf as interpolateCool,pf as interpolateCubehelixDefault,W as interpolateGnBu,bf as interpolateGreens,of as interpolateGreys,Gf as interpolateInferno,Bf as interpolateMagma,q as interpolateOrRd,vf as interpolateOranges,u as interpolatePRGn,M as interpolatePiYG,Rf as interpolatePlasma,H as interpolatePuBu,E as interpolatePuBuGn,A as interpolatePuOr,K as interpolatePuRd,tf as interpolatePurples,rainbow as interpolateRainbow,B as interpolateRdBu,R as interpolateRdGy,N as interpolateRdPu,x as interpolateRdYlBu,O as interpolateRdYlGn,lf as interpolateReds,sinebow as interpolateSinebow,C as interpolateSpectral,turbo as interpolateTurbo,Pf as interpolateViridis,hf as interpolateWarm,Z as interpolateYlGn,U as interpolateYlGnBu,_ as interpolateYlOrBr,ef as interpolateYlOrRd,b as schemeAccent,af as schemeBlues,v as schemeBrBG,I as schemeBuGn,T as schemeBuPu,c as schemeCategory10,r as schemeDark2,V as schemeGnBu,cf as schemeGreens,rf as schemeGreys,j as schemeOrRd,mf as schemeOranges,h as schemePRGn,o as schemePaired,s as schemePastel1,t as schemePastel2,w as schemePiYG,F as schemePuBu,z as schemePuBuGn,y as schemePuOr,J as schemePuRd,sf as schemePurples,P as schemeRdBu,G as schemeRdGy,L as schemeRdPu,Y as schemeRdYlBu,g as schemeRdYlGn,nf as schemeReds,n as schemeSet1,l as schemeSet2,m as schemeSet3,S as schemeSpectral,i as schemeTableau10,X as schemeYlGn,Q as schemeYlGnBu,$ as schemeYlOrBr,ff as schemeYlOrRd};
+// d3-scale-chromatic@3.1.0 downloaded from https://ga.jspm.io/npm:d3-scale-chromatic@3.1.0/src/index.js
+
+import{interpolateRgbBasis as f,interpolateCubehelixLong as e}from"d3-interpolate";import{cubehelix as a,rgb as d}from"d3-color";function colors(f){var e=f.length/6|0,a=new Array(e),d=0;while(d<e)a[d]="#"+f.slice(d*6,6*++d);return a}var c=colors("1f77b4ff7f0e2ca02cd627289467bd8c564be377c27f7f7fbcbd2217becf");var b=colors("7fc97fbeaed4fdc086ffff99386cb0f0027fbf5b17666666");var r=colors("1b9e77d95f027570b3e7298a66a61ee6ab02a6761d666666");var o=colors("4269d0efb118ff725c6cc5b03ca951ff8ab7a463f297bbf59c6b4e9498a0");var s=colors("a6cee31f78b4b2df8a33a02cfb9a99e31a1cfdbf6fff7f00cab2d66a3d9affff99b15928");var t=colors("fbb4aeb3cde3ccebc5decbe4fed9a6ffffcce5d8bdfddaecf2f2f2");var n=colors("b3e2cdfdcdaccbd5e8f4cae4e6f5c9fff2aef1e2cccccccc");var l=colors("e41a1c377eb84daf4a984ea3ff7f00ffff33a65628f781bf999999");var m=colors("66c2a5fc8d628da0cbe78ac3a6d854ffd92fe5c494b3b3b3");var i=colors("8dd3c7ffffb3bebadafb807280b1d3fdb462b3de69fccde5d9d9d9bc80bdccebc5ffed6f");var v=colors("4e79a7f28e2ce1575976b7b259a14fedc949af7aa1ff9da79c755fbab0ab");var ramp$1=e=>f(e[e.length-1]);var h=new Array(3).concat("d8b365f5f5f55ab4ac","a6611adfc27d80cdc1018571","a6611adfc27df5f5f580cdc1018571","8c510ad8b365f6e8c3c7eae55ab4ac01665e","8c510ad8b365f6e8c3f5f5f5c7eae55ab4ac01665e","8c510abf812ddfc27df6e8c3c7eae580cdc135978f01665e","8c510abf812ddfc27df6e8c3f5f5f5c7eae580cdc135978f01665e","5430058c510abf812ddfc27df6e8c3c7eae580cdc135978f01665e003c30","5430058c510abf812ddfc27df6e8c3f5f5f5c7eae580cdc135978f01665e003c30").map(colors);var p=ramp$1(h);var u=new Array(3).concat("af8dc3f7f7f77fbf7b","7b3294c2a5cfa6dba0008837","7b3294c2a5cff7f7f7a6dba0008837","762a83af8dc3e7d4e8d9f0d37fbf7b1b7837","762a83af8dc3e7d4e8f7f7f7d9f0d37fbf7b1b7837","762a839970abc2a5cfe7d4e8d9f0d3a6dba05aae611b7837","762a839970abc2a5cfe7d4e8f7f7f7d9f0d3a6dba05aae611b7837","40004b762a839970abc2a5cfe7d4e8d9f0d3a6dba05aae611b783700441b","40004b762a839970abc2a5cfe7d4e8f7f7f7d9f0d3a6dba05aae611b783700441b").map(colors);var w=ramp$1(u);var M=new Array(3).concat("e9a3c9f7f7f7a1d76a","d01c8bf1b6dab8e1864dac26","d01c8bf1b6daf7f7f7b8e1864dac26","c51b7de9a3c9fde0efe6f5d0a1d76a4d9221","c51b7de9a3c9fde0eff7f7f7e6f5d0a1d76a4d9221","c51b7dde77aef1b6dafde0efe6f5d0b8e1867fbc414d9221","c51b7dde77aef1b6dafde0eff7f7f7e6f5d0b8e1867fbc414d9221","8e0152c51b7dde77aef1b6dafde0efe6f5d0b8e1867fbc414d9221276419","8e0152c51b7dde77aef1b6dafde0eff7f7f7e6f5d0b8e1867fbc414d9221276419").map(colors);var y=ramp$1(M);var A=new Array(3).concat("998ec3f7f7f7f1a340","5e3c99b2abd2fdb863e66101","5e3c99b2abd2f7f7f7fdb863e66101","542788998ec3d8daebfee0b6f1a340b35806","542788998ec3d8daebf7f7f7fee0b6f1a340b35806","5427888073acb2abd2d8daebfee0b6fdb863e08214b35806","5427888073acb2abd2d8daebf7f7f7fee0b6fdb863e08214b35806","2d004b5427888073acb2abd2d8daebfee0b6fdb863e08214b358067f3b08","2d004b5427888073acb2abd2d8daebf7f7f7fee0b6fdb863e08214b358067f3b08").map(colors);var P=ramp$1(A);var B=new Array(3).concat("ef8a62f7f7f767a9cf","ca0020f4a58292c5de0571b0","ca0020f4a582f7f7f792c5de0571b0","b2182bef8a62fddbc7d1e5f067a9cf2166ac","b2182bef8a62fddbc7f7f7f7d1e5f067a9cf2166ac","b2182bd6604df4a582fddbc7d1e5f092c5de4393c32166ac","b2182bd6604df4a582fddbc7f7f7f7d1e5f092c5de4393c32166ac","67001fb2182bd6604df4a582fddbc7d1e5f092c5de4393c32166ac053061","67001fb2182bd6604df4a582fddbc7f7f7f7d1e5f092c5de4393c32166ac053061").map(colors);var G=ramp$1(B);var R=new Array(3).concat("ef8a62ffffff999999","ca0020f4a582bababa404040","ca0020f4a582ffffffbababa404040","b2182bef8a62fddbc7e0e0e09999994d4d4d","b2182bef8a62fddbc7ffffffe0e0e09999994d4d4d","b2182bd6604df4a582fddbc7e0e0e0bababa8787874d4d4d","b2182bd6604df4a582fddbc7ffffffe0e0e0bababa8787874d4d4d","67001fb2182bd6604df4a582fddbc7e0e0e0bababa8787874d4d4d1a1a1a","67001fb2182bd6604df4a582fddbc7ffffffe0e0e0bababa8787874d4d4d1a1a1a").map(colors);var Y=ramp$1(R);var x=new Array(3).concat("fc8d59ffffbf91bfdb","d7191cfdae61abd9e92c7bb6","d7191cfdae61ffffbfabd9e92c7bb6","d73027fc8d59fee090e0f3f891bfdb4575b4","d73027fc8d59fee090ffffbfe0f3f891bfdb4575b4","d73027f46d43fdae61fee090e0f3f8abd9e974add14575b4","d73027f46d43fdae61fee090ffffbfe0f3f8abd9e974add14575b4","a50026d73027f46d43fdae61fee090e0f3f8abd9e974add14575b4313695","a50026d73027f46d43fdae61fee090ffffbfe0f3f8abd9e974add14575b4313695").map(colors);var O=ramp$1(x);var g=new Array(3).concat("fc8d59ffffbf91cf60","d7191cfdae61a6d96a1a9641","d7191cfdae61ffffbfa6d96a1a9641","d73027fc8d59fee08bd9ef8b91cf601a9850","d73027fc8d59fee08bffffbfd9ef8b91cf601a9850","d73027f46d43fdae61fee08bd9ef8ba6d96a66bd631a9850","d73027f46d43fdae61fee08bffffbfd9ef8ba6d96a66bd631a9850","a50026d73027f46d43fdae61fee08bd9ef8ba6d96a66bd631a9850006837","a50026d73027f46d43fdae61fee08bffffbfd9ef8ba6d96a66bd631a9850006837").map(colors);var S=ramp$1(g);var C=new Array(3).concat("fc8d59ffffbf99d594","d7191cfdae61abdda42b83ba","d7191cfdae61ffffbfabdda42b83ba","d53e4ffc8d59fee08be6f59899d5943288bd","d53e4ffc8d59fee08bffffbfe6f59899d5943288bd","d53e4ff46d43fdae61fee08be6f598abdda466c2a53288bd","d53e4ff46d43fdae61fee08bffffbfe6f598abdda466c2a53288bd","9e0142d53e4ff46d43fdae61fee08be6f598abdda466c2a53288bd5e4fa2","9e0142d53e4ff46d43fdae61fee08bffffbfe6f598abdda466c2a53288bd5e4fa2").map(colors);var I=ramp$1(C);var D=new Array(3).concat("e5f5f999d8c92ca25f","edf8fbb2e2e266c2a4238b45","edf8fbb2e2e266c2a42ca25f006d2c","edf8fbccece699d8c966c2a42ca25f006d2c","edf8fbccece699d8c966c2a441ae76238b45005824","f7fcfde5f5f9ccece699d8c966c2a441ae76238b45005824","f7fcfde5f5f9ccece699d8c966c2a441ae76238b45006d2c00441b").map(colors);var T=ramp$1(D);var k=new Array(3).concat("e0ecf49ebcda8856a7","edf8fbb3cde38c96c688419d","edf8fbb3cde38c96c68856a7810f7c","edf8fbbfd3e69ebcda8c96c68856a7810f7c","edf8fbbfd3e69ebcda8c96c68c6bb188419d6e016b","f7fcfde0ecf4bfd3e69ebcda8c96c68c6bb188419d6e016b","f7fcfde0ecf4bfd3e69ebcda8c96c68c6bb188419d810f7c4d004b").map(colors);var V=ramp$1(k);var W=new Array(3).concat("e0f3dba8ddb543a2ca","f0f9e8bae4bc7bccc42b8cbe","f0f9e8bae4bc7bccc443a2ca0868ac","f0f9e8ccebc5a8ddb57bccc443a2ca0868ac","f0f9e8ccebc5a8ddb57bccc44eb3d32b8cbe08589e","f7fcf0e0f3dbccebc5a8ddb57bccc44eb3d32b8cbe08589e","f7fcf0e0f3dbccebc5a8ddb57bccc44eb3d32b8cbe0868ac084081").map(colors);var j=ramp$1(W);var q=new Array(3).concat("fee8c8fdbb84e34a33","fef0d9fdcc8afc8d59d7301f","fef0d9fdcc8afc8d59e34a33b30000","fef0d9fdd49efdbb84fc8d59e34a33b30000","fef0d9fdd49efdbb84fc8d59ef6548d7301f990000","fff7ecfee8c8fdd49efdbb84fc8d59ef6548d7301f990000","fff7ecfee8c8fdd49efdbb84fc8d59ef6548d7301fb300007f0000").map(colors);var z=ramp$1(q);var E=new Array(3).concat("ece2f0a6bddb1c9099","f6eff7bdc9e167a9cf02818a","f6eff7bdc9e167a9cf1c9099016c59","f6eff7d0d1e6a6bddb67a9cf1c9099016c59","f6eff7d0d1e6a6bddb67a9cf3690c002818a016450","fff7fbece2f0d0d1e6a6bddb67a9cf3690c002818a016450","fff7fbece2f0d0d1e6a6bddb67a9cf3690c002818a016c59014636").map(colors);var F=ramp$1(E);var H=new Array(3).concat("ece7f2a6bddb2b8cbe","f1eef6bdc9e174a9cf0570b0","f1eef6bdc9e174a9cf2b8cbe045a8d","f1eef6d0d1e6a6bddb74a9cf2b8cbe045a8d","f1eef6d0d1e6a6bddb74a9cf3690c00570b0034e7b","fff7fbece7f2d0d1e6a6bddb74a9cf3690c00570b0034e7b","fff7fbece7f2d0d1e6a6bddb74a9cf3690c00570b0045a8d023858").map(colors);var J=ramp$1(H);var K=new Array(3).concat("e7e1efc994c7dd1c77","f1eef6d7b5d8df65b0ce1256","f1eef6d7b5d8df65b0dd1c77980043","f1eef6d4b9dac994c7df65b0dd1c77980043","f1eef6d4b9dac994c7df65b0e7298ace125691003f","f7f4f9e7e1efd4b9dac994c7df65b0e7298ace125691003f","f7f4f9e7e1efd4b9dac994c7df65b0e7298ace125698004367001f").map(colors);var L=ramp$1(K);var N=new Array(3).concat("fde0ddfa9fb5c51b8a","feebe2fbb4b9f768a1ae017e","feebe2fbb4b9f768a1c51b8a7a0177","feebe2fcc5c0fa9fb5f768a1c51b8a7a0177","feebe2fcc5c0fa9fb5f768a1dd3497ae017e7a0177","fff7f3fde0ddfcc5c0fa9fb5f768a1dd3497ae017e7a0177","fff7f3fde0ddfcc5c0fa9fb5f768a1dd3497ae017e7a017749006a").map(colors);var Q=ramp$1(N);var U=new Array(3).concat("edf8b17fcdbb2c7fb8","ffffcca1dab441b6c4225ea8","ffffcca1dab441b6c42c7fb8253494","ffffccc7e9b47fcdbb41b6c42c7fb8253494","ffffccc7e9b47fcdbb41b6c41d91c0225ea80c2c84","ffffd9edf8b1c7e9b47fcdbb41b6c41d91c0225ea80c2c84","ffffd9edf8b1c7e9b47fcdbb41b6c41d91c0225ea8253494081d58").map(colors);var X=ramp$1(U);var Z=new Array(3).concat("f7fcb9addd8e31a354","ffffccc2e69978c679238443","ffffccc2e69978c67931a354006837","ffffccd9f0a3addd8e78c67931a354006837","ffffccd9f0a3addd8e78c67941ab5d238443005a32","ffffe5f7fcb9d9f0a3addd8e78c67941ab5d238443005a32","ffffe5f7fcb9d9f0a3addd8e78c67941ab5d238443006837004529").map(colors);var $=ramp$1(Z);var _=new Array(3).concat("fff7bcfec44fd95f0e","ffffd4fed98efe9929cc4c02","ffffd4fed98efe9929d95f0e993404","ffffd4fee391fec44ffe9929d95f0e993404","ffffd4fee391fec44ffe9929ec7014cc4c028c2d04","ffffe5fff7bcfee391fec44ffe9929ec7014cc4c028c2d04","ffffe5fff7bcfee391fec44ffe9929ec7014cc4c02993404662506").map(colors);var ff=ramp$1(_);var ef=new Array(3).concat("ffeda0feb24cf03b20","ffffb2fecc5cfd8d3ce31a1c","ffffb2fecc5cfd8d3cf03b20bd0026","ffffb2fed976feb24cfd8d3cf03b20bd0026","ffffb2fed976feb24cfd8d3cfc4e2ae31a1cb10026","ffffccffeda0fed976feb24cfd8d3cfc4e2ae31a1cb10026","ffffccffeda0fed976feb24cfd8d3cfc4e2ae31a1cbd0026800026").map(colors);var af=ramp$1(ef);var df=new Array(3).concat("deebf79ecae13182bd","eff3ffbdd7e76baed62171b5","eff3ffbdd7e76baed63182bd08519c","eff3ffc6dbef9ecae16baed63182bd08519c","eff3ffc6dbef9ecae16baed64292c62171b5084594","f7fbffdeebf7c6dbef9ecae16baed64292c62171b5084594","f7fbffdeebf7c6dbef9ecae16baed64292c62171b508519c08306b").map(colors);var cf=ramp$1(df);var bf=new Array(3).concat("e5f5e0a1d99b31a354","edf8e9bae4b374c476238b45","edf8e9bae4b374c47631a354006d2c","edf8e9c7e9c0a1d99b74c47631a354006d2c","edf8e9c7e9c0a1d99b74c47641ab5d238b45005a32","f7fcf5e5f5e0c7e9c0a1d99b74c47641ab5d238b45005a32","f7fcf5e5f5e0c7e9c0a1d99b74c47641ab5d238b45006d2c00441b").map(colors);var rf=ramp$1(bf);var of=new Array(3).concat("f0f0f0bdbdbd636363","f7f7f7cccccc969696525252","f7f7f7cccccc969696636363252525","f7f7f7d9d9d9bdbdbd969696636363252525","f7f7f7d9d9d9bdbdbd969696737373525252252525","fffffff0f0f0d9d9d9bdbdbd969696737373525252252525","fffffff0f0f0d9d9d9bdbdbd969696737373525252252525000000").map(colors);var sf=ramp$1(of);var tf=new Array(3).concat("efedf5bcbddc756bb1","f2f0f7cbc9e29e9ac86a51a3","f2f0f7cbc9e29e9ac8756bb154278f","f2f0f7dadaebbcbddc9e9ac8756bb154278f","f2f0f7dadaebbcbddc9e9ac8807dba6a51a34a1486","fcfbfdefedf5dadaebbcbddc9e9ac8807dba6a51a34a1486","fcfbfdefedf5dadaebbcbddc9e9ac8807dba6a51a354278f3f007d").map(colors);var nf=ramp$1(tf);var lf=new Array(3).concat("fee0d2fc9272de2d26","fee5d9fcae91fb6a4acb181d","fee5d9fcae91fb6a4ade2d26a50f15","fee5d9fcbba1fc9272fb6a4ade2d26a50f15","fee5d9fcbba1fc9272fb6a4aef3b2ccb181d99000d","fff5f0fee0d2fcbba1fc9272fb6a4aef3b2ccb181d99000d","fff5f0fee0d2fcbba1fc9272fb6a4aef3b2ccb181da50f1567000d").map(colors);var mf=ramp$1(lf);var vf=new Array(3).concat("fee6cefdae6be6550d","feeddefdbe85fd8d3cd94701","feeddefdbe85fd8d3ce6550da63603","feeddefdd0a2fdae6bfd8d3ce6550da63603","feeddefdd0a2fdae6bfd8d3cf16913d948018c2d04","fff5ebfee6cefdd0a2fdae6bfd8d3cf16913d948018c2d04","fff5ebfee6cefdd0a2fdae6bfd8d3cf16913d94801a636037f2704").map(colors);var hf=ramp$1(vf);function cividis(f){f=Math.max(0,Math.min(1,f));return"rgb("+Math.max(0,Math.min(255,Math.round(-4.54-f*(35.34-f*(2381.73-f*(6402.7-f*(7024.72-f*2710.57)))))))+", "+Math.max(0,Math.min(255,Math.round(32.49+f*(170.73+f*(52.82-f*(131.46-f*(176.58-f*67.37)))))))+", "+Math.max(0,Math.min(255,Math.round(81.24+f*(442.36-f*(2482.43-f*(6167.24-f*(6614.94-f*2475.67)))))))+")"}var pf=e(a(300,.5,0),a(-240,.5,1));var uf=e(a(-100,.75,.35),a(80,1.5,.8));var wf=e(a(260,.75,.35),a(80,1.5,.8));var Mf=a();function rainbow(f){(f<0||f>1)&&(f-=Math.floor(f));var e=Math.abs(f-.5);Mf.h=360*f-100;Mf.s=1.5-1.5*e;Mf.l=.8-.9*e;return Mf+""}var yf=d(),Af=Math.PI/3,Pf=Math.PI*2/3;function sinebow(f){var e;f=(.5-f)*Math.PI;yf.r=255*(e=Math.sin(f))*e;yf.g=255*(e=Math.sin(f+Af))*e;yf.b=255*(e=Math.sin(f+Pf))*e;return yf+""}function turbo(f){f=Math.max(0,Math.min(1,f));return"rgb("+Math.max(0,Math.min(255,Math.round(34.61+f*(1172.33-f*(10793.56-f*(33300.12-f*(38394.49-f*14825.05)))))))+", "+Math.max(0,Math.min(255,Math.round(23.31+f*(557.33+f*(1225.33-f*(3574.96-f*(1073.77+f*707.56)))))))+", "+Math.max(0,Math.min(255,Math.round(27.2+f*(3211.1-f*(15327.97-f*(27814-f*(22569.18-f*6838.66)))))))+")"}function ramp(f){var e=f.length;return function(a){return f[Math.max(0,Math.min(e-1,Math.floor(a*e)))]}}var Bf=ramp(colors("44015444025645045745055946075a46085c460a5d460b5e470d60470e6147106347116447136548146748166848176948186a481a6c481b6d481c6e481d6f481f70482071482173482374482475482576482677482878482979472a7a472c7a472d7b472e7c472f7d46307e46327e46337f463480453581453781453882443983443a83443b84433d84433e85423f854240864241864142874144874045884046883f47883f48893e49893e4a893e4c8a3d4d8a3d4e8a3c4f8a3c508b3b518b3b528b3a538b3a548c39558c39568c38588c38598c375a8c375b8d365c8d365d8d355e8d355f8d34608d34618d33628d33638d32648e32658e31668e31678e31688e30698e306a8e2f6b8e2f6c8e2e6d8e2e6e8e2e6f8e2d708e2d718e2c718e2c728e2c738e2b748e2b758e2a768e2a778e2a788e29798e297a8e297b8e287c8e287d8e277e8e277f8e27808e26818e26828e26828e25838e25848e25858e24868e24878e23888e23898e238a8d228b8d228c8d228d8d218e8d218f8d21908d21918c20928c20928c20938c1f948c1f958b1f968b1f978b1f988b1f998a1f9a8a1e9b8a1e9c891e9d891f9e891f9f881fa0881fa1881fa1871fa28720a38620a48621a58521a68522a78522a88423a98324aa8325ab8225ac8226ad8127ad8128ae8029af7f2ab07f2cb17e2db27d2eb37c2fb47c31b57b32b67a34b67935b77937b87838b9773aba763bbb753dbc743fbc7340bd7242be7144bf7046c06f48c16e4ac16d4cc26c4ec36b50c46a52c56954c56856c66758c7655ac8645cc8635ec96260ca6063cb5f65cb5e67cc5c69cd5b6ccd5a6ece5870cf5773d05675d05477d1537ad1517cd2507fd34e81d34d84d44b86d54989d5488bd6468ed64590d74393d74195d84098d83e9bd93c9dd93ba0da39a2da37a5db36a8db34aadc32addc30b0dd2fb2dd2db5de2bb8de29bade28bddf26c0df25c2df23c5e021c8e020cae11fcde11dd0e11cd2e21bd5e21ad8e219dae319dde318dfe318e2e418e5e419e7e419eae51aece51befe51cf1e51df4e61ef6e620f8e621fbe723fde725"));var Gf=ramp(colors("00000401000501010601010802010902020b02020d03030f03031204041405041606051806051a07061c08071e0907200a08220b09240c09260d0a290e0b2b100b2d110c2f120d31130d34140e36150e38160f3b180f3d19103f1a10421c10441d11471e114920114b21114e22115024125325125527125829115a2a115c2c115f2d11612f116331116533106734106936106b38106c390f6e3b0f703d0f713f0f72400f74420f75440f764510774710784910784a10794c117a4e117b4f127b51127c52137c54137d56147d57157e59157e5a167e5c167f5d177f5f187f601880621980641a80651a80671b80681c816a1c816b1d816d1d816e1e81701f81721f817320817521817621817822817922827b23827c23827e24828025828125818326818426818627818827818928818b29818c29818e2a81902a81912b81932b80942c80962c80982d80992d809b2e7f9c2e7f9e2f7fa02f7fa1307ea3307ea5317ea6317da8327daa337dab337cad347cae347bb0357bb2357bb3367ab5367ab73779b83779ba3878bc3978bd3977bf3a77c03a76c23b75c43c75c53c74c73d73c83e73ca3e72cc3f71cd4071cf4070d0416fd2426fd3436ed5446dd6456cd8456cd9466bdb476adc4869de4968df4a68e04c67e24d66e34e65e44f64e55064e75263e85362e95462ea5661eb5760ec5860ed5a5fee5b5eef5d5ef05f5ef1605df2625df2645cf3655cf4675cf4695cf56b5cf66c5cf66e5cf7705cf7725cf8745cf8765cf9785df9795df97b5dfa7d5efa7f5efa815ffb835ffb8560fb8761fc8961fc8a62fc8c63fc8e64fc9065fd9266fd9467fd9668fd9869fd9a6afd9b6bfe9d6cfe9f6dfea16efea36ffea571fea772fea973feaa74feac76feae77feb078feb27afeb47bfeb67cfeb77efeb97ffebb81febd82febf84fec185fec287fec488fec68afec88cfeca8dfecc8ffecd90fecf92fed194fed395fed597fed799fed89afdda9cfddc9efddea0fde0a1fde2a3fde3a5fde5a7fde7a9fde9aafdebacfcecaefceeb0fcf0b2fcf2b4fcf4b6fcf6b8fcf7b9fcf9bbfcfbbdfcfdbf"));var Rf=ramp(colors("00000401000501010601010802010a02020c02020e03021004031204031405041706041907051b08051d09061f0a07220b07240c08260d08290e092b10092d110a30120a32140b34150b37160b39180c3c190c3e1b0c411c0c431e0c451f0c48210c4a230c4c240c4f260c51280b53290b552b0b572d0b592f0a5b310a5c320a5e340a5f3609613809623909633b09643d09653e0966400a67420a68440a68450a69470b6a490b6a4a0c6b4c0c6b4d0d6c4f0d6c510e6c520e6d540f6d550f6d57106e59106e5a116e5c126e5d126e5f136e61136e62146e64156e65156e67166e69166e6a176e6c186e6d186e6f196e71196e721a6e741a6e751b6e771c6d781c6d7a1d6d7c1d6d7d1e6d7f1e6c801f6c82206c84206b85216b87216b88226a8a226a8c23698d23698f24699025689225689326679526679727669827669a28659b29649d29649f2a63a02a63a22b62a32c61a52c60a62d60a82e5fa92e5eab2f5ead305dae305cb0315bb1325ab3325ab43359b63458b73557b93556ba3655bc3754bd3853bf3952c03a51c13a50c33b4fc43c4ec63d4dc73e4cc83f4bca404acb4149cc4248ce4347cf4446d04545d24644d34743d44842d54a41d74b3fd84c3ed94d3dda4e3cdb503bdd513ade5238df5337e05536e15635e25734e35933e45a31e55c30e65d2fe75e2ee8602de9612bea632aeb6429eb6628ec6726ed6925ee6a24ef6c23ef6e21f06f20f1711ff1731df2741cf3761bf37819f47918f57b17f57d15f67e14f68013f78212f78410f8850ff8870ef8890cf98b0bf98c0af98e09fa9008fa9207fa9407fb9606fb9706fb9906fb9b06fb9d07fc9f07fca108fca309fca50afca60cfca80dfcaa0ffcac11fcae12fcb014fcb216fcb418fbb61afbb81dfbba1ffbbc21fbbe23fac026fac228fac42afac62df9c72ff9c932f9cb35f8cd37f8cf3af7d13df7d340f6d543f6d746f5d949f5db4cf4dd4ff4df53f4e156f3e35af3e55df2e661f2e865f2ea69f1ec6df1ed71f1ef75f1f179f2f27df2f482f3f586f3f68af4f88ef5f992f6fa96f8fb9af9fc9dfafda1fcffa4"));var Yf=ramp(colors("0d088710078813078916078a19068c1b068d1d068e20068f2206902406912605912805922a05932c05942e05952f059631059733059735049837049938049a3a049a3c049b3e049c3f049c41049d43039e44039e46039f48039f4903a04b03a14c02a14e02a25002a25102a35302a35502a45601a45801a45901a55b01a55c01a65e01a66001a66100a76300a76400a76600a76700a86900a86a00a86c00a86e00a86f00a87100a87201a87401a87501a87701a87801a87a02a87b02a87d03a87e03a88004a88104a78305a78405a78606a68707a68808a68a09a58b0aa58d0ba58e0ca48f0da4910ea3920fa39410a29511a19613a19814a099159f9a169f9c179e9d189d9e199da01a9ca11b9ba21d9aa31e9aa51f99a62098a72197a82296aa2395ab2494ac2694ad2793ae2892b02991b12a90b22b8fb32c8eb42e8db52f8cb6308bb7318ab83289ba3388bb3488bc3587bd3786be3885bf3984c03a83c13b82c23c81c33d80c43e7fc5407ec6417dc7427cc8437bc9447aca457acb4679cc4778cc4977cd4a76ce4b75cf4c74d04d73d14e72d24f71d35171d45270d5536fd5546ed6556dd7566cd8576bd9586ada5a6ada5b69db5c68dc5d67dd5e66de5f65de6164df6263e06363e16462e26561e26660e3685fe4695ee56a5de56b5de66c5ce76e5be76f5ae87059e97158e97257ea7457eb7556eb7655ec7754ed7953ed7a52ee7b51ef7c51ef7e50f07f4ff0804ef1814df1834cf2844bf3854bf3874af48849f48948f58b47f58c46f68d45f68f44f79044f79143f79342f89441f89540f9973ff9983ef99a3efa9b3dfa9c3cfa9e3bfb9f3afba139fba238fca338fca537fca636fca835fca934fdab33fdac33fdae32fdaf31fdb130fdb22ffdb42ffdb52efeb72dfeb82cfeba2cfebb2bfebd2afebe2afec029fdc229fdc328fdc527fdc627fdc827fdca26fdcb26fccd25fcce25fcd025fcd225fbd324fbd524fbd724fad824fada24f9dc24f9dd25f8df25f8e125f7e225f7e425f6e626f6e826f5e926f5eb27f4ed27f3ee27f3f027f2f227f1f426f1f525f0f724f0f921"));export{cf as interpolateBlues,p as interpolateBrBG,T as interpolateBuGn,V as interpolateBuPu,cividis as interpolateCividis,wf as interpolateCool,pf as interpolateCubehelixDefault,j as interpolateGnBu,rf as interpolateGreens,sf as interpolateGreys,Rf as interpolateInferno,Gf as interpolateMagma,z as interpolateOrRd,hf as interpolateOranges,w as interpolatePRGn,y as interpolatePiYG,Yf as interpolatePlasma,J as interpolatePuBu,F as interpolatePuBuGn,P as interpolatePuOr,L as interpolatePuRd,nf as interpolatePurples,rainbow as interpolateRainbow,G as interpolateRdBu,Y as interpolateRdGy,Q as interpolateRdPu,O as interpolateRdYlBu,S as interpolateRdYlGn,mf as interpolateReds,sinebow as interpolateSinebow,I as interpolateSpectral,turbo as interpolateTurbo,Bf as interpolateViridis,uf as interpolateWarm,$ as interpolateYlGn,X as interpolateYlGnBu,ff as interpolateYlOrBr,af as interpolateYlOrRd,b as schemeAccent,df as schemeBlues,h as schemeBrBG,D as schemeBuGn,k as schemeBuPu,c as schemeCategory10,r as schemeDark2,W as schemeGnBu,bf as schemeGreens,of as schemeGreys,o as schemeObservable10,q as schemeOrRd,vf as schemeOranges,u as schemePRGn,s as schemePaired,t as schemePastel1,n as schemePastel2,M as schemePiYG,H as schemePuBu,E as schemePuBuGn,A as schemePuOr,K as schemePuRd,tf as schemePurples,B as schemeRdBu,R as schemeRdGy,N as schemeRdPu,x as schemeRdYlBu,g as schemeRdYlGn,lf as schemeReds,l as schemeSet1,m as schemeSet2,i as schemeSet3,C as schemeSpectral,v as schemeTableau10,Z as schemeYlGn,U as schemeYlGnBu,_ as schemeYlOrBr,ef as schemeYlOrRd};
 
diff --git a/vendor/javascript/d3-scale.js b/vendor/javascript/d3-scale.js
index 2cdc5594..99910a88 100644
--- a/vendor/javascript/d3-scale.js
+++ b/vendor/javascript/d3-scale.js
@@ -1,2 +1,4 @@
+// d3-scale@4.0.2 downloaded from https://ga.jspm.io/npm:d3-scale@4.0.2/src/index.js
+
 import{InternMap as n,range as e,bisect as t,tickStep as r,ticks as a,tickIncrement as i,quantileSorted as o,ascending as l,quantile as u}from"d3-array";import{interpolate as c,interpolateNumber as s,interpolateRound as f,piecewise as g}from"d3-interpolate";import{formatSpecifier as p,precisionFixed as h,precisionRound as m,precisionPrefix as d,formatPrefix as y,format as v}from"d3-format";import{timeTicks as w,timeTickInterval as M,timeYear as q,timeMonth as k,timeWeek as b,timeDay as x,timeHour as $,timeMinute as N,timeSecond as S,utcTicks as I,utcTickInterval as R,utcYear as A,utcMonth as L,utcWeek as P,utcDay as D,utcHour as E,utcMinute as F,utcSecond as z}from"d3-time";import{timeFormat as O,utcFormat as Q}from"d3-time-format";function initRange(n,e){switch(arguments.length){case 0:break;case 1:this.range(n);break;default:this.range(e).domain(n);break}return this}function initInterpolator(n,e){switch(arguments.length){case 0:break;case 1:"function"===typeof n?this.interpolator(n):this.range(n);break;default:this.domain(n);"function"===typeof e?this.interpolator(e):this.range(e);break}return this}const T=Symbol("implicit");function ordinal(){var e=new n,t=[],r=[],a=T;function scale(n){let i=e.get(n);if(void 0===i){if(a!==T)return a;e.set(n,i=t.push(n)-1)}return r[i%r.length]}scale.domain=function(r){if(!arguments.length)return t.slice();t=[],e=new n;for(const n of r)e.has(n)||e.set(n,t.push(n)-1);return scale};scale.range=function(n){return arguments.length?(r=Array.from(n),scale):r.slice()};scale.unknown=function(n){return arguments.length?(a=n,scale):a};scale.copy=function(){return ordinal(t,r).unknown(a)};initRange.apply(scale,arguments);return scale}function band(){var n,t,r=ordinal().unknown(void 0),a=r.domain,i=r.range,o=0,l=1,u=false,c=0,s=0,f=.5;delete r.unknown;function rescale(){var r=a().length,g=l<o,p=g?l:o,h=g?o:l;n=(h-p)/Math.max(1,r-c+2*s);u&&(n=Math.floor(n));p+=(h-p-n*(r-c))*f;t=n*(1-c);u&&(p=Math.round(p),t=Math.round(t));var m=e(r).map((function(e){return p+n*e}));return i(g?m.reverse():m)}r.domain=function(n){return arguments.length?(a(n),rescale()):a()};r.range=function(n){return arguments.length?([o,l]=n,o=+o,l=+l,rescale()):[o,l]};r.rangeRound=function(n){return[o,l]=n,o=+o,l=+l,u=true,rescale()};r.bandwidth=function(){return t};r.step=function(){return n};r.round=function(n){return arguments.length?(u=!!n,rescale()):u};r.padding=function(n){return arguments.length?(c=Math.min(1,s=+n),rescale()):c};r.paddingInner=function(n){return arguments.length?(c=Math.min(1,n),rescale()):c};r.paddingOuter=function(n){return arguments.length?(s=+n,rescale()):s};r.align=function(n){return arguments.length?(f=Math.max(0,Math.min(1,n)),rescale()):f};r.copy=function(){return band(a(),[o,l]).round(u).paddingInner(c).paddingOuter(s).align(f)};return initRange.apply(rescale(),arguments)}function pointish(n){var e=n.copy;n.padding=n.paddingOuter;delete n.paddingInner;delete n.paddingOuter;n.copy=function(){return pointish(e())};return n}function point(){return pointish(band.apply(null,arguments).paddingInner(1))}function constants(n){return function(){return n}}function number$1(n){return+n}var U=[0,1];function identity$1(n){return n}function normalize(n,e){return(e-=n=+n)?function(t){return(t-n)/e}:constants(isNaN(e)?NaN:.5)}function clamper(n,e){var t;n>e&&(t=n,n=e,e=t);return function(t){return Math.max(n,Math.min(e,t))}}function bimap(n,e,t){var r=n[0],a=n[1],i=e[0],o=e[1];a<r?(r=normalize(a,r),i=t(o,i)):(r=normalize(r,a),i=t(i,o));return function(n){return i(r(n))}}function polymap(n,e,r){var a=Math.min(n.length,e.length)-1,i=new Array(a),o=new Array(a),l=-1;if(n[a]<n[0]){n=n.slice().reverse();e=e.slice().reverse()}while(++l<a){i[l]=normalize(n[l],n[l+1]);o[l]=r(e[l],e[l+1])}return function(e){var r=t(n,e,1,a)-1;return o[r](i[r](e))}}function copy$1(n,e){return e.domain(n.domain()).range(n.range()).interpolate(n.interpolate()).clamp(n.clamp()).unknown(n.unknown())}function transformer$2(){var n,e,t,r,a,i,o=U,l=U,u=c,g=identity$1;function rescale(){var n=Math.min(o.length,l.length);g!==identity$1&&(g=clamper(o[0],o[n-1]));r=n>2?polymap:bimap;a=i=null;return scale}function scale(e){return null==e||isNaN(e=+e)?t:(a||(a=r(o.map(n),l,u)))(n(g(e)))}scale.invert=function(t){return g(e((i||(i=r(l,o.map(n),s)))(t)))};scale.domain=function(n){return arguments.length?(o=Array.from(n,number$1),rescale()):o.slice()};scale.range=function(n){return arguments.length?(l=Array.from(n),rescale()):l.slice()};scale.rangeRound=function(n){return l=Array.from(n),u=f,rescale()};scale.clamp=function(n){return arguments.length?(g=!!n||identity$1,rescale()):g!==identity$1};scale.interpolate=function(n){return arguments.length?(u=n,rescale()):u};scale.unknown=function(n){return arguments.length?(t=n,scale):t};return function(t,r){n=t,e=r;return rescale()}}function continuous(){return transformer$2()(identity$1,identity$1)}function tickFormat(n,e,t,a){var i,o=r(n,e,t);a=p(null==a?",f":a);switch(a.type){case"s":var l=Math.max(Math.abs(n),Math.abs(e));null!=a.precision||isNaN(i=d(o,l))||(a.precision=i);return y(a,l);case"":case"e":case"g":case"p":case"r":null!=a.precision||isNaN(i=m(o,Math.max(Math.abs(n),Math.abs(e))))||(a.precision=i-("e"===a.type));break;case"f":case"%":null!=a.precision||isNaN(i=h(o))||(a.precision=i-2*("%"===a.type));break}return v(a)}function linearish(n){var e=n.domain;n.ticks=function(n){var t=e();return a(t[0],t[t.length-1],null==n?10:n)};n.tickFormat=function(n,t){var r=e();return tickFormat(r[0],r[r.length-1],null==n?10:n,t)};n.nice=function(t){null==t&&(t=10);var r=e();var a=0;var o=r.length-1;var l=r[a];var u=r[o];var c;var s;var f=10;if(u<l){s=l,l=u,u=s;s=a,a=o,o=s}while(f-- >0){s=i(l,u,t);if(s===c){r[a]=l;r[o]=u;return e(r)}if(s>0){l=Math.floor(l/s)*s;u=Math.ceil(u/s)*s}else{if(!(s<0))break;l=Math.ceil(l*s)/s;u=Math.floor(u*s)/s}c=s}return n};return n}function linear(){var n=continuous();n.copy=function(){return copy$1(n,linear())};initRange.apply(n,arguments);return linearish(n)}function identity(n){var e;function scale(n){return null==n||isNaN(n=+n)?e:n}scale.invert=scale;scale.domain=scale.range=function(e){return arguments.length?(n=Array.from(e,number$1),scale):n.slice()};scale.unknown=function(n){return arguments.length?(e=n,scale):e};scale.copy=function(){return identity(n).unknown(e)};n=arguments.length?Array.from(n,number$1):[0,1];return linearish(scale)}function nice(n,e){n=n.slice();var t,r=0,a=n.length-1,i=n[r],o=n[a];if(o<i){t=r,r=a,a=t;t=i,i=o,o=t}n[r]=e.floor(i);n[a]=e.ceil(o);return n}function transformLog(n){return Math.log(n)}function transformExp(n){return Math.exp(n)}function transformLogn(n){return-Math.log(-n)}function transformExpn(n){return-Math.exp(-n)}function pow10(n){return isFinite(n)?+("1e"+n):n<0?0:n}function powp(n){return 10===n?pow10:n===Math.E?Math.exp:e=>Math.pow(n,e)}function logp(n){return n===Math.E?Math.log:10===n&&Math.log10||2===n&&Math.log2||(n=Math.log(n),e=>Math.log(e)/n)}function reflect(n){return(e,t)=>-n(-e,t)}function loggish(n){const e=n(transformLog,transformExp);const t=e.domain;let r=10;let i;let o;function rescale(){i=logp(r),o=powp(r);if(t()[0]<0){i=reflect(i),o=reflect(o);n(transformLogn,transformExpn)}else n(transformLog,transformExp);return e}e.base=function(n){return arguments.length?(r=+n,rescale()):r};e.domain=function(n){return arguments.length?(t(n),rescale()):t()};e.ticks=n=>{const e=t();let l=e[0];let u=e[e.length-1];const c=u<l;c&&([l,u]=[u,l]);let s=i(l);let f=i(u);let g;let p;const h=null==n?10:+n;let m=[];if(!(r%1)&&f-s<h){s=Math.floor(s),f=Math.ceil(f);if(l>0)for(;s<=f;++s)for(g=1;g<r;++g){p=s<0?g/o(-s):g*o(s);if(!(p<l)){if(p>u)break;m.push(p)}}else for(;s<=f;++s)for(g=r-1;g>=1;--g){p=s>0?g/o(-s):g*o(s);if(!(p<l)){if(p>u)break;m.push(p)}}2*m.length<h&&(m=a(l,u,h))}else m=a(s,f,Math.min(f-s,h)).map(o);return c?m.reverse():m};e.tickFormat=(n,t)=>{null==n&&(n=10);null==t&&(t=10===r?"s":",");if("function"!==typeof t){r%1||null!=(t=p(t)).precision||(t.trim=true);t=v(t)}if(Infinity===n)return t;const a=Math.max(1,r*n/e.ticks().length);return n=>{let e=n/o(Math.round(i(n)));e*r<r-.5&&(e*=r);return e<=a?t(n):""}};e.nice=()=>t(nice(t(),{floor:n=>o(Math.floor(i(n))),ceil:n=>o(Math.ceil(i(n)))}));return e}function log(){const n=loggish(transformer$2()).domain([1,10]);n.copy=()=>copy$1(n,log()).base(n.base());initRange.apply(n,arguments);return n}function transformSymlog(n){return function(e){return Math.sign(e)*Math.log1p(Math.abs(e/n))}}function transformSymexp(n){return function(e){return Math.sign(e)*Math.expm1(Math.abs(e))*n}}function symlogish(n){var e=1,t=n(transformSymlog(e),transformSymexp(e));t.constant=function(t){return arguments.length?n(transformSymlog(e=+t),transformSymexp(e)):e};return linearish(t)}function symlog(){var n=symlogish(transformer$2());n.copy=function(){return copy$1(n,symlog()).constant(n.constant())};return initRange.apply(n,arguments)}function transformPow(n){return function(e){return e<0?-Math.pow(-e,n):Math.pow(e,n)}}function transformSqrt(n){return n<0?-Math.sqrt(-n):Math.sqrt(n)}function transformSquare(n){return n<0?-n*n:n*n}function powish(n){var e=n(identity$1,identity$1),t=1;function rescale(){return 1===t?n(identity$1,identity$1):.5===t?n(transformSqrt,transformSquare):n(transformPow(t),transformPow(1/t))}e.exponent=function(n){return arguments.length?(t=+n,rescale()):t};return linearish(e)}function pow(){var n=powish(transformer$2());n.copy=function(){return copy$1(n,pow()).exponent(n.exponent())};initRange.apply(n,arguments);return n}function sqrt(){return pow.apply(null,arguments).exponent(.5)}function square(n){return Math.sign(n)*n*n}function unsquare(n){return Math.sign(n)*Math.sqrt(Math.abs(n))}function radial(){var n,e=continuous(),t=[0,1],r=false;function scale(t){var a=unsquare(e(t));return isNaN(a)?n:r?Math.round(a):a}scale.invert=function(n){return e.invert(square(n))};scale.domain=function(n){return arguments.length?(e.domain(n),scale):e.domain()};scale.range=function(n){return arguments.length?(e.range((t=Array.from(n,number$1)).map(square)),scale):t.slice()};scale.rangeRound=function(n){return scale.range(n).round(true)};scale.round=function(n){return arguments.length?(r=!!n,scale):r};scale.clamp=function(n){return arguments.length?(e.clamp(n),scale):e.clamp()};scale.unknown=function(e){return arguments.length?(n=e,scale):n};scale.copy=function(){return radial(e.domain(),t).round(r).clamp(e.clamp()).unknown(n)};initRange.apply(scale,arguments);return linearish(scale)}function quantile(){var n,e=[],r=[],a=[];function rescale(){var n=0,t=Math.max(1,r.length);a=new Array(t-1);while(++n<t)a[n-1]=o(e,n/t);return scale}function scale(e){return null==e||isNaN(e=+e)?n:r[t(a,e)]}scale.invertExtent=function(n){var t=r.indexOf(n);return t<0?[NaN,NaN]:[t>0?a[t-1]:e[0],t<a.length?a[t]:e[e.length-1]]};scale.domain=function(n){if(!arguments.length)return e.slice();e=[];for(let t of n)null==t||isNaN(t=+t)||e.push(t);e.sort(l);return rescale()};scale.range=function(n){return arguments.length?(r=Array.from(n),rescale()):r.slice()};scale.unknown=function(e){return arguments.length?(n=e,scale):n};scale.quantiles=function(){return a.slice()};scale.copy=function(){return quantile().domain(e).range(r).unknown(n)};return initRange.apply(scale,arguments)}function quantize(){var n,e=0,r=1,a=1,i=[.5],o=[0,1];function scale(e){return null!=e&&e<=e?o[t(i,e,0,a)]:n}function rescale(){var n=-1;i=new Array(a);while(++n<a)i[n]=((n+1)*r-(n-a)*e)/(a+1);return scale}scale.domain=function(n){return arguments.length?([e,r]=n,e=+e,r=+r,rescale()):[e,r]};scale.range=function(n){return arguments.length?(a=(o=Array.from(n)).length-1,rescale()):o.slice()};scale.invertExtent=function(n){var t=o.indexOf(n);return t<0?[NaN,NaN]:t<1?[e,i[0]]:t>=a?[i[a-1],r]:[i[t-1],i[t]]};scale.unknown=function(e){return arguments.length?(n=e,scale):scale};scale.thresholds=function(){return i.slice()};scale.copy=function(){return quantize().domain([e,r]).range(o).unknown(n)};return initRange.apply(linearish(scale),arguments)}function threshold(){var n,e=[.5],r=[0,1],a=1;function scale(i){return null!=i&&i<=i?r[t(e,i,0,a)]:n}scale.domain=function(n){return arguments.length?(e=Array.from(n),a=Math.min(e.length,r.length-1),scale):e.slice()};scale.range=function(n){return arguments.length?(r=Array.from(n),a=Math.min(e.length,r.length-1),scale):r.slice()};scale.invertExtent=function(n){var t=r.indexOf(n);return[e[t-1],e[t]]};scale.unknown=function(e){return arguments.length?(n=e,scale):n};scale.copy=function(){return threshold().domain(e).range(r).unknown(n)};return initRange.apply(scale,arguments)}function date(n){return new Date(n)}function number(n){return n instanceof Date?+n:+new Date(+n)}function calendar(n,e,t,r,a,i,o,l,u,c){var s=continuous(),f=s.invert,g=s.domain;var p=c(".%L"),h=c(":%S"),m=c("%I:%M"),d=c("%I %p"),y=c("%a %d"),v=c("%b %d"),w=c("%B"),M=c("%Y");function tickFormat(n){return(u(n)<n?p:l(n)<n?h:o(n)<n?m:i(n)<n?d:r(n)<n?a(n)<n?y:v:t(n)<n?w:M)(n)}s.invert=function(n){return new Date(f(n))};s.domain=function(n){return arguments.length?g(Array.from(n,number)):g().map(date)};s.ticks=function(e){var t=g();return n(t[0],t[t.length-1],null==e?10:e)};s.tickFormat=function(n,e){return null==e?tickFormat:c(e)};s.nice=function(n){var t=g();n&&"function"===typeof n.range||(n=e(t[0],t[t.length-1],null==n?10:n));return n?g(nice(t,n)):s};s.copy=function(){return copy$1(s,calendar(n,e,t,r,a,i,o,l,u,c))};return s}function time(){return initRange.apply(calendar(w,M,q,k,b,x,$,N,S,O).domain([new Date(2e3,0,1),new Date(2e3,0,2)]),arguments)}function utcTime(){return initRange.apply(calendar(I,R,A,L,P,D,E,F,z,Q).domain([Date.UTC(2e3,0,1),Date.UTC(2e3,0,2)]),arguments)}function transformer$1(){var n,e,t,r,a,i=0,o=1,l=identity$1,u=false;function scale(e){return null==e||isNaN(e=+e)?a:l(0===t?.5:(e=(r(e)-n)*t,u?Math.max(0,Math.min(1,e)):e))}scale.domain=function(a){return arguments.length?([i,o]=a,n=r(i=+i),e=r(o=+o),t=n===e?0:1/(e-n),scale):[i,o]};scale.clamp=function(n){return arguments.length?(u=!!n,scale):u};scale.interpolator=function(n){return arguments.length?(l=n,scale):l};function range(n){return function(e){var t,r;return arguments.length?([t,r]=e,l=n(t,r),scale):[l(0),l(1)]}}scale.range=range(c);scale.rangeRound=range(f);scale.unknown=function(n){return arguments.length?(a=n,scale):a};return function(a){r=a,n=a(i),e=a(o),t=n===e?0:1/(e-n);return scale}}function copy(n,e){return e.domain(n.domain()).interpolator(n.interpolator()).clamp(n.clamp()).unknown(n.unknown())}function sequential(){var n=linearish(transformer$1()(identity$1));n.copy=function(){return copy(n,sequential())};return initInterpolator.apply(n,arguments)}function sequentialLog(){var n=loggish(transformer$1()).domain([1,10]);n.copy=function(){return copy(n,sequentialLog()).base(n.base())};return initInterpolator.apply(n,arguments)}function sequentialSymlog(){var n=symlogish(transformer$1());n.copy=function(){return copy(n,sequentialSymlog()).constant(n.constant())};return initInterpolator.apply(n,arguments)}function sequentialPow(){var n=powish(transformer$1());n.copy=function(){return copy(n,sequentialPow()).exponent(n.exponent())};return initInterpolator.apply(n,arguments)}function sequentialSqrt(){return sequentialPow.apply(null,arguments).exponent(.5)}function sequentialQuantile(){var n=[],e=identity$1;function scale(r){if(null!=r&&!isNaN(r=+r))return e((t(n,r,1)-1)/(n.length-1))}scale.domain=function(e){if(!arguments.length)return n.slice();n=[];for(let t of e)null==t||isNaN(t=+t)||n.push(t);n.sort(l);return scale};scale.interpolator=function(n){return arguments.length?(e=n,scale):e};scale.range=function(){return n.map(((t,r)=>e(r/(n.length-1))))};scale.quantiles=function(e){return Array.from({length:e+1},((t,r)=>u(n,r/e)))};scale.copy=function(){return sequentialQuantile(e).domain(n)};return initInterpolator.apply(scale,arguments)}function transformer(){var n,e,t,r,a,i,o,l=0,u=.5,s=1,p=1,h=identity$1,m=false;function scale(n){return isNaN(n=+n)?o:(n=.5+((n=+i(n))-e)*(p*n<p*e?r:a),h(m?Math.max(0,Math.min(1,n)):n))}scale.domain=function(o){return arguments.length?([l,u,s]=o,n=i(l=+l),e=i(u=+u),t=i(s=+s),r=n===e?0:.5/(e-n),a=e===t?0:.5/(t-e),p=e<n?-1:1,scale):[l,u,s]};scale.clamp=function(n){return arguments.length?(m=!!n,scale):m};scale.interpolator=function(n){return arguments.length?(h=n,scale):h};function range(n){return function(e){var t,r,a;return arguments.length?([t,r,a]=e,h=g(n,[t,r,a]),scale):[h(0),h(.5),h(1)]}}scale.range=range(c);scale.rangeRound=range(f);scale.unknown=function(n){return arguments.length?(o=n,scale):o};return function(o){i=o,n=o(l),e=o(u),t=o(s),r=n===e?0:.5/(e-n),a=e===t?0:.5/(t-e),p=e<n?-1:1;return scale}}function diverging(){var n=linearish(transformer()(identity$1));n.copy=function(){return copy(n,diverging())};return initInterpolator.apply(n,arguments)}function divergingLog(){var n=loggish(transformer()).domain([.1,1,10]);n.copy=function(){return copy(n,divergingLog()).base(n.base())};return initInterpolator.apply(n,arguments)}function divergingSymlog(){var n=symlogish(transformer());n.copy=function(){return copy(n,divergingSymlog()).constant(n.constant())};return initInterpolator.apply(n,arguments)}function divergingPow(){var n=powish(transformer());n.copy=function(){return copy(n,divergingPow()).exponent(n.exponent())};return initInterpolator.apply(n,arguments)}function divergingSqrt(){return divergingPow.apply(null,arguments).exponent(.5)}export{band as scaleBand,diverging as scaleDiverging,divergingLog as scaleDivergingLog,divergingPow as scaleDivergingPow,divergingSqrt as scaleDivergingSqrt,divergingSymlog as scaleDivergingSymlog,identity as scaleIdentity,T as scaleImplicit,linear as scaleLinear,log as scaleLog,ordinal as scaleOrdinal,point as scalePoint,pow as scalePow,quantile as scaleQuantile,quantize as scaleQuantize,radial as scaleRadial,sequential as scaleSequential,sequentialLog as scaleSequentialLog,sequentialPow as scaleSequentialPow,sequentialQuantile as scaleSequentialQuantile,sequentialSqrt as scaleSequentialSqrt,sequentialSymlog as scaleSequentialSymlog,sqrt as scaleSqrt,symlog as scaleSymlog,threshold as scaleThreshold,time as scaleTime,utcTime as scaleUtc,tickFormat};
 
diff --git a/vendor/javascript/d3-selection.js b/vendor/javascript/d3-selection.js
index 3ec71d84..77e4f35e 100644
--- a/vendor/javascript/d3-selection.js
+++ b/vendor/javascript/d3-selection.js
@@ -1,2 +1,4 @@
+// d3-selection@3.0.0 downloaded from https://ga.jspm.io/npm:d3-selection@3.0.0/src/index.js
+
 var t="http://www.w3.org/1999/xhtml";var e={svg:"http://www.w3.org/2000/svg",xhtml:t,xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace",xmlns:"http://www.w3.org/2000/xmlns/"};function namespace(t){var n=t+="",r=n.indexOf(":");r>=0&&"xmlns"!==(n=t.slice(0,r))&&(t=t.slice(r+1));return e.hasOwnProperty(n)?{space:e[n],local:t}:t}function creatorInherit(e){return function(){var n=this.ownerDocument,r=this.namespaceURI;return r===t&&n.documentElement.namespaceURI===t?n.createElement(e):n.createElementNS(r,e)}}function creatorFixed(t){return function(){return this.ownerDocument.createElementNS(t.space,t.local)}}function creator(t){var e=namespace(t);return(e.local?creatorFixed:creatorInherit)(e)}function none(){}function selector(t){return null==t?none:function(){return this.querySelector(t)}}function selection_select(t){"function"!==typeof t&&(t=selector(t));for(var e=this._groups,n=e.length,r=new Array(n),i=0;i<n;++i)for(var o,s,c=e[i],l=c.length,a=r[i]=new Array(l),u=0;u<l;++u)if((o=c[u])&&(s=t.call(o,o.__data__,u,c))){"__data__"in o&&(s.__data__=o.__data__);a[u]=s}return new Selection(r,this._parents)}function array(t){return null==t?[]:Array.isArray(t)?t:Array.from(t)}function empty(){return[]}function selectorAll(t){return null==t?empty:function(){return this.querySelectorAll(t)}}function arrayAll(t){return function(){return array(t.apply(this,arguments))}}function selection_selectAll(t){t="function"===typeof t?arrayAll(t):selectorAll(t);for(var e=this._groups,n=e.length,r=[],i=[],o=0;o<n;++o)for(var s,c=e[o],l=c.length,a=0;a<l;++a)if(s=c[a]){r.push(t.call(s,s.__data__,a,c));i.push(s)}return new Selection(r,i)}function matcher(t){return function(){return this.matches(t)}}function childMatcher(t){return function(e){return e.matches(t)}}var n=Array.prototype.find;function childFind(t){return function(){return n.call(this.children,t)}}function childFirst(){return this.firstElementChild}function selection_selectChild(t){return this.select(null==t?childFirst:childFind("function"===typeof t?t:childMatcher(t)))}var r=Array.prototype.filter;function children(){return Array.from(this.children)}function childrenFilter(t){return function(){return r.call(this.children,t)}}function selection_selectChildren(t){return this.selectAll(null==t?children:childrenFilter("function"===typeof t?t:childMatcher(t)))}function selection_filter(t){"function"!==typeof t&&(t=matcher(t));for(var e=this._groups,n=e.length,r=new Array(n),i=0;i<n;++i)for(var o,s=e[i],c=s.length,l=r[i]=[],a=0;a<c;++a)(o=s[a])&&t.call(o,o.__data__,a,s)&&l.push(o);return new Selection(r,this._parents)}function sparse(t){return new Array(t.length)}function selection_enter(){return new Selection(this._enter||this._groups.map(sparse),this._parents)}function EnterNode(t,e){this.ownerDocument=t.ownerDocument;this.namespaceURI=t.namespaceURI;this._next=null;this._parent=t;this.__data__=e}EnterNode.prototype={constructor:EnterNode,appendChild:function(t){return this._parent.insertBefore(t,this._next)},insertBefore:function(t,e){return this._parent.insertBefore(t,e)},querySelector:function(t){return this._parent.querySelector(t)},querySelectorAll:function(t){return this._parent.querySelectorAll(t)}};function constant(t){return function(){return t}}function bindIndex(t,e,n,r,i,o){var s,c=0,l=e.length,a=o.length;for(;c<a;++c)if(s=e[c]){s.__data__=o[c];r[c]=s}else n[c]=new EnterNode(t,o[c]);for(;c<l;++c)(s=e[c])&&(i[c]=s)}function bindKey(t,e,n,r,i,o,s){var c,l,a,u=new Map,h=e.length,f=o.length,p=new Array(h);for(c=0;c<h;++c)if(l=e[c]){p[c]=a=s.call(l,l.__data__,c,e)+"";u.has(a)?i[c]=l:u.set(a,l)}for(c=0;c<f;++c){a=s.call(t,o[c],c,o)+"";if(l=u.get(a)){r[c]=l;l.__data__=o[c];u.delete(a)}else n[c]=new EnterNode(t,o[c])}for(c=0;c<h;++c)(l=e[c])&&u.get(p[c])===l&&(i[c]=l)}function datum(t){return t.__data__}function selection_data(t,e){if(!arguments.length)return Array.from(this,datum);var n=e?bindKey:bindIndex,r=this._parents,i=this._groups;"function"!==typeof t&&(t=constant(t));for(var o=i.length,s=new Array(o),c=new Array(o),l=new Array(o),a=0;a<o;++a){var u=r[a],h=i[a],f=h.length,p=arraylike(t.call(u,u&&u.__data__,a,r)),_=p.length,d=c[a]=new Array(_),y=s[a]=new Array(_),m=l[a]=new Array(f);n(u,h,d,y,m,p,e);for(var v,g,w=0,A=0;w<_;++w)if(v=d[w]){w>=A&&(A=w+1);while(!(g=y[A])&&++A<_);v._next=g||null}}s=new Selection(s,r);s._enter=c;s._exit=l;return s}function arraylike(t){return"object"===typeof t&&"length"in t?t:Array.from(t)}function selection_exit(){return new Selection(this._exit||this._groups.map(sparse),this._parents)}function selection_join(t,e,n){var r=this.enter(),i=this,o=this.exit();if("function"===typeof t){r=t(r);r&&(r=r.selection())}else r=r.append(t+"");if(null!=e){i=e(i);i&&(i=i.selection())}null==n?o.remove():n(o);return r&&i?r.merge(i).order():i}function selection_merge(t){var e=t.selection?t.selection():t;for(var n=this._groups,r=e._groups,i=n.length,o=r.length,s=Math.min(i,o),c=new Array(i),l=0;l<s;++l)for(var a,u=n[l],h=r[l],f=u.length,p=c[l]=new Array(f),_=0;_<f;++_)(a=u[_]||h[_])&&(p[_]=a);for(;l<i;++l)c[l]=n[l];return new Selection(c,this._parents)}function selection_order(){for(var t=this._groups,e=-1,n=t.length;++e<n;)for(var r,i=t[e],o=i.length-1,s=i[o];--o>=0;)if(r=i[o]){s&&4^r.compareDocumentPosition(s)&&s.parentNode.insertBefore(r,s);s=r}return this}function selection_sort(t){t||(t=ascending);function compareNode(e,n){return e&&n?t(e.__data__,n.__data__):!e-!n}for(var e=this._groups,n=e.length,r=new Array(n),i=0;i<n;++i){for(var o,s=e[i],c=s.length,l=r[i]=new Array(c),a=0;a<c;++a)(o=s[a])&&(l[a]=o);l.sort(compareNode)}return new Selection(r,this._parents).order()}function ascending(t,e){return t<e?-1:t>e?1:t>=e?0:NaN}function selection_call(){var t=arguments[0];arguments[0]=this;t.apply(null,arguments);return this}function selection_nodes(){return Array.from(this)}function selection_node(){for(var t=this._groups,e=0,n=t.length;e<n;++e)for(var r=t[e],i=0,o=r.length;i<o;++i){var s=r[i];if(s)return s}return null}function selection_size(){let t=0;for(const e of this)++t;return t}function selection_empty(){return!this.node()}function selection_each(t){for(var e=this._groups,n=0,r=e.length;n<r;++n)for(var i,o=e[n],s=0,c=o.length;s<c;++s)(i=o[s])&&t.call(i,i.__data__,s,o);return this}function attrRemove(t){return function(){this.removeAttribute(t)}}function attrRemoveNS(t){return function(){this.removeAttributeNS(t.space,t.local)}}function attrConstant(t,e){return function(){this.setAttribute(t,e)}}function attrConstantNS(t,e){return function(){this.setAttributeNS(t.space,t.local,e)}}function attrFunction(t,e){return function(){var n=e.apply(this,arguments);null==n?this.removeAttribute(t):this.setAttribute(t,n)}}function attrFunctionNS(t,e){return function(){var n=e.apply(this,arguments);null==n?this.removeAttributeNS(t.space,t.local):this.setAttributeNS(t.space,t.local,n)}}function selection_attr(t,e){var n=namespace(t);if(arguments.length<2){var r=this.node();return n.local?r.getAttributeNS(n.space,n.local):r.getAttribute(n)}return this.each((null==e?n.local?attrRemoveNS:attrRemove:"function"===typeof e?n.local?attrFunctionNS:attrFunction:n.local?attrConstantNS:attrConstant)(n,e))}function defaultView(t){return t.ownerDocument&&t.ownerDocument.defaultView||t.document&&t||t.defaultView}function styleRemove(t){return function(){this.style.removeProperty(t)}}function styleConstant(t,e,n){return function(){this.style.setProperty(t,e,n)}}function styleFunction(t,e,n){return function(){var r=e.apply(this,arguments);null==r?this.style.removeProperty(t):this.style.setProperty(t,r,n)}}function selection_style(t,e,n){return arguments.length>1?this.each((null==e?styleRemove:"function"===typeof e?styleFunction:styleConstant)(t,e,null==n?"":n)):styleValue(this.node(),t)}function styleValue(t,e){return t.style.getPropertyValue(e)||defaultView(t).getComputedStyle(t,null).getPropertyValue(e)}function propertyRemove(t){return function(){delete this[t]}}function propertyConstant(t,e){return function(){this[t]=e}}function propertyFunction(t,e){return function(){var n=e.apply(this,arguments);null==n?delete this[t]:this[t]=n}}function selection_property(t,e){return arguments.length>1?this.each((null==e?propertyRemove:"function"===typeof e?propertyFunction:propertyConstant)(t,e)):this.node()[t]}function classArray(t){return t.trim().split(/^|\s+/)}function classList(t){return t.classList||new ClassList(t)}function ClassList(t){this._node=t;this._names=classArray(t.getAttribute("class")||"")}ClassList.prototype={add:function(t){var e=this._names.indexOf(t);if(e<0){this._names.push(t);this._node.setAttribute("class",this._names.join(" "))}},remove:function(t){var e=this._names.indexOf(t);if(e>=0){this._names.splice(e,1);this._node.setAttribute("class",this._names.join(" "))}},contains:function(t){return this._names.indexOf(t)>=0}};function classedAdd(t,e){var n=classList(t),r=-1,i=e.length;while(++r<i)n.add(e[r])}function classedRemove(t,e){var n=classList(t),r=-1,i=e.length;while(++r<i)n.remove(e[r])}function classedTrue(t){return function(){classedAdd(this,t)}}function classedFalse(t){return function(){classedRemove(this,t)}}function classedFunction(t,e){return function(){(e.apply(this,arguments)?classedAdd:classedRemove)(this,t)}}function selection_classed(t,e){var n=classArray(t+"");if(arguments.length<2){var r=classList(this.node()),i=-1,o=n.length;while(++i<o)if(!r.contains(n[i]))return false;return true}return this.each(("function"===typeof e?classedFunction:e?classedTrue:classedFalse)(n,e))}function textRemove(){this.textContent=""}function textConstant(t){return function(){this.textContent=t}}function textFunction(t){return function(){var e=t.apply(this,arguments);this.textContent=null==e?"":e}}function selection_text(t){return arguments.length?this.each(null==t?textRemove:("function"===typeof t?textFunction:textConstant)(t)):this.node().textContent}function htmlRemove(){this.innerHTML=""}function htmlConstant(t){return function(){this.innerHTML=t}}function htmlFunction(t){return function(){var e=t.apply(this,arguments);this.innerHTML=null==e?"":e}}function selection_html(t){return arguments.length?this.each(null==t?htmlRemove:("function"===typeof t?htmlFunction:htmlConstant)(t)):this.node().innerHTML}function raise(){this.nextSibling&&this.parentNode.appendChild(this)}function selection_raise(){return this.each(raise)}function lower(){this.previousSibling&&this.parentNode.insertBefore(this,this.parentNode.firstChild)}function selection_lower(){return this.each(lower)}function selection_append(t){var e="function"===typeof t?t:creator(t);return this.select((function(){return this.appendChild(e.apply(this,arguments))}))}function constantNull(){return null}function selection_insert(t,e){var n="function"===typeof t?t:creator(t),r=null==e?constantNull:"function"===typeof e?e:selector(e);return this.select((function(){return this.insertBefore(n.apply(this,arguments),r.apply(this,arguments)||null)}))}function remove(){var t=this.parentNode;t&&t.removeChild(this)}function selection_remove(){return this.each(remove)}function selection_cloneShallow(){var t=this.cloneNode(false),e=this.parentNode;return e?e.insertBefore(t,this.nextSibling):t}function selection_cloneDeep(){var t=this.cloneNode(true),e=this.parentNode;return e?e.insertBefore(t,this.nextSibling):t}function selection_clone(t){return this.select(t?selection_cloneDeep:selection_cloneShallow)}function selection_datum(t){return arguments.length?this.property("__data__",t):this.node().__data__}function contextListener(t){return function(e){t.call(this,e,this.__data__)}}function parseTypenames(t){return t.trim().split(/^|\s+/).map((function(t){var e="",n=t.indexOf(".");n>=0&&(e=t.slice(n+1),t=t.slice(0,n));return{type:t,name:e}}))}function onRemove(t){return function(){var e=this.__on;if(e){for(var n,r=0,i=-1,o=e.length;r<o;++r)n=e[r],t.type&&n.type!==t.type||n.name!==t.name?e[++i]=n:this.removeEventListener(n.type,n.listener,n.options);++i?e.length=i:delete this.__on}}}function onAdd(t,e,n){return function(){var r,i=this.__on,o=contextListener(e);if(i)for(var s=0,c=i.length;s<c;++s)if((r=i[s]).type===t.type&&r.name===t.name){this.removeEventListener(r.type,r.listener,r.options);this.addEventListener(r.type,r.listener=o,r.options=n);r.value=e;return}this.addEventListener(t.type,o,n);r={type:t.type,name:t.name,value:e,listener:o,options:n};i?i.push(r):this.__on=[r]}}function selection_on(t,e,n){var r,i,o=parseTypenames(t+""),s=o.length;if(!(arguments.length<2)){c=e?onAdd:onRemove;for(r=0;r<s;++r)this.each(c(o[r],e,n));return this}var c=this.node().__on;if(c)for(var l,a=0,u=c.length;a<u;++a)for(r=0,l=c[a];r<s;++r)if((i=o[r]).type===l.type&&i.name===l.name)return l.value}function dispatchEvent(t,e,n){var r=defaultView(t),i=r.CustomEvent;if("function"===typeof i)i=new i(e,n);else{i=r.document.createEvent("Event");n?(i.initEvent(e,n.bubbles,n.cancelable),i.detail=n.detail):i.initEvent(e,false,false)}t.dispatchEvent(i)}function dispatchConstant(t,e){return function(){return dispatchEvent(this,t,e)}}function dispatchFunction(t,e){return function(){return dispatchEvent(this,t,e.apply(this,arguments))}}function selection_dispatch(t,e){return this.each(("function"===typeof e?dispatchFunction:dispatchConstant)(t,e))}function*selection_iterator(){for(var t=this._groups,e=0,n=t.length;e<n;++e)for(var r,i=t[e],o=0,s=i.length;o<s;++o)(r=i[o])&&(yield r)}var i=[null];function Selection(t,e){this._groups=t;this._parents=e}function selection(){return new Selection([[document.documentElement]],i)}function selection_selection(){return this}Selection.prototype=selection.prototype={constructor:Selection,select:selection_select,selectAll:selection_selectAll,selectChild:selection_selectChild,selectChildren:selection_selectChildren,filter:selection_filter,data:selection_data,enter:selection_enter,exit:selection_exit,join:selection_join,merge:selection_merge,selection:selection_selection,order:selection_order,sort:selection_sort,call:selection_call,nodes:selection_nodes,node:selection_node,size:selection_size,empty:selection_empty,each:selection_each,attr:selection_attr,style:selection_style,property:selection_property,classed:selection_classed,text:selection_text,html:selection_html,raise:selection_raise,lower:selection_lower,append:selection_append,insert:selection_insert,remove:selection_remove,clone:selection_clone,datum:selection_datum,on:selection_on,dispatch:selection_dispatch,[Symbol.iterator]:selection_iterator};function select(t){return"string"===typeof t?new Selection([[document.querySelector(t)]],[document.documentElement]):new Selection([[t]],i)}function create(t){return select(creator(t).call(document.documentElement))}var o=0;function local(){return new Local}function Local(){this._="@"+(++o).toString(36)}Local.prototype=local.prototype={constructor:Local,get:function(t){var e=this._;while(!(e in t))if(!(t=t.parentNode))return;return t[e]},set:function(t,e){return t[this._]=e},remove:function(t){return this._ in t&&delete t[this._]},toString:function(){return this._}};function sourceEvent(t){let e;while(e=t.sourceEvent)t=e;return t}function pointer(t,e){t=sourceEvent(t);void 0===e&&(e=t.currentTarget);if(e){var n=e.ownerSVGElement||e;if(n.createSVGPoint){var r=n.createSVGPoint();r.x=t.clientX,r.y=t.clientY;r=r.matrixTransform(e.getScreenCTM().inverse());return[r.x,r.y]}if(e.getBoundingClientRect){var i=e.getBoundingClientRect();return[t.clientX-i.left-e.clientLeft,t.clientY-i.top-e.clientTop]}}return[t.pageX,t.pageY]}function pointers(t,e){if(t.target){t=sourceEvent(t);void 0===e&&(e=t.currentTarget);t=t.touches||[t]}return Array.from(t,(t=>pointer(t,e)))}function selectAll(t){return"string"===typeof t?new Selection([document.querySelectorAll(t)],[document.documentElement]):new Selection([array(t)],i)}export{create,creator,local,matcher,namespace,e as namespaces,pointer,pointers,select,selectAll,selection,selector,selectorAll,styleValue as style,defaultView as window};
 
diff --git a/vendor/javascript/d3-shape.js b/vendor/javascript/d3-shape.js
index a4307180..b4049e5a 100644
--- a/vendor/javascript/d3-shape.js
+++ b/vendor/javascript/d3-shape.js
@@ -1,2 +1,4 @@
-import{Path as t}from"d3-path";function constant(t){return function constant(){return t}}const n=Math.abs;const i=Math.atan2;const e=Math.cos;const s=Math.max;const o=Math.min;const a=Math.sin;const r=Math.sqrt;const h=1e-12;const l=Math.PI;const c=l/2;const _=2*l;function acos(t){return t>1?0:t<-1?l:Math.acos(t)}function asin(t){return t>=1?c:t<=-1?-c:Math.asin(t)}function withPath(n){let i=3;n.digits=function(t){if(!arguments.length)return i;if(null==t)i=null;else{const n=Math.floor(t);if(!(n>=0))throw new RangeError(`invalid digits: ${t}`);i=n}return n};return()=>new t(i)}function arcInnerRadius(t){return t.innerRadius}function arcOuterRadius(t){return t.outerRadius}function arcStartAngle(t){return t.startAngle}function arcEndAngle(t){return t.endAngle}function arcPadAngle(t){return t&&t.padAngle}function intersect(t,n,i,e,s,o,a,r){var l=i-t,c=e-n,_=a-s,u=r-o,f=u*l-_*c;if(!(f*f<h)){f=(_*(n-o)-u*(t-s))/f;return[t+f*l,n+f*c]}}function cornerTangents(t,n,i,e,o,a,h){var l=t-i,c=n-e,_=(h?a:-a)/r(l*l+c*c),u=_*c,f=-_*l,p=t+u,d=n+f,v=i+u,m=e+f,T=(p+v)/2,b=(d+m)/2,g=v-p,k=m-d,w=g*g+k*k,R=o-a,C=p*m-v*d,S=(k<0?-1:1)*r(s(0,R*R*w-C*C)),N=(C*k-g*S)/w,E=(-C*g-k*S)/w,P=(C*k+g*S)/w,A=(-C*g+k*S)/w,M=N-T,O=E-b,$=P-T,B=A-b;M*M+O*O>$*$+B*B&&(N=P,E=A);return{cx:N,cy:E,x01:-u,y01:-f,x11:N*(o/R-1),y11:E*(o/R-1)}}function arc(){var t=arcInnerRadius,s=arcOuterRadius,u=constant(0),f=null,p=arcStartAngle,d=arcEndAngle,v=arcPadAngle,m=null,T=withPath(arc);function arc(){var b,g,k=+t.apply(this,arguments),w=+s.apply(this,arguments),R=p.apply(this,arguments)-c,C=d.apply(this,arguments)-c,S=n(C-R),N=C>R;m||(m=b=T());w<k&&(g=w,w=k,k=g);if(w>h)if(S>_-h){m.moveTo(w*e(R),w*a(R));m.arc(0,0,w,R,C,!N);if(k>h){m.moveTo(k*e(C),k*a(C));m.arc(0,0,k,C,R,N)}}else{var E,P,A=R,M=C,O=R,$=C,B=S,X=S,Y=v.apply(this,arguments)/2,z=Y>h&&(f?+f.apply(this,arguments):r(k*k+w*w)),L=o(n(w-k)/2,+u.apply(this,arguments)),I=L,q=L;if(z>h){var V=asin(z/k*a(Y)),D=asin(z/w*a(Y));(B-=2*V)>h?(V*=N?1:-1,O+=V,$-=V):(B=0,O=$=(R+C)/2);(X-=2*D)>h?(D*=N?1:-1,A+=D,M-=D):(X=0,A=M=(R+C)/2)}var j=w*e(A),H=w*a(A),W=k*e($),F=k*a($);if(L>h){var G,J=w*e(M),K=w*a(M),Q=k*e(O),U=k*a(O);if(S<l)if(G=intersect(j,H,Q,U,J,K,W,F)){var Z=j-G[0],tt=H-G[1],nt=J-G[0],it=K-G[1],et=1/a(acos((Z*nt+tt*it)/(r(Z*Z+tt*tt)*r(nt*nt+it*it)))/2),st=r(G[0]*G[0]+G[1]*G[1]);I=o(L,(k-st)/(et-1));q=o(L,(w-st)/(et+1))}else I=q=0}if(X>h)if(q>h){E=cornerTangents(Q,U,j,H,w,q,N);P=cornerTangents(J,K,W,F,w,q,N);m.moveTo(E.cx+E.x01,E.cy+E.y01);if(q<L)m.arc(E.cx,E.cy,q,i(E.y01,E.x01),i(P.y01,P.x01),!N);else{m.arc(E.cx,E.cy,q,i(E.y01,E.x01),i(E.y11,E.x11),!N);m.arc(0,0,w,i(E.cy+E.y11,E.cx+E.x11),i(P.cy+P.y11,P.cx+P.x11),!N);m.arc(P.cx,P.cy,q,i(P.y11,P.x11),i(P.y01,P.x01),!N)}}else m.moveTo(j,H),m.arc(0,0,w,A,M,!N);else m.moveTo(j,H);if(k>h&&B>h)if(I>h){E=cornerTangents(W,F,J,K,k,-I,N);P=cornerTangents(j,H,Q,U,k,-I,N);m.lineTo(E.cx+E.x01,E.cy+E.y01);if(I<L)m.arc(E.cx,E.cy,I,i(E.y01,E.x01),i(P.y01,P.x01),!N);else{m.arc(E.cx,E.cy,I,i(E.y01,E.x01),i(E.y11,E.x11),!N);m.arc(0,0,k,i(E.cy+E.y11,E.cx+E.x11),i(P.cy+P.y11,P.cx+P.x11),N);m.arc(P.cx,P.cy,I,i(P.y11,P.x11),i(P.y01,P.x01),!N)}}else m.arc(0,0,k,$,O,N);else m.lineTo(W,F)}else m.moveTo(0,0);m.closePath();if(b)return m=null,b+""||null}arc.centroid=function(){var n=(+t.apply(this,arguments)+ +s.apply(this,arguments))/2,i=(+p.apply(this,arguments)+ +d.apply(this,arguments))/2-l/2;return[e(i)*n,a(i)*n]};arc.innerRadius=function(n){return arguments.length?(t="function"===typeof n?n:constant(+n),arc):t};arc.outerRadius=function(t){return arguments.length?(s="function"===typeof t?t:constant(+t),arc):s};arc.cornerRadius=function(t){return arguments.length?(u="function"===typeof t?t:constant(+t),arc):u};arc.padRadius=function(t){return arguments.length?(f=null==t?null:"function"===typeof t?t:constant(+t),arc):f};arc.startAngle=function(t){return arguments.length?(p="function"===typeof t?t:constant(+t),arc):p};arc.endAngle=function(t){return arguments.length?(d="function"===typeof t?t:constant(+t),arc):d};arc.padAngle=function(t){return arguments.length?(v="function"===typeof t?t:constant(+t),arc):v};arc.context=function(t){return arguments.length?(m=null==t?null:t,arc):m};return arc}var u=Array.prototype.slice;function array(t){return"object"===typeof t&&"length"in t?t:Array.from(t)}function Linear(t){this._context=t}Linear.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._point=0},lineEnd:function(){(this._line||0!==this._line&&1===this._point)&&this._context.closePath();this._line=1-this._line},point:function(t,n){t=+t,n=+n;switch(this._point){case 0:this._point=1;this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;default:this._context.lineTo(t,n);break}}};function curveLinear(t){return new Linear(t)}function x(t){return t[0]}function y(t){return t[1]}function line(t,n){var i=constant(true),e=null,s=curveLinear,o=null,a=withPath(line);t="function"===typeof t?t:void 0===t?x:constant(t);n="function"===typeof n?n:void 0===n?y:constant(n);function line(r){var h,l,c,_=(r=array(r)).length,u=false;null==e&&(o=s(c=a()));for(h=0;h<=_;++h){!(h<_&&i(l=r[h],h,r))===u&&((u=!u)?o.lineStart():o.lineEnd());u&&o.point(+t(l,h,r),+n(l,h,r))}if(c)return o=null,c+""||null}line.x=function(n){return arguments.length?(t="function"===typeof n?n:constant(+n),line):t};line.y=function(t){return arguments.length?(n="function"===typeof t?t:constant(+t),line):n};line.defined=function(t){return arguments.length?(i="function"===typeof t?t:constant(!!t),line):i};line.curve=function(t){return arguments.length?(s=t,null!=e&&(o=s(e)),line):s};line.context=function(t){return arguments.length?(null==t?e=o=null:o=s(e=t),line):e};return line}function area(t,n,i){var e=null,s=constant(true),o=null,a=curveLinear,r=null,h=withPath(area);t="function"===typeof t?t:void 0===t?x:constant(+t);n="function"===typeof n?n:constant(void 0===n?0:+n);i="function"===typeof i?i:void 0===i?y:constant(+i);function area(l){var c,_,u,f,p,d=(l=array(l)).length,v=false,m=new Array(d),T=new Array(d);null==o&&(r=a(p=h()));for(c=0;c<=d;++c){if(!(c<d&&s(f=l[c],c,l))===v)if(v=!v){_=c;r.areaStart();r.lineStart()}else{r.lineEnd();r.lineStart();for(u=c-1;u>=_;--u)r.point(m[u],T[u]);r.lineEnd();r.areaEnd()}if(v){m[c]=+t(f,c,l),T[c]=+n(f,c,l);r.point(e?+e(f,c,l):m[c],i?+i(f,c,l):T[c])}}if(p)return r=null,p+""||null}function arealine(){return line().defined(s).curve(a).context(o)}area.x=function(n){return arguments.length?(t="function"===typeof n?n:constant(+n),e=null,area):t};area.x0=function(n){return arguments.length?(t="function"===typeof n?n:constant(+n),area):t};area.x1=function(t){return arguments.length?(e=null==t?null:"function"===typeof t?t:constant(+t),area):e};area.y=function(t){return arguments.length?(n="function"===typeof t?t:constant(+t),i=null,area):n};area.y0=function(t){return arguments.length?(n="function"===typeof t?t:constant(+t),area):n};area.y1=function(t){return arguments.length?(i=null==t?null:"function"===typeof t?t:constant(+t),area):i};area.lineX0=area.lineY0=function(){return arealine().x(t).y(n)};area.lineY1=function(){return arealine().x(t).y(i)};area.lineX1=function(){return arealine().x(e).y(n)};area.defined=function(t){return arguments.length?(s="function"===typeof t?t:constant(!!t),area):s};area.curve=function(t){return arguments.length?(a=t,null!=o&&(r=a(o)),area):a};area.context=function(t){return arguments.length?(null==t?o=r=null:r=a(o=t),area):o};return area}function descending$1(t,n){return n<t?-1:n>t?1:n>=t?0:NaN}function identity(t){return t}function pie(){var t=identity,n=descending$1,i=null,e=constant(0),s=constant(_),o=constant(0);function pie(a){var r,h,l,c,u,f=(a=array(a)).length,p=0,d=new Array(f),v=new Array(f),m=+e.apply(this,arguments),T=Math.min(_,Math.max(-_,s.apply(this,arguments)-m)),b=Math.min(Math.abs(T)/f,o.apply(this,arguments)),g=b*(T<0?-1:1);for(r=0;r<f;++r)(u=v[d[r]=r]=+t(a[r],r,a))>0&&(p+=u);null!=n?d.sort((function(t,i){return n(v[t],v[i])})):null!=i&&d.sort((function(t,n){return i(a[t],a[n])}));for(r=0,l=p?(T-f*g)/p:0;r<f;++r,m=c)h=d[r],u=v[h],c=m+(u>0?u*l:0)+g,v[h]={data:a[h],index:r,value:u,startAngle:m,endAngle:c,padAngle:b};return v}pie.value=function(n){return arguments.length?(t="function"===typeof n?n:constant(+n),pie):t};pie.sortValues=function(t){return arguments.length?(n=t,i=null,pie):n};pie.sort=function(t){return arguments.length?(i=t,n=null,pie):i};pie.startAngle=function(t){return arguments.length?(e="function"===typeof t?t:constant(+t),pie):e};pie.endAngle=function(t){return arguments.length?(s="function"===typeof t?t:constant(+t),pie):s};pie.padAngle=function(t){return arguments.length?(o="function"===typeof t?t:constant(+t),pie):o};return pie}var f=curveRadial(curveLinear);function Radial(t){this._curve=t}Radial.prototype={areaStart:function(){this._curve.areaStart()},areaEnd:function(){this._curve.areaEnd()},lineStart:function(){this._curve.lineStart()},lineEnd:function(){this._curve.lineEnd()},point:function(t,n){this._curve.point(n*Math.sin(t),n*-Math.cos(t))}};function curveRadial(t){function radial(n){return new Radial(t(n))}radial._curve=t;return radial}function lineRadial(t){var n=t.curve;t.angle=t.x,delete t.x;t.radius=t.y,delete t.y;t.curve=function(t){return arguments.length?n(curveRadial(t)):n()._curve};return t}function lineRadial$1(){return lineRadial(line().curve(f))}function areaRadial(){var t=area().curve(f),n=t.curve,i=t.lineX0,e=t.lineX1,s=t.lineY0,o=t.lineY1;t.angle=t.x,delete t.x;t.startAngle=t.x0,delete t.x0;t.endAngle=t.x1,delete t.x1;t.radius=t.y,delete t.y;t.innerRadius=t.y0,delete t.y0;t.outerRadius=t.y1,delete t.y1;t.lineStartAngle=function(){return lineRadial(i())},delete t.lineX0;t.lineEndAngle=function(){return lineRadial(e())},delete t.lineX1;t.lineInnerRadius=function(){return lineRadial(s())},delete t.lineY0;t.lineOuterRadius=function(){return lineRadial(o())},delete t.lineY1;t.curve=function(t){return arguments.length?n(curveRadial(t)):n()._curve};return t}function pointRadial(t,n){return[(n=+n)*Math.cos(t-=Math.PI/2),n*Math.sin(t)]}class Bump{constructor(t,n){this._context=t;this._x=n}areaStart(){this._line=0}areaEnd(){this._line=NaN}lineStart(){this._point=0}lineEnd(){(this._line||0!==this._line&&1===this._point)&&this._context.closePath();this._line=1-this._line}point(t,n){t=+t,n=+n;switch(this._point){case 0:this._point=1;this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;default:this._x?this._context.bezierCurveTo(this._x0=(this._x0+t)/2,this._y0,this._x0,n,t,n):this._context.bezierCurveTo(this._x0,this._y0=(this._y0+n)/2,t,this._y0,t,n);break}this._x0=t,this._y0=n}}class BumpRadial{constructor(t){this._context=t}lineStart(){this._point=0}lineEnd(){}point(t,n){t=+t,n=+n;if(0===this._point)this._point=1;else{const i=pointRadial(this._x0,this._y0);const e=pointRadial(this._x0,this._y0=(this._y0+n)/2);const s=pointRadial(t,this._y0);const o=pointRadial(t,n);this._context.moveTo(...i);this._context.bezierCurveTo(...e,...s,...o)}this._x0=t,this._y0=n}}function bumpX(t){return new Bump(t,true)}function bumpY(t){return new Bump(t,false)}function bumpRadial(t){return new BumpRadial(t)}function linkSource(t){return t.source}function linkTarget(t){return t.target}function link(t){let n=linkSource,i=linkTarget,e=x,s=y,o=null,a=null,r=withPath(link);function link(){let h;const l=u.call(arguments);const c=n.apply(this,l);const _=i.apply(this,l);null==o&&(a=t(h=r()));a.lineStart();l[0]=c,a.point(+e.apply(this,l),+s.apply(this,l));l[0]=_,a.point(+e.apply(this,l),+s.apply(this,l));a.lineEnd();if(h)return a=null,h+""||null}link.source=function(t){return arguments.length?(n=t,link):n};link.target=function(t){return arguments.length?(i=t,link):i};link.x=function(t){return arguments.length?(e="function"===typeof t?t:constant(+t),link):e};link.y=function(t){return arguments.length?(s="function"===typeof t?t:constant(+t),link):s};link.context=function(n){return arguments.length?(null==n?o=a=null:a=t(o=n),link):o};return link}function linkHorizontal(){return link(bumpX)}function linkVertical(){return link(bumpY)}function linkRadial(){const t=link(bumpRadial);t.angle=t.x,delete t.x;t.radius=t.y,delete t.y;return t}const p=r(3);var d={draw(t,n){const i=.59436*r(n+o(n/28,.75));const e=i/2;const s=e*p;t.moveTo(0,i);t.lineTo(0,-i);t.moveTo(-s,-e);t.lineTo(s,e);t.moveTo(-s,e);t.lineTo(s,-e)}};var v={draw(t,n){const i=r(n/l);t.moveTo(i,0);t.arc(0,0,i,0,_)}};var m={draw(t,n){const i=r(n/5)/2;t.moveTo(-3*i,-i);t.lineTo(-i,-i);t.lineTo(-i,-3*i);t.lineTo(i,-3*i);t.lineTo(i,-i);t.lineTo(3*i,-i);t.lineTo(3*i,i);t.lineTo(i,i);t.lineTo(i,3*i);t.lineTo(-i,3*i);t.lineTo(-i,i);t.lineTo(-3*i,i);t.closePath()}};const T=r(1/3);const b=2*T;var g={draw(t,n){const i=r(n/b);const e=i*T;t.moveTo(0,-i);t.lineTo(e,0);t.lineTo(0,i);t.lineTo(-e,0);t.closePath()}};var k={draw(t,n){const i=.62625*r(n);t.moveTo(0,-i);t.lineTo(i,0);t.lineTo(0,i);t.lineTo(-i,0);t.closePath()}};var w={draw(t,n){const i=.87559*r(n-o(n/7,2));t.moveTo(-i,0);t.lineTo(i,0);t.moveTo(0,i);t.lineTo(0,-i)}};var R={draw(t,n){const i=r(n);const e=-i/2;t.rect(e,e,i,i)}};var C={draw(t,n){const i=.4431*r(n);t.moveTo(i,i);t.lineTo(i,-i);t.lineTo(-i,-i);t.lineTo(-i,i);t.closePath()}};const S=.8908130915292852;const N=a(l/10)/a(7*l/10);const E=a(_/10)*N;const P=-e(_/10)*N;var A={draw(t,n){const i=r(n*S);const s=E*i;const o=P*i;t.moveTo(0,-i);t.lineTo(s,o);for(let n=1;n<5;++n){const r=_*n/5;const h=e(r);const l=a(r);t.lineTo(l*i,-h*i);t.lineTo(h*s-l*o,l*s+h*o)}t.closePath()}};const M=r(3);var O={draw(t,n){const i=-r(n/(3*M));t.moveTo(0,2*i);t.lineTo(-M*i,-i);t.lineTo(M*i,-i);t.closePath()}};const $=r(3);var B={draw(t,n){const i=.6824*r(n);const e=i/2;const s=i*$/2;t.moveTo(0,-i);t.lineTo(s,e);t.lineTo(-s,e);t.closePath()}};const X=-.5;const Y=r(3)/2;const z=1/r(12);const L=3*(z/2+1);var I={draw(t,n){const i=r(n/L);const e=i/2,s=i*z;const o=e,a=i*z+i;const h=-o,l=a;t.moveTo(e,s);t.lineTo(o,a);t.lineTo(h,l);t.lineTo(X*e-Y*s,Y*e+X*s);t.lineTo(X*o-Y*a,Y*o+X*a);t.lineTo(X*h-Y*l,Y*h+X*l);t.lineTo(X*e+Y*s,X*s-Y*e);t.lineTo(X*o+Y*a,X*a-Y*o);t.lineTo(X*h+Y*l,X*l-Y*h);t.closePath()}};var q={draw(t,n){const i=.6189*r(n-o(n/6,1.7));t.moveTo(-i,-i);t.lineTo(i,i);t.moveTo(-i,i);t.lineTo(i,-i)}};const V=[v,m,g,R,A,O,I];const D=[v,w,q,B,d,C,k];function Symbol$1(t,n){let i=null,e=withPath(symbol);t="function"===typeof t?t:constant(t||v);n="function"===typeof n?n:constant(void 0===n?64:+n);function symbol(){let s;i||(i=s=e());t.apply(this,arguments).draw(i,+n.apply(this,arguments));if(s)return i=null,s+""||null}symbol.type=function(n){return arguments.length?(t="function"===typeof n?n:constant(n),symbol):t};symbol.size=function(t){return arguments.length?(n="function"===typeof t?t:constant(+t),symbol):n};symbol.context=function(t){return arguments.length?(i=null==t?null:t,symbol):i};return symbol}function noop(){}function point$3(t,n,i){t._context.bezierCurveTo((2*t._x0+t._x1)/3,(2*t._y0+t._y1)/3,(t._x0+2*t._x1)/3,(t._y0+2*t._y1)/3,(t._x0+4*t._x1+n)/6,(t._y0+4*t._y1+i)/6)}function Basis(t){this._context=t}Basis.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._y0=this._y1=NaN;this._point=0},lineEnd:function(){switch(this._point){case 3:point$3(this,this._x1,this._y1);case 2:this._context.lineTo(this._x1,this._y1);break}(this._line||0!==this._line&&1===this._point)&&this._context.closePath();this._line=1-this._line},point:function(t,n){t=+t,n=+n;switch(this._point){case 0:this._point=1;this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;break;case 2:this._point=3;this._context.lineTo((5*this._x0+this._x1)/6,(5*this._y0+this._y1)/6);default:point$3(this,t,n);break}this._x0=this._x1,this._x1=t;this._y0=this._y1,this._y1=n}};function basis(t){return new Basis(t)}function BasisClosed(t){this._context=t}BasisClosed.prototype={areaStart:noop,areaEnd:noop,lineStart:function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._y0=this._y1=this._y2=this._y3=this._y4=NaN;this._point=0},lineEnd:function(){switch(this._point){case 1:this._context.moveTo(this._x2,this._y2);this._context.closePath();break;case 2:this._context.moveTo((this._x2+2*this._x3)/3,(this._y2+2*this._y3)/3);this._context.lineTo((this._x3+2*this._x2)/3,(this._y3+2*this._y2)/3);this._context.closePath();break;case 3:this.point(this._x2,this._y2);this.point(this._x3,this._y3);this.point(this._x4,this._y4);break}},point:function(t,n){t=+t,n=+n;switch(this._point){case 0:this._point=1;this._x2=t,this._y2=n;break;case 1:this._point=2;this._x3=t,this._y3=n;break;case 2:this._point=3;this._x4=t,this._y4=n;this._context.moveTo((this._x0+4*this._x1+t)/6,(this._y0+4*this._y1+n)/6);break;default:point$3(this,t,n);break}this._x0=this._x1,this._x1=t;this._y0=this._y1,this._y1=n}};function basisClosed(t){return new BasisClosed(t)}function BasisOpen(t){this._context=t}BasisOpen.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._y0=this._y1=NaN;this._point=0},lineEnd:function(){(this._line||0!==this._line&&3===this._point)&&this._context.closePath();this._line=1-this._line},point:function(t,n){t=+t,n=+n;switch(this._point){case 0:this._point=1;break;case 1:this._point=2;break;case 2:this._point=3;var i=(this._x0+4*this._x1+t)/6,e=(this._y0+4*this._y1+n)/6;this._line?this._context.lineTo(i,e):this._context.moveTo(i,e);break;case 3:this._point=4;default:point$3(this,t,n);break}this._x0=this._x1,this._x1=t;this._y0=this._y1,this._y1=n}};function basisOpen(t){return new BasisOpen(t)}function Bundle(t,n){this._basis=new Basis(t);this._beta=n}Bundle.prototype={lineStart:function(){this._x=[];this._y=[];this._basis.lineStart()},lineEnd:function(){var t=this._x,n=this._y,i=t.length-1;if(i>0){var e,s=t[0],o=n[0],a=t[i]-s,r=n[i]-o,h=-1;while(++h<=i){e=h/i;this._basis.point(this._beta*t[h]+(1-this._beta)*(s+e*a),this._beta*n[h]+(1-this._beta)*(o+e*r))}}this._x=this._y=null;this._basis.lineEnd()},point:function(t,n){this._x.push(+t);this._y.push(+n)}};var j=function custom(t){function bundle(n){return 1===t?new Basis(n):new Bundle(n,t)}bundle.beta=function(t){return custom(+t)};return bundle}(.85);function point$2(t,n,i){t._context.bezierCurveTo(t._x1+t._k*(t._x2-t._x0),t._y1+t._k*(t._y2-t._y0),t._x2+t._k*(t._x1-n),t._y2+t._k*(t._y1-i),t._x2,t._y2)}function Cardinal(t,n){this._context=t;this._k=(1-n)/6}Cardinal.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN;this._point=0},lineEnd:function(){switch(this._point){case 2:this._context.lineTo(this._x2,this._y2);break;case 3:point$2(this,this._x1,this._y1);break}(this._line||0!==this._line&&1===this._point)&&this._context.closePath();this._line=1-this._line},point:function(t,n){t=+t,n=+n;switch(this._point){case 0:this._point=1;this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;this._x1=t,this._y1=n;break;case 2:this._point=3;default:point$2(this,t,n);break}this._x0=this._x1,this._x1=this._x2,this._x2=t;this._y0=this._y1,this._y1=this._y2,this._y2=n}};var H=function custom(t){function cardinal(n){return new Cardinal(n,t)}cardinal.tension=function(t){return custom(+t)};return cardinal}(0);function CardinalClosed(t,n){this._context=t;this._k=(1-n)/6}CardinalClosed.prototype={areaStart:noop,areaEnd:noop,lineStart:function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._x5=this._y0=this._y1=this._y2=this._y3=this._y4=this._y5=NaN;this._point=0},lineEnd:function(){switch(this._point){case 1:this._context.moveTo(this._x3,this._y3);this._context.closePath();break;case 2:this._context.lineTo(this._x3,this._y3);this._context.closePath();break;case 3:this.point(this._x3,this._y3);this.point(this._x4,this._y4);this.point(this._x5,this._y5);break}},point:function(t,n){t=+t,n=+n;switch(this._point){case 0:this._point=1;this._x3=t,this._y3=n;break;case 1:this._point=2;this._context.moveTo(this._x4=t,this._y4=n);break;case 2:this._point=3;this._x5=t,this._y5=n;break;default:point$2(this,t,n);break}this._x0=this._x1,this._x1=this._x2,this._x2=t;this._y0=this._y1,this._y1=this._y2,this._y2=n}};var W=function custom(t){function cardinal(n){return new CardinalClosed(n,t)}cardinal.tension=function(t){return custom(+t)};return cardinal}(0);function CardinalOpen(t,n){this._context=t;this._k=(1-n)/6}CardinalOpen.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN;this._point=0},lineEnd:function(){(this._line||0!==this._line&&3===this._point)&&this._context.closePath();this._line=1-this._line},point:function(t,n){t=+t,n=+n;switch(this._point){case 0:this._point=1;break;case 1:this._point=2;break;case 2:this._point=3;this._line?this._context.lineTo(this._x2,this._y2):this._context.moveTo(this._x2,this._y2);break;case 3:this._point=4;default:point$2(this,t,n);break}this._x0=this._x1,this._x1=this._x2,this._x2=t;this._y0=this._y1,this._y1=this._y2,this._y2=n}};var F=function custom(t){function cardinal(n){return new CardinalOpen(n,t)}cardinal.tension=function(t){return custom(+t)};return cardinal}(0);function point$1(t,n,i){var e=t._x1,s=t._y1,o=t._x2,a=t._y2;if(t._l01_a>h){var r=2*t._l01_2a+3*t._l01_a*t._l12_a+t._l12_2a,l=3*t._l01_a*(t._l01_a+t._l12_a);e=(e*r-t._x0*t._l12_2a+t._x2*t._l01_2a)/l;s=(s*r-t._y0*t._l12_2a+t._y2*t._l01_2a)/l}if(t._l23_a>h){var c=2*t._l23_2a+3*t._l23_a*t._l12_a+t._l12_2a,_=3*t._l23_a*(t._l23_a+t._l12_a);o=(o*c+t._x1*t._l23_2a-n*t._l12_2a)/_;a=(a*c+t._y1*t._l23_2a-i*t._l12_2a)/_}t._context.bezierCurveTo(e,s,o,a,t._x2,t._y2)}function CatmullRom(t,n){this._context=t;this._alpha=n}CatmullRom.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN;this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){switch(this._point){case 2:this._context.lineTo(this._x2,this._y2);break;case 3:this.point(this._x2,this._y2);break}(this._line||0!==this._line&&1===this._point)&&this._context.closePath();this._line=1-this._line},point:function(t,n){t=+t,n=+n;if(this._point){var i=this._x2-t,e=this._y2-n;this._l23_a=Math.sqrt(this._l23_2a=Math.pow(i*i+e*e,this._alpha))}switch(this._point){case 0:this._point=1;this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;break;case 2:this._point=3;default:point$1(this,t,n);break}this._l01_a=this._l12_a,this._l12_a=this._l23_a;this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a;this._x0=this._x1,this._x1=this._x2,this._x2=t;this._y0=this._y1,this._y1=this._y2,this._y2=n}};var G=function custom(t){function catmullRom(n){return t?new CatmullRom(n,t):new Cardinal(n,0)}catmullRom.alpha=function(t){return custom(+t)};return catmullRom}(.5);function CatmullRomClosed(t,n){this._context=t;this._alpha=n}CatmullRomClosed.prototype={areaStart:noop,areaEnd:noop,lineStart:function(){this._x0=this._x1=this._x2=this._x3=this._x4=this._x5=this._y0=this._y1=this._y2=this._y3=this._y4=this._y5=NaN;this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){switch(this._point){case 1:this._context.moveTo(this._x3,this._y3);this._context.closePath();break;case 2:this._context.lineTo(this._x3,this._y3);this._context.closePath();break;case 3:this.point(this._x3,this._y3);this.point(this._x4,this._y4);this.point(this._x5,this._y5);break}},point:function(t,n){t=+t,n=+n;if(this._point){var i=this._x2-t,e=this._y2-n;this._l23_a=Math.sqrt(this._l23_2a=Math.pow(i*i+e*e,this._alpha))}switch(this._point){case 0:this._point=1;this._x3=t,this._y3=n;break;case 1:this._point=2;this._context.moveTo(this._x4=t,this._y4=n);break;case 2:this._point=3;this._x5=t,this._y5=n;break;default:point$1(this,t,n);break}this._l01_a=this._l12_a,this._l12_a=this._l23_a;this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a;this._x0=this._x1,this._x1=this._x2,this._x2=t;this._y0=this._y1,this._y1=this._y2,this._y2=n}};var J=function custom(t){function catmullRom(n){return t?new CatmullRomClosed(n,t):new CardinalClosed(n,0)}catmullRom.alpha=function(t){return custom(+t)};return catmullRom}(.5);function CatmullRomOpen(t,n){this._context=t;this._alpha=n}CatmullRomOpen.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._x2=this._y0=this._y1=this._y2=NaN;this._l01_a=this._l12_a=this._l23_a=this._l01_2a=this._l12_2a=this._l23_2a=this._point=0},lineEnd:function(){(this._line||0!==this._line&&3===this._point)&&this._context.closePath();this._line=1-this._line},point:function(t,n){t=+t,n=+n;if(this._point){var i=this._x2-t,e=this._y2-n;this._l23_a=Math.sqrt(this._l23_2a=Math.pow(i*i+e*e,this._alpha))}switch(this._point){case 0:this._point=1;break;case 1:this._point=2;break;case 2:this._point=3;this._line?this._context.lineTo(this._x2,this._y2):this._context.moveTo(this._x2,this._y2);break;case 3:this._point=4;default:point$1(this,t,n);break}this._l01_a=this._l12_a,this._l12_a=this._l23_a;this._l01_2a=this._l12_2a,this._l12_2a=this._l23_2a;this._x0=this._x1,this._x1=this._x2,this._x2=t;this._y0=this._y1,this._y1=this._y2,this._y2=n}};var K=function custom(t){function catmullRom(n){return t?new CatmullRomOpen(n,t):new CardinalOpen(n,0)}catmullRom.alpha=function(t){return custom(+t)};return catmullRom}(.5);function LinearClosed(t){this._context=t}LinearClosed.prototype={areaStart:noop,areaEnd:noop,lineStart:function(){this._point=0},lineEnd:function(){this._point&&this._context.closePath()},point:function(t,n){t=+t,n=+n;this._point?this._context.lineTo(t,n):(this._point=1,this._context.moveTo(t,n))}};function linearClosed(t){return new LinearClosed(t)}function sign(t){return t<0?-1:1}function slope3(t,n,i){var e=t._x1-t._x0,s=n-t._x1,o=(t._y1-t._y0)/(e||s<0&&-0),a=(i-t._y1)/(s||e<0&&-0),r=(o*s+a*e)/(e+s);return(sign(o)+sign(a))*Math.min(Math.abs(o),Math.abs(a),.5*Math.abs(r))||0}function slope2(t,n){var i=t._x1-t._x0;return i?(3*(t._y1-t._y0)/i-n)/2:n}function point(t,n,i){var e=t._x0,s=t._y0,o=t._x1,a=t._y1,r=(o-e)/3;t._context.bezierCurveTo(e+r,s+r*n,o-r,a-r*i,o,a)}function MonotoneX(t){this._context=t}MonotoneX.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x0=this._x1=this._y0=this._y1=this._t0=NaN;this._point=0},lineEnd:function(){switch(this._point){case 2:this._context.lineTo(this._x1,this._y1);break;case 3:point(this,this._t0,slope2(this,this._t0));break}(this._line||0!==this._line&&1===this._point)&&this._context.closePath();this._line=1-this._line},point:function(t,n){var i=NaN;t=+t,n=+n;if(t!==this._x1||n!==this._y1){switch(this._point){case 0:this._point=1;this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;break;case 2:this._point=3;point(this,slope2(this,i=slope3(this,t,n)),i);break;default:point(this,this._t0,i=slope3(this,t,n));break}this._x0=this._x1,this._x1=t;this._y0=this._y1,this._y1=n;this._t0=i}}};function MonotoneY(t){this._context=new ReflectContext(t)}(MonotoneY.prototype=Object.create(MonotoneX.prototype)).point=function(t,n){MonotoneX.prototype.point.call(this,n,t)};function ReflectContext(t){this._context=t}ReflectContext.prototype={moveTo:function(t,n){this._context.moveTo(n,t)},closePath:function(){this._context.closePath()},lineTo:function(t,n){this._context.lineTo(n,t)},bezierCurveTo:function(t,n,i,e,s,o){this._context.bezierCurveTo(n,t,e,i,o,s)}};function monotoneX(t){return new MonotoneX(t)}function monotoneY(t){return new MonotoneY(t)}function Natural(t){this._context=t}Natural.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x=[];this._y=[]},lineEnd:function(){var t=this._x,n=this._y,i=t.length;if(i){this._line?this._context.lineTo(t[0],n[0]):this._context.moveTo(t[0],n[0]);if(2===i)this._context.lineTo(t[1],n[1]);else{var e=controlPoints(t),s=controlPoints(n);for(var o=0,a=1;a<i;++o,++a)this._context.bezierCurveTo(e[0][o],s[0][o],e[1][o],s[1][o],t[a],n[a])}}(this._line||0!==this._line&&1===i)&&this._context.closePath();this._line=1-this._line;this._x=this._y=null},point:function(t,n){this._x.push(+t);this._y.push(+n)}};function controlPoints(t){var n,i,e=t.length-1,s=new Array(e),o=new Array(e),a=new Array(e);s[0]=0,o[0]=2,a[0]=t[0]+2*t[1];for(n=1;n<e-1;++n)s[n]=1,o[n]=4,a[n]=4*t[n]+2*t[n+1];s[e-1]=2,o[e-1]=7,a[e-1]=8*t[e-1]+t[e];for(n=1;n<e;++n)i=s[n]/o[n-1],o[n]-=i,a[n]-=i*a[n-1];s[e-1]=a[e-1]/o[e-1];for(n=e-2;n>=0;--n)s[n]=(a[n]-s[n+1])/o[n];o[e-1]=(t[e]+s[e-1])/2;for(n=0;n<e-1;++n)o[n]=2*t[n+1]-s[n+1];return[s,o]}function natural(t){return new Natural(t)}function Step(t,n){this._context=t;this._t=n}Step.prototype={areaStart:function(){this._line=0},areaEnd:function(){this._line=NaN},lineStart:function(){this._x=this._y=NaN;this._point=0},lineEnd:function(){0<this._t&&this._t<1&&2===this._point&&this._context.lineTo(this._x,this._y);(this._line||0!==this._line&&1===this._point)&&this._context.closePath();this._line>=0&&(this._t=1-this._t,this._line=1-this._line)},point:function(t,n){t=+t,n=+n;switch(this._point){case 0:this._point=1;this._line?this._context.lineTo(t,n):this._context.moveTo(t,n);break;case 1:this._point=2;default:if(this._t<=0){this._context.lineTo(this._x,n);this._context.lineTo(t,n)}else{var i=this._x*(1-this._t)+t*this._t;this._context.lineTo(i,this._y);this._context.lineTo(i,n)}break}this._x=t,this._y=n}};function step(t){return new Step(t,.5)}function stepBefore(t){return new Step(t,0)}function stepAfter(t){return new Step(t,1)}function none$1(t,n){if((s=t.length)>1)for(var i,e,s,o=1,a=t[n[0]],r=a.length;o<s;++o){e=a,a=t[n[o]];for(i=0;i<r;++i)a[i][1]+=a[i][0]=isNaN(e[i][1])?e[i][0]:e[i][1]}}function none(t){var n=t.length,i=new Array(n);while(--n>=0)i[n]=n;return i}function stackValue(t,n){return t[n]}function stackSeries(t){const n=[];n.key=t;return n}function stack(){var t=constant([]),n=none,i=none$1,e=stackValue;function stack(s){var o,a,r=Array.from(t.apply(this,arguments),stackSeries),h=r.length,l=-1;for(const t of s)for(o=0,++l;o<h;++o)(r[o][l]=[0,+e(t,r[o].key,l,s)]).data=t;for(o=0,a=array(n(r));o<h;++o)r[a[o]].index=o;i(r,a);return r}stack.keys=function(n){return arguments.length?(t="function"===typeof n?n:constant(Array.from(n)),stack):t};stack.value=function(t){return arguments.length?(e="function"===typeof t?t:constant(+t),stack):e};stack.order=function(t){return arguments.length?(n=null==t?none:"function"===typeof t?t:constant(Array.from(t)),stack):n};stack.offset=function(t){return arguments.length?(i=null==t?none$1:t,stack):i};return stack}function expand(t,n){if((e=t.length)>0){for(var i,e,s,o=0,a=t[0].length;o<a;++o){for(s=i=0;i<e;++i)s+=t[i][o][1]||0;if(s)for(i=0;i<e;++i)t[i][o][1]/=s}none$1(t,n)}}function diverging(t,n){if((r=t.length)>0)for(var i,e,s,o,a,r,h=0,l=t[n[0]].length;h<l;++h)for(o=a=0,i=0;i<r;++i)(s=(e=t[n[i]][h])[1]-e[0])>0?(e[0]=o,e[1]=o+=s):s<0?(e[1]=a,e[0]=a+=s):(e[0]=0,e[1]=s)}function silhouette(t,n){if((i=t.length)>0){for(var i,e=0,s=t[n[0]],o=s.length;e<o;++e){for(var a=0,r=0;a<i;++a)r+=t[a][e][1]||0;s[e][1]+=s[e][0]=-r/2}none$1(t,n)}}function wiggle(t,n){if((s=t.length)>0&&(e=(i=t[n[0]]).length)>0){for(var i,e,s,o=0,a=1;a<e;++a){for(var r=0,h=0,l=0;r<s;++r){var c=t[n[r]],_=c[a][1]||0,u=c[a-1][1]||0,f=(_-u)/2;for(var p=0;p<r;++p){var d=t[n[p]],v=d[a][1]||0,m=d[a-1][1]||0;f+=v-m}h+=_,l+=f*_}i[a-1][1]+=i[a-1][0]=o;h&&(o-=l/h)}i[a-1][1]+=i[a-1][0]=o;none$1(t,n)}}function appearance(t){var n=t.map(peak);return none(t).sort((function(t,i){return n[t]-n[i]}))}function peak(t){var n,i=-1,e=0,s=t.length,o=-Infinity;while(++i<s)(n=+t[i][1])>o&&(o=n,e=i);return e}function ascending(t){var n=t.map(sum);return none(t).sort((function(t,i){return n[t]-n[i]}))}function sum(t){var n,i=0,e=-1,s=t.length;while(++e<s)(n=+t[e][1])&&(i+=n);return i}function descending(t){return ascending(t).reverse()}function insideOut(t){var n,i,e=t.length,s=t.map(sum),o=appearance(t),a=0,r=0,h=[],l=[];for(n=0;n<e;++n){i=o[n];if(a<r){a+=s[i];h.push(i)}else{r+=s[i];l.push(i)}}return l.reverse().concat(h)}function reverse(t){return none(t).reverse()}export{arc,area,areaRadial,basis as curveBasis,basisClosed as curveBasisClosed,basisOpen as curveBasisOpen,bumpX as curveBumpX,bumpY as curveBumpY,j as curveBundle,H as curveCardinal,W as curveCardinalClosed,F as curveCardinalOpen,G as curveCatmullRom,J as curveCatmullRomClosed,K as curveCatmullRomOpen,curveLinear,linearClosed as curveLinearClosed,monotoneX as curveMonotoneX,monotoneY as curveMonotoneY,natural as curveNatural,step as curveStep,stepAfter as curveStepAfter,stepBefore as curveStepBefore,line,lineRadial$1 as lineRadial,link,linkHorizontal,linkRadial,linkVertical,pie,pointRadial,areaRadial as radialArea,lineRadial$1 as radialLine,stack,diverging as stackOffsetDiverging,expand as stackOffsetExpand,none$1 as stackOffsetNone,silhouette as stackOffsetSilhouette,wiggle as stackOffsetWiggle,appearance as stackOrderAppearance,ascending as stackOrderAscending,descending as stackOrderDescending,insideOut as stackOrderInsideOut,none as stackOrderNone,reverse as stackOrderReverse,Symbol$1 as symbol,d as symbolAsterisk,v as symbolCircle,m as symbolCross,g as symbolDiamond,k as symbolDiamond2,w as symbolPlus,R as symbolSquare,C as symbolSquare2,A as symbolStar,q as symbolTimes,O as symbolTriangle,B as symbolTriangle2,I as symbolWye,q as symbolX,V as symbols,V as symbolsFill,D as symbolsStroke};
+// d3-shape@1.3.7 downloaded from https://ga.jspm.io/npm:d3-shape@1.3.7/dist/d3-shape.js
+
+import t from"d3-path";var n="undefined"!==typeof globalThis?globalThis:"undefined"!==typeof self?self:global;var i={};(function(n,e){e(i,t)})(i,(function(t,i){function constant(t){return function constant(){return t}}var e=Math.abs;var a=Math.atan2;var s=Math.cos;var o=Math.max;var r=Math.min;var l=Math.sin;var h=Math.sqrt;var c=1e-12;var _=Math.PI;var u=_/2;var f=2*_;function acos(t){return t>1?0:t<-1?_:Math.acos(t)}function asin(t){return t>=1?u:t<=-1?-u:Math.asin(t)}function arcInnerRadius(t){return t.innerRadius}function arcOuterRadius(t){return t.outerRadius}function arcStartAngle(t){return t.startAngle}function arcEndAngle(t){return t.endAngle}function arcPadAngle(t){return t&&t.padAngle}function intersect(t,n,i,e,a,s,o,r){var l=i-t,h=e-n,_=o-a,u=r-s,f=u*l-_*h;if(!(f*f<c)){f=(_*(n-s)-u*(t-a))/f;return[t+f*l,n+f*h]}}function cornerTangents(t,n,i,e,a,s,r){var l=t-i,c=n-e,_=(r?s:-s)/h(l*l+c*c),u=_*c,f=-_*l,p=t+u,d=n+f,v=i+u,m=e+f,k=(p+v)/2,g=(d+m)/2,b=v-p,T=m-d,R=b*b+T*T,C=a-s,w=p*m-v*d,M=(T<0?-1:1)*h(o(0,C*C*R-w*w)),S=(w*T-b*M)/R,N=(-w*b-T*M)/R,O=(w*T+b*M)/R,A=(-w*b+T*M)/R,E=S-k,P=N-g,$=O-k,B=A-g;E*E+P*P>$*$+B*B&&(S=O,N=A);return{cx:S,cy:N,x01:-u,y01:-f,x11:S*(a/C-1),y11:N*(a/C-1)}}function arc(){var t=arcInnerRadius,o=arcOuterRadius,p=constant(0),d=null,v=arcStartAngle,m=arcEndAngle,k=arcPadAngle,g=null;function arc(){var b,T,R=+t.apply(this||n,arguments),C=+o.apply(this||n,arguments),w=v.apply(this||n,arguments)-u,M=m.apply(this||n,arguments)-u,S=e(M-w),N=M>w;g||(g=b=i.path());C<R&&(T=C,C=R,R=T);if(C>c)if(S>f-c){g.moveTo(C*s(w),C*l(w));g.arc(0,0,C,w,M,!N);if(R>c){g.moveTo(R*s(M),R*l(M));g.arc(0,0,R,M,w,N)}}else{var O=w,A=M,E=w,P=M,$=S,B=S,q=k.apply(this||n,arguments)/2,z=q>c&&(d?+d.apply(this||n,arguments):h(R*R+C*C)),L=r(e(C-R)/2,+p.apply(this||n,arguments)),X=L,Y=L,V,I;if(z>c){var D=asin(z/R*l(q)),H=asin(z/C*l(q));($-=2*D)>c?(D*=N?1:-1,E+=D,P-=D):($=0,E=P=(w+M)/2);(B-=2*H)>c?(H*=N?1:-1,O+=H,A-=H):(B=0,O=A=(w+M)/2)}var W=C*s(O),j=C*l(O),F=R*s(P),G=R*l(P);if(L>c){var J=C*s(A),K=C*l(A),Q=R*s(E),U=R*l(E),Z;if(S<_&&(Z=intersect(W,j,Q,U,J,K,F,G))){var tt=W-Z[0],nt=j-Z[1],it=J-Z[0],et=K-Z[1],at=1/l(acos((tt*it+nt*et)/(h(tt*tt+nt*nt)*h(it*it+et*et)))/2),st=h(Z[0]*Z[0]+Z[1]*Z[1]);X=r(L,(R-st)/(at-1));Y=r(L,(C-st)/(at+1))}}if(B>c)if(Y>c){V=cornerTangents(Q,U,W,j,C,Y,N);I=cornerTangents(J,K,F,G,C,Y,N);g.moveTo(V.cx+V.x01,V.cy+V.y01);if(Y<L)g.arc(V.cx,V.cy,Y,a(V.y01,V.x01),a(I.y01,I.x01),!N);else{g.arc(V.cx,V.cy,Y,a(V.y01,V.x01),a(V.y11,V.x11),!N);g.arc(0,0,C,a(V.cy+V.y11,V.cx+V.x11),a(I.cy+I.y11,I.cx+I.x11),!N);g.arc(I.cx,I.cy,Y,a(I.y11,I.x11),a(I.y01,I.x01),!N)}}else g.moveTo(W,j),g.arc(0,0,C,O,A,!N);else g.moveTo(W,j);if(R>c&&$>c)if(X>c){V=cornerTangents(F,G,J,K,R,-X,N);I=cornerTangents(W,j,Q,U,R,-X,N);g.lineTo(V.cx+V.x01,V.cy+V.y01);if(X<L)g.arc(V.cx,V.cy,X,a(V.y01,V.x01),a(I.y01,I.x01),!N);else{g.arc(V.cx,V.cy,X,a(V.y01,V.x01),a(V.y11,V.x11),!N);g.arc(0,0,R,a(V.cy+V.y11,V.cx+V.x11),a(I.cy+I.y11,I.cx+I.x11),N);g.arc(I.cx,I.cy,X,a(I.y11,I.x11),a(I.y01,I.x01),!N)}}else g.arc(0,0,R,P,E,N);else g.lineTo(F,G)}else g.moveTo(0,0);g.closePath();if(b)return g=null,b+""||null}arc.centroid=function(){var i=(+t.apply(this||n,arguments)+ +o.apply(this||n,arguments))/2,e=(+v.apply(this||n,arguments)+ +m.apply(this||n,arguments))/2-_/2;return[s(e)*i,l(e)*i]};arc.innerRadius=function(n){return arguments.length?(t="function"===typeof n?n:constant(+n),arc):t};arc.outerRadius=function(t){return arguments.length?(o="function"===typeof t?t:constant(+t),arc):o};arc.cornerRadius=function(t){return arguments.length?(p="function"===typeof t?t:constant(+t),arc):p};arc.padRadius=function(t){return arguments.length?(d=null==t?null:"function"===typeof t?t:constant(+t),arc):d};arc.startAngle=function(t){return arguments.length?(v="function"===typeof t?t:constant(+t),arc):v};arc.endAngle=function(t){return arguments.length?(m="function"===typeof t?t:constant(+t),arc):m};arc.padAngle=function(t){return arguments.length?(k="function"===typeof t?t:constant(+t),arc):k};arc.context=function(t){return arguments.length?(g=null==t?null:t,arc):g};return arc}function Linear(t){(this||n)._context=t}Linear.prototype={areaStart:function(){(this||n)._line=0},areaEnd:function(){(this||n)._line=NaN},lineStart:function(){(this||n)._point=0},lineEnd:function(){((this||n)._line||0!==(this||n)._line&&1===(this||n)._point)&&(this||n)._context.closePath();(this||n)._line=1-(this||n)._line},point:function(t,i){t=+t,i=+i;switch((this||n)._point){case 0:(this||n)._point=1;(this||n)._line?(this||n)._context.lineTo(t,i):(this||n)._context.moveTo(t,i);break;case 1:(this||n)._point=2;default:(this||n)._context.lineTo(t,i);break}}};function curveLinear(t){return new Linear(t)}function x(t){return t[0]}function y(t){return t[1]}function line(){var t=x,n=y,e=constant(true),a=null,s=curveLinear,o=null;function line(r){var l,h=r.length,c,_=false,u;null==a&&(o=s(u=i.path()));for(l=0;l<=h;++l){!(l<h&&e(c=r[l],l,r))===_&&((_=!_)?o.lineStart():o.lineEnd());_&&o.point(+t(c,l,r),+n(c,l,r))}if(u)return o=null,u+""||null}line.x=function(n){return arguments.length?(t="function"===typeof n?n:constant(+n),line):t};line.y=function(t){return arguments.length?(n="function"===typeof t?t:constant(+t),line):n};line.defined=function(t){return arguments.length?(e="function"===typeof t?t:constant(!!t),line):e};line.curve=function(t){return arguments.length?(s=t,null!=a&&(o=s(a)),line):s};line.context=function(t){return arguments.length?(null==t?a=o=null:o=s(a=t),line):a};return line}function area(){var t=x,n=null,e=constant(0),a=y,s=constant(true),o=null,r=curveLinear,l=null;function area(h){var c,_,u,f=h.length,p,d=false,v,m=new Array(f),k=new Array(f);null==o&&(l=r(v=i.path()));for(c=0;c<=f;++c){if(!(c<f&&s(p=h[c],c,h))===d)if(d=!d){_=c;l.areaStart();l.lineStart()}else{l.lineEnd();l.lineStart();for(u=c-1;u>=_;--u)l.point(m[u],k[u]);l.lineEnd();l.areaEnd()}if(d){m[c]=+t(p,c,h),k[c]=+e(p,c,h);l.point(n?+n(p,c,h):m[c],a?+a(p,c,h):k[c])}}if(v)return l=null,v+""||null}function arealine(){return line().defined(s).curve(r).context(o)}area.x=function(i){return arguments.length?(t="function"===typeof i?i:constant(+i),n=null,area):t};area.x0=function(n){return arguments.length?(t="function"===typeof n?n:constant(+n),area):t};area.x1=function(t){return arguments.length?(n=null==t?null:"function"===typeof t?t:constant(+t),area):n};area.y=function(t){return arguments.length?(e="function"===typeof t?t:constant(+t),a=null,area):e};area.y0=function(t){return arguments.length?(e="function"===typeof t?t:constant(+t),area):e};area.y1=function(t){return arguments.length?(a=null==t?null:"function"===typeof t?t:constant(+t),area):a};area.lineX0=area.lineY0=function(){return arealine().x(t).y(e)};area.lineY1=function(){return arealine().x(t).y(a)};area.lineX1=function(){return arealine().x(n).y(e)};area.defined=function(t){return arguments.length?(s="function"===typeof t?t:constant(!!t),area):s};area.curve=function(t){return arguments.length?(r=t,null!=o&&(l=r(o)),area):r};area.context=function(t){return arguments.length?(null==t?o=l=null:l=r(o=t),area):o};return area}function descending(t,n){return n<t?-1:n>t?1:n>=t?0:NaN}function identity(t){return t}function pie(){var t=identity,i=descending,e=null,a=constant(0),s=constant(f),o=constant(0);function pie(r){var l,h=r.length,c,_,u=0,p=new Array(h),d=new Array(h),v=+a.apply(this||n,arguments),m=Math.min(f,Math.max(-f,s.apply(this||n,arguments)-v)),k,g=Math.min(Math.abs(m)/h,o.apply(this||n,arguments)),b=g*(m<0?-1:1),T;for(l=0;l<h;++l)(T=d[p[l]=l]=+t(r[l],l,r))>0&&(u+=T);null!=i?p.sort((function(t,n){return i(d[t],d[n])})):null!=e&&p.sort((function(t,n){return e(r[t],r[n])}));for(l=0,_=u?(m-h*b)/u:0;l<h;++l,v=k)c=p[l],T=d[c],k=v+(T>0?T*_:0)+b,d[c]={data:r[c],index:l,value:T,startAngle:v,endAngle:k,padAngle:g};return d}pie.value=function(n){return arguments.length?(t="function"===typeof n?n:constant(+n),pie):t};pie.sortValues=function(t){return arguments.length?(i=t,e=null,pie):i};pie.sort=function(t){return arguments.length?(e=t,i=null,pie):e};pie.startAngle=function(t){return arguments.length?(a="function"===typeof t?t:constant(+t),pie):a};pie.endAngle=function(t){return arguments.length?(s="function"===typeof t?t:constant(+t),pie):s};pie.padAngle=function(t){return arguments.length?(o="function"===typeof t?t:constant(+t),pie):o};return pie}var p=curveRadial(curveLinear);function Radial(t){(this||n)._curve=t}Radial.prototype={areaStart:function(){(this||n)._curve.areaStart()},areaEnd:function(){(this||n)._curve.areaEnd()},lineStart:function(){(this||n)._curve.lineStart()},lineEnd:function(){(this||n)._curve.lineEnd()},point:function(t,i){(this||n)._curve.point(i*Math.sin(t),i*-Math.cos(t))}};function curveRadial(t){function radial(n){return new Radial(t(n))}radial._curve=t;return radial}function lineRadial(t){var n=t.curve;t.angle=t.x,delete t.x;t.radius=t.y,delete t.y;t.curve=function(t){return arguments.length?n(curveRadial(t)):n()._curve};return t}function lineRadial$1(){return lineRadial(line().curve(p))}function areaRadial(){var t=area().curve(p),n=t.curve,i=t.lineX0,e=t.lineX1,a=t.lineY0,s=t.lineY1;t.angle=t.x,delete t.x;t.startAngle=t.x0,delete t.x0;t.endAngle=t.x1,delete t.x1;t.radius=t.y,delete t.y;t.innerRadius=t.y0,delete t.y0;t.outerRadius=t.y1,delete t.y1;t.lineStartAngle=function(){return lineRadial(i())},delete t.lineX0;t.lineEndAngle=function(){return lineRadial(e())},delete t.lineX1;t.lineInnerRadius=function(){return lineRadial(a())},delete t.lineY0;t.lineOuterRadius=function(){return lineRadial(s())},delete t.lineY1;t.curve=function(t){return arguments.length?n(curveRadial(t)):n()._curve};return t}function pointRadial(t,n){return[(n=+n)*Math.cos(t-=Math.PI/2),n*Math.sin(t)]}var d=Array.prototype.slice;function linkSource(t){return t.source}function linkTarget(t){return t.target}function link(t){var e=linkSource,a=linkTarget,s=x,o=y,r=null;function link(){var l,h=d.call(arguments),c=e.apply(this||n,h),_=a.apply(this||n,h);r||(r=l=i.path());t(r,+s.apply(this||n,(h[0]=c,h)),+o.apply(this||n,h),+s.apply(this||n,(h[0]=_,h)),+o.apply(this||n,h));if(l)return r=null,l+""||null}link.source=function(t){return arguments.length?(e=t,link):e};link.target=function(t){return arguments.length?(a=t,link):a};link.x=function(t){return arguments.length?(s="function"===typeof t?t:constant(+t),link):s};link.y=function(t){return arguments.length?(o="function"===typeof t?t:constant(+t),link):o};link.context=function(t){return arguments.length?(r=null==t?null:t,link):r};return link}function curveHorizontal(t,n,i,e,a){t.moveTo(n,i);t.bezierCurveTo(n=(n+e)/2,i,n,a,e,a)}function curveVertical(t,n,i,e,a){t.moveTo(n,i);t.bezierCurveTo(n,i=(i+a)/2,e,i,e,a)}function curveRadial$1(t,n,i,e,a){var s=pointRadial(n,i),o=pointRadial(n,i=(i+a)/2),r=pointRadial(e,i),l=pointRadial(e,a);t.moveTo(s[0],s[1]);t.bezierCurveTo(o[0],o[1],r[0],r[1],l[0],l[1])}function linkHorizontal(){return link(curveHorizontal)}function linkVertical(){return link(curveVertical)}function linkRadial(){var t=link(curveRadial$1);t.angle=t.x,delete t.x;t.radius=t.y,delete t.y;return t}var v={draw:function(t,n){var i=Math.sqrt(n/_);t.moveTo(i,0);t.arc(0,0,i,0,f)}};var m={draw:function(t,n){var i=Math.sqrt(n/5)/2;t.moveTo(-3*i,-i);t.lineTo(-i,-i);t.lineTo(-i,-3*i);t.lineTo(i,-3*i);t.lineTo(i,-i);t.lineTo(3*i,-i);t.lineTo(3*i,i);t.lineTo(i,i);t.lineTo(i,3*i);t.lineTo(-i,3*i);t.lineTo(-i,i);t.lineTo(-3*i,i);t.closePath()}};var k=Math.sqrt(1/3),g=2*k;var b={draw:function(t,n){var i=Math.sqrt(n/g),e=i*k;t.moveTo(0,-i);t.lineTo(e,0);t.lineTo(0,i);t.lineTo(-e,0);t.closePath()}};var T=.8908130915292852,R=Math.sin(_/10)/Math.sin(7*_/10),C=Math.sin(f/10)*R,w=-Math.cos(f/10)*R;var M={draw:function(t,n){var i=Math.sqrt(n*T),e=C*i,a=w*i;t.moveTo(0,-i);t.lineTo(e,a);for(var s=1;s<5;++s){var o=f*s/5,r=Math.cos(o),l=Math.sin(o);t.lineTo(l*i,-r*i);t.lineTo(r*e-l*a,l*e+r*a)}t.closePath()}};var S={draw:function(t,n){var i=Math.sqrt(n),e=-i/2;t.rect(e,e,i,i)}};var N=Math.sqrt(3);var O={draw:function(t,n){var i=-Math.sqrt(n/(3*N));t.moveTo(0,2*i);t.lineTo(-N*i,-i);t.lineTo(N*i,-i);t.closePath()}};var A=-.5,E=Math.sqrt(3)/2,P=1/Math.sqrt(12),$=3*(P/2+1);var B={draw:function(t,n){var i=Math.sqrt(n/$),e=i/2,a=i*P,s=e,o=i*P+i,r=-s,l=o;t.moveTo(e,a);t.lineTo(s,o);t.lineTo(r,l);t.lineTo(A*e-E*a,E*e+A*a);t.lineTo(A*s-E*o,E*s+A*o);t.lineTo(A*r-E*l,E*r+A*l);t.lineTo(A*e+E*a,A*a-E*e);t.lineTo(A*s+E*o,A*o-E*s);t.lineTo(A*r+E*l,A*l-E*r);t.closePath()}};var q=[v,m,b,S,M,O,B];function symbol(){var t=constant(v),e=constant(64),a=null;function symbol(){var s;a||(a=s=i.path());t.apply(this||n,arguments).draw(a,+e.apply(this||n,arguments));if(s)return a=null,s+""||null}symbol.type=function(n){return arguments.length?(t="function"===typeof n?n:constant(n),symbol):t};symbol.size=function(t){return arguments.length?(e="function"===typeof t?t:constant(+t),symbol):e};symbol.context=function(t){return arguments.length?(a=null==t?null:t,symbol):a};return symbol}function noop(){}function point(t,n,i){t._context.bezierCurveTo((2*t._x0+t._x1)/3,(2*t._y0+t._y1)/3,(t._x0+2*t._x1)/3,(t._y0+2*t._y1)/3,(t._x0+4*t._x1+n)/6,(t._y0+4*t._y1+i)/6)}function Basis(t){(this||n)._context=t}Basis.prototype={areaStart:function(){(this||n)._line=0},areaEnd:function(){(this||n)._line=NaN},lineStart:function(){(this||n)._x0=(this||n)._x1=(this||n)._y0=(this||n)._y1=NaN;(this||n)._point=0},lineEnd:function(){switch((this||n)._point){case 3:point(this||n,(this||n)._x1,(this||n)._y1);case 2:(this||n)._context.lineTo((this||n)._x1,(this||n)._y1);break}((this||n)._line||0!==(this||n)._line&&1===(this||n)._point)&&(this||n)._context.closePath();(this||n)._line=1-(this||n)._line},point:function(t,i){t=+t,i=+i;switch((this||n)._point){case 0:(this||n)._point=1;(this||n)._line?(this||n)._context.lineTo(t,i):(this||n)._context.moveTo(t,i);break;case 1:(this||n)._point=2;break;case 2:(this||n)._point=3;(this||n)._context.lineTo((5*(this||n)._x0+(this||n)._x1)/6,(5*(this||n)._y0+(this||n)._y1)/6);default:point(this||n,t,i);break}(this||n)._x0=(this||n)._x1,(this||n)._x1=t;(this||n)._y0=(this||n)._y1,(this||n)._y1=i}};function basis(t){return new Basis(t)}function BasisClosed(t){(this||n)._context=t}BasisClosed.prototype={areaStart:noop,areaEnd:noop,lineStart:function(){(this||n)._x0=(this||n)._x1=(this||n)._x2=(this||n)._x3=(this||n)._x4=(this||n)._y0=(this||n)._y1=(this||n)._y2=(this||n)._y3=(this||n)._y4=NaN;(this||n)._point=0},lineEnd:function(){switch((this||n)._point){case 1:(this||n)._context.moveTo((this||n)._x2,(this||n)._y2);(this||n)._context.closePath();break;case 2:(this||n)._context.moveTo(((this||n)._x2+2*(this||n)._x3)/3,((this||n)._y2+2*(this||n)._y3)/3);(this||n)._context.lineTo(((this||n)._x3+2*(this||n)._x2)/3,((this||n)._y3+2*(this||n)._y2)/3);(this||n)._context.closePath();break;case 3:this.point((this||n)._x2,(this||n)._y2);this.point((this||n)._x3,(this||n)._y3);this.point((this||n)._x4,(this||n)._y4);break}},point:function(t,i){t=+t,i=+i;switch((this||n)._point){case 0:(this||n)._point=1;(this||n)._x2=t,(this||n)._y2=i;break;case 1:(this||n)._point=2;(this||n)._x3=t,(this||n)._y3=i;break;case 2:(this||n)._point=3;(this||n)._x4=t,(this||n)._y4=i;(this||n)._context.moveTo(((this||n)._x0+4*(this||n)._x1+t)/6,((this||n)._y0+4*(this||n)._y1+i)/6);break;default:point(this||n,t,i);break}(this||n)._x0=(this||n)._x1,(this||n)._x1=t;(this||n)._y0=(this||n)._y1,(this||n)._y1=i}};function basisClosed(t){return new BasisClosed(t)}function BasisOpen(t){(this||n)._context=t}BasisOpen.prototype={areaStart:function(){(this||n)._line=0},areaEnd:function(){(this||n)._line=NaN},lineStart:function(){(this||n)._x0=(this||n)._x1=(this||n)._y0=(this||n)._y1=NaN;(this||n)._point=0},lineEnd:function(){((this||n)._line||0!==(this||n)._line&&3===(this||n)._point)&&(this||n)._context.closePath();(this||n)._line=1-(this||n)._line},point:function(t,i){t=+t,i=+i;switch((this||n)._point){case 0:(this||n)._point=1;break;case 1:(this||n)._point=2;break;case 2:(this||n)._point=3;var e=((this||n)._x0+4*(this||n)._x1+t)/6,a=((this||n)._y0+4*(this||n)._y1+i)/6;(this||n)._line?(this||n)._context.lineTo(e,a):(this||n)._context.moveTo(e,a);break;case 3:(this||n)._point=4;default:point(this||n,t,i);break}(this||n)._x0=(this||n)._x1,(this||n)._x1=t;(this||n)._y0=(this||n)._y1,(this||n)._y1=i}};function basisOpen(t){return new BasisOpen(t)}function Bundle(t,i){(this||n)._basis=new Basis(t);(this||n)._beta=i}Bundle.prototype={lineStart:function(){(this||n)._x=[];(this||n)._y=[];(this||n)._basis.lineStart()},lineEnd:function(){var t=(this||n)._x,i=(this||n)._y,e=t.length-1;if(e>0){var a=t[0],s=i[0],o=t[e]-a,r=i[e]-s,l=-1,h;while(++l<=e){h=l/e;(this||n)._basis.point((this||n)._beta*t[l]+(1-(this||n)._beta)*(a+h*o),(this||n)._beta*i[l]+(1-(this||n)._beta)*(s+h*r))}}(this||n)._x=(this||n)._y=null;(this||n)._basis.lineEnd()},point:function(t,i){(this||n)._x.push(+t);(this||n)._y.push(+i)}};var z=function custom(t){function bundle(n){return 1===t?new Basis(n):new Bundle(n,t)}bundle.beta=function(t){return custom(+t)};return bundle}(.85);function point$1(t,n,i){t._context.bezierCurveTo(t._x1+t._k*(t._x2-t._x0),t._y1+t._k*(t._y2-t._y0),t._x2+t._k*(t._x1-n),t._y2+t._k*(t._y1-i),t._x2,t._y2)}function Cardinal(t,i){(this||n)._context=t;(this||n)._k=(1-i)/6}Cardinal.prototype={areaStart:function(){(this||n)._line=0},areaEnd:function(){(this||n)._line=NaN},lineStart:function(){(this||n)._x0=(this||n)._x1=(this||n)._x2=(this||n)._y0=(this||n)._y1=(this||n)._y2=NaN;(this||n)._point=0},lineEnd:function(){switch((this||n)._point){case 2:(this||n)._context.lineTo((this||n)._x2,(this||n)._y2);break;case 3:point$1(this||n,(this||n)._x1,(this||n)._y1);break}((this||n)._line||0!==(this||n)._line&&1===(this||n)._point)&&(this||n)._context.closePath();(this||n)._line=1-(this||n)._line},point:function(t,i){t=+t,i=+i;switch((this||n)._point){case 0:(this||n)._point=1;(this||n)._line?(this||n)._context.lineTo(t,i):(this||n)._context.moveTo(t,i);break;case 1:(this||n)._point=2;(this||n)._x1=t,(this||n)._y1=i;break;case 2:(this||n)._point=3;default:point$1(this||n,t,i);break}(this||n)._x0=(this||n)._x1,(this||n)._x1=(this||n)._x2,(this||n)._x2=t;(this||n)._y0=(this||n)._y1,(this||n)._y1=(this||n)._y2,(this||n)._y2=i}};var L=function custom(t){function cardinal(n){return new Cardinal(n,t)}cardinal.tension=function(t){return custom(+t)};return cardinal}(0);function CardinalClosed(t,i){(this||n)._context=t;(this||n)._k=(1-i)/6}CardinalClosed.prototype={areaStart:noop,areaEnd:noop,lineStart:function(){(this||n)._x0=(this||n)._x1=(this||n)._x2=(this||n)._x3=(this||n)._x4=(this||n)._x5=(this||n)._y0=(this||n)._y1=(this||n)._y2=(this||n)._y3=(this||n)._y4=(this||n)._y5=NaN;(this||n)._point=0},lineEnd:function(){switch((this||n)._point){case 1:(this||n)._context.moveTo((this||n)._x3,(this||n)._y3);(this||n)._context.closePath();break;case 2:(this||n)._context.lineTo((this||n)._x3,(this||n)._y3);(this||n)._context.closePath();break;case 3:this.point((this||n)._x3,(this||n)._y3);this.point((this||n)._x4,(this||n)._y4);this.point((this||n)._x5,(this||n)._y5);break}},point:function(t,i){t=+t,i=+i;switch((this||n)._point){case 0:(this||n)._point=1;(this||n)._x3=t,(this||n)._y3=i;break;case 1:(this||n)._point=2;(this||n)._context.moveTo((this||n)._x4=t,(this||n)._y4=i);break;case 2:(this||n)._point=3;(this||n)._x5=t,(this||n)._y5=i;break;default:point$1(this||n,t,i);break}(this||n)._x0=(this||n)._x1,(this||n)._x1=(this||n)._x2,(this||n)._x2=t;(this||n)._y0=(this||n)._y1,(this||n)._y1=(this||n)._y2,(this||n)._y2=i}};var X=function custom(t){function cardinal(n){return new CardinalClosed(n,t)}cardinal.tension=function(t){return custom(+t)};return cardinal}(0);function CardinalOpen(t,i){(this||n)._context=t;(this||n)._k=(1-i)/6}CardinalOpen.prototype={areaStart:function(){(this||n)._line=0},areaEnd:function(){(this||n)._line=NaN},lineStart:function(){(this||n)._x0=(this||n)._x1=(this||n)._x2=(this||n)._y0=(this||n)._y1=(this||n)._y2=NaN;(this||n)._point=0},lineEnd:function(){((this||n)._line||0!==(this||n)._line&&3===(this||n)._point)&&(this||n)._context.closePath();(this||n)._line=1-(this||n)._line},point:function(t,i){t=+t,i=+i;switch((this||n)._point){case 0:(this||n)._point=1;break;case 1:(this||n)._point=2;break;case 2:(this||n)._point=3;(this||n)._line?(this||n)._context.lineTo((this||n)._x2,(this||n)._y2):(this||n)._context.moveTo((this||n)._x2,(this||n)._y2);break;case 3:(this||n)._point=4;default:point$1(this||n,t,i);break}(this||n)._x0=(this||n)._x1,(this||n)._x1=(this||n)._x2,(this||n)._x2=t;(this||n)._y0=(this||n)._y1,(this||n)._y1=(this||n)._y2,(this||n)._y2=i}};var Y=function custom(t){function cardinal(n){return new CardinalOpen(n,t)}cardinal.tension=function(t){return custom(+t)};return cardinal}(0);function point$2(t,n,i){var e=t._x1,a=t._y1,s=t._x2,o=t._y2;if(t._l01_a>c){var r=2*t._l01_2a+3*t._l01_a*t._l12_a+t._l12_2a,l=3*t._l01_a*(t._l01_a+t._l12_a);e=(e*r-t._x0*t._l12_2a+t._x2*t._l01_2a)/l;a=(a*r-t._y0*t._l12_2a+t._y2*t._l01_2a)/l}if(t._l23_a>c){var h=2*t._l23_2a+3*t._l23_a*t._l12_a+t._l12_2a,_=3*t._l23_a*(t._l23_a+t._l12_a);s=(s*h+t._x1*t._l23_2a-n*t._l12_2a)/_;o=(o*h+t._y1*t._l23_2a-i*t._l12_2a)/_}t._context.bezierCurveTo(e,a,s,o,t._x2,t._y2)}function CatmullRom(t,i){(this||n)._context=t;(this||n)._alpha=i}CatmullRom.prototype={areaStart:function(){(this||n)._line=0},areaEnd:function(){(this||n)._line=NaN},lineStart:function(){(this||n)._x0=(this||n)._x1=(this||n)._x2=(this||n)._y0=(this||n)._y1=(this||n)._y2=NaN;(this||n)._l01_a=(this||n)._l12_a=(this||n)._l23_a=(this||n)._l01_2a=(this||n)._l12_2a=(this||n)._l23_2a=(this||n)._point=0},lineEnd:function(){switch((this||n)._point){case 2:(this||n)._context.lineTo((this||n)._x2,(this||n)._y2);break;case 3:this.point((this||n)._x2,(this||n)._y2);break}((this||n)._line||0!==(this||n)._line&&1===(this||n)._point)&&(this||n)._context.closePath();(this||n)._line=1-(this||n)._line},point:function(t,i){t=+t,i=+i;if((this||n)._point){var e=(this||n)._x2-t,a=(this||n)._y2-i;(this||n)._l23_a=Math.sqrt((this||n)._l23_2a=Math.pow(e*e+a*a,(this||n)._alpha))}switch((this||n)._point){case 0:(this||n)._point=1;(this||n)._line?(this||n)._context.lineTo(t,i):(this||n)._context.moveTo(t,i);break;case 1:(this||n)._point=2;break;case 2:(this||n)._point=3;default:point$2(this||n,t,i);break}(this||n)._l01_a=(this||n)._l12_a,(this||n)._l12_a=(this||n)._l23_a;(this||n)._l01_2a=(this||n)._l12_2a,(this||n)._l12_2a=(this||n)._l23_2a;(this||n)._x0=(this||n)._x1,(this||n)._x1=(this||n)._x2,(this||n)._x2=t;(this||n)._y0=(this||n)._y1,(this||n)._y1=(this||n)._y2,(this||n)._y2=i}};var V=function custom(t){function catmullRom(n){return t?new CatmullRom(n,t):new Cardinal(n,0)}catmullRom.alpha=function(t){return custom(+t)};return catmullRom}(.5);function CatmullRomClosed(t,i){(this||n)._context=t;(this||n)._alpha=i}CatmullRomClosed.prototype={areaStart:noop,areaEnd:noop,lineStart:function(){(this||n)._x0=(this||n)._x1=(this||n)._x2=(this||n)._x3=(this||n)._x4=(this||n)._x5=(this||n)._y0=(this||n)._y1=(this||n)._y2=(this||n)._y3=(this||n)._y4=(this||n)._y5=NaN;(this||n)._l01_a=(this||n)._l12_a=(this||n)._l23_a=(this||n)._l01_2a=(this||n)._l12_2a=(this||n)._l23_2a=(this||n)._point=0},lineEnd:function(){switch((this||n)._point){case 1:(this||n)._context.moveTo((this||n)._x3,(this||n)._y3);(this||n)._context.closePath();break;case 2:(this||n)._context.lineTo((this||n)._x3,(this||n)._y3);(this||n)._context.closePath();break;case 3:this.point((this||n)._x3,(this||n)._y3);this.point((this||n)._x4,(this||n)._y4);this.point((this||n)._x5,(this||n)._y5);break}},point:function(t,i){t=+t,i=+i;if((this||n)._point){var e=(this||n)._x2-t,a=(this||n)._y2-i;(this||n)._l23_a=Math.sqrt((this||n)._l23_2a=Math.pow(e*e+a*a,(this||n)._alpha))}switch((this||n)._point){case 0:(this||n)._point=1;(this||n)._x3=t,(this||n)._y3=i;break;case 1:(this||n)._point=2;(this||n)._context.moveTo((this||n)._x4=t,(this||n)._y4=i);break;case 2:(this||n)._point=3;(this||n)._x5=t,(this||n)._y5=i;break;default:point$2(this||n,t,i);break}(this||n)._l01_a=(this||n)._l12_a,(this||n)._l12_a=(this||n)._l23_a;(this||n)._l01_2a=(this||n)._l12_2a,(this||n)._l12_2a=(this||n)._l23_2a;(this||n)._x0=(this||n)._x1,(this||n)._x1=(this||n)._x2,(this||n)._x2=t;(this||n)._y0=(this||n)._y1,(this||n)._y1=(this||n)._y2,(this||n)._y2=i}};var I=function custom(t){function catmullRom(n){return t?new CatmullRomClosed(n,t):new CardinalClosed(n,0)}catmullRom.alpha=function(t){return custom(+t)};return catmullRom}(.5);function CatmullRomOpen(t,i){(this||n)._context=t;(this||n)._alpha=i}CatmullRomOpen.prototype={areaStart:function(){(this||n)._line=0},areaEnd:function(){(this||n)._line=NaN},lineStart:function(){(this||n)._x0=(this||n)._x1=(this||n)._x2=(this||n)._y0=(this||n)._y1=(this||n)._y2=NaN;(this||n)._l01_a=(this||n)._l12_a=(this||n)._l23_a=(this||n)._l01_2a=(this||n)._l12_2a=(this||n)._l23_2a=(this||n)._point=0},lineEnd:function(){((this||n)._line||0!==(this||n)._line&&3===(this||n)._point)&&(this||n)._context.closePath();(this||n)._line=1-(this||n)._line},point:function(t,i){t=+t,i=+i;if((this||n)._point){var e=(this||n)._x2-t,a=(this||n)._y2-i;(this||n)._l23_a=Math.sqrt((this||n)._l23_2a=Math.pow(e*e+a*a,(this||n)._alpha))}switch((this||n)._point){case 0:(this||n)._point=1;break;case 1:(this||n)._point=2;break;case 2:(this||n)._point=3;(this||n)._line?(this||n)._context.lineTo((this||n)._x2,(this||n)._y2):(this||n)._context.moveTo((this||n)._x2,(this||n)._y2);break;case 3:(this||n)._point=4;default:point$2(this||n,t,i);break}(this||n)._l01_a=(this||n)._l12_a,(this||n)._l12_a=(this||n)._l23_a;(this||n)._l01_2a=(this||n)._l12_2a,(this||n)._l12_2a=(this||n)._l23_2a;(this||n)._x0=(this||n)._x1,(this||n)._x1=(this||n)._x2,(this||n)._x2=t;(this||n)._y0=(this||n)._y1,(this||n)._y1=(this||n)._y2,(this||n)._y2=i}};var D=function custom(t){function catmullRom(n){return t?new CatmullRomOpen(n,t):new CardinalOpen(n,0)}catmullRom.alpha=function(t){return custom(+t)};return catmullRom}(.5);function LinearClosed(t){(this||n)._context=t}LinearClosed.prototype={areaStart:noop,areaEnd:noop,lineStart:function(){(this||n)._point=0},lineEnd:function(){(this||n)._point&&(this||n)._context.closePath()},point:function(t,i){t=+t,i=+i;(this||n)._point?(this||n)._context.lineTo(t,i):((this||n)._point=1,(this||n)._context.moveTo(t,i))}};function linearClosed(t){return new LinearClosed(t)}function sign(t){return t<0?-1:1}function slope3(t,n,i){var e=t._x1-t._x0,a=n-t._x1,s=(t._y1-t._y0)/(e||a<0&&-0),o=(i-t._y1)/(a||e<0&&-0),r=(s*a+o*e)/(e+a);return(sign(s)+sign(o))*Math.min(Math.abs(s),Math.abs(o),.5*Math.abs(r))||0}function slope2(t,n){var i=t._x1-t._x0;return i?(3*(t._y1-t._y0)/i-n)/2:n}function point$3(t,n,i){var e=t._x0,a=t._y0,s=t._x1,o=t._y1,r=(s-e)/3;t._context.bezierCurveTo(e+r,a+r*n,s-r,o-r*i,s,o)}function MonotoneX(t){(this||n)._context=t}MonotoneX.prototype={areaStart:function(){(this||n)._line=0},areaEnd:function(){(this||n)._line=NaN},lineStart:function(){(this||n)._x0=(this||n)._x1=(this||n)._y0=(this||n)._y1=(this||n)._t0=NaN;(this||n)._point=0},lineEnd:function(){switch((this||n)._point){case 2:(this||n)._context.lineTo((this||n)._x1,(this||n)._y1);break;case 3:point$3(this||n,(this||n)._t0,slope2(this||n,(this||n)._t0));break}((this||n)._line||0!==(this||n)._line&&1===(this||n)._point)&&(this||n)._context.closePath();(this||n)._line=1-(this||n)._line},point:function(t,i){var e=NaN;t=+t,i=+i;if(t!==(this||n)._x1||i!==(this||n)._y1){switch((this||n)._point){case 0:(this||n)._point=1;(this||n)._line?(this||n)._context.lineTo(t,i):(this||n)._context.moveTo(t,i);break;case 1:(this||n)._point=2;break;case 2:(this||n)._point=3;point$3(this||n,slope2(this||n,e=slope3(this||n,t,i)),e);break;default:point$3(this||n,(this||n)._t0,e=slope3(this||n,t,i));break}(this||n)._x0=(this||n)._x1,(this||n)._x1=t;(this||n)._y0=(this||n)._y1,(this||n)._y1=i;(this||n)._t0=e}}};function MonotoneY(t){(this||n)._context=new ReflectContext(t)}(MonotoneY.prototype=Object.create(MonotoneX.prototype)).point=function(t,i){MonotoneX.prototype.point.call(this||n,i,t)};function ReflectContext(t){(this||n)._context=t}ReflectContext.prototype={moveTo:function(t,i){(this||n)._context.moveTo(i,t)},closePath:function(){(this||n)._context.closePath()},lineTo:function(t,i){(this||n)._context.lineTo(i,t)},bezierCurveTo:function(t,i,e,a,s,o){(this||n)._context.bezierCurveTo(i,t,a,e,o,s)}};function monotoneX(t){return new MonotoneX(t)}function monotoneY(t){return new MonotoneY(t)}function Natural(t){(this||n)._context=t}Natural.prototype={areaStart:function(){(this||n)._line=0},areaEnd:function(){(this||n)._line=NaN},lineStart:function(){(this||n)._x=[];(this||n)._y=[]},lineEnd:function(){var t=(this||n)._x,i=(this||n)._y,e=t.length;if(e){(this||n)._line?(this||n)._context.lineTo(t[0],i[0]):(this||n)._context.moveTo(t[0],i[0]);if(2===e)(this||n)._context.lineTo(t[1],i[1]);else{var a=controlPoints(t),s=controlPoints(i);for(var o=0,r=1;r<e;++o,++r)(this||n)._context.bezierCurveTo(a[0][o],s[0][o],a[1][o],s[1][o],t[r],i[r])}}((this||n)._line||0!==(this||n)._line&&1===e)&&(this||n)._context.closePath();(this||n)._line=1-(this||n)._line;(this||n)._x=(this||n)._y=null},point:function(t,i){(this||n)._x.push(+t);(this||n)._y.push(+i)}};function controlPoints(t){var n,i=t.length-1,e,a=new Array(i),s=new Array(i),o=new Array(i);a[0]=0,s[0]=2,o[0]=t[0]+2*t[1];for(n=1;n<i-1;++n)a[n]=1,s[n]=4,o[n]=4*t[n]+2*t[n+1];a[i-1]=2,s[i-1]=7,o[i-1]=8*t[i-1]+t[i];for(n=1;n<i;++n)e=a[n]/s[n-1],s[n]-=e,o[n]-=e*o[n-1];a[i-1]=o[i-1]/s[i-1];for(n=i-2;n>=0;--n)a[n]=(o[n]-a[n+1])/s[n];s[i-1]=(t[i]+a[i-1])/2;for(n=0;n<i-1;++n)s[n]=2*t[n+1]-a[n+1];return[a,s]}function natural(t){return new Natural(t)}function Step(t,i){(this||n)._context=t;(this||n)._t=i}Step.prototype={areaStart:function(){(this||n)._line=0},areaEnd:function(){(this||n)._line=NaN},lineStart:function(){(this||n)._x=(this||n)._y=NaN;(this||n)._point=0},lineEnd:function(){0<(this||n)._t&&(this||n)._t<1&&2===(this||n)._point&&(this||n)._context.lineTo((this||n)._x,(this||n)._y);((this||n)._line||0!==(this||n)._line&&1===(this||n)._point)&&(this||n)._context.closePath();(this||n)._line>=0&&((this||n)._t=1-(this||n)._t,(this||n)._line=1-(this||n)._line)},point:function(t,i){t=+t,i=+i;switch((this||n)._point){case 0:(this||n)._point=1;(this||n)._line?(this||n)._context.lineTo(t,i):(this||n)._context.moveTo(t,i);break;case 1:(this||n)._point=2;default:if((this||n)._t<=0){(this||n)._context.lineTo((this||n)._x,i);(this||n)._context.lineTo(t,i)}else{var e=(this||n)._x*(1-(this||n)._t)+t*(this||n)._t;(this||n)._context.lineTo(e,(this||n)._y);(this||n)._context.lineTo(e,i)}break}(this||n)._x=t,(this||n)._y=i}};function step(t){return new Step(t,.5)}function stepBefore(t){return new Step(t,0)}function stepAfter(t){return new Step(t,1)}function none(t,n){if((o=t.length)>1)for(var i=1,e,a,s=t[n[0]],o,r=s.length;i<o;++i){a=s,s=t[n[i]];for(e=0;e<r;++e)s[e][1]+=s[e][0]=isNaN(a[e][1])?a[e][0]:a[e][1]}}function none$1(t){var n=t.length,i=new Array(n);while(--n>=0)i[n]=n;return i}function stackValue(t,n){return t[n]}function stack(){var t=constant([]),i=none$1,e=none,a=stackValue;function stack(s){var o=t.apply(this||n,arguments),r,l=s.length,h=o.length,c=new Array(h),_;for(r=0;r<h;++r){for(var u=o[r],f=c[r]=new Array(l),p=0,d;p<l;++p){f[p]=d=[0,+a(s[p],u,p,s)];d.data=s[p]}f.key=u}for(r=0,_=i(c);r<h;++r)c[_[r]].index=r;e(c,_);return c}stack.keys=function(n){return arguments.length?(t="function"===typeof n?n:constant(d.call(n)),stack):t};stack.value=function(t){return arguments.length?(a="function"===typeof t?t:constant(+t),stack):a};stack.order=function(t){return arguments.length?(i=null==t?none$1:"function"===typeof t?t:constant(d.call(t)),stack):i};stack.offset=function(t){return arguments.length?(e=null==t?none:t,stack):e};return stack}function expand(t,n){if((e=t.length)>0){for(var i,e,a=0,s=t[0].length,o;a<s;++a){for(o=i=0;i<e;++i)o+=t[i][a][1]||0;if(o)for(i=0;i<e;++i)t[i][a][1]/=o}none(t,n)}}function diverging(t,n){if((l=t.length)>0)for(var i,e=0,a,s,o,r,l,h=t[n[0]].length;e<h;++e)for(o=r=0,i=0;i<l;++i)(s=(a=t[n[i]][e])[1]-a[0])>0?(a[0]=o,a[1]=o+=s):s<0?(a[1]=r,a[0]=r+=s):(a[0]=0,a[1]=s)}function silhouette(t,n){if((a=t.length)>0){for(var i=0,e=t[n[0]],a,s=e.length;i<s;++i){for(var o=0,r=0;o<a;++o)r+=t[o][i][1]||0;e[i][1]+=e[i][0]=-r/2}none(t,n)}}function wiggle(t,n){if((o=t.length)>0&&(s=(a=t[n[0]]).length)>0){for(var i=0,e=1,a,s,o;e<s;++e){for(var r=0,l=0,h=0;r<o;++r){var c=t[n[r]],_=c[e][1]||0,u=c[e-1][1]||0,f=(_-u)/2;for(var p=0;p<r;++p){var d=t[n[p]],v=d[e][1]||0,m=d[e-1][1]||0;f+=v-m}l+=_,h+=f*_}a[e-1][1]+=a[e-1][0]=i;l&&(i-=h/l)}a[e-1][1]+=a[e-1][0]=i;none(t,n)}}function appearance(t){var n=t.map(peak);return none$1(t).sort((function(t,i){return n[t]-n[i]}))}function peak(t){var n=-1,i=0,e=t.length,a,s=-Infinity;while(++n<e)(a=+t[n][1])>s&&(s=a,i=n);return i}function ascending(t){var n=t.map(sum);return none$1(t).sort((function(t,i){return n[t]-n[i]}))}function sum(t){var n=0,i=-1,e=t.length,a;while(++i<e)(a=+t[i][1])&&(n+=a);return n}function descending$1(t){return ascending(t).reverse()}function insideOut(t){var n=t.length,i,e,a=t.map(sum),s=appearance(t),o=0,r=0,l=[],h=[];for(i=0;i<n;++i){e=s[i];if(o<r){o+=a[e];l.push(e)}else{r+=a[e];h.push(e)}}return h.reverse().concat(l)}function reverse(t){return none$1(t).reverse()}t.arc=arc;t.area=area;t.areaRadial=areaRadial;t.curveBasis=basis;t.curveBasisClosed=basisClosed;t.curveBasisOpen=basisOpen;t.curveBundle=z;t.curveCardinal=L;t.curveCardinalClosed=X;t.curveCardinalOpen=Y;t.curveCatmullRom=V;t.curveCatmullRomClosed=I;t.curveCatmullRomOpen=D;t.curveLinear=curveLinear;t.curveLinearClosed=linearClosed;t.curveMonotoneX=monotoneX;t.curveMonotoneY=monotoneY;t.curveNatural=natural;t.curveStep=step;t.curveStepAfter=stepAfter;t.curveStepBefore=stepBefore;t.line=line;t.lineRadial=lineRadial$1;t.linkHorizontal=linkHorizontal;t.linkRadial=linkRadial;t.linkVertical=linkVertical;t.pie=pie;t.pointRadial=pointRadial;t.radialArea=areaRadial;t.radialLine=lineRadial$1;t.stack=stack;t.stackOffsetDiverging=diverging;t.stackOffsetExpand=expand;t.stackOffsetNone=none;t.stackOffsetSilhouette=silhouette;t.stackOffsetWiggle=wiggle;t.stackOrderAppearance=appearance;t.stackOrderAscending=ascending;t.stackOrderDescending=descending$1;t.stackOrderInsideOut=insideOut;t.stackOrderNone=none$1;t.stackOrderReverse=reverse;t.symbol=symbol;t.symbolCircle=v;t.symbolCross=m;t.symbolDiamond=b;t.symbolSquare=S;t.symbolStar=M;t.symbolTriangle=O;t.symbolWye=B;t.symbols=q;Object.defineProperty(t,"__esModule",{value:true})}));const e=i.arc,a=i.area,s=i.areaRadial,o=i.curveBasis,r=i.curveBasisClosed,l=i.curveBasisOpen,h=i.curveBundle,c=i.curveCardinal,_=i.curveCardinalClosed,u=i.curveCardinalOpen,f=i.curveCatmullRom,p=i.curveCatmullRomClosed,d=i.curveCatmullRomOpen,v=i.curveLinear,m=i.curveLinearClosed,k=i.curveMonotoneX,g=i.curveMonotoneY,b=i.curveNatural,T=i.curveStep,R=i.curveStepAfter,C=i.curveStepBefore,w=i.line,M=i.lineRadial,S=i.linkHorizontal,N=i.linkRadial,O=i.linkVertical,A=i.pie,E=i.pointRadial,P=i.radialArea,$=i.radialLine,B=i.stack,q=i.stackOffsetDiverging,z=i.stackOffsetExpand,L=i.stackOffsetNone,X=i.stackOffsetSilhouette,Y=i.stackOffsetWiggle,V=i.stackOrderAppearance,I=i.stackOrderAscending,D=i.stackOrderDescending,H=i.stackOrderInsideOut,W=i.stackOrderNone,j=i.stackOrderReverse,F=i.symbol,G=i.symbolCircle,J=i.symbolCross,K=i.symbolDiamond,Q=i.symbolSquare,U=i.symbolStar,Z=i.symbolTriangle,tt=i.symbolWye,nt=i.symbols,it=i.__esModule;export default i;export{it as __esModule,e as arc,a as area,s as areaRadial,o as curveBasis,r as curveBasisClosed,l as curveBasisOpen,h as curveBundle,c as curveCardinal,_ as curveCardinalClosed,u as curveCardinalOpen,f as curveCatmullRom,p as curveCatmullRomClosed,d as curveCatmullRomOpen,v as curveLinear,m as curveLinearClosed,k as curveMonotoneX,g as curveMonotoneY,b as curveNatural,T as curveStep,R as curveStepAfter,C as curveStepBefore,w as line,M as lineRadial,S as linkHorizontal,N as linkRadial,O as linkVertical,A as pie,E as pointRadial,P as radialArea,$ as radialLine,B as stack,q as stackOffsetDiverging,z as stackOffsetExpand,L as stackOffsetNone,X as stackOffsetSilhouette,Y as stackOffsetWiggle,V as stackOrderAppearance,I as stackOrderAscending,D as stackOrderDescending,H as stackOrderInsideOut,W as stackOrderNone,j as stackOrderReverse,F as symbol,G as symbolCircle,J as symbolCross,K as symbolDiamond,Q as symbolSquare,U as symbolStar,Z as symbolTriangle,tt as symbolWye,nt as symbols};
 
diff --git a/vendor/javascript/d3-time-format.js b/vendor/javascript/d3-time-format.js
index 0cb8aae3..2d48e334 100644
--- a/vendor/javascript/d3-time-format.js
+++ b/vendor/javascript/d3-time-format.js
@@ -1,2 +1,4 @@
+// d3-time-format@4.1.0 downloaded from https://ga.jspm.io/npm:d3-time-format@4.1.0/src/index.js
+
 import{utcMonday as e,utcDay as r,timeMonday as t,timeDay as n,timeYear as a,timeSunday as o,timeThursday as u,utcYear as f,utcSunday as i,utcThursday as c}from"d3-time";function localDate(e){if(0<=e.y&&e.y<100){var r=new Date(-1,e.m,e.d,e.H,e.M,e.S,e.L);r.setFullYear(e.y);return r}return new Date(e.y,e.m,e.d,e.H,e.M,e.S,e.L)}function utcDate(e){if(0<=e.y&&e.y<100){var r=new Date(Date.UTC(-1,e.m,e.d,e.H,e.M,e.S,e.L));r.setUTCFullYear(e.y);return r}return new Date(Date.UTC(e.y,e.m,e.d,e.H,e.M,e.S,e.L))}function newDate(e,r,t){return{y:e,m:r,d:t,H:0,M:0,S:0,L:0}}function formatLocale(a){var o=a.dateTime,u=a.date,f=a.time,i=a.periods,c=a.days,s=a.shortDays,l=a.months,d=a.shortMonths;var p=formatRe(i),y=formatLookup(i),T=formatRe(c),h=formatLookup(c),g=formatRe(s),U=formatLookup(s),M=formatRe(l),C=formatLookup(l),S=formatRe(d),D=formatLookup(d);var v={a:formatShortWeekday,A:formatWeekday,b:formatShortMonth,B:formatMonth,c:null,d:formatDayOfMonth,e:formatDayOfMonth,f:formatMicroseconds,g:formatYearISO,G:formatFullYearISO,H:formatHour24,I:formatHour12,j:formatDayOfYear,L:formatMilliseconds,m:formatMonthNumber,M:formatMinutes,p:formatPeriod,q:formatQuarter,Q:formatUnixTimestamp,s:formatUnixTimestampSeconds,S:formatSeconds,u:formatWeekdayNumberMonday,U:formatWeekNumberSunday,V:formatWeekNumberISO,w:formatWeekdayNumberSunday,W:formatWeekNumberMonday,x:null,X:null,y:formatYear,Y:formatFullYear,Z:formatZone,"%":formatLiteralPercent};var w={a:formatUTCShortWeekday,A:formatUTCWeekday,b:formatUTCShortMonth,B:formatUTCMonth,c:null,d:formatUTCDayOfMonth,e:formatUTCDayOfMonth,f:formatUTCMicroseconds,g:formatUTCYearISO,G:formatUTCFullYearISO,H:formatUTCHour24,I:formatUTCHour12,j:formatUTCDayOfYear,L:formatUTCMilliseconds,m:formatUTCMonthNumber,M:formatUTCMinutes,p:formatUTCPeriod,q:formatUTCQuarter,Q:formatUnixTimestamp,s:formatUnixTimestampSeconds,S:formatUTCSeconds,u:formatUTCWeekdayNumberMonday,U:formatUTCWeekNumberSunday,V:formatUTCWeekNumberISO,w:formatUTCWeekdayNumberSunday,W:formatUTCWeekNumberMonday,x:null,X:null,y:formatUTCYear,Y:formatUTCFullYear,Z:formatUTCZone,"%":formatLiteralPercent};var W={a:parseShortWeekday,A:parseWeekday,b:parseShortMonth,B:parseMonth,c:parseLocaleDateTime,d:parseDayOfMonth,e:parseDayOfMonth,f:parseMicroseconds,g:parseYear,G:parseFullYear,H:parseHour24,I:parseHour24,j:parseDayOfYear,L:parseMilliseconds,m:parseMonthNumber,M:parseMinutes,p:parsePeriod,q:parseQuarter,Q:parseUnixTimestamp,s:parseUnixTimestampSeconds,S:parseSeconds,u:parseWeekdayNumberMonday,U:parseWeekNumberSunday,V:parseWeekNumberISO,w:parseWeekdayNumberSunday,W:parseWeekNumberMonday,x:parseLocaleDate,X:parseLocaleTime,y:parseYear,Y:parseFullYear,Z:parseZone,"%":parseLiteralPercent};v.x=newFormat(u,v);v.X=newFormat(f,v);v.c=newFormat(o,v);w.x=newFormat(u,w);w.X=newFormat(f,w);w.c=newFormat(o,w);function newFormat(e,r){return function(t){var n,a,o,u=[],f=-1,i=0,c=e.length;t instanceof Date||(t=new Date(+t));while(++f<c)if(37===e.charCodeAt(f)){u.push(e.slice(i,f));null!=(a=m[n=e.charAt(++f)])?n=e.charAt(++f):a="e"===n?" ":"0";(o=r[n])&&(n=o(t,a));u.push(n);i=f+1}u.push(e.slice(i,f));return u.join("")}}function newParse(a,o){return function(u){var f,i,c=newDate(1900,void 0,1),m=parseSpecifier(c,a,u+="",0);if(m!=u.length)return null;if("Q"in c)return new Date(c.Q);if("s"in c)return new Date(1e3*c.s+("L"in c?c.L:0));o&&!("Z"in c)&&(c.Z=0);"p"in c&&(c.H=c.H%12+12*c.p);void 0===c.m&&(c.m="q"in c?c.q:0);if("V"in c){if(c.V<1||c.V>53)return null;"w"in c||(c.w=1);if("Z"in c){f=utcDate(newDate(c.y,0,1)),i=f.getUTCDay();f=i>4||0===i?e.ceil(f):e(f);f=r.offset(f,7*(c.V-1));c.y=f.getUTCFullYear();c.m=f.getUTCMonth();c.d=f.getUTCDate()+(c.w+6)%7}else{f=localDate(newDate(c.y,0,1)),i=f.getDay();f=i>4||0===i?t.ceil(f):t(f);f=n.offset(f,7*(c.V-1));c.y=f.getFullYear();c.m=f.getMonth();c.d=f.getDate()+(c.w+6)%7}}else if("W"in c||"U"in c){"w"in c||(c.w="u"in c?c.u%7:"W"in c?1:0);i="Z"in c?utcDate(newDate(c.y,0,1)).getUTCDay():localDate(newDate(c.y,0,1)).getDay();c.m=0;c.d="W"in c?(c.w+6)%7+7*c.W-(i+5)%7:c.w+7*c.U-(i+6)%7}if("Z"in c){c.H+=c.Z/100|0;c.M+=c.Z%100;return utcDate(c)}return localDate(c)}}function parseSpecifier(e,r,t,n){var a,o,u=0,f=r.length,i=t.length;while(u<f){if(n>=i)return-1;a=r.charCodeAt(u++);if(37===a){a=r.charAt(u++);o=W[a in m?r.charAt(u++):a];if(!o||(n=o(e,t,n))<0)return-1}else if(a!=t.charCodeAt(n++))return-1}return n}function parsePeriod(e,r,t){var n=p.exec(r.slice(t));return n?(e.p=y.get(n[0].toLowerCase()),t+n[0].length):-1}function parseShortWeekday(e,r,t){var n=g.exec(r.slice(t));return n?(e.w=U.get(n[0].toLowerCase()),t+n[0].length):-1}function parseWeekday(e,r,t){var n=T.exec(r.slice(t));return n?(e.w=h.get(n[0].toLowerCase()),t+n[0].length):-1}function parseShortMonth(e,r,t){var n=S.exec(r.slice(t));return n?(e.m=D.get(n[0].toLowerCase()),t+n[0].length):-1}function parseMonth(e,r,t){var n=M.exec(r.slice(t));return n?(e.m=C.get(n[0].toLowerCase()),t+n[0].length):-1}function parseLocaleDateTime(e,r,t){return parseSpecifier(e,o,r,t)}function parseLocaleDate(e,r,t){return parseSpecifier(e,u,r,t)}function parseLocaleTime(e,r,t){return parseSpecifier(e,f,r,t)}function formatShortWeekday(e){return s[e.getDay()]}function formatWeekday(e){return c[e.getDay()]}function formatShortMonth(e){return d[e.getMonth()]}function formatMonth(e){return l[e.getMonth()]}function formatPeriod(e){return i[+(e.getHours()>=12)]}function formatQuarter(e){return 1+~~(e.getMonth()/3)}function formatUTCShortWeekday(e){return s[e.getUTCDay()]}function formatUTCWeekday(e){return c[e.getUTCDay()]}function formatUTCShortMonth(e){return d[e.getUTCMonth()]}function formatUTCMonth(e){return l[e.getUTCMonth()]}function formatUTCPeriod(e){return i[+(e.getUTCHours()>=12)]}function formatUTCQuarter(e){return 1+~~(e.getUTCMonth()/3)}return{format:function(e){var r=newFormat(e+="",v);r.toString=function(){return e};return r},parse:function(e){var r=newParse(e+="",false);r.toString=function(){return e};return r},utcFormat:function(e){var r=newFormat(e+="",w);r.toString=function(){return e};return r},utcParse:function(e){var r=newParse(e+="",true);r.toString=function(){return e};return r}}}var m={"-":"",_:" ",0:"0"},s=/^\s*\d+/,l=/^%/,d=/[\\^$*+?|[\]().{}]/g;function pad(e,r,t){var n=e<0?"-":"",a=(n?-e:e)+"",o=a.length;return n+(o<t?new Array(t-o+1).join(r)+a:a)}function requote(e){return e.replace(d,"\\$&")}function formatRe(e){return new RegExp("^(?:"+e.map(requote).join("|")+")","i")}function formatLookup(e){return new Map(e.map(((e,r)=>[e.toLowerCase(),r])))}function parseWeekdayNumberSunday(e,r,t){var n=s.exec(r.slice(t,t+1));return n?(e.w=+n[0],t+n[0].length):-1}function parseWeekdayNumberMonday(e,r,t){var n=s.exec(r.slice(t,t+1));return n?(e.u=+n[0],t+n[0].length):-1}function parseWeekNumberSunday(e,r,t){var n=s.exec(r.slice(t,t+2));return n?(e.U=+n[0],t+n[0].length):-1}function parseWeekNumberISO(e,r,t){var n=s.exec(r.slice(t,t+2));return n?(e.V=+n[0],t+n[0].length):-1}function parseWeekNumberMonday(e,r,t){var n=s.exec(r.slice(t,t+2));return n?(e.W=+n[0],t+n[0].length):-1}function parseFullYear(e,r,t){var n=s.exec(r.slice(t,t+4));return n?(e.y=+n[0],t+n[0].length):-1}function parseYear(e,r,t){var n=s.exec(r.slice(t,t+2));return n?(e.y=+n[0]+(+n[0]>68?1900:2e3),t+n[0].length):-1}function parseZone(e,r,t){var n=/^(Z)|([+-]\d\d)(?::?(\d\d))?/.exec(r.slice(t,t+6));return n?(e.Z=n[1]?0:-(n[2]+(n[3]||"00")),t+n[0].length):-1}function parseQuarter(e,r,t){var n=s.exec(r.slice(t,t+1));return n?(e.q=3*n[0]-3,t+n[0].length):-1}function parseMonthNumber(e,r,t){var n=s.exec(r.slice(t,t+2));return n?(e.m=n[0]-1,t+n[0].length):-1}function parseDayOfMonth(e,r,t){var n=s.exec(r.slice(t,t+2));return n?(e.d=+n[0],t+n[0].length):-1}function parseDayOfYear(e,r,t){var n=s.exec(r.slice(t,t+3));return n?(e.m=0,e.d=+n[0],t+n[0].length):-1}function parseHour24(e,r,t){var n=s.exec(r.slice(t,t+2));return n?(e.H=+n[0],t+n[0].length):-1}function parseMinutes(e,r,t){var n=s.exec(r.slice(t,t+2));return n?(e.M=+n[0],t+n[0].length):-1}function parseSeconds(e,r,t){var n=s.exec(r.slice(t,t+2));return n?(e.S=+n[0],t+n[0].length):-1}function parseMilliseconds(e,r,t){var n=s.exec(r.slice(t,t+3));return n?(e.L=+n[0],t+n[0].length):-1}function parseMicroseconds(e,r,t){var n=s.exec(r.slice(t,t+6));return n?(e.L=Math.floor(n[0]/1e3),t+n[0].length):-1}function parseLiteralPercent(e,r,t){var n=l.exec(r.slice(t,t+1));return n?t+n[0].length:-1}function parseUnixTimestamp(e,r,t){var n=s.exec(r.slice(t));return n?(e.Q=+n[0],t+n[0].length):-1}function parseUnixTimestampSeconds(e,r,t){var n=s.exec(r.slice(t));return n?(e.s=+n[0],t+n[0].length):-1}function formatDayOfMonth(e,r){return pad(e.getDate(),r,2)}function formatHour24(e,r){return pad(e.getHours(),r,2)}function formatHour12(e,r){return pad(e.getHours()%12||12,r,2)}function formatDayOfYear(e,r){return pad(1+n.count(a(e),e),r,3)}function formatMilliseconds(e,r){return pad(e.getMilliseconds(),r,3)}function formatMicroseconds(e,r){return formatMilliseconds(e,r)+"000"}function formatMonthNumber(e,r){return pad(e.getMonth()+1,r,2)}function formatMinutes(e,r){return pad(e.getMinutes(),r,2)}function formatSeconds(e,r){return pad(e.getSeconds(),r,2)}function formatWeekdayNumberMonday(e){var r=e.getDay();return 0===r?7:r}function formatWeekNumberSunday(e,r){return pad(o.count(a(e)-1,e),r,2)}function dISO(e){var r=e.getDay();return r>=4||0===r?u(e):u.ceil(e)}function formatWeekNumberISO(e,r){e=dISO(e);return pad(u.count(a(e),e)+(4===a(e).getDay()),r,2)}function formatWeekdayNumberSunday(e){return e.getDay()}function formatWeekNumberMonday(e,r){return pad(t.count(a(e)-1,e),r,2)}function formatYear(e,r){return pad(e.getFullYear()%100,r,2)}function formatYearISO(e,r){e=dISO(e);return pad(e.getFullYear()%100,r,2)}function formatFullYear(e,r){return pad(e.getFullYear()%1e4,r,4)}function formatFullYearISO(e,r){var t=e.getDay();e=t>=4||0===t?u(e):u.ceil(e);return pad(e.getFullYear()%1e4,r,4)}function formatZone(e){var r=e.getTimezoneOffset();return(r>0?"-":(r*=-1,"+"))+pad(r/60|0,"0",2)+pad(r%60,"0",2)}function formatUTCDayOfMonth(e,r){return pad(e.getUTCDate(),r,2)}function formatUTCHour24(e,r){return pad(e.getUTCHours(),r,2)}function formatUTCHour12(e,r){return pad(e.getUTCHours()%12||12,r,2)}function formatUTCDayOfYear(e,t){return pad(1+r.count(f(e),e),t,3)}function formatUTCMilliseconds(e,r){return pad(e.getUTCMilliseconds(),r,3)}function formatUTCMicroseconds(e,r){return formatUTCMilliseconds(e,r)+"000"}function formatUTCMonthNumber(e,r){return pad(e.getUTCMonth()+1,r,2)}function formatUTCMinutes(e,r){return pad(e.getUTCMinutes(),r,2)}function formatUTCSeconds(e,r){return pad(e.getUTCSeconds(),r,2)}function formatUTCWeekdayNumberMonday(e){var r=e.getUTCDay();return 0===r?7:r}function formatUTCWeekNumberSunday(e,r){return pad(i.count(f(e)-1,e),r,2)}function UTCdISO(e){var r=e.getUTCDay();return r>=4||0===r?c(e):c.ceil(e)}function formatUTCWeekNumberISO(e,r){e=UTCdISO(e);return pad(c.count(f(e),e)+(4===f(e).getUTCDay()),r,2)}function formatUTCWeekdayNumberSunday(e){return e.getUTCDay()}function formatUTCWeekNumberMonday(r,t){return pad(e.count(f(r)-1,r),t,2)}function formatUTCYear(e,r){return pad(e.getUTCFullYear()%100,r,2)}function formatUTCYearISO(e,r){e=UTCdISO(e);return pad(e.getUTCFullYear()%100,r,2)}function formatUTCFullYear(e,r){return pad(e.getUTCFullYear()%1e4,r,4)}function formatUTCFullYearISO(e,r){var t=e.getUTCDay();e=t>=4||0===t?c(e):c.ceil(e);return pad(e.getUTCFullYear()%1e4,r,4)}function formatUTCZone(){return"+0000"}function formatLiteralPercent(){return"%"}function formatUnixTimestamp(e){return+e}function formatUnixTimestampSeconds(e){return Math.floor(+e/1e3)}var p;var y;var T;var h;var g;defaultLocale({dateTime:"%x, %X",date:"%-m/%-d/%Y",time:"%-I:%M:%S %p",periods:["AM","PM"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]});function defaultLocale(e){p=formatLocale(e);y=p.format;T=p.parse;h=p.utcFormat;g=p.utcParse;return p}var U="%Y-%m-%dT%H:%M:%S.%LZ";function formatIsoNative(e){return e.toISOString()}var M=Date.prototype.toISOString?formatIsoNative:h(U);function parseIsoNative(e){var r=new Date(e);return isNaN(r)?null:r}var C=+new Date("2000-01-01T00:00:00.000Z")?parseIsoNative:g(U);export{M as isoFormat,C as isoParse,y as timeFormat,defaultLocale as timeFormatDefaultLocale,formatLocale as timeFormatLocale,T as timeParse,h as utcFormat,g as utcParse};
 
diff --git a/vendor/javascript/d3-time.js b/vendor/javascript/d3-time.js
index 7f5538e3..1f61a2ef 100644
--- a/vendor/javascript/d3-time.js
+++ b/vendor/javascript/d3-time.js
@@ -1,2 +1,4 @@
+// d3-time@3.1.0 downloaded from https://ga.jspm.io/npm:d3-time@3.1.0/src/index.js
+
 import{bisector as e,tickStep as t}from"d3-array";const n=new Date,s=new Date;function timeInterval(e,t,r,a){function interval(t){return e(t=0===arguments.length?new Date:new Date(+t)),t}interval.floor=t=>(e(t=new Date(+t)),t);interval.ceil=n=>(e(n=new Date(n-1)),t(n,1),e(n),n);interval.round=e=>{const t=interval(e),n=interval.ceil(e);return e-t<n-e?t:n};interval.offset=(e,n)=>(t(e=new Date(+e),null==n?1:Math.floor(n)),e);interval.range=(n,s,r)=>{const a=[];n=interval.ceil(n);r=null==r?1:Math.floor(r);if(!(n<s)||!(r>0))return a;let o;do{a.push(o=new Date(+n)),t(n,r),e(n)}while(o<n&&n<s);return a};interval.filter=n=>timeInterval((t=>{if(t>=t)while(e(t),!n(t))t.setTime(t-1)}),((e,s)=>{if(e>=e)if(s<0)while(++s<=0)while(t(e,-1),!n(e));else while(--s>=0)while(t(e,1),!n(e));}));if(r){interval.count=(t,a)=>{n.setTime(+t),s.setTime(+a);e(n),e(s);return Math.floor(r(n,s))};interval.every=e=>{e=Math.floor(e);return isFinite(e)&&e>0?e>1?interval.filter(a?t=>a(t)%e===0:t=>interval.count(0,t)%e===0):interval:null}}return interval}const r=timeInterval((()=>{}),((e,t)=>{e.setTime(+e+t)}),((e,t)=>t-e));r.every=e=>{e=Math.floor(e);return isFinite(e)&&e>0?e>1?timeInterval((t=>{t.setTime(Math.floor(t/e)*e)}),((t,n)=>{t.setTime(+t+n*e)}),((t,n)=>(n-t)/e)):r:null};const a=r.range;const o=1e3;const l=60*o;const i=60*l;const c=24*i;const u=7*c;const g=30*c;const T=365*c;const m=timeInterval((e=>{e.setTime(e-e.getMilliseconds())}),((e,t)=>{e.setTime(+e+t*o)}),((e,t)=>(t-e)/o),(e=>e.getUTCSeconds()));const v=m.range;const f=timeInterval((e=>{e.setTime(e-e.getMilliseconds()-e.getSeconds()*o)}),((e,t)=>{e.setTime(+e+t*l)}),((e,t)=>(t-e)/l),(e=>e.getMinutes()));const C=f.range;const U=timeInterval((e=>{e.setUTCSeconds(0,0)}),((e,t)=>{e.setTime(+e+t*l)}),((e,t)=>(t-e)/l),(e=>e.getUTCMinutes()));const M=U.range;const h=timeInterval((e=>{e.setTime(e-e.getMilliseconds()-e.getSeconds()*o-e.getMinutes()*l)}),((e,t)=>{e.setTime(+e+t*i)}),((e,t)=>(t-e)/i),(e=>e.getHours()));const d=h.range;const k=timeInterval((e=>{e.setUTCMinutes(0,0,0)}),((e,t)=>{e.setTime(+e+t*i)}),((e,t)=>(t-e)/i),(e=>e.getUTCHours()));const D=k.range;const y=timeInterval((e=>e.setHours(0,0,0,0)),((e,t)=>e.setDate(e.getDate()+t)),((e,t)=>(t-e-(t.getTimezoneOffset()-e.getTimezoneOffset())*l)/c),(e=>e.getDate()-1));const F=y.range;const I=timeInterval((e=>{e.setUTCHours(0,0,0,0)}),((e,t)=>{e.setUTCDate(e.getUTCDate()+t)}),((e,t)=>(t-e)/c),(e=>e.getUTCDate()-1));const Y=I.range;const W=timeInterval((e=>{e.setUTCHours(0,0,0,0)}),((e,t)=>{e.setUTCDate(e.getUTCDate()+t)}),((e,t)=>(t-e)/c),(e=>Math.floor(e/c)));const w=W.range;function timeWeekday(e){return timeInterval((t=>{t.setDate(t.getDate()-(t.getDay()+7-e)%7);t.setHours(0,0,0,0)}),((e,t)=>{e.setDate(e.getDate()+7*t)}),((e,t)=>(t-e-(t.getTimezoneOffset()-e.getTimezoneOffset())*l)/u))}const H=timeWeekday(0);const S=timeWeekday(1);const p=timeWeekday(2);const z=timeWeekday(3);const O=timeWeekday(4);const x=timeWeekday(5);const b=timeWeekday(6);const j=H.range;const q=S.range;const A=p.range;const B=z.range;const E=O.range;const G=x.range;const J=b.range;function utcWeekday(e){return timeInterval((t=>{t.setUTCDate(t.getUTCDate()-(t.getUTCDay()+7-e)%7);t.setUTCHours(0,0,0,0)}),((e,t)=>{e.setUTCDate(e.getUTCDate()+7*t)}),((e,t)=>(t-e)/u))}const K=utcWeekday(0);const L=utcWeekday(1);const N=utcWeekday(2);const P=utcWeekday(3);const Q=utcWeekday(4);const R=utcWeekday(5);const V=utcWeekday(6);const X=K.range;const Z=L.range;const $=N.range;const _=P.range;const ee=Q.range;const te=R.range;const ne=V.range;const se=timeInterval((e=>{e.setDate(1);e.setHours(0,0,0,0)}),((e,t)=>{e.setMonth(e.getMonth()+t)}),((e,t)=>t.getMonth()-e.getMonth()+12*(t.getFullYear()-e.getFullYear())),(e=>e.getMonth()));const re=se.range;const ae=timeInterval((e=>{e.setUTCDate(1);e.setUTCHours(0,0,0,0)}),((e,t)=>{e.setUTCMonth(e.getUTCMonth()+t)}),((e,t)=>t.getUTCMonth()-e.getUTCMonth()+12*(t.getUTCFullYear()-e.getUTCFullYear())),(e=>e.getUTCMonth()));const oe=ae.range;const le=timeInterval((e=>{e.setMonth(0,1);e.setHours(0,0,0,0)}),((e,t)=>{e.setFullYear(e.getFullYear()+t)}),((e,t)=>t.getFullYear()-e.getFullYear()),(e=>e.getFullYear()));le.every=e=>isFinite(e=Math.floor(e))&&e>0?timeInterval((t=>{t.setFullYear(Math.floor(t.getFullYear()/e)*e);t.setMonth(0,1);t.setHours(0,0,0,0)}),((t,n)=>{t.setFullYear(t.getFullYear()+n*e)})):null;const ie=le.range;const ce=timeInterval((e=>{e.setUTCMonth(0,1);e.setUTCHours(0,0,0,0)}),((e,t)=>{e.setUTCFullYear(e.getUTCFullYear()+t)}),((e,t)=>t.getUTCFullYear()-e.getUTCFullYear()),(e=>e.getUTCFullYear()));ce.every=e=>isFinite(e=Math.floor(e))&&e>0?timeInterval((t=>{t.setUTCFullYear(Math.floor(t.getUTCFullYear()/e)*e);t.setUTCMonth(0,1);t.setUTCHours(0,0,0,0)}),((t,n)=>{t.setUTCFullYear(t.getUTCFullYear()+n*e)})):null;const ue=ce.range;function ticker(n,s,a,v,f,C){const U=[[m,1,o],[m,5,5*o],[m,15,15*o],[m,30,30*o],[C,1,l],[C,5,5*l],[C,15,15*l],[C,30,30*l],[f,1,i],[f,3,3*i],[f,6,6*i],[f,12,12*i],[v,1,c],[v,2,2*c],[a,1,u],[s,1,g],[s,3,3*g],[n,1,T]];function ticks(e,t,n){const s=t<e;s&&([e,t]=[t,e]);const r=n&&"function"===typeof n.range?n:tickInterval(e,t,n);const a=r?r.range(e,+t+1):[];return s?a.reverse():a}function tickInterval(s,a,o){const l=Math.abs(a-s)/o;const i=e((([,,e])=>e)).right(U,l);if(i===U.length)return n.every(t(s/T,a/T,o));if(0===i)return r.every(Math.max(t(s,a,o),1));const[c,u]=U[l/U[i-1][2]<U[i][2]/l?i-1:i];return c.every(u)}return[ticks,tickInterval]}const[ge,Te]=ticker(ce,ae,K,W,k,U);const[me,ve]=ticker(le,se,H,y,h,f);export{y as timeDay,F as timeDays,x as timeFriday,G as timeFridays,h as timeHour,d as timeHours,timeInterval,r as timeMillisecond,a as timeMilliseconds,f as timeMinute,C as timeMinutes,S as timeMonday,q as timeMondays,se as timeMonth,re as timeMonths,b as timeSaturday,J as timeSaturdays,m as timeSecond,v as timeSeconds,H as timeSunday,j as timeSundays,O as timeThursday,E as timeThursdays,ve as timeTickInterval,me as timeTicks,p as timeTuesday,A as timeTuesdays,z as timeWednesday,B as timeWednesdays,H as timeWeek,j as timeWeeks,le as timeYear,ie as timeYears,W as unixDay,w as unixDays,I as utcDay,Y as utcDays,R as utcFriday,te as utcFridays,k as utcHour,D as utcHours,r as utcMillisecond,a as utcMilliseconds,U as utcMinute,M as utcMinutes,L as utcMonday,Z as utcMondays,ae as utcMonth,oe as utcMonths,V as utcSaturday,ne as utcSaturdays,m as utcSecond,v as utcSeconds,K as utcSunday,X as utcSundays,Q as utcThursday,ee as utcThursdays,Te as utcTickInterval,ge as utcTicks,N as utcTuesday,$ as utcTuesdays,P as utcWednesday,_ as utcWednesdays,K as utcWeek,X as utcWeeks,ce as utcYear,ue as utcYears};
 
diff --git a/vendor/javascript/d3-timer.js b/vendor/javascript/d3-timer.js
index 46798bc3..22f5532b 100644
--- a/vendor/javascript/d3-timer.js
+++ b/vendor/javascript/d3-timer.js
@@ -1,2 +1,4 @@
+// d3-timer@3.0.1 downloaded from https://ga.jspm.io/npm:d3-timer@3.0.1/src/index.js
+
 var t,e,n=0,i=0,r=0,o=1e3,l=0,a=0,u=0,s="object"===typeof performance&&performance.now?performance:Date,c="object"===typeof window&&window.requestAnimationFrame?window.requestAnimationFrame.bind(window):function(t){setTimeout(t,17)};function now(){return a||(c(clearNow),a=s.now()+u)}function clearNow(){a=0}function Timer(){this._call=this._time=this._next=null}Timer.prototype=timer.prototype={constructor:Timer,restart:function(n,i,r){if("function"!==typeof n)throw new TypeError("callback is not a function");r=(null==r?now():+r)+(null==i?0:+i);if(!this._next&&e!==this){e?e._next=this:t=this;e=this}this._call=n;this._time=r;sleep()},stop:function(){if(this._call){this._call=null;this._time=Infinity;sleep()}}};function timer(t,e,n){var i=new Timer;i.restart(t,e,n);return i}function timerFlush(){now();++n;var e,i=t;while(i){(e=a-i._time)>=0&&i._call.call(void 0,e);i=i._next}--n}function wake(){a=(l=s.now())+u;n=i=0;try{timerFlush()}finally{n=0;nap();a=0}}function poke(){var t=s.now(),e=t-l;e>o&&(u-=e,l=t)}function nap(){var n,i,r=t,o=Infinity;while(r)if(r._call){o>r._time&&(o=r._time);n=r,r=r._next}else{i=r._next,r._next=null;r=n?n._next=i:t=i}e=n;sleep(o)}function sleep(t){if(!n){i&&(i=clearTimeout(i));var e=t-a;if(e>24){t<Infinity&&(i=setTimeout(wake,t-s.now()-u));r&&(r=clearInterval(r))}else{r||(l=s.now(),r=setInterval(poke,o));n=1,c(wake)}}}function timeout(t,e,n){var i=new Timer;e=null==e?0:+e;i.restart((n=>{i.stop();t(n+e)}),e,n);return i}function interval(t,e,n){var i=new Timer,r=e;if(null==e)return i.restart(t,e,n),i;i._restart=i.restart;i.restart=function(t,e,n){e=+e,n=null==n?now():+n;i._restart((function tick(o){o+=r;i._restart(tick,r+=e,n);t(o)}),e,n)};i.restart(t,e,n);return i}export{interval,now,timeout,timer,timerFlush};
 
diff --git a/vendor/javascript/d3-transition.js b/vendor/javascript/d3-transition.js
index f47dc858..e57459d3 100644
--- a/vendor/javascript/d3-transition.js
+++ b/vendor/javascript/d3-transition.js
@@ -1,2 +1,4 @@
+// d3-transition@3.0.1 downloaded from https://ga.jspm.io/npm:d3-transition@3.0.1/src/index.js
+
 import{namespace as t,matcher as n,selector as e,selectorAll as r,selection as i,style as o}from"d3-selection";import{dispatch as a}from"d3-dispatch";import{timer as s,timeout as u,now as l}from"d3-timer";import{interpolateNumber as c,interpolateRgb as f,interpolateString as h,interpolateTransformSvg as _,interpolateTransformCss as v}from"d3-interpolate";import{color as d}from"d3-color";import{easeCubicInOut as p}from"d3-ease";var y=a("start","end","cancel","interrupt");var w=[];var m=0;var g=1;var T=2;var x=3;var C=4;var A=5;var N=6;function schedule(t,n,e,r,i,o){var a=t.__transition;if(a){if(e in a)return}else t.__transition={};create(t,e,{name:n,index:r,group:i,on:y,tween:w,time:o.time,delay:o.delay,duration:o.duration,ease:o.ease,timer:null,state:m})}function init(t,n){var e=get(t,n);if(e.state>m)throw new Error("too late; already scheduled");return e}function set(t,n){var e=get(t,n);if(e.state>x)throw new Error("too late; already running");return e}function get(t,n){var e=t.__transition;if(!e||!(e=e[n]))throw new Error("transition not found");return e}function create(t,n,e){var r,i=t.__transition;i[n]=e;e.timer=s(schedule,0,e.time);function schedule(t){e.state=g;e.timer.restart(start,e.delay,e.time);e.delay<=t&&start(t-e.delay)}function start(o){var a,s,l,c;if(e.state!==g)return stop();for(a in i){c=i[a];if(c.name===e.name){if(c.state===x)return u(start);if(c.state===C){c.state=N;c.timer.stop();c.on.call("interrupt",t,t.__data__,c.index,c.group);delete i[a]}else if(+a<n){c.state=N;c.timer.stop();c.on.call("cancel",t,t.__data__,c.index,c.group);delete i[a]}}}u((function(){if(e.state===x){e.state=C;e.timer.restart(tick,e.delay,e.time);tick(o)}}));e.state=T;e.on.call("start",t,t.__data__,e.index,e.group);if(e.state===T){e.state=x;r=new Array(l=e.tween.length);for(a=0,s=-1;a<l;++a)(c=e.tween[a].value.call(t,t.__data__,e.index,e.group))&&(r[++s]=c);r.length=s+1}}function tick(n){var i=n<e.duration?e.ease.call(null,n/e.duration):(e.timer.restart(stop),e.state=A,1),o=-1,a=r.length;while(++o<a)r[o].call(t,i);if(e.state===A){e.on.call("end",t,t.__data__,e.index,e.group);stop()}}function stop(){e.state=N;e.timer.stop();delete i[n];for(var r in i)return;delete t.__transition}}function interrupt(t,n){var e,r,i,o=t.__transition,a=true;if(o){n=null==n?null:n+"";for(i in o)if((e=o[i]).name===n){r=e.state>T&&e.state<A;e.state=N;e.timer.stop();e.on.call(r?"interrupt":"cancel",t,t.__data__,e.index,e.group);delete o[i]}else a=false;a&&delete t.__transition}}function selection_interrupt(t){return this.each((function(){interrupt(this,t)}))}function tweenRemove(t,n){var e,r;return function(){var i=set(this,t),o=i.tween;if(o!==e){r=e=o;for(var a=0,s=r.length;a<s;++a)if(r[a].name===n){r=r.slice();r.splice(a,1);break}}i.tween=r}}function tweenFunction(t,n,e){var r,i;if("function"!==typeof e)throw new Error;return function(){var o=set(this,t),a=o.tween;if(a!==r){i=(r=a).slice();for(var s={name:n,value:e},u=0,l=i.length;u<l;++u)if(i[u].name===n){i[u]=s;break}u===l&&i.push(s)}o.tween=i}}function transition_tween(t,n){var e=this._id;t+="";if(arguments.length<2){var r=get(this.node(),e).tween;for(var i,o=0,a=r.length;o<a;++o)if((i=r[o]).name===t)return i.value;return null}return this.each((null==n?tweenRemove:tweenFunction)(e,t,n))}function tweenValue(t,n,e){var r=t._id;t.each((function(){var t=set(this,r);(t.value||(t.value={}))[n]=e.apply(this,arguments)}));return function(t){return get(t,r).value[n]}}function interpolate(t,n){var e;return("number"===typeof n?c:n instanceof d?f:(e=d(n))?(n=e,f):h)(t,n)}function attrRemove(t){return function(){this.removeAttribute(t)}}function attrRemoveNS(t){return function(){this.removeAttributeNS(t.space,t.local)}}function attrConstant(t,n,e){var r,i,o=e+"";return function(){var a=this.getAttribute(t);return a===o?null:a===r?i:i=n(r=a,e)}}function attrConstantNS(t,n,e){var r,i,o=e+"";return function(){var a=this.getAttributeNS(t.space,t.local);return a===o?null:a===r?i:i=n(r=a,e)}}function attrFunction(t,n,e){var r,i,o;return function(){var a,s,u=e(this);if(null!=u){a=this.getAttribute(t);s=u+"";return a===s?null:a===r&&s===i?o:(i=s,o=n(r=a,u))}this.removeAttribute(t)}}function attrFunctionNS(t,n,e){var r,i,o;return function(){var a,s,u=e(this);if(null!=u){a=this.getAttributeNS(t.space,t.local);s=u+"";return a===s?null:a===r&&s===i?o:(i=s,o=n(r=a,u))}this.removeAttributeNS(t.space,t.local)}}function transition_attr(n,e){var r=t(n),i="transform"===r?_:interpolate;return this.attrTween(n,"function"===typeof e?(r.local?attrFunctionNS:attrFunction)(r,i,tweenValue(this,"attr."+n,e)):null==e?(r.local?attrRemoveNS:attrRemove)(r):(r.local?attrConstantNS:attrConstant)(r,i,e))}function attrInterpolate(t,n){return function(e){this.setAttribute(t,n.call(this,e))}}function attrInterpolateNS(t,n){return function(e){this.setAttributeNS(t.space,t.local,n.call(this,e))}}function attrTweenNS(t,n){var e,r;function tween(){var i=n.apply(this,arguments);i!==r&&(e=(r=i)&&attrInterpolateNS(t,i));return e}tween._value=n;return tween}function attrTween(t,n){var e,r;function tween(){var i=n.apply(this,arguments);i!==r&&(e=(r=i)&&attrInterpolate(t,i));return e}tween._value=n;return tween}function transition_attrTween(n,e){var r="attr."+n;if(arguments.length<2)return(r=this.tween(r))&&r._value;if(null==e)return this.tween(r,null);if("function"!==typeof e)throw new Error;var i=t(n);return this.tween(r,(i.local?attrTweenNS:attrTween)(i,e))}function delayFunction(t,n){return function(){init(this,t).delay=+n.apply(this,arguments)}}function delayConstant(t,n){return n=+n,function(){init(this,t).delay=n}}function transition_delay(t){var n=this._id;return arguments.length?this.each(("function"===typeof t?delayFunction:delayConstant)(n,t)):get(this.node(),n).delay}function durationFunction(t,n){return function(){set(this,t).duration=+n.apply(this,arguments)}}function durationConstant(t,n){return n=+n,function(){set(this,t).duration=n}}function transition_duration(t){var n=this._id;return arguments.length?this.each(("function"===typeof t?durationFunction:durationConstant)(n,t)):get(this.node(),n).duration}function easeConstant(t,n){if("function"!==typeof n)throw new Error;return function(){set(this,t).ease=n}}function transition_ease(t){var n=this._id;return arguments.length?this.each(easeConstant(n,t)):get(this.node(),n).ease}function easeVarying(t,n){return function(){var e=n.apply(this,arguments);if("function"!==typeof e)throw new Error;set(this,t).ease=e}}function transition_easeVarying(t){if("function"!==typeof t)throw new Error;return this.each(easeVarying(this._id,t))}function transition_filter(t){"function"!==typeof t&&(t=n(t));for(var e=this._groups,r=e.length,i=new Array(r),o=0;o<r;++o)for(var a,s=e[o],u=s.length,l=i[o]=[],c=0;c<u;++c)(a=s[c])&&t.call(a,a.__data__,c,s)&&l.push(a);return new Transition(i,this._parents,this._name,this._id)}function transition_merge(t){if(t._id!==this._id)throw new Error;for(var n=this._groups,e=t._groups,r=n.length,i=e.length,o=Math.min(r,i),a=new Array(r),s=0;s<o;++s)for(var u,l=n[s],c=e[s],f=l.length,h=a[s]=new Array(f),_=0;_<f;++_)(u=l[_]||c[_])&&(h[_]=u);for(;s<r;++s)a[s]=n[s];return new Transition(a,this._parents,this._name,this._id)}function start(t){return(t+"").trim().split(/^|\s+/).every((function(t){var n=t.indexOf(".");n>=0&&(t=t.slice(0,n));return!t||"start"===t}))}function onFunction(t,n,e){var r,i,o=start(n)?init:set;return function(){var a=o(this,t),s=a.on;s!==r&&(i=(r=s).copy()).on(n,e);a.on=i}}function transition_on(t,n){var e=this._id;return arguments.length<2?get(this.node(),e).on.on(t):this.each(onFunction(e,t,n))}function removeFunction(t){return function(){var n=this.parentNode;for(var e in this.__transition)if(+e!==t)return;n&&n.removeChild(this)}}function transition_remove(){return this.on("end.remove",removeFunction(this._id))}function transition_select(t){var n=this._name,r=this._id;"function"!==typeof t&&(t=e(t));for(var i=this._groups,o=i.length,a=new Array(o),s=0;s<o;++s)for(var u,l,c=i[s],f=c.length,h=a[s]=new Array(f),_=0;_<f;++_)if((u=c[_])&&(l=t.call(u,u.__data__,_,c))){"__data__"in u&&(l.__data__=u.__data__);h[_]=l;schedule(h[_],n,r,_,h,get(u,r))}return new Transition(a,this._parents,n,r)}function transition_selectAll(t){var n=this._name,e=this._id;"function"!==typeof t&&(t=r(t));for(var i=this._groups,o=i.length,a=[],s=[],u=0;u<o;++u)for(var l,c=i[u],f=c.length,h=0;h<f;++h)if(l=c[h]){for(var _,v=t.call(l,l.__data__,h,c),d=get(l,e),p=0,y=v.length;p<y;++p)(_=v[p])&&schedule(_,n,e,p,v,d);a.push(v);s.push(l)}return new Transition(a,s,n,e)}var F=i.prototype.constructor;function transition_selection(){return new F(this._groups,this._parents)}function styleNull(t,n){var e,r,i;return function(){var a=o(this,t),s=(this.style.removeProperty(t),o(this,t));return a===s?null:a===e&&s===r?i:i=n(e=a,r=s)}}function styleRemove(t){return function(){this.style.removeProperty(t)}}function styleConstant(t,n,e){var r,i,a=e+"";return function(){var s=o(this,t);return s===a?null:s===r?i:i=n(r=s,e)}}function styleFunction(t,n,e){var r,i,a;return function(){var s=o(this,t),u=e(this),l=u+"";null==u&&(l=u=(this.style.removeProperty(t),o(this,t)));return s===l?null:s===r&&l===i?a:(i=l,a=n(r=s,u))}}function styleMaybeRemove(t,n){var e,r,i,o,a="style."+n,s="end."+a;return function(){var u=set(this,t),l=u.on,c=null==u.value[a]?o||(o=styleRemove(n)):void 0;l===e&&i===c||(r=(e=l).copy()).on(s,i=c);u.on=r}}function transition_style(t,n,e){var r="transform"===(t+="")?v:interpolate;return null==n?this.styleTween(t,styleNull(t,r)).on("end.style."+t,styleRemove(t)):"function"===typeof n?this.styleTween(t,styleFunction(t,r,tweenValue(this,"style."+t,n))).each(styleMaybeRemove(this._id,t)):this.styleTween(t,styleConstant(t,r,n),e).on("end.style."+t,null)}function styleInterpolate(t,n,e){return function(r){this.style.setProperty(t,n.call(this,r),e)}}function styleTween(t,n,e){var r,i;function tween(){var o=n.apply(this,arguments);o!==i&&(r=(i=o)&&styleInterpolate(t,o,e));return r}tween._value=n;return tween}function transition_styleTween(t,n,e){var r="style."+(t+="");if(arguments.length<2)return(r=this.tween(r))&&r._value;if(null==n)return this.tween(r,null);if("function"!==typeof n)throw new Error;return this.tween(r,styleTween(t,n,null==e?"":e))}function textConstant(t){return function(){this.textContent=t}}function textFunction(t){return function(){var n=t(this);this.textContent=null==n?"":n}}function transition_text(t){return this.tween("text","function"===typeof t?textFunction(tweenValue(this,"text",t)):textConstant(null==t?"":t+""))}function textInterpolate(t){return function(n){this.textContent=t.call(this,n)}}function textTween(t){var n,e;function tween(){var r=t.apply(this,arguments);r!==e&&(n=(e=r)&&textInterpolate(r));return n}tween._value=t;return tween}function transition_textTween(t){var n="text";if(arguments.length<1)return(n=this.tween(n))&&n._value;if(null==t)return this.tween(n,null);if("function"!==typeof t)throw new Error;return this.tween(n,textTween(t))}function transition_transition(){var t=this._name,n=this._id,e=newId();for(var r=this._groups,i=r.length,o=0;o<i;++o)for(var a,s=r[o],u=s.length,l=0;l<u;++l)if(a=s[l]){var c=get(a,n);schedule(a,t,e,l,s,{time:c.time+c.delay+c.duration,delay:0,duration:c.duration,ease:c.ease})}return new Transition(r,this._parents,t,e)}function transition_end(){var t,n,e=this,r=e._id,i=e.size();return new Promise((function(o,a){var s={value:a},u={value:function(){0===--i&&o()}};e.each((function(){var e=set(this,r),i=e.on;if(i!==t){n=(t=i).copy();n._.cancel.push(s);n._.interrupt.push(s);n._.end.push(u)}e.on=n}));0===i&&o()}))}var b=0;function Transition(t,n,e,r){this._groups=t;this._parents=n;this._name=e;this._id=r}function transition(t){return i().transition(t)}function newId(){return++b}var S=i.prototype;Transition.prototype=transition.prototype={constructor:Transition,select:transition_select,selectAll:transition_selectAll,selectChild:S.selectChild,selectChildren:S.selectChildren,filter:transition_filter,merge:transition_merge,selection:transition_selection,transition:transition_transition,call:S.call,nodes:S.nodes,node:S.node,size:S.size,empty:S.empty,each:S.each,on:transition_on,attr:transition_attr,attrTween:transition_attrTween,style:transition_style,styleTween:transition_styleTween,text:transition_text,textTween:transition_textTween,remove:transition_remove,tween:transition_tween,delay:transition_delay,duration:transition_duration,ease:transition_ease,easeVarying:transition_easeVarying,end:transition_end,[Symbol.iterator]:S[Symbol.iterator]};var E={time:null,delay:0,duration:250,ease:p};function inherit(t,n){var e;while(!(e=t.__transition)||!(e=e[n]))if(!(t=t.parentNode))throw new Error(`transition ${n} not found`);return e}function selection_transition(t){var n,e;t instanceof Transition?(n=t._id,t=t._name):(n=newId(),(e=E).time=l(),t=null==t?null:t+"");for(var r=this._groups,i=r.length,o=0;o<i;++o)for(var a,s=r[o],u=s.length,c=0;c<u;++c)(a=s[c])&&schedule(a,t,n,c,s,e||inherit(a,n));return new Transition(r,this._parents,t,n)}i.prototype.interrupt=selection_interrupt;i.prototype.transition=selection_transition;var I=[null];function active(t,n){var e,r,i=t.__transition;if(i){n=null==n?null:n+"";for(r in i)if((e=i[r]).state>g&&e.name===n)return new Transition([[t]],I,n,+r)}return null}export{active,interrupt,transition};
 
diff --git a/vendor/javascript/d3-zoom.js b/vendor/javascript/d3-zoom.js
index f155a61d..2d59d2ff 100644
--- a/vendor/javascript/d3-zoom.js
+++ b/vendor/javascript/d3-zoom.js
@@ -1,2 +1,4 @@
+// d3-zoom@3.0.0 downloaded from https://ga.jspm.io/npm:d3-zoom@3.0.0/src/index.js
+
 import{dispatch as t}from"d3-dispatch";import{dragDisable as o,dragEnable as e}from"d3-drag";import{interpolateZoom as n}from"d3-interpolate";import{select as i,pointer as r}from"d3-selection";import{interrupt as u}from"d3-transition";var constant=t=>()=>t;function ZoomEvent(t,{sourceEvent:o,target:e,transform:n,dispatch:i}){Object.defineProperties(this,{type:{value:t,enumerable:true,configurable:true},sourceEvent:{value:o,enumerable:true,configurable:true},target:{value:e,enumerable:true,configurable:true},transform:{value:n,enumerable:true,configurable:true},_:{value:i}})}function Transform(t,o,e){this.k=t;this.x=o;this.y=e}Transform.prototype={constructor:Transform,scale:function(t){return 1===t?this:new Transform(this.k*t,this.x,this.y)},translate:function(t,o){return 0===t&0===o?this:new Transform(this.k,this.x+this.k*t,this.y+this.k*o)},apply:function(t){return[t[0]*this.k+this.x,t[1]*this.k+this.y]},applyX:function(t){return t*this.k+this.x},applyY:function(t){return t*this.k+this.y},invert:function(t){return[(t[0]-this.x)/this.k,(t[1]-this.y)/this.k]},invertX:function(t){return(t-this.x)/this.k},invertY:function(t){return(t-this.y)/this.k},rescaleX:function(t){return t.copy().domain(t.range().map(this.invertX,this).map(t.invert,t))},rescaleY:function(t){return t.copy().domain(t.range().map(this.invertY,this).map(t.invert,t))},toString:function(){return"translate("+this.x+","+this.y+") scale("+this.k+")"}};var s=new Transform(1,0,0);transform.prototype=Transform.prototype;function transform(t){while(!t.__zoom)if(!(t=t.parentNode))return s;return t.__zoom}function nopropagation(t){t.stopImmediatePropagation()}function noevent(t){t.preventDefault();t.stopImmediatePropagation()}function defaultFilter(t){return(!t.ctrlKey||"wheel"===t.type)&&!t.button}function defaultExtent(){var t=this;if(t instanceof SVGElement){t=t.ownerSVGElement||t;if(t.hasAttribute("viewBox")){t=t.viewBox.baseVal;return[[t.x,t.y],[t.x+t.width,t.y+t.height]]}return[[0,0],[t.width.baseVal.value,t.height.baseVal.value]]}return[[0,0],[t.clientWidth,t.clientHeight]]}function defaultTransform(){return this.__zoom||s}function defaultWheelDelta(t){return-t.deltaY*(1===t.deltaMode?.05:t.deltaMode?1:.002)*(t.ctrlKey?10:1)}function defaultTouchable(){return navigator.maxTouchPoints||"ontouchstart"in this}function defaultConstrain(t,o,e){var n=t.invertX(o[0][0])-e[0][0],i=t.invertX(o[1][0])-e[1][0],r=t.invertY(o[0][1])-e[0][1],u=t.invertY(o[1][1])-e[1][1];return t.translate(i>n?(n+i)/2:Math.min(0,n)||Math.max(0,i),u>r?(r+u)/2:Math.min(0,r)||Math.max(0,u))}function zoom(){var a,h,c,l=defaultFilter,m=defaultExtent,f=defaultConstrain,p=defaultWheelDelta,d=defaultTouchable,v=[0,Infinity],z=[[-Infinity,-Infinity],[Infinity,Infinity]],y=250,g=n,_=t("start","zoom","end"),w=500,T=150,k=0,x=10;function zoom(t){t.property("__zoom",defaultTransform).on("wheel.zoom",wheeled,{passive:false}).on("mousedown.zoom",mousedowned).on("dblclick.zoom",dblclicked).filter(d).on("touchstart.zoom",touchstarted).on("touchmove.zoom",touchmoved).on("touchend.zoom touchcancel.zoom",touchended).style("-webkit-tap-highlight-color","rgba(0,0,0,0)")}zoom.transform=function(t,o,e,n){var i=t.selection?t.selection():t;i.property("__zoom",defaultTransform);t!==i?schedule(t,o,e,n):i.interrupt().each((function(){gesture(this,arguments).event(n).start().zoom(null,"function"===typeof o?o.apply(this,arguments):o).end()}))};zoom.scaleBy=function(t,o,e,n){zoom.scaleTo(t,(function(){var t=this.__zoom.k,e="function"===typeof o?o.apply(this,arguments):o;return t*e}),e,n)};zoom.scaleTo=function(t,o,e,n){zoom.transform(t,(function(){var t=m.apply(this,arguments),n=this.__zoom,i=null==e?centroid(t):"function"===typeof e?e.apply(this,arguments):e,r=n.invert(i),u="function"===typeof o?o.apply(this,arguments):o;return f(translate(scale(n,u),i,r),t,z)}),e,n)};zoom.translateBy=function(t,o,e,n){zoom.transform(t,(function(){return f(this.__zoom.translate("function"===typeof o?o.apply(this,arguments):o,"function"===typeof e?e.apply(this,arguments):e),m.apply(this,arguments),z)}),null,n)};zoom.translateTo=function(t,o,e,n,i){zoom.transform(t,(function(){var t=m.apply(this,arguments),i=this.__zoom,r=null==n?centroid(t):"function"===typeof n?n.apply(this,arguments):n;return f(s.translate(r[0],r[1]).scale(i.k).translate("function"===typeof o?-o.apply(this,arguments):-o,"function"===typeof e?-e.apply(this,arguments):-e),t,z)}),n,i)};function scale(t,o){o=Math.max(v[0],Math.min(v[1],o));return o===t.k?t:new Transform(o,t.x,t.y)}function translate(t,o,e){var n=o[0]-e[0]*t.k,i=o[1]-e[1]*t.k;return n===t.x&&i===t.y?t:new Transform(t.k,n,i)}function centroid(t){return[(+t[0][0]+ +t[1][0])/2,(+t[0][1]+ +t[1][1])/2]}function schedule(t,o,e,n){t.on("start.zoom",(function(){gesture(this,arguments).event(n).start()})).on("interrupt.zoom end.zoom",(function(){gesture(this,arguments).event(n).end()})).tween("zoom",(function(){var t=this,i=arguments,r=gesture(t,i).event(n),u=m.apply(t,i),s=null==e?centroid(u):"function"===typeof e?e.apply(t,i):e,a=Math.max(u[1][0]-u[0][0],u[1][1]-u[0][1]),h=t.__zoom,c="function"===typeof o?o.apply(t,i):o,l=g(h.invert(s).concat(a/h.k),c.invert(s).concat(a/c.k));return function(t){if(1===t)t=c;else{var o=l(t),e=a/o[2];t=new Transform(e,s[0]-o[0]*e,s[1]-o[1]*e)}r.zoom(null,t)}}))}function gesture(t,o,e){return!e&&t.__zooming||new Gesture(t,o)}function Gesture(t,o){this.that=t;this.args=o;this.active=0;this.sourceEvent=null;this.extent=m.apply(t,o);this.taps=0}Gesture.prototype={event:function(t){t&&(this.sourceEvent=t);return this},start:function(){if(1===++this.active){this.that.__zooming=this;this.emit("start")}return this},zoom:function(t,o){this.mouse&&"mouse"!==t&&(this.mouse[1]=o.invert(this.mouse[0]));this.touch0&&"touch"!==t&&(this.touch0[1]=o.invert(this.touch0[0]));this.touch1&&"touch"!==t&&(this.touch1[1]=o.invert(this.touch1[0]));this.that.__zoom=o;this.emit("zoom");return this},end:function(){if(0===--this.active){delete this.that.__zooming;this.emit("end")}return this},emit:function(t){var o=i(this.that).datum();_.call(t,this.that,new ZoomEvent(t,{sourceEvent:this.sourceEvent,target:zoom,type:t,transform:this.that.__zoom,dispatch:_}),o)}};function wheeled(t,...o){if(l.apply(this,arguments)){var e=gesture(this,o).event(t),n=this.__zoom,i=Math.max(v[0],Math.min(v[1],n.k*Math.pow(2,p.apply(this,arguments)))),s=r(t);if(e.wheel){e.mouse[0][0]===s[0]&&e.mouse[0][1]===s[1]||(e.mouse[1]=n.invert(e.mouse[0]=s));clearTimeout(e.wheel)}else{if(n.k===i)return;e.mouse=[s,n.invert(s)];u(this);e.start()}noevent(t);e.wheel=setTimeout(wheelidled,T);e.zoom("mouse",f(translate(scale(n,i),e.mouse[0],e.mouse[1]),e.extent,z))}function wheelidled(){e.wheel=null;e.end()}}function mousedowned(t,...n){if(!c&&l.apply(this,arguments)){var s=t.currentTarget,a=gesture(this,n,true).event(t),h=i(t.view).on("mousemove.zoom",mousemoved,true).on("mouseup.zoom",mouseupped,true),m=r(t,s),p=t.clientX,d=t.clientY;o(t.view);nopropagation(t);a.mouse=[m,this.__zoom.invert(m)];u(this);a.start()}function mousemoved(t){noevent(t);if(!a.moved){var o=t.clientX-p,e=t.clientY-d;a.moved=o*o+e*e>k}a.event(t).zoom("mouse",f(translate(a.that.__zoom,a.mouse[0]=r(t,s),a.mouse[1]),a.extent,z))}function mouseupped(t){h.on("mousemove.zoom mouseup.zoom",null);e(t.view,a.moved);noevent(t);a.event(t).end()}}function dblclicked(t,...o){if(l.apply(this,arguments)){var e=this.__zoom,n=r(t.changedTouches?t.changedTouches[0]:t,this),u=e.invert(n),s=e.k*(t.shiftKey?.5:2),a=f(translate(scale(e,s),n,u),m.apply(this,o),z);noevent(t);y>0?i(this).transition().duration(y).call(schedule,a,n,t):i(this).call(zoom.transform,a,n,t)}}function touchstarted(t,...o){if(l.apply(this,arguments)){var e,n,i,s,c=t.touches,m=c.length,f=gesture(this,o,t.changedTouches.length===m).event(t);nopropagation(t);for(n=0;n<m;++n){i=c[n],s=r(i,this);s=[s,this.__zoom.invert(s),i.identifier];f.touch0?f.touch1||f.touch0[2]===s[2]||(f.touch1=s,f.taps=0):(f.touch0=s,e=true,f.taps=1+!!a)}a&&(a=clearTimeout(a));if(e){f.taps<2&&(h=s[0],a=setTimeout((function(){a=null}),w));u(this);f.start()}}}function touchmoved(t,...o){if(this.__zooming){var e,n,i,u,s=gesture(this,o).event(t),a=t.changedTouches,h=a.length;noevent(t);for(e=0;e<h;++e){n=a[e],i=r(n,this);s.touch0&&s.touch0[2]===n.identifier?s.touch0[0]=i:s.touch1&&s.touch1[2]===n.identifier&&(s.touch1[0]=i)}n=s.that.__zoom;if(s.touch1){var c=s.touch0[0],l=s.touch0[1],m=s.touch1[0],p=s.touch1[1],d=(d=m[0]-c[0])*d+(d=m[1]-c[1])*d,v=(v=p[0]-l[0])*v+(v=p[1]-l[1])*v;n=scale(n,Math.sqrt(d/v));i=[(c[0]+m[0])/2,(c[1]+m[1])/2];u=[(l[0]+p[0])/2,(l[1]+p[1])/2]}else{if(!s.touch0)return;i=s.touch0[0],u=s.touch0[1]}s.zoom("touch",f(translate(n,i,u),s.extent,z))}}function touchended(t,...o){if(this.__zooming){var e,n,u=gesture(this,o).event(t),s=t.changedTouches,a=s.length;nopropagation(t);c&&clearTimeout(c);c=setTimeout((function(){c=null}),w);for(e=0;e<a;++e){n=s[e];u.touch0&&u.touch0[2]===n.identifier?delete u.touch0:u.touch1&&u.touch1[2]===n.identifier&&delete u.touch1}u.touch1&&!u.touch0&&(u.touch0=u.touch1,delete u.touch1);if(u.touch0)u.touch0[1]=this.__zoom.invert(u.touch0[0]);else{u.end();if(2===u.taps){n=r(n,this);if(Math.hypot(h[0]-n[0],h[1]-n[1])<x){var l=i(this).on("dblclick.zoom");l&&l.apply(this,arguments)}}}}}zoom.wheelDelta=function(t){return arguments.length?(p="function"===typeof t?t:constant(+t),zoom):p};zoom.filter=function(t){return arguments.length?(l="function"===typeof t?t:constant(!!t),zoom):l};zoom.touchable=function(t){return arguments.length?(d="function"===typeof t?t:constant(!!t),zoom):d};zoom.extent=function(t){return arguments.length?(m="function"===typeof t?t:constant([[+t[0][0],+t[0][1]],[+t[1][0],+t[1][1]]]),zoom):m};zoom.scaleExtent=function(t){return arguments.length?(v[0]=+t[0],v[1]=+t[1],zoom):[v[0],v[1]]};zoom.translateExtent=function(t){return arguments.length?(z[0][0]=+t[0][0],z[1][0]=+t[1][0],z[0][1]=+t[0][1],z[1][1]=+t[1][1],zoom):[[z[0][0],z[0][1]],[z[1][0],z[1][1]]]};zoom.constrain=function(t){return arguments.length?(f=t,zoom):f};zoom.duration=function(t){return arguments.length?(y=+t,zoom):y};zoom.interpolate=function(t){return arguments.length?(g=t,zoom):g};zoom.on=function(){var t=_.on.apply(_,arguments);return t===_?zoom:t};zoom.clickDistance=function(t){return arguments.length?(k=(t=+t)*t,zoom):Math.sqrt(k)};zoom.tapDistance=function(t){return arguments.length?(x=+t,zoom):x};return zoom}export{Transform as ZoomTransform,zoom,s as zoomIdentity,transform as zoomTransform};
 
diff --git a/vendor/javascript/d3.js b/vendor/javascript/d3.js
index 85ca95d3..cdbea611 100644
--- a/vendor/javascript/d3.js
+++ b/vendor/javascript/d3.js
@@ -1 +1,4 @@
+// d3@7.9.0 downloaded from https://ga.jspm.io/npm:d3@7.9.0/src/index.js
+
 export*from"d3-array";export*from"d3-axis";export*from"d3-brush";export*from"d3-chord";export*from"d3-color";export*from"d3-contour";export*from"d3-delaunay";export*from"d3-dispatch";export*from"d3-drag";export*from"d3-dsv";export*from"d3-ease";export*from"d3-fetch";export*from"d3-force";export*from"d3-format";export*from"d3-geo";export*from"d3-hierarchy";export*from"d3-interpolate";export*from"d3-path";export*from"d3-polygon";export*from"d3-quadtree";export*from"d3-random";export*from"d3-scale";export*from"d3-scale-chromatic";export*from"d3-selection";export*from"d3-shape";export*from"d3-time";export*from"d3-time-format";export*from"d3-timer";export*from"d3-transition";export*from"d3-zoom";
+
diff --git a/vendor/javascript/delaunator.js b/vendor/javascript/delaunator.js
index 49508cb1..815f42ca 100644
--- a/vendor/javascript/delaunator.js
+++ b/vendor/javascript/delaunator.js
@@ -1,2 +1,4 @@
+// delaunator@5.0.1 downloaded from https://ga.jspm.io/npm:delaunator@5.0.1/index.js
+
 import{orient2d as t}from"robust-predicates";const s=Math.pow(2,-52);const i=new Uint32Array(512);class Delaunator{static from(t,s=defaultGetX,i=defaultGetY){const n=t.length;const e=new Float64Array(n*2);for(let h=0;h<n;h++){const n=t[h];e[2*h]=s(n);e[2*h+1]=i(n)}return new Delaunator(e)}constructor(t){const s=t.length>>1;if(s>0&&typeof t[0]!=="number")throw new Error("Expected coords to contain numbers.");this.coords=t;const i=Math.max(2*s-5,0);this._triangles=new Uint32Array(i*3);this._halfedges=new Int32Array(i*3);this._hashSize=Math.ceil(Math.sqrt(s));this._hullPrev=new Uint32Array(s);this._hullNext=new Uint32Array(s);this._hullTri=new Uint32Array(s);this._hullHash=new Int32Array(this._hashSize);this._ids=new Uint32Array(s);this._dists=new Float64Array(s);this.update()}update(){const{coords:i,_hullPrev:n,_hullNext:e,_hullTri:h,_hullHash:l}=this;const r=i.length>>1;let o=Infinity;let c=Infinity;let a=-Infinity;let u=-Infinity;for(let t=0;t<r;t++){const s=i[2*t];const n=i[2*t+1];s<o&&(o=s);n<c&&(c=n);s>a&&(a=s);n>u&&(u=n);this._ids[t]=t}const _=(o+a)/2;const f=(c+u)/2;let d,y,g;for(let t=0,s=Infinity;t<r;t++){const n=dist(_,f,i[2*t],i[2*t+1]);if(n<s){d=t;s=n}}const w=i[2*d];const k=i[2*d+1];for(let t=0,s=Infinity;t<r;t++){if(t===d)continue;const n=dist(w,k,i[2*t],i[2*t+1]);if(n<s&&n>0){y=t;s=n}}let b=i[2*y];let p=i[2*y+1];let A=Infinity;for(let t=0;t<r;t++){if(t===d||t===y)continue;const s=circumradius(w,k,b,p,i[2*t],i[2*t+1]);if(s<A){g=t;A=s}}let I=i[2*g];let S=i[2*g+1];if(A===Infinity){for(let t=0;t<r;t++)this._dists[t]=i[2*t]-i[0]||i[2*t+1]-i[1];quicksort(this._ids,this._dists,0,r-1);const t=new Uint32Array(r);let s=0;for(let i=0,n=-Infinity;i<r;i++){const e=this._ids[i];const h=this._dists[e];if(h>n){t[s++]=e;n=h}}this.hull=t.subarray(0,s);this.triangles=new Uint32Array(0);this.halfedges=new Uint32Array(0);return}if(t(w,k,b,p,I,S)<0){const t=y;const s=b;const i=p;y=g;b=I;p=S;g=t;I=s;S=i}const m=circumcenter(w,k,b,p,I,S);this._cx=m.x;this._cy=m.y;for(let t=0;t<r;t++)this._dists[t]=dist(i[2*t],i[2*t+1],m.x,m.y);quicksort(this._ids,this._dists,0,r-1);this._hullStart=d;let x=3;e[d]=n[g]=y;e[y]=n[d]=g;e[g]=n[y]=d;h[d]=0;h[y]=1;h[g]=2;l.fill(-1);l[this._hashKey(w,k)]=d;l[this._hashKey(b,p)]=y;l[this._hashKey(I,S)]=g;this.trianglesLen=0;this._addTriangle(d,y,g,-1,-1,-1);for(let r,o,c=0;c<this._ids.length;c++){const a=this._ids[c];const u=i[2*a];const _=i[2*a+1];if(c>0&&Math.abs(u-r)<=s&&Math.abs(_-o)<=s)continue;r=u;o=_;if(a===d||a===y||a===g)continue;let f=0;for(let t=0,s=this._hashKey(u,_);t<this._hashSize;t++){f=l[(s+t)%this._hashSize];if(f!==-1&&f!==e[f])break}f=n[f];let w,k=f;while(w=e[k],t(u,_,i[2*k],i[2*k+1],i[2*w],i[2*w+1])>=0){k=w;if(k===f){k=-1;break}}if(k===-1)continue;let b=this._addTriangle(k,a,e[k],-1,-1,h[k]);h[a]=this._legalize(b+2);h[k]=b;x++;let p=e[k];while(w=e[p],t(u,_,i[2*p],i[2*p+1],i[2*w],i[2*w+1])<0){b=this._addTriangle(p,a,w,h[a],-1,h[p]);h[a]=this._legalize(b+2);e[p]=p;x--;p=w}if(k===f)while(w=n[k],t(u,_,i[2*w],i[2*w+1],i[2*k],i[2*k+1])<0){b=this._addTriangle(w,a,k,-1,h[k],h[w]);this._legalize(b+2);h[w]=b;e[k]=k;x--;k=w}this._hullStart=n[a]=k;e[k]=n[p]=a;e[a]=p;l[this._hashKey(u,_)]=a;l[this._hashKey(i[2*k],i[2*k+1])]=k}this.hull=new Uint32Array(x);for(let t=0,s=this._hullStart;t<x;t++){this.hull[t]=s;s=e[s]}this.triangles=this._triangles.subarray(0,this.trianglesLen);this.halfedges=this._halfedges.subarray(0,this.trianglesLen)}_hashKey(t,s){return Math.floor(pseudoAngle(t-this._cx,s-this._cy)*this._hashSize)%this._hashSize}_legalize(t){const{_triangles:s,_halfedges:n,coords:e}=this;let h=0;let l=0;while(true){const r=n[t];const o=t-t%3;l=o+(t+2)%3;if(r===-1){if(h===0)break;t=i[--h];continue}const c=r-r%3;const a=o+(t+1)%3;const u=c+(r+2)%3;const _=s[l];const f=s[t];const d=s[a];const y=s[u];const g=inCircle(e[2*_],e[2*_+1],e[2*f],e[2*f+1],e[2*d],e[2*d+1],e[2*y],e[2*y+1]);if(g){s[t]=y;s[r]=_;const e=n[u];if(e===-1){let s=this._hullStart;do{if(this._hullTri[s]===u){this._hullTri[s]=t;break}s=this._hullPrev[s]}while(s!==this._hullStart)}this._link(t,e);this._link(r,n[l]);this._link(l,u);const o=c+(r+1)%3;h<i.length&&(i[h++]=o)}else{if(h===0)break;t=i[--h]}}return l}_link(t,s){this._halfedges[t]=s;s!==-1&&(this._halfedges[s]=t)}_addTriangle(t,s,i,n,e,h){const l=this.trianglesLen;this._triangles[l]=t;this._triangles[l+1]=s;this._triangles[l+2]=i;this._link(l,n);this._link(l+1,e);this._link(l+2,h);this.trianglesLen+=3;return l}}function pseudoAngle(t,s){const i=t/(Math.abs(t)+Math.abs(s));return(s>0?3-i:1+i)/4}function dist(t,s,i,n){const e=t-i;const h=s-n;return e*e+h*h}function inCircle(t,s,i,n,e,h,l,r){const o=t-l;const c=s-r;const a=i-l;const u=n-r;const _=e-l;const f=h-r;const d=o*o+c*c;const y=a*a+u*u;const g=_*_+f*f;return o*(u*g-y*f)-c*(a*g-y*_)+d*(a*f-u*_)<0}function circumradius(t,s,i,n,e,h){const l=i-t;const r=n-s;const o=e-t;const c=h-s;const a=l*l+r*r;const u=o*o+c*c;const _=.5/(l*c-r*o);const f=(c*a-r*u)*_;const d=(l*u-o*a)*_;return f*f+d*d}function circumcenter(t,s,i,n,e,h){const l=i-t;const r=n-s;const o=e-t;const c=h-s;const a=l*l+r*r;const u=o*o+c*c;const _=.5/(l*c-r*o);const f=t+(c*a-r*u)*_;const d=s+(l*u-o*a)*_;return{x:f,y:d}}function quicksort(t,s,i,n){if(n-i<=20)for(let e=i+1;e<=n;e++){const n=t[e];const h=s[n];let l=e-1;while(l>=i&&s[t[l]]>h)t[l+1]=t[l--];t[l+1]=n}else{const e=i+n>>1;let h=i+1;let l=n;swap(t,e,h);s[t[i]]>s[t[n]]&&swap(t,i,n);s[t[h]]>s[t[n]]&&swap(t,h,n);s[t[i]]>s[t[h]]&&swap(t,i,h);const r=t[h];const o=s[r];while(true){do{h++}while(s[t[h]]<o);do{l--}while(s[t[l]]>o);if(l<h)break;swap(t,h,l)}t[i+1]=t[l];t[l]=r;if(n-h+1>=l-i){quicksort(t,s,h,n);quicksort(t,s,i,l-1)}else{quicksort(t,s,i,l-1);quicksort(t,s,h,n)}}}function swap(t,s,i){const n=t[s];t[s]=t[i];t[i]=n}function defaultGetX(t){return t[0]}function defaultGetY(t){return t[1]}export{Delaunator as default};
 
diff --git a/vendor/javascript/internmap.js b/vendor/javascript/internmap.js
index 8f8ace93..d1aea069 100644
--- a/vendor/javascript/internmap.js
+++ b/vendor/javascript/internmap.js
@@ -1,2 +1,4 @@
+// internmap@2.0.3 downloaded from https://ga.jspm.io/npm:internmap@2.0.3/src/index.js
+
 class InternMap extends Map{constructor(e,t=keyof){super();Object.defineProperties(this,{_intern:{value:new Map},_key:{value:t}});if(null!=e)for(const[t,n]of e)this.set(t,n)}get(e){return super.get(intern_get(this,e))}has(e){return super.has(intern_get(this,e))}set(e,t){return super.set(intern_set(this,e),t)}delete(e){return super.delete(intern_delete(this,e))}}class InternSet extends Set{constructor(e,t=keyof){super();Object.defineProperties(this,{_intern:{value:new Map},_key:{value:t}});if(null!=e)for(const t of e)this.add(t)}has(e){return super.has(intern_get(this,e))}add(e){return super.add(intern_set(this,e))}delete(e){return super.delete(intern_delete(this,e))}}function intern_get({_intern:e,_key:t},n){const r=t(n);return e.has(r)?e.get(r):n}function intern_set({_intern:e,_key:t},n){const r=t(n);if(e.has(r))return e.get(r);e.set(r,n);return n}function intern_delete({_intern:e,_key:t},n){const r=t(n);if(e.has(r)){n=e.get(r);e.delete(r)}return n}function keyof(e){return null!==e&&"object"===typeof e?e.valueOf():e}export{InternMap,InternSet};
 
diff --git a/vendor/javascript/robust-predicates.js b/vendor/javascript/robust-predicates.js
index d82a84a8..c89bb214 100644
--- a/vendor/javascript/robust-predicates.js
+++ b/vendor/javascript/robust-predicates.js
@@ -1,2 +1,4 @@
+// robust-predicates@3.0.2 downloaded from https://ga.jspm.io/npm:robust-predicates@3.0.2/index.js
+
 const c=11102230246251565e-32;const s=134217729;const t=(3+8*c)*c;function sum(c,s,t,n,e){let o,a,l,i;let r=s[0];let f=n[0];let u=0;let d=0;if(f>r===f>-r){o=r;r=s[++u]}else{o=f;f=n[++d]}let v=0;if(u<c&&d<t){if(f>r===f>-r){a=r+o;l=o-(a-r);r=s[++u]}else{a=f+o;l=o-(a-f);f=n[++d]}o=a;0!==l&&(e[v++]=l);while(u<c&&d<t){if(f>r===f>-r){a=o+r;i=a-o;l=o-(a-i)+(r-i);r=s[++u]}else{a=o+f;i=a-o;l=o-(a-i)+(f-i);f=n[++d]}o=a;0!==l&&(e[v++]=l)}}while(u<c){a=o+r;i=a-o;l=o-(a-i)+(r-i);r=s[++u];o=a;0!==l&&(e[v++]=l)}while(d<t){a=o+f;i=a-o;l=o-(a-i)+(f-i);f=n[++d];o=a;0!==l&&(e[v++]=l)}0===o&&0!==v||(e[v++]=o);return v}function sum_three(c,s,t,n,e,o,a,l){return sum(sum(c,s,t,n,a),a,e,o,l)}function scale(c,t,n,e){let o,a,l,i,r;let f,u,d,v,h,m;u=s*n;h=u-(u-n);m=n-h;let _=t[0];o=_*n;u=s*_;d=u-(u-_);v=_-d;l=v*m-(o-d*h-v*h-d*m);let b=0;0!==l&&(e[b++]=l);for(let M=1;M<c;M++){_=t[M];i=_*n;u=s*_;d=u-(u-_);v=_-d;r=v*m-(i-d*h-v*h-d*m);a=o+r;f=a-o;l=o-(a-f)+(r-f);0!==l&&(e[b++]=l);o=i+a;l=a-(o-i);0!==l&&(e[b++]=l)}0===o&&0!==b||(e[b++]=o);return b}function negate(c,s){for(let t=0;t<c;t++)s[t]=-s[t];return c}function estimate(c,s){let t=s[0];for(let n=1;n<c;n++)t+=s[n];return t}function vec(c){return new Float64Array(c)}const n=(3+16*c)*c;const e=(2+12*c)*c;const o=(9+64*c)*c*c;const a=vec(4);const l=vec(8);const i=vec(12);const r=vec(16);const f=vec(4);function orient2dadapt(c,n,u,d,v,h,m){let _,b,M,p;let $,x,g,w,y,A,F,j,k,q,z,B,C,D;const E=c-v;const G=u-v;const H=n-h;const I=d-h;q=E*I;x=s*E;g=x-(x-E);w=E-g;x=s*I;y=x-(x-I);A=I-y;z=w*A-(q-g*y-w*y-g*A);B=H*G;x=s*H;g=x-(x-H);w=H-g;x=s*G;y=x-(x-G);A=G-y;C=w*A-(B-g*y-w*y-g*A);F=z-C;$=z-F;a[0]=z-(F+$)+($-C);j=q+F;$=j-q;k=q-(j-$)+(F-$);F=k-B;$=k-F;a[1]=k-(F+$)+($-B);D=j+F;$=D-j;a[2]=j-(D-$)+(F-$);a[3]=D;let J=estimate(4,a);let K=e*m;if(J>=K||-J>=K)return J;$=c-E;_=c-(E+$)+($-v);$=u-G;M=u-(G+$)+($-v);$=n-H;b=n-(H+$)+($-h);$=d-I;p=d-(I+$)+($-h);if(0===_&&0===b&&0===M&&0===p)return J;K=o*m+t*Math.abs(J);J+=E*p+I*_-(H*M+G*b);if(J>=K||-J>=K)return J;q=_*I;x=s*_;g=x-(x-_);w=_-g;x=s*I;y=x-(x-I);A=I-y;z=w*A-(q-g*y-w*y-g*A);B=b*G;x=s*b;g=x-(x-b);w=b-g;x=s*G;y=x-(x-G);A=G-y;C=w*A-(B-g*y-w*y-g*A);F=z-C;$=z-F;f[0]=z-(F+$)+($-C);j=q+F;$=j-q;k=q-(j-$)+(F-$);F=k-B;$=k-F;f[1]=k-(F+$)+($-B);D=j+F;$=D-j;f[2]=j-(D-$)+(F-$);f[3]=D;const L=sum(4,a,4,f,l);q=E*p;x=s*E;g=x-(x-E);w=E-g;x=s*p;y=x-(x-p);A=p-y;z=w*A-(q-g*y-w*y-g*A);B=H*M;x=s*H;g=x-(x-H);w=H-g;x=s*M;y=x-(x-M);A=M-y;C=w*A-(B-g*y-w*y-g*A);F=z-C;$=z-F;f[0]=z-(F+$)+($-C);j=q+F;$=j-q;k=q-(j-$)+(F-$);F=k-B;$=k-F;f[1]=k-(F+$)+($-B);D=j+F;$=D-j;f[2]=j-(D-$)+(F-$);f[3]=D;const N=sum(L,l,4,f,i);q=_*p;x=s*_;g=x-(x-_);w=_-g;x=s*p;y=x-(x-p);A=p-y;z=w*A-(q-g*y-w*y-g*A);B=b*M;x=s*b;g=x-(x-b);w=b-g;x=s*M;y=x-(x-M);A=M-y;C=w*A-(B-g*y-w*y-g*A);F=z-C;$=z-F;f[0]=z-(F+$)+($-C);j=q+F;$=j-q;k=q-(j-$)+(F-$);F=k-B;$=k-F;f[1]=k-(F+$)+($-B);D=j+F;$=D-j;f[2]=j-(D-$)+(F-$);f[3]=D;const O=sum(N,i,4,f,r);return r[O-1]}function orient2d(c,s,t,e,o,a){const l=(s-a)*(t-o);const i=(c-o)*(e-a);const r=l-i;const f=Math.abs(l+i);return Math.abs(r)>=n*f?r:-orient2dadapt(c,s,t,e,o,a,f)}function orient2dfast(c,s,t,n,e,o){return(s-o)*(t-e)-(c-e)*(n-o)}const u=(7+56*c)*c;const d=(3+28*c)*c;const v=(26+288*c)*c*c;const h=vec(4);const m=vec(4);const _=vec(4);const b=vec(4);const M=vec(4);const p=vec(4);const $=vec(4);const x=vec(4);const g=vec(4);const w=vec(8);const y=vec(8);const A=vec(8);const F=vec(4);const j=vec(8);const k=vec(8);const q=vec(8);const z=vec(12);let B=vec(192);let C=vec(192);function finadd$1(c,s,t){c=sum(c,B,s,t,C);const n=B;B=C;C=n;return c}function tailinit(c,t,n,e,o,a,l,i){let r,f,u,d,v,h,m,_,b,M,p,$,x,g,w;if(0===c){if(0===t){l[0]=0;i[0]=0;return 1}w=-t;M=w*n;f=s*w;u=f-(f-w);d=w-u;f=s*n;v=f-(f-n);h=n-v;l[0]=d*h-(M-u*v-d*v-u*h);l[1]=M;M=t*o;f=s*t;u=f-(f-t);d=t-u;f=s*o;v=f-(f-o);h=o-v;i[0]=d*h-(M-u*v-d*v-u*h);i[1]=M;return 2}if(0===t){M=c*e;f=s*c;u=f-(f-c);d=c-u;f=s*e;v=f-(f-e);h=e-v;l[0]=d*h-(M-u*v-d*v-u*h);l[1]=M;w=-c;M=w*a;f=s*w;u=f-(f-w);d=w-u;f=s*a;v=f-(f-a);h=a-v;i[0]=d*h-(M-u*v-d*v-u*h);i[1]=M;return 2}M=c*e;f=s*c;u=f-(f-c);d=c-u;f=s*e;v=f-(f-e);h=e-v;p=d*h-(M-u*v-d*v-u*h);$=t*n;f=s*t;u=f-(f-t);d=t-u;f=s*n;v=f-(f-n);h=n-v;x=d*h-($-u*v-d*v-u*h);m=p-x;r=p-m;l[0]=p-(m+r)+(r-x);_=M+m;r=_-M;b=M-(_-r)+(m-r);m=b-$;r=b-m;l[1]=b-(m+r)+(r-$);g=_+m;r=g-_;l[2]=_-(g-r)+(m-r);l[3]=g;M=t*o;f=s*t;u=f-(f-t);d=t-u;f=s*o;v=f-(f-o);h=o-v;p=d*h-(M-u*v-d*v-u*h);$=c*a;f=s*c;u=f-(f-c);d=c-u;f=s*a;v=f-(f-a);h=a-v;x=d*h-($-u*v-d*v-u*h);m=p-x;r=p-m;i[0]=p-(m+r)+(r-x);_=M+m;r=_-M;b=M-(_-r)+(m-r);m=b-$;r=b-m;i[1]=b-(m+r)+(r-$);g=_+m;r=g-_;i[2]=_-(g-r)+(m-r);i[3]=g;return 4}function tailadd(c,t,n,e,o){let a,l,i,r,f,u,d,v,h,m,_,b,M;_=t*n;l=s*t;i=l-(l-t);r=t-i;l=s*n;f=l-(l-n);u=n-f;b=r*u-(_-i*f-r*f-i*u);l=s*e;f=l-(l-e);u=e-f;d=b*e;l=s*b;i=l-(l-b);r=b-i;F[0]=r*u-(d-i*f-r*f-i*u);v=_*e;l=s*_;i=l-(l-_);r=_-i;m=r*u-(v-i*f-r*f-i*u);h=d+m;a=h-d;F[1]=d-(h-a)+(m-a);M=v+h;F[2]=h-(M-v);F[3]=M;c=finadd$1(c,4,F);if(0!==o){l=s*o;f=l-(l-o);u=o-f;d=b*o;l=s*b;i=l-(l-b);r=b-i;F[0]=r*u-(d-i*f-r*f-i*u);v=_*o;l=s*_;i=l-(l-_);r=_-i;m=r*u-(v-i*f-r*f-i*u);h=d+m;a=h-d;F[1]=d-(h-a)+(m-a);M=v+h;F[2]=h-(M-v);F[3]=M;c=finadd$1(c,4,F)}return c}function orient3dadapt(c,n,e,o,a,l,i,r,f,u,F,C,D){let E;let G,H,I;let J,K,L;let N,O,P;let Q,R,S,T,U,V,W,X,Y,Z,cc,sc,tc,nc;const ec=c-u;const oc=o-u;const ac=i-u;const lc=n-F;const ic=a-F;const rc=r-F;const fc=e-C;const uc=l-C;const dc=f-C;Z=oc*rc;R=s*oc;S=R-(R-oc);T=oc-S;R=s*rc;U=R-(R-rc);V=rc-U;cc=T*V-(Z-S*U-T*U-S*V);sc=ac*ic;R=s*ac;S=R-(R-ac);T=ac-S;R=s*ic;U=R-(R-ic);V=ic-U;tc=T*V-(sc-S*U-T*U-S*V);W=cc-tc;Q=cc-W;h[0]=cc-(W+Q)+(Q-tc);X=Z+W;Q=X-Z;Y=Z-(X-Q)+(W-Q);W=Y-sc;Q=Y-W;h[1]=Y-(W+Q)+(Q-sc);nc=X+W;Q=nc-X;h[2]=X-(nc-Q)+(W-Q);h[3]=nc;Z=ac*lc;R=s*ac;S=R-(R-ac);T=ac-S;R=s*lc;U=R-(R-lc);V=lc-U;cc=T*V-(Z-S*U-T*U-S*V);sc=ec*rc;R=s*ec;S=R-(R-ec);T=ec-S;R=s*rc;U=R-(R-rc);V=rc-U;tc=T*V-(sc-S*U-T*U-S*V);W=cc-tc;Q=cc-W;m[0]=cc-(W+Q)+(Q-tc);X=Z+W;Q=X-Z;Y=Z-(X-Q)+(W-Q);W=Y-sc;Q=Y-W;m[1]=Y-(W+Q)+(Q-sc);nc=X+W;Q=nc-X;m[2]=X-(nc-Q)+(W-Q);m[3]=nc;Z=ec*ic;R=s*ec;S=R-(R-ec);T=ec-S;R=s*ic;U=R-(R-ic);V=ic-U;cc=T*V-(Z-S*U-T*U-S*V);sc=oc*lc;R=s*oc;S=R-(R-oc);T=oc-S;R=s*lc;U=R-(R-lc);V=lc-U;tc=T*V-(sc-S*U-T*U-S*V);W=cc-tc;Q=cc-W;_[0]=cc-(W+Q)+(Q-tc);X=Z+W;Q=X-Z;Y=Z-(X-Q)+(W-Q);W=Y-sc;Q=Y-W;_[1]=Y-(W+Q)+(Q-sc);nc=X+W;Q=nc-X;_[2]=X-(nc-Q)+(W-Q);_[3]=nc;E=sum(sum(scale(4,h,fc,j),j,scale(4,m,uc,k),k,q),q,scale(4,_,dc,j),j,B);let vc=estimate(E,B);let hc=d*D;if(vc>=hc||-vc>=hc)return vc;Q=c-ec;G=c-(ec+Q)+(Q-u);Q=o-oc;H=o-(oc+Q)+(Q-u);Q=i-ac;I=i-(ac+Q)+(Q-u);Q=n-lc;J=n-(lc+Q)+(Q-F);Q=a-ic;K=a-(ic+Q)+(Q-F);Q=r-rc;L=r-(rc+Q)+(Q-F);Q=e-fc;N=e-(fc+Q)+(Q-C);Q=l-uc;O=l-(uc+Q)+(Q-C);Q=f-dc;P=f-(dc+Q)+(Q-C);if(0===G&&0===H&&0===I&&0===J&&0===K&&0===L&&0===N&&0===O&&0===P)return vc;hc=v*D+t*Math.abs(vc);vc+=fc*(oc*L+rc*H-(ic*I+ac*K))+N*(oc*rc-ic*ac)+uc*(ac*J+lc*I-(rc*G+ec*L))+O*(ac*lc-rc*ec)+dc*(ec*K+ic*G-(lc*H+oc*J))+P*(ec*ic-lc*oc);if(vc>=hc||-vc>=hc)return vc;const mc=tailinit(G,J,oc,ic,ac,rc,b,M);const _c=tailinit(H,K,ac,rc,ec,lc,p,$);const bc=tailinit(I,L,ec,lc,oc,ic,x,g);const Mc=sum(_c,p,bc,g,w);E=finadd$1(E,scale(Mc,w,fc,q),q);const pc=sum(bc,x,mc,M,y);E=finadd$1(E,scale(pc,y,uc,q),q);const $c=sum(mc,b,_c,$,A);E=finadd$1(E,scale($c,A,dc,q),q);if(0!==N){E=finadd$1(E,scale(4,h,N,z),z);E=finadd$1(E,scale(Mc,w,N,q),q)}if(0!==O){E=finadd$1(E,scale(4,m,O,z),z);E=finadd$1(E,scale(pc,y,O,q),q)}if(0!==P){E=finadd$1(E,scale(4,_,P,z),z);E=finadd$1(E,scale($c,A,P,q),q)}if(0!==G){0!==K&&(E=tailadd(E,G,K,dc,P));0!==L&&(E=tailadd(E,-G,L,uc,O))}if(0!==H){0!==L&&(E=tailadd(E,H,L,fc,N));0!==J&&(E=tailadd(E,-H,J,dc,P))}if(0!==I){0!==J&&(E=tailadd(E,I,J,uc,O));0!==K&&(E=tailadd(E,-I,K,fc,N))}return B[E-1]}function orient3d(c,s,t,n,e,o,a,l,i,r,f,d){const v=c-r;const h=n-r;const m=a-r;const _=s-f;const b=e-f;const M=l-f;const p=t-d;const $=o-d;const x=i-d;const g=h*M;const w=m*b;const y=m*_;const A=v*M;const F=v*b;const j=h*_;const k=p*(g-w)+$*(y-A)+x*(F-j);const q=(Math.abs(g)+Math.abs(w))*Math.abs(p)+(Math.abs(y)+Math.abs(A))*Math.abs($)+(Math.abs(F)+Math.abs(j))*Math.abs(x);const z=u*q;return k>z||-k>z?k:orient3dadapt(c,s,t,n,e,o,a,l,i,r,f,d,q)}function orient3dfast(c,s,t,n,e,o,a,l,i,r,f,u){const d=c-r;const v=n-r;const h=a-r;const m=s-f;const _=e-f;const b=l-f;const M=t-u;const p=o-u;const $=i-u;return d*(_*$-p*b)+v*(b*M-$*m)+h*(m*p-M*_)}const D=(10+96*c)*c;const E=(4+48*c)*c;const G=(44+576*c)*c*c;const H=vec(4);const I=vec(4);const J=vec(4);const K=vec(4);const L=vec(4);const N=vec(4);const O=vec(4);const P=vec(4);const Q=vec(8);const R=vec(8);const S=vec(8);const T=vec(8);const U=vec(8);const V=vec(8);const W=vec(8);const X=vec(8);const Y=vec(8);const Z=vec(4);const cc=vec(4);const sc=vec(4);const tc=vec(8);const nc=vec(16);const ec=vec(16);const oc=vec(16);const ac=vec(32);const lc=vec(32);const ic=vec(48);const rc=vec(64);let fc=vec(1152);let uc=vec(1152);function finadd(c,s,t){c=sum(c,fc,s,t,uc);const n=fc;fc=uc;uc=n;return c}function incircleadapt(c,n,e,o,a,l,i,r,f){let u;let d,v,h,m,_,b;let M,p,$,x,g,w;let y,A,F;let j,k,q;let z,B;let C,D,uc,dc,vc,hc,mc,_c,bc,Mc,pc,$c,xc,gc;const wc=c-i;const yc=e-i;const Ac=a-i;const Fc=n-r;const jc=o-r;const kc=l-r;Mc=yc*kc;D=s*yc;uc=D-(D-yc);dc=yc-uc;D=s*kc;vc=D-(D-kc);hc=kc-vc;pc=dc*hc-(Mc-uc*vc-dc*vc-uc*hc);$c=Ac*jc;D=s*Ac;uc=D-(D-Ac);dc=Ac-uc;D=s*jc;vc=D-(D-jc);hc=jc-vc;xc=dc*hc-($c-uc*vc-dc*vc-uc*hc);mc=pc-xc;C=pc-mc;H[0]=pc-(mc+C)+(C-xc);_c=Mc+mc;C=_c-Mc;bc=Mc-(_c-C)+(mc-C);mc=bc-$c;C=bc-mc;H[1]=bc-(mc+C)+(C-$c);gc=_c+mc;C=gc-_c;H[2]=_c-(gc-C)+(mc-C);H[3]=gc;Mc=Ac*Fc;D=s*Ac;uc=D-(D-Ac);dc=Ac-uc;D=s*Fc;vc=D-(D-Fc);hc=Fc-vc;pc=dc*hc-(Mc-uc*vc-dc*vc-uc*hc);$c=wc*kc;D=s*wc;uc=D-(D-wc);dc=wc-uc;D=s*kc;vc=D-(D-kc);hc=kc-vc;xc=dc*hc-($c-uc*vc-dc*vc-uc*hc);mc=pc-xc;C=pc-mc;I[0]=pc-(mc+C)+(C-xc);_c=Mc+mc;C=_c-Mc;bc=Mc-(_c-C)+(mc-C);mc=bc-$c;C=bc-mc;I[1]=bc-(mc+C)+(C-$c);gc=_c+mc;C=gc-_c;I[2]=_c-(gc-C)+(mc-C);I[3]=gc;Mc=wc*jc;D=s*wc;uc=D-(D-wc);dc=wc-uc;D=s*jc;vc=D-(D-jc);hc=jc-vc;pc=dc*hc-(Mc-uc*vc-dc*vc-uc*hc);$c=yc*Fc;D=s*yc;uc=D-(D-yc);dc=yc-uc;D=s*Fc;vc=D-(D-Fc);hc=Fc-vc;xc=dc*hc-($c-uc*vc-dc*vc-uc*hc);mc=pc-xc;C=pc-mc;J[0]=pc-(mc+C)+(C-xc);_c=Mc+mc;C=_c-Mc;bc=Mc-(_c-C)+(mc-C);mc=bc-$c;C=bc-mc;J[1]=bc-(mc+C)+(C-$c);gc=_c+mc;C=gc-_c;J[2]=_c-(gc-C)+(mc-C);J[3]=gc;u=sum(sum(sum(scale(scale(4,H,wc,tc),tc,wc,nc),nc,scale(scale(4,H,Fc,tc),tc,Fc,ec),ec,ac),ac,sum(scale(scale(4,I,yc,tc),tc,yc,nc),nc,scale(scale(4,I,jc,tc),tc,jc,ec),ec,lc),lc,rc),rc,sum(scale(scale(4,J,Ac,tc),tc,Ac,nc),nc,scale(scale(4,J,kc,tc),tc,kc,ec),ec,ac),ac,fc);let qc=estimate(u,fc);let zc=E*f;if(qc>=zc||-qc>=zc)return qc;C=c-wc;d=c-(wc+C)+(C-i);C=n-Fc;m=n-(Fc+C)+(C-r);C=e-yc;v=e-(yc+C)+(C-i);C=o-jc;_=o-(jc+C)+(C-r);C=a-Ac;h=a-(Ac+C)+(C-i);C=l-kc;b=l-(kc+C)+(C-r);if(0===d&&0===v&&0===h&&0===m&&0===_&&0===b)return qc;zc=G*f+t*Math.abs(qc);qc+=(wc*wc+Fc*Fc)*(yc*b+kc*v-(jc*h+Ac*_))+2*(wc*d+Fc*m)*(yc*kc-jc*Ac)+((yc*yc+jc*jc)*(Ac*m+Fc*h-(kc*d+wc*b))+2*(yc*v+jc*_)*(Ac*Fc-kc*wc))+((Ac*Ac+kc*kc)*(wc*_+jc*d-(Fc*v+yc*m))+2*(Ac*h+kc*b)*(wc*jc-Fc*yc));if(qc>=zc||-qc>=zc)return qc;if(0!==v||0!==_||0!==h||0!==b){Mc=wc*wc;D=s*wc;uc=D-(D-wc);dc=wc-uc;pc=dc*dc-(Mc-uc*uc-(uc+uc)*dc);$c=Fc*Fc;D=s*Fc;uc=D-(D-Fc);dc=Fc-uc;xc=dc*dc-($c-uc*uc-(uc+uc)*dc);mc=pc+xc;C=mc-pc;K[0]=pc-(mc-C)+(xc-C);_c=Mc+mc;C=_c-Mc;bc=Mc-(_c-C)+(mc-C);mc=bc+$c;C=mc-bc;K[1]=bc-(mc-C)+($c-C);gc=_c+mc;C=gc-_c;K[2]=_c-(gc-C)+(mc-C);K[3]=gc}if(0!==h||0!==b||0!==d||0!==m){Mc=yc*yc;D=s*yc;uc=D-(D-yc);dc=yc-uc;pc=dc*dc-(Mc-uc*uc-(uc+uc)*dc);$c=jc*jc;D=s*jc;uc=D-(D-jc);dc=jc-uc;xc=dc*dc-($c-uc*uc-(uc+uc)*dc);mc=pc+xc;C=mc-pc;L[0]=pc-(mc-C)+(xc-C);_c=Mc+mc;C=_c-Mc;bc=Mc-(_c-C)+(mc-C);mc=bc+$c;C=mc-bc;L[1]=bc-(mc-C)+($c-C);gc=_c+mc;C=gc-_c;L[2]=_c-(gc-C)+(mc-C);L[3]=gc}if(0!==d||0!==m||0!==v||0!==_){Mc=Ac*Ac;D=s*Ac;uc=D-(D-Ac);dc=Ac-uc;pc=dc*dc-(Mc-uc*uc-(uc+uc)*dc);$c=kc*kc;D=s*kc;uc=D-(D-kc);dc=kc-uc;xc=dc*dc-($c-uc*uc-(uc+uc)*dc);mc=pc+xc;C=mc-pc;N[0]=pc-(mc-C)+(xc-C);_c=Mc+mc;C=_c-Mc;bc=Mc-(_c-C)+(mc-C);mc=bc+$c;C=mc-bc;N[1]=bc-(mc-C)+($c-C);gc=_c+mc;C=gc-_c;N[2]=_c-(gc-C)+(mc-C);N[3]=gc}if(0!==d){M=scale(4,H,d,Q);u=finadd(u,sum_three(scale(M,Q,2*wc,nc),nc,scale(scale(4,N,d,tc),tc,jc,ec),ec,scale(scale(4,L,d,tc),tc,-kc,oc),oc,ac,ic),ic)}if(0!==m){p=scale(4,H,m,R);u=finadd(u,sum_three(scale(p,R,2*Fc,nc),nc,scale(scale(4,L,m,tc),tc,Ac,ec),ec,scale(scale(4,N,m,tc),tc,-yc,oc),oc,ac,ic),ic)}if(0!==v){$=scale(4,I,v,S);u=finadd(u,sum_three(scale($,S,2*yc,nc),nc,scale(scale(4,K,v,tc),tc,kc,ec),ec,scale(scale(4,N,v,tc),tc,-Fc,oc),oc,ac,ic),ic)}if(0!==_){x=scale(4,I,_,T);u=finadd(u,sum_three(scale(x,T,2*jc,nc),nc,scale(scale(4,N,_,tc),tc,wc,ec),ec,scale(scale(4,K,_,tc),tc,-Ac,oc),oc,ac,ic),ic)}if(0!==h){g=scale(4,J,h,U);u=finadd(u,sum_three(scale(g,U,2*Ac,nc),nc,scale(scale(4,L,h,tc),tc,Fc,ec),ec,scale(scale(4,K,h,tc),tc,-jc,oc),oc,ac,ic),ic)}if(0!==b){w=scale(4,J,b,V);u=finadd(u,sum_three(scale(w,V,2*kc,nc),nc,scale(scale(4,K,b,tc),tc,yc,ec),ec,scale(scale(4,L,b,tc),tc,-wc,oc),oc,ac,ic),ic)}if(0!==d||0!==m){if(0!==v||0!==_||0!==h||0!==b){Mc=v*kc;D=s*v;uc=D-(D-v);dc=v-uc;D=s*kc;vc=D-(D-kc);hc=kc-vc;pc=dc*hc-(Mc-uc*vc-dc*vc-uc*hc);$c=yc*b;D=s*yc;uc=D-(D-yc);dc=yc-uc;D=s*b;vc=D-(D-b);hc=b-vc;xc=dc*hc-($c-uc*vc-dc*vc-uc*hc);mc=pc+xc;C=mc-pc;O[0]=pc-(mc-C)+(xc-C);_c=Mc+mc;C=_c-Mc;bc=Mc-(_c-C)+(mc-C);mc=bc+$c;C=mc-bc;O[1]=bc-(mc-C)+($c-C);gc=_c+mc;C=gc-_c;O[2]=_c-(gc-C)+(mc-C);O[3]=gc;Mc=h*-jc;D=s*h;uc=D-(D-h);dc=h-uc;D=s*-jc;vc=D-(D- -jc);hc=-jc-vc;pc=dc*hc-(Mc-uc*vc-dc*vc-uc*hc);$c=Ac*-_;D=s*Ac;uc=D-(D-Ac);dc=Ac-uc;D=s*-_;vc=D-(D- -_);hc=-_-vc;xc=dc*hc-($c-uc*vc-dc*vc-uc*hc);mc=pc+xc;C=mc-pc;P[0]=pc-(mc-C)+(xc-C);_c=Mc+mc;C=_c-Mc;bc=Mc-(_c-C)+(mc-C);mc=bc+$c;C=mc-bc;P[1]=bc-(mc-C)+($c-C);gc=_c+mc;C=gc-_c;P[2]=_c-(gc-C)+(mc-C);P[3]=gc;A=sum(4,O,4,P,X);Mc=v*b;D=s*v;uc=D-(D-v);dc=v-uc;D=s*b;vc=D-(D-b);hc=b-vc;pc=dc*hc-(Mc-uc*vc-dc*vc-uc*hc);$c=h*_;D=s*h;uc=D-(D-h);dc=h-uc;D=s*_;vc=D-(D-_);hc=_-vc;xc=dc*hc-($c-uc*vc-dc*vc-uc*hc);mc=pc-xc;C=pc-mc;cc[0]=pc-(mc+C)+(C-xc);_c=Mc+mc;C=_c-Mc;bc=Mc-(_c-C)+(mc-C);mc=bc-$c;C=bc-mc;cc[1]=bc-(mc+C)+(C-$c);gc=_c+mc;C=gc-_c;cc[2]=_c-(gc-C)+(mc-C);cc[3]=gc;k=4}else{X[0]=0;A=1;cc[0]=0;k=1}if(0!==d){const c=scale(A,X,d,oc);u=finadd(u,sum(scale(M,Q,d,nc),nc,scale(c,oc,2*wc,ac),ac,ic),ic);const s=scale(k,cc,d,tc);u=finadd(u,sum_three(scale(s,tc,2*wc,nc),nc,scale(s,tc,d,ec),ec,scale(c,oc,d,ac),ac,lc,rc),rc);0!==_&&(u=finadd(u,scale(scale(4,N,d,tc),tc,_,nc),nc));0!==b&&(u=finadd(u,scale(scale(4,L,-d,tc),tc,b,nc),nc))}if(0!==m){const c=scale(A,X,m,oc);u=finadd(u,sum(scale(p,R,m,nc),nc,scale(c,oc,2*Fc,ac),ac,ic),ic);const s=scale(k,cc,m,tc);u=finadd(u,sum_three(scale(s,tc,2*Fc,nc),nc,scale(s,tc,m,ec),ec,scale(c,oc,m,ac),ac,lc,rc),rc)}}if(0!==v||0!==_){if(0!==h||0!==b||0!==d||0!==m){Mc=h*Fc;D=s*h;uc=D-(D-h);dc=h-uc;D=s*Fc;vc=D-(D-Fc);hc=Fc-vc;pc=dc*hc-(Mc-uc*vc-dc*vc-uc*hc);$c=Ac*m;D=s*Ac;uc=D-(D-Ac);dc=Ac-uc;D=s*m;vc=D-(D-m);hc=m-vc;xc=dc*hc-($c-uc*vc-dc*vc-uc*hc);mc=pc+xc;C=mc-pc;O[0]=pc-(mc-C)+(xc-C);_c=Mc+mc;C=_c-Mc;bc=Mc-(_c-C)+(mc-C);mc=bc+$c;C=mc-bc;O[1]=bc-(mc-C)+($c-C);gc=_c+mc;C=gc-_c;O[2]=_c-(gc-C)+(mc-C);O[3]=gc;z=-kc;B=-b;Mc=d*z;D=s*d;uc=D-(D-d);dc=d-uc;D=s*z;vc=D-(D-z);hc=z-vc;pc=dc*hc-(Mc-uc*vc-dc*vc-uc*hc);$c=wc*B;D=s*wc;uc=D-(D-wc);dc=wc-uc;D=s*B;vc=D-(D-B);hc=B-vc;xc=dc*hc-($c-uc*vc-dc*vc-uc*hc);mc=pc+xc;C=mc-pc;P[0]=pc-(mc-C)+(xc-C);_c=Mc+mc;C=_c-Mc;bc=Mc-(_c-C)+(mc-C);mc=bc+$c;C=mc-bc;P[1]=bc-(mc-C)+($c-C);gc=_c+mc;C=gc-_c;P[2]=_c-(gc-C)+(mc-C);P[3]=gc;F=sum(4,O,4,P,Y);Mc=h*m;D=s*h;uc=D-(D-h);dc=h-uc;D=s*m;vc=D-(D-m);hc=m-vc;pc=dc*hc-(Mc-uc*vc-dc*vc-uc*hc);$c=d*b;D=s*d;uc=D-(D-d);dc=d-uc;D=s*b;vc=D-(D-b);hc=b-vc;xc=dc*hc-($c-uc*vc-dc*vc-uc*hc);mc=pc-xc;C=pc-mc;sc[0]=pc-(mc+C)+(C-xc);_c=Mc+mc;C=_c-Mc;bc=Mc-(_c-C)+(mc-C);mc=bc-$c;C=bc-mc;sc[1]=bc-(mc+C)+(C-$c);gc=_c+mc;C=gc-_c;sc[2]=_c-(gc-C)+(mc-C);sc[3]=gc;q=4}else{Y[0]=0;F=1;sc[0]=0;q=1}if(0!==v){const c=scale(F,Y,v,oc);u=finadd(u,sum(scale($,S,v,nc),nc,scale(c,oc,2*yc,ac),ac,ic),ic);const s=scale(q,sc,v,tc);u=finadd(u,sum_three(scale(s,tc,2*yc,nc),nc,scale(s,tc,v,ec),ec,scale(c,oc,v,ac),ac,lc,rc),rc);0!==b&&(u=finadd(u,scale(scale(4,K,v,tc),tc,b,nc),nc));0!==m&&(u=finadd(u,scale(scale(4,N,-v,tc),tc,m,nc),nc))}if(0!==_){const c=scale(F,Y,_,oc);u=finadd(u,sum(scale(x,T,_,nc),nc,scale(c,oc,2*jc,ac),ac,ic),ic);const s=scale(q,sc,_,tc);u=finadd(u,sum_three(scale(s,tc,2*jc,nc),nc,scale(s,tc,_,ec),ec,scale(c,oc,_,ac),ac,lc,rc),rc)}}if(0!==h||0!==b){if(0!==d||0!==m||0!==v||0!==_){Mc=d*jc;D=s*d;uc=D-(D-d);dc=d-uc;D=s*jc;vc=D-(D-jc);hc=jc-vc;pc=dc*hc-(Mc-uc*vc-dc*vc-uc*hc);$c=wc*_;D=s*wc;uc=D-(D-wc);dc=wc-uc;D=s*_;vc=D-(D-_);hc=_-vc;xc=dc*hc-($c-uc*vc-dc*vc-uc*hc);mc=pc+xc;C=mc-pc;O[0]=pc-(mc-C)+(xc-C);_c=Mc+mc;C=_c-Mc;bc=Mc-(_c-C)+(mc-C);mc=bc+$c;C=mc-bc;O[1]=bc-(mc-C)+($c-C);gc=_c+mc;C=gc-_c;O[2]=_c-(gc-C)+(mc-C);O[3]=gc;z=-Fc;B=-m;Mc=v*z;D=s*v;uc=D-(D-v);dc=v-uc;D=s*z;vc=D-(D-z);hc=z-vc;pc=dc*hc-(Mc-uc*vc-dc*vc-uc*hc);$c=yc*B;D=s*yc;uc=D-(D-yc);dc=yc-uc;D=s*B;vc=D-(D-B);hc=B-vc;xc=dc*hc-($c-uc*vc-dc*vc-uc*hc);mc=pc+xc;C=mc-pc;P[0]=pc-(mc-C)+(xc-C);_c=Mc+mc;C=_c-Mc;bc=Mc-(_c-C)+(mc-C);mc=bc+$c;C=mc-bc;P[1]=bc-(mc-C)+($c-C);gc=_c+mc;C=gc-_c;P[2]=_c-(gc-C)+(mc-C);P[3]=gc;y=sum(4,O,4,P,W);Mc=d*_;D=s*d;uc=D-(D-d);dc=d-uc;D=s*_;vc=D-(D-_);hc=_-vc;pc=dc*hc-(Mc-uc*vc-dc*vc-uc*hc);$c=v*m;D=s*v;uc=D-(D-v);dc=v-uc;D=s*m;vc=D-(D-m);hc=m-vc;xc=dc*hc-($c-uc*vc-dc*vc-uc*hc);mc=pc-xc;C=pc-mc;Z[0]=pc-(mc+C)+(C-xc);_c=Mc+mc;C=_c-Mc;bc=Mc-(_c-C)+(mc-C);mc=bc-$c;C=bc-mc;Z[1]=bc-(mc+C)+(C-$c);gc=_c+mc;C=gc-_c;Z[2]=_c-(gc-C)+(mc-C);Z[3]=gc;j=4}else{W[0]=0;y=1;Z[0]=0;j=1}if(0!==h){const c=scale(y,W,h,oc);u=finadd(u,sum(scale(g,U,h,nc),nc,scale(c,oc,2*Ac,ac),ac,ic),ic);const s=scale(j,Z,h,tc);u=finadd(u,sum_three(scale(s,tc,2*Ac,nc),nc,scale(s,tc,h,ec),ec,scale(c,oc,h,ac),ac,lc,rc),rc);0!==m&&(u=finadd(u,scale(scale(4,L,h,tc),tc,m,nc),nc));0!==_&&(u=finadd(u,scale(scale(4,K,-h,tc),tc,_,nc),nc))}if(0!==b){const c=scale(y,W,b,oc);u=finadd(u,sum(scale(w,V,b,nc),nc,scale(c,oc,2*kc,ac),ac,ic),ic);const s=scale(j,Z,b,tc);u=finadd(u,sum_three(scale(s,tc,2*kc,nc),nc,scale(s,tc,b,ec),ec,scale(c,oc,b,ac),ac,lc,rc),rc)}}return fc[u-1]}function incircle(c,s,t,n,e,o,a,l){const i=c-a;const r=t-a;const f=e-a;const u=s-l;const d=n-l;const v=o-l;const h=r*v;const m=f*d;const _=i*i+u*u;const b=f*u;const M=i*v;const p=r*r+d*d;const $=i*d;const x=r*u;const g=f*f+v*v;const w=_*(h-m)+p*(b-M)+g*($-x);const y=(Math.abs(h)+Math.abs(m))*_+(Math.abs(b)+Math.abs(M))*p+(Math.abs($)+Math.abs(x))*g;const A=D*y;return w>A||-w>A?w:incircleadapt(c,s,t,n,e,o,a,l,y)}function incirclefast(c,s,t,n,e,o,a,l){const i=c-a;const r=s-l;const f=t-a;const u=n-l;const d=e-a;const v=o-l;const h=i*u-f*r;const m=f*v-d*u;const _=d*r-i*v;const b=i*i+r*r;const M=f*f+u*u;const p=d*d+v*v;return b*m+M*_+p*h}const dc=(16+224*c)*c;const vc=(5+72*c)*c;const hc=(71+1408*c)*c*c;const mc=vec(4);const _c=vec(4);const bc=vec(4);const Mc=vec(4);const pc=vec(4);const $c=vec(4);const xc=vec(4);const gc=vec(4);const wc=vec(4);const yc=vec(4);const Ac=vec(24);const Fc=vec(24);const jc=vec(24);const kc=vec(24);const qc=vec(24);const zc=vec(24);const Bc=vec(24);const Cc=vec(24);const Dc=vec(24);const Ec=vec(24);const Gc=vec(1152);const Hc=vec(1152);const Ic=vec(1152);const Jc=vec(1152);const Kc=vec(1152);const Lc=vec(2304);const Nc=vec(2304);const Oc=vec(3456);const Pc=vec(5760);const Qc=vec(8);const Rc=vec(8);const Sc=vec(8);const Tc=vec(16);const Uc=vec(24);const Vc=vec(48);const Wc=vec(48);const Xc=vec(96);const Yc=vec(192);const Zc=vec(384);const cs=vec(384);const ss=vec(384);const ts=vec(768);function sum_three_scale(c,s,t,n,e,o,a){return sum_three(scale(4,c,n,Qc),Qc,scale(4,s,e,Rc),Rc,scale(4,t,o,Sc),Sc,Tc,a)}function liftexact(c,s,t,n,e,o,a,l,i,r,f,u){const d=sum(sum(c,s,t,n,Vc),Vc,negate(sum(e,o,a,l,Wc),Wc),Wc,Xc);return sum_three(scale(scale(d,Xc,i,Yc),Yc,i,Zc),Zc,scale(scale(d,Xc,r,Yc),Yc,r,cs),cs,scale(scale(d,Xc,f,Yc),Yc,f,ss),ss,ts,u)}function insphereexact(c,t,n,e,o,a,l,i,r,f,u,d,v,h,m){let _,b,M,p,$,x,g,w,y,A,F,j,k,q;A=c*o;b=s*c;M=b-(b-c);p=c-M;b=s*o;$=b-(b-o);x=o-$;F=p*x-(A-M*$-p*$-M*x);j=e*t;b=s*e;M=b-(b-e);p=e-M;b=s*t;$=b-(b-t);x=t-$;k=p*x-(j-M*$-p*$-M*x);g=F-k;_=F-g;mc[0]=F-(g+_)+(_-k);w=A+g;_=w-A;y=A-(w-_)+(g-_);g=y-j;_=y-g;mc[1]=y-(g+_)+(_-j);q=w+g;_=q-w;mc[2]=w-(q-_)+(g-_);mc[3]=q;A=e*i;b=s*e;M=b-(b-e);p=e-M;b=s*i;$=b-(b-i);x=i-$;F=p*x-(A-M*$-p*$-M*x);j=l*o;b=s*l;M=b-(b-l);p=l-M;b=s*o;$=b-(b-o);x=o-$;k=p*x-(j-M*$-p*$-M*x);g=F-k;_=F-g;_c[0]=F-(g+_)+(_-k);w=A+g;_=w-A;y=A-(w-_)+(g-_);g=y-j;_=y-g;_c[1]=y-(g+_)+(_-j);q=w+g;_=q-w;_c[2]=w-(q-_)+(g-_);_c[3]=q;A=l*u;b=s*l;M=b-(b-l);p=l-M;b=s*u;$=b-(b-u);x=u-$;F=p*x-(A-M*$-p*$-M*x);j=f*i;b=s*f;M=b-(b-f);p=f-M;b=s*i;$=b-(b-i);x=i-$;k=p*x-(j-M*$-p*$-M*x);g=F-k;_=F-g;bc[0]=F-(g+_)+(_-k);w=A+g;_=w-A;y=A-(w-_)+(g-_);g=y-j;_=y-g;bc[1]=y-(g+_)+(_-j);q=w+g;_=q-w;bc[2]=w-(q-_)+(g-_);bc[3]=q;A=f*h;b=s*f;M=b-(b-f);p=f-M;b=s*h;$=b-(b-h);x=h-$;F=p*x-(A-M*$-p*$-M*x);j=v*u;b=s*v;M=b-(b-v);p=v-M;b=s*u;$=b-(b-u);x=u-$;k=p*x-(j-M*$-p*$-M*x);g=F-k;_=F-g;Mc[0]=F-(g+_)+(_-k);w=A+g;_=w-A;y=A-(w-_)+(g-_);g=y-j;_=y-g;Mc[1]=y-(g+_)+(_-j);q=w+g;_=q-w;Mc[2]=w-(q-_)+(g-_);Mc[3]=q;A=v*t;b=s*v;M=b-(b-v);p=v-M;b=s*t;$=b-(b-t);x=t-$;F=p*x-(A-M*$-p*$-M*x);j=c*h;b=s*c;M=b-(b-c);p=c-M;b=s*h;$=b-(b-h);x=h-$;k=p*x-(j-M*$-p*$-M*x);g=F-k;_=F-g;pc[0]=F-(g+_)+(_-k);w=A+g;_=w-A;y=A-(w-_)+(g-_);g=y-j;_=y-g;pc[1]=y-(g+_)+(_-j);q=w+g;_=q-w;pc[2]=w-(q-_)+(g-_);pc[3]=q;A=c*i;b=s*c;M=b-(b-c);p=c-M;b=s*i;$=b-(b-i);x=i-$;F=p*x-(A-M*$-p*$-M*x);j=l*t;b=s*l;M=b-(b-l);p=l-M;b=s*t;$=b-(b-t);x=t-$;k=p*x-(j-M*$-p*$-M*x);g=F-k;_=F-g;$c[0]=F-(g+_)+(_-k);w=A+g;_=w-A;y=A-(w-_)+(g-_);g=y-j;_=y-g;$c[1]=y-(g+_)+(_-j);q=w+g;_=q-w;$c[2]=w-(q-_)+(g-_);$c[3]=q;A=e*u;b=s*e;M=b-(b-e);p=e-M;b=s*u;$=b-(b-u);x=u-$;F=p*x-(A-M*$-p*$-M*x);j=f*o;b=s*f;M=b-(b-f);p=f-M;b=s*o;$=b-(b-o);x=o-$;k=p*x-(j-M*$-p*$-M*x);g=F-k;_=F-g;xc[0]=F-(g+_)+(_-k);w=A+g;_=w-A;y=A-(w-_)+(g-_);g=y-j;_=y-g;xc[1]=y-(g+_)+(_-j);q=w+g;_=q-w;xc[2]=w-(q-_)+(g-_);xc[3]=q;A=l*h;b=s*l;M=b-(b-l);p=l-M;b=s*h;$=b-(b-h);x=h-$;F=p*x-(A-M*$-p*$-M*x);j=v*i;b=s*v;M=b-(b-v);p=v-M;b=s*i;$=b-(b-i);x=i-$;k=p*x-(j-M*$-p*$-M*x);g=F-k;_=F-g;gc[0]=F-(g+_)+(_-k);w=A+g;_=w-A;y=A-(w-_)+(g-_);g=y-j;_=y-g;gc[1]=y-(g+_)+(_-j);q=w+g;_=q-w;gc[2]=w-(q-_)+(g-_);gc[3]=q;A=f*t;b=s*f;M=b-(b-f);p=f-M;b=s*t;$=b-(b-t);x=t-$;F=p*x-(A-M*$-p*$-M*x);j=c*u;b=s*c;M=b-(b-c);p=c-M;b=s*u;$=b-(b-u);x=u-$;k=p*x-(j-M*$-p*$-M*x);g=F-k;_=F-g;wc[0]=F-(g+_)+(_-k);w=A+g;_=w-A;y=A-(w-_)+(g-_);g=y-j;_=y-g;wc[1]=y-(g+_)+(_-j);q=w+g;_=q-w;wc[2]=w-(q-_)+(g-_);wc[3]=q;A=v*o;b=s*v;M=b-(b-v);p=v-M;b=s*o;$=b-(b-o);x=o-$;F=p*x-(A-M*$-p*$-M*x);j=e*h;b=s*e;M=b-(b-e);p=e-M;b=s*h;$=b-(b-h);x=h-$;k=p*x-(j-M*$-p*$-M*x);g=F-k;_=F-g;yc[0]=F-(g+_)+(_-k);w=A+g;_=w-A;y=A-(w-_)+(g-_);g=y-j;_=y-g;yc[1]=y-(g+_)+(_-j);q=w+g;_=q-w;yc[2]=w-(q-_)+(g-_);yc[3]=q;const z=sum_three_scale(mc,_c,$c,r,n,-a,Ac);const B=sum_three_scale(_c,bc,xc,d,a,-r,Fc);const C=sum_three_scale(bc,Mc,gc,m,r,-d,jc);const D=sum_three_scale(Mc,pc,wc,n,d,-m,kc);const E=sum_three_scale(pc,mc,yc,a,m,-n,qc);const G=sum_three_scale(mc,xc,wc,d,n,a,zc);const H=sum_three_scale(_c,gc,yc,m,a,r,Bc);const I=sum_three_scale(bc,wc,$c,n,r,d,Cc);const J=sum_three_scale(Mc,yc,xc,a,d,m,Dc);const K=sum_three_scale(pc,$c,gc,r,m,n,Ec);const L=sum_three(liftexact(C,jc,H,Bc,J,Dc,B,Fc,c,t,n,Gc),Gc,liftexact(D,kc,I,Cc,K,Ec,C,jc,e,o,a,Hc),Hc,sum_three(liftexact(E,qc,J,Dc,G,zc,D,kc,l,i,r,Ic),Ic,liftexact(z,Ac,K,Ec,H,Bc,E,qc,f,u,d,Jc),Jc,liftexact(B,Fc,G,zc,I,Cc,z,Ac,v,h,m,Kc),Kc,Nc,Oc),Oc,Lc,Pc);return Pc[L-1]}const ns=vec(96);const es=vec(96);const os=vec(96);const as=vec(1152);function liftadapt(c,s,t,n,e,o,a,l,i,r){const f=sum_three_scale(c,s,t,n,e,o,Uc);return sum_three(scale(scale(f,Uc,a,Vc),Vc,a,ns),ns,scale(scale(f,Uc,l,Vc),Vc,l,es),es,scale(scale(f,Uc,i,Vc),Vc,i,os),os,Yc,r)}function insphereadapt(c,n,e,o,a,l,i,r,f,u,d,v,h,m,_,b){let M,p,$,x,g,w;let y,A,F,j;let k,q,z,B;let C,D,E,G;let H,I,J,K,L,N,O,P,Q,R,S,T,U;const V=c-h;const W=o-h;const X=i-h;const Y=u-h;const Z=n-m;const cc=a-m;const sc=r-m;const tc=d-m;const nc=e-_;const ec=l-_;const oc=f-_;const ac=v-_;R=V*cc;I=s*V;J=I-(I-V);K=V-J;I=s*cc;L=I-(I-cc);N=cc-L;S=K*N-(R-J*L-K*L-J*N);T=W*Z;I=s*W;J=I-(I-W);K=W-J;I=s*Z;L=I-(I-Z);N=Z-L;U=K*N-(T-J*L-K*L-J*N);O=S-U;H=S-O;mc[0]=S-(O+H)+(H-U);P=R+O;H=P-R;Q=R-(P-H)+(O-H);O=Q-T;H=Q-O;mc[1]=Q-(O+H)+(H-T);M=P+O;H=M-P;mc[2]=P-(M-H)+(O-H);mc[3]=M;R=W*sc;I=s*W;J=I-(I-W);K=W-J;I=s*sc;L=I-(I-sc);N=sc-L;S=K*N-(R-J*L-K*L-J*N);T=X*cc;I=s*X;J=I-(I-X);K=X-J;I=s*cc;L=I-(I-cc);N=cc-L;U=K*N-(T-J*L-K*L-J*N);O=S-U;H=S-O;_c[0]=S-(O+H)+(H-U);P=R+O;H=P-R;Q=R-(P-H)+(O-H);O=Q-T;H=Q-O;_c[1]=Q-(O+H)+(H-T);p=P+O;H=p-P;_c[2]=P-(p-H)+(O-H);_c[3]=p;R=X*tc;I=s*X;J=I-(I-X);K=X-J;I=s*tc;L=I-(I-tc);N=tc-L;S=K*N-(R-J*L-K*L-J*N);T=Y*sc;I=s*Y;J=I-(I-Y);K=Y-J;I=s*sc;L=I-(I-sc);N=sc-L;U=K*N-(T-J*L-K*L-J*N);O=S-U;H=S-O;bc[0]=S-(O+H)+(H-U);P=R+O;H=P-R;Q=R-(P-H)+(O-H);O=Q-T;H=Q-O;bc[1]=Q-(O+H)+(H-T);$=P+O;H=$-P;bc[2]=P-($-H)+(O-H);bc[3]=$;R=Y*Z;I=s*Y;J=I-(I-Y);K=Y-J;I=s*Z;L=I-(I-Z);N=Z-L;S=K*N-(R-J*L-K*L-J*N);T=V*tc;I=s*V;J=I-(I-V);K=V-J;I=s*tc;L=I-(I-tc);N=tc-L;U=K*N-(T-J*L-K*L-J*N);O=S-U;H=S-O;wc[0]=S-(O+H)+(H-U);P=R+O;H=P-R;Q=R-(P-H)+(O-H);O=Q-T;H=Q-O;wc[1]=Q-(O+H)+(H-T);x=P+O;H=x-P;wc[2]=P-(x-H)+(O-H);wc[3]=x;R=V*sc;I=s*V;J=I-(I-V);K=V-J;I=s*sc;L=I-(I-sc);N=sc-L;S=K*N-(R-J*L-K*L-J*N);T=X*Z;I=s*X;J=I-(I-X);K=X-J;I=s*Z;L=I-(I-Z);N=Z-L;U=K*N-(T-J*L-K*L-J*N);O=S-U;H=S-O;$c[0]=S-(O+H)+(H-U);P=R+O;H=P-R;Q=R-(P-H)+(O-H);O=Q-T;H=Q-O;$c[1]=Q-(O+H)+(H-T);g=P+O;H=g-P;$c[2]=P-(g-H)+(O-H);$c[3]=g;R=W*tc;I=s*W;J=I-(I-W);K=W-J;I=s*tc;L=I-(I-tc);N=tc-L;S=K*N-(R-J*L-K*L-J*N);T=Y*cc;I=s*Y;J=I-(I-Y);K=Y-J;I=s*cc;L=I-(I-cc);N=cc-L;U=K*N-(T-J*L-K*L-J*N);O=S-U;H=S-O;xc[0]=S-(O+H)+(H-U);P=R+O;H=P-R;Q=R-(P-H)+(O-H);O=Q-T;H=Q-O;xc[1]=Q-(O+H)+(H-T);w=P+O;H=w-P;xc[2]=P-(w-H)+(O-H);xc[3]=w;const lc=sum(sum(negate(liftadapt(_c,bc,xc,ac,ec,-oc,V,Z,nc,Gc),Gc),Gc,liftadapt(bc,wc,$c,nc,oc,ac,W,cc,ec,Hc),Hc,Lc),Lc,sum(negate(liftadapt(wc,mc,xc,ec,ac,nc,X,sc,oc,Ic),Ic),Ic,liftadapt(mc,_c,$c,oc,nc,-ec,Y,tc,ac,Jc),Jc,Nc),Nc,as);let ic=estimate(lc,as);let rc=vc*b;if(ic>=rc||-ic>=rc)return ic;H=c-V;y=c-(V+H)+(H-h);H=n-Z;k=n-(Z+H)+(H-m);H=e-nc;C=e-(nc+H)+(H-_);H=o-W;A=o-(W+H)+(H-h);H=a-cc;q=a-(cc+H)+(H-m);H=l-ec;D=l-(ec+H)+(H-_);H=i-X;F=i-(X+H)+(H-h);H=r-sc;z=r-(sc+H)+(H-m);H=f-oc;E=f-(oc+H)+(H-_);H=u-Y;j=u-(Y+H)+(H-h);H=d-tc;B=d-(tc+H)+(H-m);H=v-ac;G=v-(ac+H)+(H-_);if(0===y&&0===k&&0===C&&0===A&&0===q&&0===D&&0===F&&0===z&&0===E&&0===j&&0===B&&0===G)return ic;rc=hc*b+t*Math.abs(ic);const fc=V*q+cc*y-(Z*A+W*k);const uc=W*z+sc*A-(cc*F+X*q);const dc=X*B+tc*F-(sc*j+Y*z);const Mc=Y*k+Z*j-(tc*y+V*B);const pc=V*z+sc*y-(Z*F+X*k);const gc=W*B+tc*A-(cc*j+Y*q);ic+=(W*W+cc*cc+ec*ec)*(oc*Mc+ac*pc+nc*dc+(E*x+G*g+C*$))+(Y*Y+tc*tc+ac*ac)*(nc*uc-ec*pc+oc*fc+(C*p-D*g+E*M))-((V*V+Z*Z+nc*nc)*(ec*dc-oc*gc+ac*uc+(D*$-E*w+G*p))+(X*X+sc*sc+oc*oc)*(ac*fc+nc*gc+ec*Mc+(G*M+C*w+D*x)))+2*((W*A+cc*q+ec*D)*(oc*x+ac*g+nc*$)+(Y*j+tc*B+ac*G)*(nc*p-ec*g+oc*M)-((V*y+Z*k+nc*C)*(ec*$-oc*w+ac*p)+(X*F+sc*z+oc*E)*(ac*M+nc*w+ec*x)));return ic>=rc||-ic>=rc?ic:insphereexact(c,n,e,o,a,l,i,r,f,u,d,v,h,m,_)}function insphere(c,s,t,n,e,o,a,l,i,r,f,u,d,v,h){const m=c-d;const _=n-d;const b=a-d;const M=r-d;const p=s-v;const $=e-v;const x=l-v;const g=f-v;const w=t-h;const y=o-h;const A=i-h;const F=u-h;const j=m*$;const k=_*p;const q=j-k;const z=_*x;const B=b*$;const C=z-B;const D=b*g;const E=M*x;const G=D-E;const H=M*p;const I=m*g;const J=H-I;const K=m*x;const L=b*p;const N=K-L;const O=_*g;const P=M*$;const Q=O-P;const R=m*m+p*p+w*w;const S=_*_+$*$+y*y;const T=b*b+x*x+A*A;const U=M*M+g*g+F*F;const V=T*(F*q+w*Q+y*J)-U*(w*C-y*N+A*q)+(R*(y*G-A*Q+F*C)-S*(A*J+F*N+w*G));const W=Math.abs(w);const X=Math.abs(y);const Y=Math.abs(A);const Z=Math.abs(F);const cc=Math.abs(j)+Math.abs(k);const sc=Math.abs(z)+Math.abs(B);const tc=Math.abs(D)+Math.abs(E);const nc=Math.abs(H)+Math.abs(I);const ec=Math.abs(K)+Math.abs(L);const oc=Math.abs(O)+Math.abs(P);const ac=(tc*X+oc*Y+sc*Z)*R+(nc*Y+ec*Z+tc*W)*S+(cc*Z+oc*W+nc*X)*T+(sc*W+ec*X+cc*Y)*U;const lc=dc*ac;return V>lc||-V>lc?V:-insphereadapt(c,s,t,n,e,o,a,l,i,r,f,u,d,v,h,ac)}function inspherefast(c,s,t,n,e,o,a,l,i,r,f,u,d,v,h){const m=c-d;const _=n-d;const b=a-d;const M=r-d;const p=s-v;const $=e-v;const x=l-v;const g=f-v;const w=t-h;const y=o-h;const A=i-h;const F=u-h;const j=m*$-_*p;const k=_*x-b*$;const q=b*g-M*x;const z=M*p-m*g;const B=m*x-b*p;const C=_*g-M*$;const D=w*k-y*B+A*j;const E=y*q-A*C+F*k;const G=A*z+F*B+w*q;const H=F*j+w*C+y*z;const I=m*m+p*p+w*w;const J=_*_+$*$+y*y;const K=b*b+x*x+A*A;const L=M*M+g*g+F*F;return K*H-L*D+(I*E-J*G)}export{incircle,incirclefast,insphere,inspherefast,orient2d,orient2dfast,orient3d,orient3dfast};