Bump to v0.1.0-alpha.11

Signed-off-by: Zach Gollwitzer <zach@maybe.co>
Sync notifications and troubleshooting guides (#998 )
2024-07-19 16:09:05 -04:00 · 2024-07-18 14:39:38 -04:00 · 2024-07-17 14:18:12 -04:00 · 2024-07-17 08:57:28 -04:00 · 2024-07-17 08:57:17 -04:00 · 2024-07-16 14:08:24 -04:00
380 changed files with 6310 additions and 4304 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,11 +7,6 @@ assignees: ''

 ---

-**Where did this bug occur?**
-
- [ ] Local development
- [ ] Self hosted app (i.e. Docker)
-
 **Describe the bug**
 A clear and concise description of what the bug is.

--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -97,7 +97,6 @@ jobs:

      - name: System tests
        run: DISABLE_PARALLELIZATION=true bin/rails test:system
-        continue-on-error: true # TODO: Eventually we'll enforce for PRs

      - name: Keep screenshots from failed system tests
        uses: actions/upload-artifact@v4
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -58,7 +58,7 @@ jobs:
            type=raw,value=stable,enable=${{ startsWith(github.ref, 'refs/tags/v') }}

      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
        id: build
        with:
          context: .
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,9 @@
 # Ignore .devcontainer files
 compose-dev.yaml

+# Ignore asdf ruby version file
+.tool-versions
+
 # Ignore GCP keyfile
 gcp-storage-keyfile.json

--- a/2
+++ b/2
@@ -44,6 +44,7 @@ gem "pagy"
 gem "rails-settings-cached"
 gem "tzinfo-data", platforms: %i[ windows jruby ]
 gem "csv"
+gem "redcarpet"

 group :development, :test do
  gem "debug", platforms: %i[ mri windows ]
@@ -59,6 +60,7 @@ group :development do
  gem "letter_opener"
  gem "ruby-lsp-rails"
  gem "web-console"
+  gem "faker"
 end

 group :test do
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,32 +7,32 @@ GIT

 GIT
  remote: https://github.com/rails/rails.git
-  revision: f9c847fac102039d9174106f44b59144da267751
+  revision: 8035bece705f60e6bddca70ee7d88e935a242bf8
  branch: 7-2-stable
  specs:
-    actioncable (7.2.0.beta2)
-      actionpack (= 7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+    actioncable (7.2.0.beta3)
+      actionpack (= 7.2.0.beta3)
+      activesupport (= 7.2.0.beta3)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
      zeitwerk (~> 2.6)
-    actionmailbox (7.2.0.beta2)
-      actionpack (= 7.2.0.beta2)
-      activejob (= 7.2.0.beta2)
-      activerecord (= 7.2.0.beta2)
-      activestorage (= 7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+    actionmailbox (7.2.0.beta3)
+      actionpack (= 7.2.0.beta3)
+      activejob (= 7.2.0.beta3)
+      activerecord (= 7.2.0.beta3)
+      activestorage (= 7.2.0.beta3)
+      activesupport (= 7.2.0.beta3)
      mail (>= 2.8.0)
-    actionmailer (7.2.0.beta2)
-      actionpack (= 7.2.0.beta2)
-      actionview (= 7.2.0.beta2)
-      activejob (= 7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+    actionmailer (7.2.0.beta3)
+      actionpack (= 7.2.0.beta3)
+      actionview (= 7.2.0.beta3)
+      activejob (= 7.2.0.beta3)
+      activesupport (= 7.2.0.beta3)
      mail (>= 2.8.0)
      rails-dom-testing (~> 2.2)
-    actionpack (7.2.0.beta2)
-      actionview (= 7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+    actionpack (7.2.0.beta3)
+      actionview (= 7.2.0.beta3)
+      activesupport (= 7.2.0.beta3)
      nokogiri (>= 1.8.5)
      racc
      rack (>= 2.2.4)
@@ -41,61 +41,61 @@ GIT
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
      useragent (~> 0.16)
-    actiontext (7.2.0.beta2)
-      actionpack (= 7.2.0.beta2)
-      activerecord (= 7.2.0.beta2)
-      activestorage (= 7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+    actiontext (7.2.0.beta3)
+      actionpack (= 7.2.0.beta3)
+      activerecord (= 7.2.0.beta3)
+      activestorage (= 7.2.0.beta3)
+      activesupport (= 7.2.0.beta3)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+    actionview (7.2.0.beta3)
+      activesupport (= 7.2.0.beta3)
      builder (~> 3.1)
      erubi (~> 1.11)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
-    activejob (7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+    activejob (7.2.0.beta3)
+      activesupport (= 7.2.0.beta3)
      globalid (>= 0.3.6)
-    activemodel (7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
-    activerecord (7.2.0.beta2)
-      activemodel (= 7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+    activemodel (7.2.0.beta3)
+      activesupport (= 7.2.0.beta3)
+    activerecord (7.2.0.beta3)
+      activemodel (= 7.2.0.beta3)
+      activesupport (= 7.2.0.beta3)
      timeout (>= 0.4.0)
-    activestorage (7.2.0.beta2)
-      actionpack (= 7.2.0.beta2)
-      activejob (= 7.2.0.beta2)
-      activerecord (= 7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+    activestorage (7.2.0.beta3)
+      actionpack (= 7.2.0.beta3)
+      activejob (= 7.2.0.beta3)
+      activerecord (= 7.2.0.beta3)
+      activesupport (= 7.2.0.beta3)
      marcel (~> 1.0)
-    activesupport (7.2.0.beta2)
+    activesupport (7.2.0.beta3)
      base64
      bigdecimal
      concurrent-ruby (~> 1.0, >= 1.3.1)
      connection_pool (>= 2.2.5)
      drb
      i18n (>= 1.6, < 2)
-      logger
+      logger (>= 1.4.2)
      minitest (>= 5.1)
      tzinfo (~> 2.0, >= 2.0.5)
-    rails (7.2.0.beta2)
-      actioncable (= 7.2.0.beta2)
-      actionmailbox (= 7.2.0.beta2)
-      actionmailer (= 7.2.0.beta2)
-      actionpack (= 7.2.0.beta2)
-      actiontext (= 7.2.0.beta2)
-      actionview (= 7.2.0.beta2)
-      activejob (= 7.2.0.beta2)
-      activemodel (= 7.2.0.beta2)
-      activerecord (= 7.2.0.beta2)
-      activestorage (= 7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+    rails (7.2.0.beta3)
+      actioncable (= 7.2.0.beta3)
+      actionmailbox (= 7.2.0.beta3)
+      actionmailer (= 7.2.0.beta3)
+      actionpack (= 7.2.0.beta3)
+      actiontext (= 7.2.0.beta3)
+      actionview (= 7.2.0.beta3)
+      activejob (= 7.2.0.beta3)
+      activemodel (= 7.2.0.beta3)
+      activerecord (= 7.2.0.beta3)
+      activestorage (= 7.2.0.beta3)
+      activesupport (= 7.2.0.beta3)
      bundler (>= 1.15.0)
-      railties (= 7.2.0.beta2)
-    railties (7.2.0.beta2)
-      actionpack (= 7.2.0.beta2)
-      activesupport (= 7.2.0.beta2)
+      railties (= 7.2.0.beta3)
+    railties (7.2.0.beta3)
+      actionpack (= 7.2.0.beta3)
+      activesupport (= 7.2.0.beta3)
      irb (~> 1.13)
      rackup (>= 1.0.0)
      rake (>= 12.2)
@@ -109,19 +109,19 @@ GEM
      public_suffix (>= 2.0.2, < 6.0)
    ast (2.4.2)
    aws-eventstream (1.3.0)
-    aws-partitions (1.941.0)
-    aws-sdk-core (3.197.0)
+    aws-partitions (1.952.0)
+    aws-sdk-core (3.201.1)
      aws-eventstream (~> 1, >= 1.3.0)
      aws-partitions (~> 1, >= 1.651.0)
      aws-sigv4 (~> 1.8)
      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.83.0)
-      aws-sdk-core (~> 3, >= 3.197.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.0)
-      aws-sdk-core (~> 3, >= 3.197.0)
+    aws-sdk-kms (1.88.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.156.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
+      aws-sigv4 (~> 1.5)
    aws-sigv4 (1.8.0)
      aws-eventstream (~> 1, >= 1.0.2)
    base64 (0.2.0)
@@ -175,11 +175,14 @@ GEM
      rainbow
      rubocop
      smart_properties
-    erubi (1.12.0)
+    erubi (1.13.0)
    et-orbi (1.2.11)
      tzinfo
-    faraday (2.9.1)
+    faker (3.4.1)
+      i18n (>= 1.8.11, < 2)
+    faraday (2.10.0)
      faraday-net_http (>= 2.0, < 3.2)
+      logger
    faraday-net_http (3.1.0)
      net-http
    faraday-retry (2.2.1)
@@ -190,13 +193,13 @@ GEM
      raabro (~> 1.4)
    globalid (1.2.1)
      activesupport (>= 6.1)
-    good_job (3.29.3)
-      activejob (>= 6.0.0)
-      activerecord (>= 6.0.0)
-      concurrent-ruby (>= 1.0.2)
-      fugit (>= 1.1)
-      railties (>= 6.0.0)
-      thor (>= 0.14.1)
+    good_job (4.0.3)
+      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.0)
    highline (3.0.1)
    hotwire-livereload (1.4.0)
@@ -226,7 +229,7 @@ GEM
      activesupport (>= 3.0)
      nokogiri (>= 1.6)
    io-console (0.7.2)
-    irb (1.13.1)
+    irb (1.14.0)
      rdoc (>= 4.0.0)
      reline (>= 0.4.2)
    jmespath (1.6.2)
@@ -253,13 +256,13 @@ GEM
    matrix (0.4.2)
    mini_magick (4.12.0)
    mini_mime (1.1.5)
-    minitest (5.23.1)
-    mocha (2.3.0)
+    minitest (5.24.1)
+    mocha (2.4.0)
      ruby2_keywords (>= 0.0.5)
    msgpack (1.7.2)
    net-http (0.4.1)
      uri
-    net-imap (0.4.12)
+    net-imap (0.4.14)
      date
      net-protocol
    net-pop (0.1.2)
@@ -269,29 +272,28 @@ GEM
    net-smtp (0.5.0)
      net-protocol
    nio4r (2.7.3)
-    nokogiri (1.16.5-aarch64-linux)
+    nokogiri (1.16.6-aarch64-linux)
      racc (~> 1.4)
-    nokogiri (1.16.5-arm-linux)
+    nokogiri (1.16.6-arm-linux)
      racc (~> 1.4)
-    nokogiri (1.16.5-arm64-darwin)
+    nokogiri (1.16.6-arm64-darwin)
      racc (~> 1.4)
-    nokogiri (1.16.5-x86-linux)
+    nokogiri (1.16.6-x86-linux)
      racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-darwin)
+    nokogiri (1.16.6-x86_64-darwin)
      racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.16.6-x86_64-linux)
      racc (~> 1.4)
-    octokit (8.1.0)
-      base64
+    octokit (9.1.0)
      faraday (>= 1, < 3)
      sawyer (~> 0.9)
-    pagy (8.4.4)
+    pagy (8.6.3)
    parallel (1.24.0)
    parser (3.3.1.0)
      ast (~> 2.4.1)
      racc
    pg (1.5.6)
-    prism (0.29.0)
+    prism (0.30.0)
    propshaft (0.9.0)
      actionpack (>= 7.0.0)
      activesupport (>= 7.0.0)
@@ -299,12 +301,12 @@ GEM
      railties (>= 7.0.0)
    psych (5.1.2)
      stringio
-    public_suffix (5.0.5)
+    public_suffix (5.1.0)
    puma (6.4.2)
      nio4r (~> 2.0)
    raabro (1.4.0)
    racc (1.8.0)
-    rack (3.0.11)
+    rack (3.1.7)
    rack-session (2.0.0)
      rack (>= 3.0.0)
    rack-test (2.1.0)
@@ -330,13 +332,16 @@ GEM
    rb-fsevent (0.11.2)
    rb-inotify (0.10.1)
      ffi (~> 1.0)
+    rbs (3.5.2)
+      logger
    rdoc (6.7.0)
      psych (>= 4.0.0)
+    redcarpet (3.6.0)
    regexp_parser (2.9.2)
-    reline (0.5.8)
+    reline (0.5.9)
      io-console (~> 0.5)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.0)
+      strscan
    rubocop (1.63.5)
      json (~> 2.3)
      language_server-protocol (>= 3.17.0)
@@ -366,12 +371,13 @@ GEM
      rubocop-minitest
      rubocop-performance
      rubocop-rails
-    ruby-lsp (0.17.1)
+    ruby-lsp (0.17.7)
      language_server-protocol (~> 3.17.0)
-      prism (>= 0.29.0, < 0.30)
+      prism (>= 0.29.0, < 0.31)
+      rbs (>= 3, < 4)
      sorbet-runtime (>= 0.5.10782)
-    ruby-lsp-rails (0.3.7)
-      ruby-lsp (>= 0.17.0, < 0.18.0)
+    ruby-lsp-rails (0.3.10)
+      ruby-lsp (>= 0.17.2, < 0.18.0)
    ruby-progressbar (1.13.0)
    ruby-vips (2.2.1)
      ffi (~> 1.12)
@@ -380,15 +386,16 @@ GEM
    sawyer (0.9.2)
      addressable (>= 2.3.5)
      faraday (>= 0.17.3, < 3)
-    selenium-webdriver (4.21.1)
+    selenium-webdriver (4.22.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.17.3)
+    sentry-rails (5.18.1)
      railties (>= 5.0)
-      sentry-ruby (~> 5.17.3)
-    sentry-ruby (5.17.3)
+      sentry-ruby (~> 5.18.1)
+    sentry-ruby (5.18.1)
      bigdecimal
      concurrent-ruby (~> 1.0, >= 1.0.2)
    simplecov (0.22.0)
@@ -398,11 +405,11 @@ GEM
    simplecov-html (0.12.3)
    simplecov_json_formatter (0.1.4)
    smart_properties (1.17.0)
-    sorbet-runtime (0.5.11406)
+    sorbet-runtime (0.5.11481)
    stackprof (0.2.26)
    stimulus-rails (1.3.3)
      railties (>= 6.0.0)
-    stringio (3.1.0)
+    stringio (3.1.1)
    strscan (3.1.0)
    tailwindcss-rails (2.6.1)
      railties (>= 7.0.0)
@@ -446,7 +453,7 @@ GEM
    websocket-extensions (0.1.5)
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.16)

 PLATFORMS
  aarch64-linux
@@ -467,6 +474,7 @@ DEPENDENCIES
  debug
  dotenv-rails
  erb_lint
+  faker
  faraday
  faraday-retry
  good_job
@@ -485,6 +493,7 @@ DEPENDENCIES
  puma (>= 5.0)
  rails!
  rails-settings-cached
+  redcarpet
  rubocop-rails-omakase
  ruby-lsp-rails
  selenium-webdriver
--- a/app/assets/stylesheets/application.tailwind.css
+++ b/app/assets/stylesheets/application.tailwind.css
@@ -7,20 +7,24 @@
  details > summary::-webkit-details-marker {
    @apply hidden;
  }
+
+  details > summary {
+    @apply list-none;
+  }
 }

@layer components {
  .form-field {
-    @apply relative rounded-md border bg-white border-alpha-black-100 shadow-xs;
+    @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 px-3 pt-2 pb-0 text-xs text-gray-500;
+    @apply block text-xs text-gray-500;
  }

  .form-field__input {
-    @apply w-full border-none bg-transparent px-3 pt-1 pb-2 text-sm opacity-100;
+    @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:opacity-50;
@@ -54,6 +58,19 @@
    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 p-2 rounded-md;
+  }
+
+  select[multiple="multiple"] option:checked {
+    @apply bg-gray-50;
+    @apply after:content-['\2713'] after:float-right after:text-gray-500;
+  }
+
  .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;
--- a/app/controllers/account/entries_controller.rb
+++ b/app/controllers/account/entries_controller.rb
@@ -0,0 +1,105 @@
+class Account::EntriesController < ApplicationController
+  layout "with_sidebar"
+
+  before_action :set_account
+  before_action :set_entry, only: %i[ edit update show destroy ]
+
+  def transactions
+    @transaction_entries = @account.entries.account_transactions.reverse_chronological
+  end
+
+  def valuations
+    @valuation_entries = @account.entries.account_valuations.reverse_chronological
+  end
+
+  def new
+    @entry = @account.entries.build.tap do |entry|
+      if params[:entryable_type]
+        entry.entryable = Account::Entryable.from_type(params[:entryable_type]).new
+      else
+        entry.entryable = Account::Valuation.new
+      end
+    end
+  end
+
+  def create
+    @entry = @account.entries.build(entry_params_with_defaults(entry_params))
+
+    if @entry.save
+      @entry.sync_account_later
+      redirect_to account_path(@account), notice: t(".success", name: @entry.entryable_name_short.upcase_first)
+    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] = @entry.errors.full_messages.to_sentence
+      redirect_to account_path(@account)
+    end
+  end
+
+  def edit
+  end
+
+  def update
+    @entry.assign_attributes entry_params
+    @entry.amount = amount if nature.present?
+    @entry.save!
+    @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
+  end
+
+  def destroy
+    @entry.destroy!
+    @entry.sync_account_later
+    redirect_back_or_to account_url(@entry.account), notice: t(".success")
+  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 permitted_entryable_attributes
+      entryable_type = @entry ? @entry.entryable_class.to_s : params[:account_entry][:entryable_type]
+
+      case entryable_type
+      when "Account::Transaction"
+        [ :id, :notes, :excluded, :category_id, :merchant_id, tag_ids: [] ]
+      else
+        [ :id ]
+      end
+    end
+
+    def entry_params
+      params.require(:account_entry)
+            .permit(:name, :date, :amount, :currency, :entryable_type, entryable_attributes: permitted_entryable_attributes)
+    end
+
+    def amount
+      if nature.income?
+        entry_params[:amount].to_d.abs * -1
+      else
+        entry_params[:amount].to_d.abs
+      end
+    end
+
+    def nature
+      params[:account_entry][:nature].to_s.inquiry
+    end
+
+    # entryable_type is required here because Rails expects both of these params in this exact order (potential upstream bug)
+    def entry_params_with_defaults(params)
+      params.with_defaults(entryable_type: params[:entryable_type], entryable_attributes: {})
+    end
+end
--- a/app/controllers/accounts/logos_controller.rb
+++ b/app/controllers/accounts/logos_controller.rb
@@ -1,4 +1,4 @@
-class Accounts::LogosController < ApplicationController
+class Account::LogosController < ApplicationController
  def show
    @account = Current.family.accounts.find(params[:account_id])
    render_placeholder
--- a/app/controllers/account/transfers_controller.rb
+++ b/app/controllers/account/transfers_controller.rb
@@ -0,0 +1,45 @@
+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, :currency, :date, :name)
+    end
+end
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -3,7 +3,6 @@ class AccountsController < ApplicationController

  include Filterable
  before_action :set_account, only: %i[ edit show destroy sync update ]
-  after_action :sync_account, only: :create

  def index
    @institutions = Current.family.institutions
@@ -20,13 +19,11 @@ class AccountsController < ApplicationController
  end

  def list
+    render layout: false
  end

  def new
-    @account = Account.new(
-      balance: nil,
-      accountable: Accountable.from_type(params[:type])&.new
-    )
+    @account = Account.new(accountable: Accountable.from_type(params[:type])&.new)

    if params[:institution_id]
      @account.institution = Current.family.institutions.find_by(id: params[:institution_id])
@@ -35,14 +32,17 @@ class AccountsController < ApplicationController

  def show
    @balance_series = @account.series(period: @period)
-    @valuation_series = @account.valuations.to_series
  end

  def edit
  end

  def update
-    @account.update! account_params.except(:accountable_type)
+    Account.transaction do
+      @account.update! account_params.except(:accountable_type, :balance)
+      @account.update_balance!(account_params[:balance]) if account_params[:balance]
+    end
+    @account.sync_later
    redirect_back_or_to account_path(@account), notice: t(".success")
  end

@@ -53,8 +53,10 @@ class AccountsController < ApplicationController
                        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")
+  rescue ActiveRecord::RecordInvalid => e
+    redirect_back_or_to accounts_path, alert: e.record.errors.full_messages.to_sentence
  end

  def destroy
@@ -66,8 +68,11 @@ class AccountsController < ApplicationController
    unless @account.syncing?
      @account.sync_later
    end
+  end

-    redirect_to account_path(@account), notice: t(".success")
+  def sync_all
+    Current.family.accounts.active.sync
+    redirect_back_or_to accounts_path, notice: t(".success")
  end

  private
@@ -79,8 +84,4 @@ class AccountsController < ApplicationController
    def account_params
      params.require(:account).permit(:name, :accountable_type, :balance, :start_date, :start_balance, :currency, :subtype, :is_active, :institution_id)
    end
-
-    def sync_account
-      @account.sync_later
-    end
 end
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,8 +2,6 @@ class ApplicationController < ActionController::Base
  include Authentication, Invitable, SelfHostable
  include Pagy::Backend

-  default_form_builder ApplicationFormBuilder
-
  # Only allow modern browsers supporting webp images, web push, badges, import maps, CSS nesting, and CSS :has.
  allow_browser versions: :modern
 end
--- a/app/controllers/transactions/categories_controller.rb
+++ b/app/controllers/transactions/categories_controller.rb
@@ -1,20 +1,20 @@
-class Transactions::CategoriesController < ApplicationController
+class CategoriesController < ApplicationController
  layout "with_sidebar"

  before_action :set_category, only: %i[ edit update ]
  before_action :set_transaction, only: :create

  def index
-    @categories = Current.family.transaction_categories.alphabetically
+    @categories = Current.family.categories.alphabetically
  end

  def new
-    @category = Current.family.transaction_categories.new color: Transaction::Category::COLORS.sample
+    @category = Current.family.categories.new color: Category::COLORS.sample
  end

  def create
-    Transaction::Category.transaction do
-      category = Current.family.transaction_categories.create!(category_params)
+    Category.transaction do
+      category = Current.family.categories.create!(category_params)
      @transaction.update!(category_id: category.id) if @transaction
    end

@@ -32,7 +32,7 @@ class Transactions::CategoriesController < ApplicationController

  private
    def set_category
-      @category = Current.family.transaction_categories.find(params[:id])
+      @category = Current.family.categories.find(params[:id])
    end

    def set_transaction
@@ -42,6 +42,6 @@ class Transactions::CategoriesController < ApplicationController
    end

    def category_params
-      params.require(:transaction_category).permit(:name, :color)
+      params.require(:category).permit(:name, :color)
    end
 end
--- a/app/controllers/transactions/categories/deletions_controller.rb
+++ b/app/controllers/transactions/categories/deletions_controller.rb
@@ -1,4 +1,4 @@
-class Transactions::Categories::DeletionsController < ApplicationController
+class Category::DeletionsController < ApplicationController
  layout "with_sidebar"

  before_action :set_category
@@ -15,12 +15,12 @@ class Transactions::Categories::DeletionsController < ApplicationController

  private
    def set_category
-      @category = Current.family.transaction_categories.find(params[:category_id])
+      @category = Current.family.categories.find(params[:category_id])
    end

    def set_replacement_category
      if params[:replacement_category_id].present?
-        @replacement_category = Current.family.transaction_categories.find(params[:replacement_category_id])
+        @replacement_category = Current.family.categories.find(params[:replacement_category_id])
      end
    end
 end
--- a/app/controllers/transactions/categories/dropdowns_controller.rb
+++ b/app/controllers/transactions/categories/dropdowns_controller.rb
@@ -1,4 +1,4 @@
-class Transactions::Categories::DropdownsController < ApplicationController
+class Category::DropdownsController < ApplicationController
  before_action :set_from_params

  def show
@@ -17,6 +17,6 @@ class Transactions::Categories::DropdownsController < ApplicationController
  end

  def categories_scope
-    Current.family.transaction_categories.alphabetically
+    Current.family.categories.alphabetically
  end
 end
--- a/app/controllers/currencies_controller.rb
+++ b/app/controllers/currencies_controller.rb
@@ -1,6 +1,6 @@
 class CurrenciesController < ApplicationController
  def show
-    @currency = Money::Currency.all_instances.find { |currency| currency.iso_code == params[:id] }
-    render json: { step: @currency.step, placeholder: Money.new(0, @currency).format }
+    currency = Money::Currency.all_instances.find { |currency| currency.iso_code == params[:id] }
+    render json: currency.as_json.merge({ step: currency.step })
  end
 end
--- a/app/controllers/help/articles_controller.rb
+++ b/app/controllers/help/articles_controller.rb
@@ -0,0 +1,11 @@
+class Help::ArticlesController < ApplicationController
+  layout "with_sidebar"
+
+  def show
+    @article = Help::Article.find(params[:id])
+
+    unless @article
+      head :not_found
+    end
+  end
+end
--- a/app/controllers/imports_controller.rb
+++ b/app/controllers/imports_controller.rb
@@ -38,11 +38,26 @@ class ImportsController < ApplicationController
  def load
  end

+  def upload_csv
+    begin
+      @import.raw_csv_str = import_params[:raw_csv_str].read
+    rescue NoMethodError
+      flash.now[:alert] = "Please select a file to upload"
+      render :load, status: :unprocessable_entity and return
+    end
+    if @import.save
+      redirect_to configure_import_path(@import), notice: t(".import_loaded")
+    else
+      flash.now[:alert] = @import.errors.full_messages.to_sentence
+      render :load, status: :unprocessable_entity
+    end
+  end
+
  def load_csv
    if @import.update(import_params)
      redirect_to configure_import_path(@import), notice: t(".import_loaded")
    else
-      flash.now[:error] = @import.errors.full_messages.to_sentence
+      flash.now[:alert] = @import.errors.full_messages.to_sentence
      render :load, status: :unprocessable_entity
    end
  end
--- a/app/controllers/merchants_controller.rb
+++ b/app/controllers/merchants_controller.rb
@@ -0,0 +1,41 @@
+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
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -21,7 +21,7 @@ class PagesController < ApplicationController

    @accounts = Current.family.accounts
    @account_groups = @accounts.by_group(period: @period, currency: Current.family.currency)
-    @transactions = Current.family.transactions.limit(5).order(date: :desc)
+    @transaction_entries = Current.family.entries.account_transactions.limit(6).reverse_chronological

    # TODO: Placeholders for trendlines
    placeholder_series_data = 10.times.map do |i|
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -16,7 +16,7 @@ class RegistrationsController < ApplicationController
    @user.role = :admin

    if @user.save
-      Transaction::Category.create_default_categories(@user.family)
+      Category.create_default_categories(@user.family)
      login @user
      flash[:notice] = t(".success")
      redirect_to root_path
--- a/app/controllers/settings/hostings_controller.rb
+++ b/app/controllers/settings/hostings_controller.rb
@@ -19,7 +19,7 @@ class Settings::HostingsController < SettingsController

  def send_test_email
    unless Setting.smtp_settings_populated?
-      flash[:error] = t(".missing_smtp_setting_error")
+      flash[:alert] = t(".missing_smtp_setting_error")
      render(:show, status: :unprocessable_entity)
      return
    end
@@ -27,7 +27,7 @@ class Settings::HostingsController < SettingsController
    begin
      NotificationMailer.with(user: Current.user).test_email.deliver_now
    rescue => _e
-      flash[:error] = t(".error")
+      flash[:alert] = t(".error")
      render :show, status: :unprocessable_entity
      return
    end
--- a/app/controllers/tags/deletions_controller.rb
+++ b/app/controllers/tags/deletions_controller.rb
@@ -1,4 +1,4 @@
-class Tags::DeletionsController < ApplicationController
+class Tag::DeletionsController < ApplicationController
  layout "with_sidebar"

  before_action :set_tag
--- a/app/controllers/transactions/merchants_controller.rb
+++ b/app/controllers/transactions/merchants_controller.rb
@@ -1,41 +0,0 @@
-class Transactions::MerchantsController < ApplicationController
-  layout "with_sidebar"
-
-  before_action :set_merchant, only: %i[ edit update destroy ]
-
-  def index
-    @merchants = Current.family.transaction_merchants.alphabetically
-  end
-
-  def new
-    @merchant = Transaction::Merchant.new
-  end
-
-  def create
-    Current.family.transaction_merchants.create!(merchant_params)
-    redirect_to transaction_merchants_path, notice: t(".success")
-  end
-
-  def edit
-  end
-
-  def update
-    @merchant.update!(merchant_params)
-    redirect_to transaction_merchants_path, notice: t(".success")
-  end
-
-  def destroy
-    @merchant.destroy!
-    redirect_to transaction_merchants_path, notice: t(".success")
-  end
-
-  private
-
-  def set_merchant
-    @merchant = Current.family.transaction_merchants.find(params[:id])
-  end
-
-  def merchant_params
-    params.require(:transaction_merchant).permit(:name, :color)
-  end
-end
--- a/app/controllers/transactions/rows_controller.rb
+++ b/app/controllers/transactions/rows_controller.rb
@@ -1,22 +0,0 @@
-class Transactions::RowsController < ApplicationController
-  before_action :set_transaction, only: %i[ show update ]
-
-  def show
-  end
-
-  def update
-    @transaction.update! transaction_params
-
-    redirect_to transaction_row_path(@transaction)
-  end
-
-  private
-
-    def transaction_params
-      params.require(:transaction).permit(:category_id)
-    end
-
-    def set_transaction
-      @transaction = Current.family.transactions.find(params[:id])
-    end
-end
--- a/app/controllers/transactions/rules_controller.rb
+++ b/app/controllers/transactions/rules_controller.rb
@@ -1,6 +0,0 @@
-class Transactions::RulesController < ApplicationController
-  layout "with_sidebar"
-
-  def index
-  end
-end
--- a/app/controllers/transactions_controller.rb
+++ b/app/controllers/transactions_controller.rb
@@ -1,106 +1,104 @@
 class TransactionsController < ApplicationController
  layout "with_sidebar"

-  before_action :set_transaction, only: %i[ show edit update destroy ]
-
  def index
    @q = search_params
-    result = Current.family.transactions.search(@q).ordered
-    @pagy, @transactions = pagy(result, items: 50)
+    result = Current.family.entries.account_transactions.search(@q).reverse_chronological
+    @pagy, @transaction_entries = pagy(result, items: params[:per_page] || "50")

    @totals = {
-      count: result.count,
-      income: result.inflows.sum(&:amount_money).abs,
-      expense: result.outflows.sum(&:amount_money).abs
+      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)
    }
  end

-  def show
-  end
-
  def new
-    @transaction = Transaction.new.tap do |txn|
+    @entry = Current.family.entries.new(entryable: Account::Transaction.new).tap do |e|
      if params[:account_id]
-        txn.account = Current.family.accounts.find(params[:account_id])
+        e.account = Current.family.accounts.find(params[:account_id])
      end
    end
  end

-  def edit
-  end
-
  def create
-    @transaction = Current.family.accounts
-                     .find(params[:transaction][:account_id])
-                     .transactions.build(transaction_params.merge(amount: amount))
+    @entry = Current.family
+                    .accounts
+                    .find(params[:account_entry][:account_id])
+                    .entries
+                    .create!(transaction_entry_params.merge(amount: amount))

-    @transaction.save!
-    @transaction.sync_account_later
-    redirect_to transactions_url, notice: t(".success")
-  end
-
-  def update
-    @transaction.update! transaction_params
-    @transaction.sync_account_later
-
-    redirect_to transaction_url(@transaction), notice: t(".success")
-  end
-
-  def destroy
-    @transaction.destroy!
-    @transaction.sync_account_later
-    redirect_to transactions_url, notice: t(".success")
+    @entry.sync_account_later
+    redirect_back_or_to account_path(@entry.account), notice: t(".success")
  end

  def bulk_delete
-    destroyed = Current.family.transactions.destroy_by(id: bulk_delete_params[:transaction_ids])
-    redirect_to transactions_url, notice: t(".success", count: destroyed.count)
+    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 bulk_edit
  end

  def bulk_update
-    transactions = Current.family.transactions.where(id: bulk_update_params[:transaction_ids])
-    if transactions.update_all(bulk_update_params.except(:transaction_ids).to_h.compact_blank!)
-      redirect_to transactions_url, notice: t(".success", count: transactions.count)
-    else
-      flash.now[:error] = t(".failure")
-      render :index, status: :unprocessable_entity
-    end
+    updated = Current.family
+                     .entries
+                     .where(id: bulk_update_params[:entry_ids])
+                     .bulk_update!(bulk_update_params)
+
+    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")
+  end
+
+  def rules
  end

  private

-    def set_transaction
-      @transaction = Current.family.transactions.find(params[:id])
-    end
-
    def amount
      if nature.income?
-        transaction_params[:amount].to_d * -1
+        transaction_entry_params[:amount].to_d * -1
      else
-        transaction_params[:amount].to_d
+        transaction_entry_params[:amount].to_d
      end
    end

    def nature
-      params[:transaction][:nature].to_s.inquiry
+      params[:account_entry][:nature].to_s.inquiry
    end

    def bulk_delete_params
-      params.require(:bulk_delete).permit(transaction_ids: [])
+      params.require(:bulk_delete).permit(entry_ids: [])
    end

    def bulk_update_params
-      params.require(:bulk_update).permit(:date, :notes, :excluded, :category_id, :merchant_id, transaction_ids: [])
+      params.require(:bulk_update).permit(:date, :notes, :category_id, :merchant_id, entry_ids: [])
    end

    def search_params
      params.fetch(:q, {}).permit(:start_date, :end_date, :search, accounts: [], account_ids: [], categories: [], merchants: [])
    end

-    def transaction_params
-      params.require(:transaction).permit(:name, :date, :amount, :currency, :notes, :excluded, :category_id, :merchant_id, tag_ids: [])
+    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: {})
    end
 end
--- a/app/controllers/valuations_controller.rb
+++ b/app/controllers/valuations_controller.rb
@@ -1,70 +0,0 @@
-class ValuationsController < ApplicationController
-  before_action :set_valuation, only: %i[ edit update destroy ]
-  def create
-    @account = Current.family.accounts.find(params[:account_id])
-
-    # TODO: placeholder logic until we have a better abstraction for trends
-    @valuation = @account.valuations.new(valuation_params.merge(currency: @account.currency))
-    if @valuation.save
-      @valuation.account.sync_later(@valuation.date)
-
-      respond_to do |format|
-        format.html { redirect_to account_path(@account), notice: "Valuation created" }
-        format.turbo_stream
-      end
-    else
-      render :new, status: :unprocessable_entity
-    end
-  rescue ActiveRecord::RecordNotUnique
-    flash.now[:error] = "Valuation already exists for this date"
-    render :new, status: :unprocessable_entity
-  end
-
-  def show
-    @valuation = Current.family.accounts.find(params[:account_id]).valuations.find(params[:id])
-  end
-
-  def edit
-  end
-
-  def update
-    sync_start_date = [ @valuation.date, Date.parse(valuation_params[:date]) ].compact.min
-    if @valuation.update(valuation_params)
-      @valuation.account.sync_later(sync_start_date)
-
-      redirect_to account_path(@valuation.account), notice: "Valuation updated"
-    else
-      render :edit, status: :unprocessable_entity
-    end
-  rescue ActiveRecord::RecordNotUnique
-    flash.now[:error] = "Valuation already exists for this date"
-    render :edit, status: :unprocessable_entity
-  end
-
-  def destroy
-    @account = @valuation.account
-    sync_start_date = @account.valuations.where("date < ?", @valuation.date).order(date: :desc).first&.date
-    @valuation.destroy!
-    @account.sync_later(sync_start_date)
-
-    respond_to do |format|
-      format.html { redirect_to account_path(@account), notice: "Valuation deleted" }
-      format.turbo_stream
-    end
-  end
-
-  def new
-    @account = Current.family.accounts.find(params[:account_id])
-    @valuation = @account.valuations.new
-  end
-
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_valuation
-      @valuation = Valuation.find(params[:id])
-    end
-
-    def valuation_params
-      params.require(:valuation).permit(:date, :value)
-    end
-end
--- a/app/helpers/account/entries_helper.rb
+++ b/app/helpers/account/entries_helper.rb
@@ -0,0 +1,39 @@
+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
+
+  private
+
+    def permitted_entryable_key(entry)
+      permitted_entryable_paths = %w[transaction valuation]
+      entry.entryable_name_short.presence_in(permitted_entryable_paths)
+    end
+end
--- a/app/helpers/account/transfers_helper.rb
+++ b/app/helpers/account/transfers_helper.rb
@@ -0,0 +1,2 @@
+module Account::TransfersHelper
+end
--- a/app/helpers/accounts_helper.rb
+++ b/app/helpers/accounts_helper.rb
@@ -27,14 +27,14 @@ module AccountsHelper

  def class_mapping(accountable_type)
    {
-      "Account::Credit" => { text: "text-red-500", bg: "bg-red-500", bg_transparent: "bg-red-500/10", fill: "fill-red-500", hex: "#F13636" },
-      "Account::Loan" => { text: "text-fuchsia-500", bg: "bg-fuchsia-500", bg_transparent: "bg-fuchsia-500/10", fill: "fill-fuchsia-500", hex: "#D444F1" },
-      "Account::OtherLiability" => { text: "text-gray-500", bg: "bg-gray-500", bg_transparent: "bg-gray-500/10", fill: "fill-gray-500", hex: "#737373" },
-      "Account::Depository" => { text: "text-violet-500", bg: "bg-violet-500", bg_transparent: "bg-violet-500/10", fill: "fill-violet-500", hex: "#875BF7" },
-      "Account::Investment" => { text: "text-blue-600", bg: "bg-blue-600", bg_transparent: "bg-blue-600/10", fill: "fill-blue-600", hex: "#1570EF" },
-      "Account::OtherAsset" => { text: "text-green-500", bg: "bg-green-500", bg_transparent: "bg-green-500/10", fill: "fill-green-500", hex: "#12B76A" },
-      "Account::Property" => { text: "text-cyan-500", bg: "bg-cyan-500", bg_transparent: "bg-cyan-500/10", fill: "fill-cyan-500", hex: "#06AED4" },
-      "Account::Vehicle" => { text: "text-pink-500", bg: "bg-pink-500", bg_transparent: "bg-pink-500/10", fill: "fill-pink-500", hex: "#F23E94" }
+      "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
--- a/app/helpers/application_form_builder.rb
+++ b/app/helpers/application_form_builder.rb
@@ -1,149 +0,0 @@
-class ApplicationFormBuilder < ActionView::Helpers::FormBuilder
-  def initialize(object_name, object, template, options)
-    options[:html] ||= {}
-    options[:html][:class] ||= "space-y-4"
-
-    super(object_name, object, template, options)
-  end
-
-  (field_helpers - [ :label, :check_box, :radio_button, :fields_for, :fields, :hidden_field, :file_field ]).each do |selector|
-    class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-      def #{selector}(method, options = {})
-        default_options = { class: "form-field__input" }
-        merged_options = default_options.merge(options)
-
-        return super(method, merged_options) unless options[:label]
-
-        @template.form_field_tag do
-          label(method, *label_args(options)) +
-          super(method, merged_options.except(:label))
-        end
-      end
-    RUBY_EVAL
-  end
-
-  # See `Monetizable` concern, which adds a _money suffix to the attribute name
-  # For a monetized field, the setter will always be the attribute name without the _money suffix
-  def money_field(method, options = {})
-    money = @object.send(method)
-    raise ArgumentError, "The value of #{method} is not a Money object" unless money.is_a?(Money) || money.nil?
-
-    money_amount_method = method.to_s.chomp("_money").to_sym
-    money_currency_method = :currency
-
-    readonly_currency = options[:readonly_currency] || false
-
-    currency = money&.currency || Money::Currency.new(Current.family.currency)  || Money.default_currency
-    default_options = {
-      class: "form-field__input",
-      value: money&.amount,
-      "data-money-field-target" => "amount",
-      placeholder: Money.new(0, currency).format,
-      min: -99999999999999,
-      max: 99999999999999,
-      step: currency.step
-    }
-
-    merged_options = default_options.merge(options)
-
-    grouped_options = currency_options_for_select
-    selected_currency = money&.currency&.iso_code || currency.iso_code
-
-    @template.form_field_tag data: { controller: "money-field" } do
-      (label(method, *label_args(options)).to_s if options[:label]) +
-        @template.tag.div(class: "flex items-center") do
-          number_field(money_amount_method, merged_options.except(:label)) +
-            grouped_select(money_currency_method, grouped_options, { selected: selected_currency, disabled: readonly_currency }, class: "ml-auto form-field__input w-fit pr-8", data: { "money-field-target" => "currency", action: "change->money-field#handleCurrencyChange" })
-        end
-    end
-  end
-
-  def radio_button(method, tag_value, options = {})
-    default_options = { class: "form-field__radio" }
-    merged_options = default_options.merge(options)
-    super(method, tag_value, merged_options)
-  end
-
-  def grouped_select(method, grouped_choices, options = {}, html_options = {})
-    default_options = { class: "form-field__input" }
-    merged_html_options = default_options.merge(html_options)
-
-    label_html = label(method, *label_args(options)).to_s if options[:label]
-    select_html = @template.grouped_collection_select(@object_name, method, grouped_choices, :last, :first, :last, :first, options, merged_html_options)
-
-    @template.content_tag(:div, class: "flex items-center") do
-      label_html.to_s.html_safe + select_html
-    end
-  end
-
-  def currency_select(method, options = {}, html_options = {})
-    default_options = { class: "form-field__input" }
-    merged_options = default_options.merge(html_options)
-
-    choices = currency_options_for_select
-
-    return @template.grouped_collection_select(@object_name, method, choices, :last, :first, :last, :first, options, merged_options) unless options[:label]
-
-    @template.form_field_tag do
-      label(method, *label_args(options)) +
-        @template.grouped_collection_select(@object_name, method, choices, :last, :first, :last, :first, options, merged_options.except(:label))
-    end
-  end
-
-  def select(method, choices, options = {}, html_options = {})
-    default_options = { class: "form-field__input" }
-    merged_options = default_options.merge(html_options)
-
-    return super(method, choices, options, merged_options) unless options[:label]
-
-    @template.form_field_tag do
-      label(method, *label_args(options)) +
-        super(method, choices, options, merged_options.except(:label))
-    end
-  end
-
-  def collection_select(method, collection, value_method, text_method, options = {}, html_options = {})
-    default_options = { class: "form-field__input" }
-    merged_options = default_options.merge(html_options)
-
-    return super(method, collection, value_method, text_method, options, merged_options) unless options[:label]
-
-    @template.form_field_tag do
-      label(method, *label_args(options)) +
-        super(method, collection, value_method, text_method, options, merged_options.except(:label))
-    end
-  end
-
-  def submit(value = nil, options = {})
-    value, options = nil, value if value.is_a?(Hash)
-    default_options = { class: "form-field__submit" }
-    merged_options = default_options.merge(options)
-    super(value, merged_options)
-  end
-
-  private
-
-    def currency_options_for_select
-      popular_currencies = Money::Currency.popular.map { |currency| [ currency.iso_code, currency.iso_code ] }
-      all_currencies = Money::Currency.all_instances.map { |currency| [ currency.iso_code, currency.iso_code ] }
-      all_other_currencies = all_currencies.reject { |c| popular_currencies.map(&:last).include?(c.last) }.sort_by(&:last)
-
-      {
-        I18n.t("accounts.new.currency.popular") => popular_currencies,
-        I18n.t("accounts.new.currency.all_others") => all_other_currencies
-      }
-    end
-
-    def label_args(options)
-      case options[:label]
-      when Array
-        options[:label]
-      when String
-        [ options[:label], { class: "form-field__label" } ]
-      when Hash
-        [ nil, options[:label] ]
-      else
-        [ nil, { class: "form-field__label" } ]
-      end
-    end
-end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -13,11 +13,18 @@ module ApplicationHelper
    name.underscore
  end

-  def notification(text, **options, &block)
-    content = tag.p(text)
-    content = capture &block if block_given?
+  def family_notifications_stream
+    turbo_stream_from [ Current.family, :notifications ] if Current.family
+  end

-    render partial: "shared/notification", locals: { type: options[:type], content: { body: content } }
+  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
+
+    safe_join(notifications)
  end

  ##
@@ -65,6 +72,20 @@ module ApplicationHelper
    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
@@ -122,4 +143,11 @@ module ApplicationHelper
    options.reverse_merge!(money.default_format_options)
    ActiveSupport::NumberHelper.number_to_delimited(money.amount.round(options[:precision] || 0), { delimiter: options[:delimiter], separator: options[:separator] })
  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) }
+              .map { |_currency, money| format_money(money) }
+              .join(separator)
+  end
 end
--- a/app/helpers/categories_helper.rb
+++ b/app/helpers/categories_helper.rb
@@ -0,0 +1,7 @@
+module CategoriesHelper
+  def null_category
+    Category.new \
+      name: "Uncategorized",
+      color: Category::UNCATEGORIZED_COLOR
+  end
+end
--- a/app/helpers/forms_helper.rb
+++ b/app/helpers/forms_helper.rb
@@ -1,7 +1,12 @@
 module FormsHelper
+  def styled_form_with(**options, &block)
+    options[:builder] = StyledFormBuilder
+    form_with(**options, &block)
+  end
+
  def form_field_tag(options = {}, &block)
    options[:class] = [ "form-field", options[:class] ].compact.join(" ")
-    tag.div **options, &block
+    tag.div(**options, &block)
  end

  def radio_tab_tag(form:, name:, value:, label:, icon:, checked: false, disabled: false)
@@ -11,7 +16,60 @@ module FormsHelper
    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 money_with_currency_field(form, money_method, options = {})
+    render partial: "shared/money_field", locals: {
+      form: form,
+      money_method: money_method,
+      default_currency: options[:default_currency] || "USD",
+      disable_currency: options[:disable_currency] || false,
+      hide_currency: options[:hide_currency] || false,
+      label: options[:label] || "Amount"
+    }
+  end
+
+  def money_field(form, method, options = {})
+    value = form.object.send(method)
+
+    currency = value&.currency || Money::Currency.new(options[:default_currency] || "USD")
+
+    # See "Monetizable" concern
+    money_amount_method = method.to_s.chomp("_money").to_sym
+
+    money_options = {
+      value: value&.amount,
+      placeholder: 100,
+      min: -99999999999999,
+      max: 99999999999999,
+      step: currency.step
+    }
+
+    merged_options = options.merge(money_options)
+
+    form.number_field money_amount_method, merged_options
+  end
+
+  def currency_select_full(form, method, options = {}, html_options = {}, &block)
+    choices = currencies_for_select.map { |currency| [ "#{currency.name} (#{currency.iso_code})", currency.iso_code ] }
+    form.select method, choices, options, html_options, &block
+  end
+
+  def currency_select(form, method, options = {}, html_options = {}, &block)
+    choices = currencies_for_select.map(&:iso_code)
+    form.select method, choices, options, html_options, &block
+  end
+
  private
+
+    def currencies_for_select
+      Money::Currency.all_instances
+                     .sort_by(&:priority)
+    end
+
    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")
--- a/app/helpers/menus_helper.rb
+++ b/app/helpers/menus_helper.rb
@@ -6,6 +6,23 @@ module MenusHelper
    end
  end

+  def contextual_menu_modal_action_item(label, url, icon: "pencil-line", turbo_frame: nil)
+    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", data: { menu_target: "button" } do
--- a/app/helpers/styled_form_builder.rb
+++ b/app/helpers/styled_form_builder.rb
@@ -0,0 +1,55 @@
+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 = {})
+        input_html = label_html(method, options) + super(method, merged_options(options))
+        input_html = apply_form_field_wrapper(input_html) unless options[:inline]
+        input_html
+      end
+    RUBY_EVAL
+  end
+
+  def radio_button(method, tag_value, options = {})
+    super(method, tag_value, merged_options(options, "form-field__radio"))
+  end
+
+  def select(method, choices, options = {}, html_options = {})
+    input_html = label_html(method, options) + super(method, choices, options, merged_options(html_options))
+    input_html = apply_form_field_wrapper(input_html, class: "pr-0") unless options[:inline]
+    input_html
+  end
+
+  def collection_select(method, collection, value_method, text_method, options = {}, html_options = {})
+    input_html = label_html(method, options) + super(method, collection, value_method, text_method, options, merged_options(html_options))
+    input_html = apply_form_field_wrapper(input_html, class: "pr-0") unless options[:inline]
+    input_html
+  end
+
+  def submit(value = nil, options = {})
+    value, options = nil, value if value.is_a?(Hash)
+    super(value, merged_options(options, "form-field__submit"))
+  end
+
+  private
+
+    def apply_form_field_wrapper(input_html, **options)
+      @template.form_field_tag(**options) do
+        input_html
+      end
+    end
+
+    def merged_options(options, default_class = "form-field__input")
+      combined_classes = options.fetch(:class, "") + " #{default_class}"
+      style_options = { class: combined_classes }
+      non_custom_options = options.except(:class, :label, :inline)
+      style_options.merge(non_custom_options)
+    end
+
+    def label_html(method, options)
+      options[:label] ? label(method, options[:label], class: "form-field__label") : "".html_safe
+    end
+end
--- a/app/helpers/transactions/categories_helper.rb
+++ b/app/helpers/transactions/categories_helper.rb
@@ -1,7 +0,0 @@
-module Transactions::CategoriesHelper
-  def null_category
-    Transaction::Category.new \
-      name: "Uncategorized",
-      color: Transaction::Category::UNCATEGORIZED_COLOR
-  end
-end
--- a/app/helpers/transactions/searches_helper.rb
+++ b/app/helpers/transactions/searches_helper.rb
@@ -1,37 +0,0 @@
-module Transactions::SearchesHelper
-  def transaction_search_filters
-    [
-      { key: "account_filter", name: "Account", icon: "layers" },
-      { key: "date_filter", name: "Date", icon: "calendar" },
-      { key: "type_filter", name: "Type", icon: "shapes" },
-      { key: "amount_filter", name: "Amount", icon: "hash" },
-      { key: "category_filter", name: "Category", icon: "tag" },
-      { key: "merchant_filter", name: "Merchant", icon: "store" }
-    ]
-  end
-
-  def get_transaction_search_filter_partial_path(filter)
-    "transactions/searches/filters/#{filter[:key]}"
-  end
-
-  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
--- a/app/helpers/transactions_helper.rb
+++ b/app/helpers/transactions_helper.rb
@@ -1,20 +1,37 @@
 module TransactionsHelper
-  def transactions_group(date, transactions, transaction_partial_path = "transactions/transaction")
-    header_left = content_tag :span do
-      "#{date.strftime('%b %d, %Y')} · #{transactions.size}".html_safe
+  def transaction_search_filters
+    [
+      { key: "account_filter", name: "Account", icon: "layers" },
+      { key: "date_filter", name: "Date", icon: "calendar" },
+      { key: "type_filter", name: "Type", icon: "shapes" },
+      { key: "amount_filter", name: "Amount", icon: "hash" },
+      { key: "category_filter", name: "Category", icon: "tag" },
+      { key: "merchant_filter", name: "Merchant", icon: "store" }
+    ]
+  end
+
+  def get_transaction_search_filter_partial_path(filter)
+    "transactions/searches/filters/#{filter[:key]}"
+  end
+
+  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

-    header_right = content_tag :span do
-      format_money(-transactions.sum(&:amount_money))
-    end
+    updated_params[:q] = q_params

-    header = header_left.concat(header_right)
-
-    content = render partial: transaction_partial_path, collection: transactions
-
-    render partial: "shared/list_group", locals: {
-      header: header,
-      content: content
-    }
+    transactions_path(updated_params)
  end
 end
--- a/app/helpers/valuations_helper.rb
+++ b/app/helpers/valuations_helper.rb
@@ -1,2 +0,0 @@
-module ValuationsHelper
-end
--- a/app/javascript/controllers/bulk_select_controller.js
+++ b/app/javascript/controllers/bulk_select_controller.js
@@ -25,7 +25,7 @@ export default class extends Controller {
  submitBulkRequest(e) {
    const form = e.target.closest("form");
    const scope = e.params.scope
-    this.#addHiddenFormInputsForSelectedIds(form, `${scope}[transaction_ids][]`, this.selectedIdsValue)
+    this.#addHiddenFormInputsForSelectedIds(form, `${scope}[entry_ids][]`, this.selectedIdsValue)
    form.requestSubmit()
  }

@@ -66,6 +66,8 @@ export default class extends Controller {
  }

  #addHiddenFormInputsForSelectedIds(form, paramName, transactionIds) {
+    this.#resetFormInputs(form, paramName);
+
    transactionIds.forEach(id => {
      const input = document.createElement("input");
      input.type = 'hidden'
@@ -75,6 +77,11 @@ export default class extends Controller {
    })
  }

+  #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))
  }
@@ -113,7 +120,7 @@ export default class extends Controller {
  #updateGroups() {
    this.groupTargets.forEach(group => {
      const rows = this.rowTargets.filter(row => group.contains(row))
-      const groupSelected = rows.every(row => this.selectedIdsValue.includes(row.dataset.id))
+      const groupSelected = rows.length > 0 && rows.every(row => this.selectedIdsValue.includes(row.dataset.id))
      group.querySelector("input[type='checkbox']").checked = groupSelected
    })
  }
--- a/app/javascript/controllers/csv_upload_controller.js
+++ b/app/javascript/controllers/csv_upload_controller.js
@@ -0,0 +1,94 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static targets = ["input", "preview", "submit", "filename", "filesize"]
+
+  connect() {
+    this.submitTarget.disabled = true
+  }
+
+  addFile(event) {
+    const file = event.target.files[0]
+    this._fileAdded(file)
+  }
+
+  dragover(event) {
+    event.preventDefault()
+    event.stopPropagation()
+    event.currentTarget.classList.add("bg-gray-100")
+  }
+
+  dragleave(event) {
+    event.preventDefault()
+    event.stopPropagation()
+    event.currentTarget.classList.remove("bg-gray-100")
+  }
+
+  drop(event) {
+    event.preventDefault()
+    event.stopPropagation()
+    event.currentTarget.classList.remove("bg-gray-100")
+
+    const file = event.dataTransfer.files[0]
+    if (file && this._isCSVFile(file)) {
+      this._setFileInput(file);
+      this._fileAdded(file)
+    } else {
+      this.previewTarget.classList.add("text-red-500")
+      this.previewTarget.textContent = "Only CSV files are allowed."
+    }
+  }
+
+  // Private
+
+  _fetchFileSize(size) {
+    let fileSize = '';
+    if (size < 1024 * 1024) {
+      fileSize = (size / 1024).toFixed(2) + ' KB'; // Convert bytes to KB
+    } else {
+      fileSize = (size / (1024 * 1024)).toFixed(2) + ' MB'; // Convert bytes to MB
+    }
+    return fileSize;
+  }
+
+  _fileAdded(file) {
+    const fileSizeLimit = 5 * 1024 * 1024 // 5MB
+
+    if (file) {
+      if (file.size > fileSizeLimit) {
+        this.previewTarget.classList.add("text-red-500")
+        this.previewTarget.textContent = "File size exceeds the limit of 5MB"
+        return
+      }
+
+      this.submitTarget.classList.remove([
+        "bg-alpha-black-25",
+        "text-gray",
+        "cursor-not-allowed",
+      ]);
+      this.submitTarget.classList.add(
+        "bg-gray-900",
+        "text-white",
+        "cursor-pointer",
+      );
+      this.submitTarget.disabled = false;
+      this.previewTarget.innerHTML = document.querySelector("#template-preview").innerHTML;
+      this.previewTarget.classList.remove("text-red-500")
+      this.previewTarget.classList.add("text-gray-900")
+      this.filenameTarget.textContent = file.name;
+      this.filesizeTarget.textContent = this._fetchFileSize(file.size);
+    }
+  }
+
+  _isCSVFile(file) {
+    const acceptedTypes = ["text/csv", "application/csv", ".csv"]
+    const extension = file.name.split('.').pop().toLowerCase()
+    return acceptedTypes.includes(file.type) || extension === "csv"
+  }
+
+  _setFileInput(file) {
+    const dataTransfer = new DataTransfer();
+    dataTransfer.items.add(file);
+    this.inputTarget.files = dataTransfer.files;
+  }
+}
--- a/app/javascript/controllers/money_field_controller.js
+++ b/app/javascript/controllers/money_field_controller.js
@@ -4,17 +4,23 @@ import { CurrenciesService } from "services/currencies_service";
 // Connects to data-controller="money-field"
 // when currency select change, update the input value with the correct placeholder and step
 export default class extends Controller {
-  static targets = ["amount", "currency"];
+  static targets = ["amount", "currency", "symbol"];

-  handleCurrencyChange() {
-    const selectedCurrency = event.target.value;
+  handleCurrencyChange(e) {
+    const selectedCurrency = e.target.value;
    this.updateAmount(selectedCurrency);
  }

  updateAmount(currency) {
-    (new CurrenciesService).get(currency).then((data) => {
-      this.amountTarget.placeholder = data.placeholder;
-      this.amountTarget.step = data.step;
+    (new CurrenciesService).get(currency).then((currency) => {
+      console.log(currency)
+      this.amountTarget.step = currency.step;
+
+      if (isFinite(this.amountTarget.value)) {
+        this.amountTarget.value = parseFloat(this.amountTarget.value).toFixed(currency.default_precision)
+      }
+
+      this.symbolTarget.innerText = currency.symbol;
    });
  }
 }
--- a/app/javascript/controllers/select_controller.js
+++ b/app/javascript/controllers/select_controller.js
@@ -1,179 +0,0 @@
-import { Controller } from "@hotwired/stimulus";
-
-/**
- * A custom "select" element that follows accessibility patterns of a native select element.
- *
- * - If you need to display arbitrary content including non-clickable items, links, buttons, and forms, use the "popover" controller instead.
- */
-export default class extends Controller {
-  static classes = ["active"];
-  static targets = ["option", "button", "list", "input", "buttonText"];
-  static values = { selected: String };
-
-  initialize() {
-    this.show = false;
-
-    const selectedElement = this.optionTargets.find(
-      (option) => option.dataset.value === this.selectedValue
-    );
-    if (selectedElement) {
-      this.updateAriaAttributesAndClasses(selectedElement);
-      this.syncButtonTextWithInput();
-    }
-  }
-
-  connect() {
-    this.syncButtonTextWithInput();
-    if (this.hasButtonTarget) {
-      this.buttonTarget.addEventListener("click", this.toggleList);
-    }
-    this.element.addEventListener("keydown", this.handleKeydown);
-    document.addEventListener("click", this.handleOutsideClick);
-    this.element.addEventListener("turbo:load", this.handleTurboLoad);
-  }
-
-  disconnect() {
-    this.element.removeEventListener("keydown", this.handleKeydown);
-    document.removeEventListener("click", this.handleOutsideClick);
-    this.element.removeEventListener("turbo:load", this.handleTurboLoad);
-
-    if (this.hasButtonTarget) {
-      this.buttonTarget.removeEventListener("click", this.toggleList);
-    }
-  }
-
-  selectedValueChanged() {
-    this.syncButtonTextWithInput();
-  }
-
-  handleOutsideClick = (event) => {
-    if (this.show && !this.element.contains(event.target)) {
-      this.close();
-    }
-  };
-
-  handleTurboLoad = () => {
-    this.close();
-    this.syncButtonTextWithInput();
-  };
-
-  handleKeydown = (event) => {
-    switch (event.key) {
-      case " ":
-      case "Enter":
-        event.preventDefault(); // Prevent the default action to avoid scrolling
-        if (
-          this.hasButtonTarget &&
-          document.activeElement === this.buttonTarget
-        ) {
-          this.toggleList();
-        } else {
-          this.selectOption(event);
-        }
-        break;
-      case "ArrowDown":
-        event.preventDefault(); // Prevent the default action to avoid scrolling
-        this.focusNextOption();
-        break;
-      case "ArrowUp":
-        event.preventDefault(); // Prevent the default action to avoid scrolling
-        this.focusPreviousOption();
-        break;
-      case "Escape":
-        this.close();
-        if (this.hasButtonTarget) {
-          this.buttonTarget.focus(); // Bring focus back to the button
-        }
-        break;
-      case "Tab":
-        this.close();
-        break;
-    }
-  };
-
-  focusNextOption() {
-    this.focusOptionInDirection(1);
-  }
-
-  focusPreviousOption() {
-    this.focusOptionInDirection(-1);
-  }
-
-  focusOptionInDirection(direction) {
-    const currentFocusedIndex = this.optionTargets.findIndex(
-      (option) => option === document.activeElement
-    );
-    const optionsCount = this.optionTargets.length;
-    const nextIndex =
-      (currentFocusedIndex + direction + optionsCount) % optionsCount;
-    this.optionTargets[nextIndex].focus();
-  }
-
-  toggleList = () => {
-    if (!this.hasButtonTarget) return; // Ensure button target is present before toggling
-
-    this.show = !this.show;
-    this.listTarget.classList.toggle("hidden", !this.show);
-    this.buttonTarget.setAttribute("aria-expanded", this.show.toString());
-
-    if (this.show) {
-      // Focus the first option or the selected option when the list is shown
-      const selectedOption = this.optionTargets.find(
-        (option) => option.getAttribute("aria-selected") === "true"
-      );
-      (selectedOption || this.optionTargets[0]).focus();
-    }
-  };
-
-  close() {
-    if (this.hasButtonTarget) {
-      this.show = false;
-      this.listTarget.classList.add("hidden");
-      this.buttonTarget.setAttribute("aria-expanded", "false");
-    }
-  }
-
-  selectOption(event) {
-    const selectedOption =
-      event.type === "keydown" ? document.activeElement : event.currentTarget;
-    this.updateAriaAttributesAndClasses(selectedOption);
-    if (this.inputTarget.value !== selectedOption.getAttribute("data-value")) {
-      this.updateInputValueAndEmitEvent(selectedOption);
-    }
-    this.close(); // Close the list after selection
-  }
-
-  updateAriaAttributesAndClasses(selectedOption) {
-    this.optionTargets.forEach((option) => {
-      option.setAttribute("aria-selected", "false");
-      option.setAttribute("tabindex", "-1");
-      option.classList.remove(...this.activeClasses);
-    });
-    selectedOption.classList.add(...this.activeClasses);
-    selectedOption.setAttribute("aria-selected", "true");
-    selectedOption.focus();
-  }
-
-  updateInputValueAndEmitEvent(selectedOption) {
-    // Update the hidden input's value
-    const selectedValue = selectedOption.getAttribute("data-value");
-    this.inputTarget.value = selectedValue;
-    this.syncButtonTextWithInput();
-
-    // Emit an input event for auto-submit functionality
-    const inputEvent = new Event("input", {
-      bubbles: true,
-      cancelable: true,
-    });
-    this.inputTarget.dispatchEvent(inputEvent);
-  }
-
-  syncButtonTextWithInput() {
-    const matchingOption = this.optionTargets.find(
-      (option) => option.getAttribute("data-value") === this.inputTarget.value
-    );
-    if (matchingOption && this.hasButtonTextTarget) {
-      this.buttonTextTarget.textContent = matchingOption.textContent.trim();
-    }
-  }
-}
--- a/app/jobs/account_sync_job.rb
+++ b/app/jobs/account_sync_job.rb
@@ -1,7 +1,7 @@
 class AccountSyncJob < ApplicationJob
  queue_as :default

-  def perform(account, start_date = nil)
-    account.sync(start_date)
+  def perform(account, start_date: nil)
+    account.sync(start_date: start_date)
  end
 end
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -2,20 +2,23 @@ class Account < ApplicationRecord
  include Syncable
  include Monetizable

-  broadcasts_refreshes
-
-  validates :family, presence: true
+  validates :name, :balance, :currency, presence: true

  belongs_to :family
  belongs_to :institution, optional: true
+
+  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 :holdings, dependent: :destroy
  has_many :balances, dependent: :destroy
-  has_many :valuations, dependent: :destroy
-  has_many :transactions, dependent: :destroy
  has_many :imports, dependent: :destroy
+  has_many :syncs, dependent: :destroy

  monetize :balance

-  enum :status, { ok: "ok", syncing: "syncing", error: "error" }, validate: true
+  enum :classification, { asset: "asset", liability: "liability" }, validate: { allow_nil: true }

  scope :active, -> { where(is_active: true) }
  scope :assets, -> { where(classification: "asset") }
@@ -25,78 +28,91 @@ class Account < ApplicationRecord

  delegated_type :accountable, types: Accountable::TYPES, dependent: :destroy

-  def balance_on(date)
-    balances.where("date <= ?", date).order(date: :desc).first&.balance
+  class << self
+    def by_group(period: Period.all, currency: Money.default_currency)
+      grouped_accounts = { assets: ValueGroup.new("Assets", currency), liabilities: ValueGroup.new("Liabilities", currency) }
+
+      Accountable.by_classification.each do |classification, types|
+        types.each do |type|
+          group = grouped_accounts[classification.to_sym].add_child_group(type, currency)
+          self.where(accountable_type: type).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
+
+      grouped_accounts
+    end
+
+    def create_with_optional_start_balance!(attributes:, start_date: nil, start_balance: nil)
+      account = self.new(attributes.except(:accountable_type))
+      account.accountable = Accountable.from_type(attributes[:accountable_type])&.new
+
+      # Always build the initial valuation
+      account.entries.build \
+        date: Date.current,
+        amount: attributes[:balance],
+        currency: account.currency,
+        entryable: Account::Valuation.new
+
+      # Conditionally build the optional start valuation
+      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
+    end
  end

-  # e.g. Wise, Revolut accounts that have transactions in multiple currencies
-  def multi_currency?
-    currencies = [ valuations.pluck(:currency), transactions.pluck(:currency) ].flatten.uniq
-    currencies.count > 1
+  def alert
+    latest_sync = syncs.latest
+    [ latest_sync&.error, *latest_sync&.warnings ].compact.first
  end

-  # e.g. Accounts denominated in currency other than family currency
-  def foreign_currency?
-    currency != family.currency
+  def favorable_direction
+    classification == "asset" ? "up" : "down"
  end

-  def self.by_provider
-    # TODO: When 3rd party providers are supported, dynamically load all providers and their accounts
-    [ { name: "Manual accounts", accounts: all.order(balance: :desc).group_by(&:accountable_type) } ]
-  end
-
-  def self.some_syncing?
-    exists?(status: "syncing")
-  end
-
-
  def series(period: Period.all, currency: self.currency)
    balance_series = balances.in_period(period).where(currency: Money::Currency.new(currency).iso_code)

    if balance_series.empty? && period.date_range.end == Date.current
-      converted_balance = balance_money.exchange_to(currency)
-      if converted_balance
-        TimeSeries.new([ { date: Date.current, value: converted_balance } ])
-      else
-        TimeSeries.new([])
-      end
+      TimeSeries.new([ { date: Date.current, value: balance_money.exchange_to(currency) } ])
    else
      TimeSeries.from_collection(balance_series, :balance_money)
    end
+  rescue Money::ConversionError
+    TimeSeries.new([])
  end

-  def self.by_group(period: Period.all, currency: Money.default_currency)
-    grouped_accounts = { assets: ValueGroup.new("Assets", currency), liabilities: ValueGroup.new("Liabilities", currency) }
+  def update_balance!(balance)
+    valuation = entries.account_valuations.find_by(date: Date.current)

-    Accountable.by_classification.each do |classification, types|
-      types.each do |type|
-        group = grouped_accounts[classification.to_sym].add_child_group(type, currency)
-        self.where(accountable_type: type).each do |account|
-          value_node = group.add_value_node(
-            account,
-            account.balance_money.exchange_to(currency) || Money.new(0, currency),
-            account.series(period: period, currency: currency)
-          )
-        end
-      end
+    if valuation
+      valuation.update! amount: balance
+    else
+      entries.create! \
+        date: Date.current,
+        amount: balance,
+        currency: currency,
+        entryable: Account::Valuation.new
    end
-
-    grouped_accounts
  end

-  def self.create_with_optional_start_balance!(attributes:, start_date: nil, start_balance: nil)
-    account = self.new(attributes.except(:accountable_type))
-    account.accountable = Accountable.from_type(attributes[:accountable_type])&.new
-
-    # Always build the initial valuation
-    account.valuations.build(date: Date.current, value: attributes[:balance], currency: account.currency)
-
-    # Conditionally build the optional start valuation
-    if start_date.present? && start_balance.present?
-      account.valuations.build(date: start_date, value: start_balance, currency: account.currency)
-    end
-
-    account.save!
-    account
+  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
--- a/app/models/account/balance.rb
+++ b/app/models/account/balance.rb
@@ -5,4 +5,5 @@ class Account::Balance < ApplicationRecord
    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
--- a/app/models/account/balance/calculator.rb
+++ b/app/models/account/balance/calculator.rb
@@ -1,123 +0,0 @@
-class Account::Balance::Calculator
-    attr_reader :daily_balances, :errors, :warnings
-
-    def initialize(account, options = {})
-      @daily_balances = []
-      @errors = []
-      @warnings = []
-      @account = account
-      @calc_start_date = [ options[:calc_start_date], @account.effective_start_date ].compact.max
-    end
-
-    def calculate
-      prior_balance = implied_start_balance
-
-      calculated_balances = ((@calc_start_date + 1.day)..Date.current).map do |date|
-        valuation = normalized_valuations.find { |v| v["date"] == date }
-
-        if valuation
-          current_balance = valuation["value"]
-        else
-          txn_flows = transaction_flows(date)
-          current_balance = prior_balance - txn_flows
-        end
-
-        prior_balance = current_balance
-
-        { date:, balance: current_balance, currency: @account.currency, updated_at: Time.current }
-      end
-
-      @daily_balances = [
-        { date: @calc_start_date, balance: implied_start_balance, currency: @account.currency, updated_at: Time.current },
-        *calculated_balances
-      ]
-
-      if @account.foreign_currency?
-        converted_balances = convert_balances_to_family_currency
-        @daily_balances.concat(converted_balances)
-      end
-
-      self
-    end
-
-    private
-      def convert_balances_to_family_currency
-        rates = ExchangeRate.get_rates(
-          @account.currency,
-          @account.family.currency,
-          @calc_start_date..Date.current
-        ).to_a
-
-        # Abort conversion if some required rates are missing
-        if rates.length != @daily_balances.length
-          @errors << :sync_message_missing_rates
-          return []
-        end
-
-        @daily_balances.map.with_index do |balance, index|
-          converted_balance = balance[:balance] * rates[index].rate
-          { date: balance[:date], balance: converted_balance, currency: @account.family.currency, updated_at: Time.current }
-        end
-      end
-
-      # For calculation, all transactions and valuations need to be normalized to the same currency (the account's primary currency)
-      def normalize_entries_to_account_currency(entries, value_key)
-        grouped_entries = entries.group_by(&:currency)
-        normalized_entries = []
-
-        grouped_entries.each do |currency, entries|
-          if currency != @account.currency
-            dates = entries.map(&:date).uniq
-            rates = ExchangeRate.get_rates(currency, @account.currency, dates).to_a
-            if rates.length != dates.length
-              @errors << :sync_message_missing_rates
-            else
-              entries.each do |entry|
-                ## There can be several entries on the same date so we cannot rely on indeces
-                rate = rates.find { |rate| rate.date == entry.date }
-                value = entry.send(value_key)
-                value *= rate.rate
-                normalized_entries << entry.attributes.merge(value_key.to_s => value, "currency" => currency)
-              end
-            end
-          else
-            normalized_entries.concat(entries)
-          end
-        end
-
-        normalized_entries
-      end
-
-      def normalized_valuations
-        @normalized_valuations ||= normalize_entries_to_account_currency(@account.valuations.where("date >= ?", @calc_start_date).order(:date).select(:date, :value, :currency), :value)
-      end
-
-      def normalized_transactions
-        @normalized_transactions ||= normalize_entries_to_account_currency(@account.transactions.where("date >= ?", @calc_start_date).order(:date).select(:date, :amount, :currency), :amount)
-      end
-
-      def transaction_flows(date)
-        flows = normalized_transactions.select { |t| t["date"] == date }.sum { |t| t["amount"] }
-        flows *= -1 if @account.classification == "liability"
-        flows
-      end
-
-      def implied_start_balance
-        if @calc_start_date > @account.effective_start_date
-          return @account.balance_on(@calc_start_date)
-        end
-
-        oldest_valuation_date = normalized_valuations.first&.date
-        oldest_transaction_date = normalized_transactions.first&.date
-        oldest_entry_date = [ oldest_valuation_date, oldest_transaction_date ].compact.min
-
-        if oldest_entry_date.present? && oldest_entry_date == oldest_valuation_date
-          oldest_valuation = normalized_valuations.find { |v| v["date"] == oldest_valuation_date }
-          oldest_valuation["value"].to_d
-        else
-          net_transaction_flows = normalized_transactions.sum { |t| t["amount"].to_d }
-          net_transaction_flows *= -1 if @account.classification == "liability"
-          @account.balance.to_d + net_transaction_flows
-        end
-      end
-end
--- a/app/models/account/balance/syncer.rb
+++ b/app/models/account/balance/syncer.rb
@@ -0,0 +1,127 @@
+class Account::Balance::Syncer
+  attr_reader :warnings
+
+  def initialize(account, start_date: nil)
+    @account = account
+    @warnings = []
+    @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
+        account.update! balance: daily_balances.select { |db| db.currency == account.currency }.last&.balance
+      end
+    end
+  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
+
+      exchange_rates = ExchangeRate.find_rates from: from_currency,
+                                               to: to_currency,
+                                               start_date: sync_start_date
+
+      balances.map do |balance|
+        exchange_rate = exchange_rates.find { |er| er.date == balance.date }
+
+        raise Money::ConversionError.new("missing exchange rate from #{from_currency} to #{to_currency} on date #{balance.date}") unless exchange_rate
+
+        build_balance(balance.date, exchange_rate.rate * balance.balance, to_currency)
+      end
+    rescue Money::ConversionError
+      @warnings << "missing exchange rates from #{from_currency} to #{to_currency}"
+      []
+    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("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
--- a/app/models/account/credit.rb
+++ b/app/models/account/credit.rb
@@ -1,3 +0,0 @@
-class Account::Credit < ApplicationRecord
-  include Accountable
-end
--- a/app/models/account/crypto.rb
+++ b/app/models/account/crypto.rb
@@ -1,3 +0,0 @@
-class Account::Crypto < ApplicationRecord
-  include Accountable
-end
--- a/app/models/account/depository.rb
+++ b/app/models/account/depository.rb
@@ -1,3 +0,0 @@
-class Account::Depository < ApplicationRecord
-  include Accountable
-end
--- a/app/models/account/entry.rb
+++ b/app/models/account/entry.rb
@@ -0,0 +1,205 @@
+class Account::Entry < ApplicationRecord
+  include Monetizable
+
+  monetize :amount
+
+  belongs_to :account
+  belongs_to :transfer, 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? }
+  validate :trade_valid?, if: -> { account_trade? }
+
+  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
+    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],
+        entryable_attributes: {
+          notes: bulk_update_params[:notes],
+          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")
+      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
+    end
+
+    def expense_total(currency = "USD")
+      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
+    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[: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
+
+    def trade_valid?
+      if account_trade.sell?
+        current_qty = account.holding_qty(account_trade.security)
+
+        if current_qty < account_trade.qty.abs
+          errors.add(:base, "cannot sell #{account_trade.qty.abs} shares of #{account_trade.security.symbol} because you only own #{current_qty} shares")
+        end
+      end
+    end
+end
--- a/app/models/account/entryable.rb
+++ b/app/models/account/entryable.rb
@@ -0,0 +1,13 @@
+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
--- a/app/models/account/holding.rb
+++ b/app/models/account/holding.rb
@@ -0,0 +1,6 @@
+class Account::Holding < ApplicationRecord
+  belongs_to :account
+  belongs_to :security
+
+  scope :chronological, -> { order(:date) }
+end
--- a/app/models/account/holding/syncer.rb
+++ b/app/models/account/holding/syncer.rb
@@ -0,0 +1,96 @@
+class Account::Holding::Syncer
+  attr_reader :warnings
+
+  def initialize(account, start_date: nil)
+    @account = account
+    @warnings = []
+    @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 build_holdings_for_date(date)
+      trades = sync_entries.select { |trade| trade.date == date }
+
+      @portfolio = generate_next_portfolio(@portfolio, trades)
+
+      @portfolio.map do |isin, holding|
+        price = Security::Price.find_by!(date: date, isin: isin).price
+
+        account.holdings.build \
+          date: date,
+          security_id: holding[:security_id],
+          qty: holding[:qty],
+          price: price,
+          amount: price * holding[:qty]
+      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.isin, :qty) || 0
+        new_qty = prior_qty + trade.qty
+
+        new_portfolio[trade.security.isin] = {
+          qty: new_qty,
+          price: price,
+          amount: new_qty * price,
+          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.isin] = {
+          qty: holding.qty,
+          price: holding.price,
+          amount: holding.amount,
+          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
--- a/app/models/account/loan.rb
+++ b/app/models/account/loan.rb
@@ -1,3 +0,0 @@
-class Account::Loan < ApplicationRecord
-  include Accountable
-end
--- a/app/models/account/other_asset.rb
+++ b/app/models/account/other_asset.rb
@@ -1,3 +0,0 @@
-class Account::OtherAsset < ApplicationRecord
-  include Accountable
-end
--- a/app/models/account/other_liability.rb
+++ b/app/models/account/other_liability.rb
@@ -1,3 +0,0 @@
-class Account::OtherLiability < ApplicationRecord
-  include Accountable
-end
--- a/app/models/account/property.rb
+++ b/app/models/account/property.rb
@@ -1,3 +0,0 @@
-class Account::Property < ApplicationRecord
-  include Accountable
-end
--- a/app/models/account/sync.rb
+++ b/app/models/account/sync.rb
@@ -0,0 +1,82 @@
+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!
+
+    sync_balances
+    sync_holdings
+
+    complete!
+  rescue StandardError => error
+    fail! error
+  end
+
+  private
+
+    def sync_balances
+      syncer = Account::Balance::Syncer.new(account, start_date: start_date)
+
+      syncer.run
+
+      append_warnings(syncer.warnings)
+    end
+
+    def sync_holdings
+      syncer = Account::Holding::Syncer.new(account, start_date: start_date)
+
+      syncer.run
+
+      append_warnings(syncer.warnings)
+    end
+
+    def append_warnings(new_warnings)
+      update! warnings: warnings + new_warnings
+    end
+
+    def start!
+      update! status: "syncing", last_ran_at: Time.now
+      broadcast_start
+    end
+
+    def complete!
+      update! status: "completed"
+      broadcast_result type: "notice", message: "Sync complete"
+    end
+
+    def fail!(error)
+      update! status: "failed", error: error.message
+      broadcast_result type: "alert", message: error.message
+    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 }
+      )
+    end
+end
--- a/app/models/account/syncable.rb
+++ b/app/models/account/syncable.rb
@@ -1,85 +1,21 @@
 module Account::Syncable
  extend ActiveSupport::Concern

-  def sync_later(start_date = nil)
-    AccountSyncJob.perform_later(self, start_date)
-  end
-
-  def sync(start_date = nil)
-    update!(status: "syncing")
-
-    sync_exchange_rates
-
-    calc_start_date = start_date - 1.day if start_date.present? && self.balance_on(start_date - 1.day).present?
-
-    calculator = Account::Balance::Calculator.new(self, { calc_start_date: })
-    calculator.calculate
-    self.balances.upsert_all(calculator.daily_balances, unique_by: :index_account_balances_on_account_id_date_currency_unique)
-    self.balances.where("date < ?", effective_start_date).delete_all
-    new_balance = calculator.daily_balances.select { |b| b[:currency] == self.currency }.last[:balance]
-
-    update!(status: "ok", last_sync_date: Date.today, balance: new_balance, sync_errors: calculator.errors, sync_warnings: calculator.warnings)
-  rescue => e
-    update!(status: "error", sync_errors: [ :sync_message_unknown_error ])
-    logger.error("Failed to sync account #{id}: #{e.message}")
-  end
-
-  def can_sync?
-    # Skip account sync if account is not active or the sync process is already running
-    return false unless is_active
-    return false if syncing?
-    # If last_sync_date is blank (i.e. the account has never been synced before) allow syncing
-    return true if last_sync_date.blank?
-
-    # If last_sync_date is not today, allow syncing
-    last_sync_date != Date.today
-  end
-
-  # The earliest date we can calculate a balance for
-  def effective_start_date
-    first_valuation_date = self.valuations.order(:date).pluck(:date).first
-    first_transaction_date = self.transactions.order(:date).pluck(:date).first
-
-    [ first_valuation_date, first_transaction_date&.prev_day ].compact.min || Date.current
-  end
-
-  # Finds all the rate pairs that are required to calculate balances for an account and syncs them
-  def sync_exchange_rates
-    rate_candidates = []
-
-    if multi_currency?
-      transactions_in_foreign_currency = self.transactions.where.not(currency: self.currency).pluck(:currency, :date).uniq
-      transactions_in_foreign_currency.each do |currency, date|
-        rate_candidates << { date: date, from_currency: currency, to_currency: self.currency }
-      end
+  class_methods do
+    def sync(start_date: nil)
+      all.each { |a| a.sync_later(start_date: start_date) }
    end
+  end

-    if foreign_currency?
-      (effective_start_date..Date.current).each do |date|
-        rate_candidates << { date: date, from_currency: self.currency, to_currency: self.family.currency }
-      end
-    end
+  def syncing?
+    syncs.syncing.any?
+  end

-    existing_rates = ExchangeRate.where(
-      base_currency: rate_candidates.map { |rc| rc[:from_currency] },
-      converted_currency: rate_candidates.map { |rc| rc[:to_currency] },
-      date: rate_candidates.map { |rc| rc[:date] }
-    ).pluck(:base_currency, :converted_currency, :date)
+  def sync_later(start_date: nil)
+    AccountSyncJob.perform_later(self, start_date: start_date)
+  end

-    # Convert to a set for faster lookup
-    existing_rates_set = existing_rates.map { |er| [ er[0], er[1], er[2].to_s ] }.to_set
-
-    rate_candidates.each do |rate_candidate|
-      rc_from = rate_candidate[:from_currency]
-      rc_to = rate_candidate[:to_currency]
-      rc_date = rate_candidate[:date]
-
-      next if existing_rates_set.include?([ rc_from, rc_to, rc_date.to_s ])
-
-      logger.info "Fetching exchange rate from provider for account #{self.name}: #{self.id} (#{rc_from} to #{rc_to} on #{rc_date})"
-      ExchangeRate.find_rate_or_fetch from: rc_from, to: rc_to, date: rc_date
-    end
-
-    nil
+  def sync(start_date: nil)
+    Account::Sync.for(self, start_date: start_date).run
  end
 end
--- a/app/models/account/trade.rb
+++ b/app/models/account/trade.rb
@@ -0,0 +1,26 @@
+class Account::Trade < ApplicationRecord
+  include Account::Entryable
+
+  belongs_to :security
+
+  validates :qty, presence: true, numericality: { other_than: 0 }
+  validates :price, 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
+end
--- a/app/models/account/transaction.rb
+++ b/app/models/account/transaction.rb
@@ -0,0 +1,40 @@
+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("LEFT JOIN categories ON categories.id = account_transactions.category_id").where(categories: { name: params[:categories] }) if params[:categories].present?
+      query = query.joins("LEFT JOIN merchants ON merchants.id = account_transactions.merchant_id").where(merchants: { name: params[:merchants] }) if params[:merchants].present?
+      query
+    end
+
+    def requires_search?(params)
+      searchable_keys.any? { |key| params.key?(key) }
+    end
+
+    private
+
+      def searchable_keys
+        %i[ categories merchants ]
+      end
+  end
+
+  private
+    def previous_transaction_date
+      self.account
+          .transactions
+          .where("date < ?", date)
+          .order(date: :desc)
+          .first&.date
+    end
+end
--- a/app/models/account/transfer.rb
+++ b/app/models/account/transfer.rb
@@ -0,0 +1,96 @@
+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
+  end
+
+  def from_name
+    outflow_transaction&.account&.name
+  end
+
+  def to_name
+    inflow_transaction&.account&.name
+  end
+
+  def name
+    return nil unless from_name && to_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: currency,
+        date: date,
+        name: name,
+        marked_as_transfer: true,
+        entryable: Account::Transaction.new
+
+      inflow = to_account.entries.build \
+        amount: amount.abs * -1,
+        currency: 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 :transactions, "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
--- a/app/models/account/valuation.rb
+++ b/app/models/account/valuation.rb
@@ -0,0 +1,13 @@
+class Account::Valuation < ApplicationRecord
+  include Account::Entryable
+
+  class << self
+    def search(_params)
+      all
+    end
+
+    def requires_search?(_params)
+      false
+    end
+  end
+end
--- a/app/models/account/vehicle.rb
+++ b/app/models/account/vehicle.rb
@@ -1,3 +0,0 @@
-class Account::Vehicle < ApplicationRecord
-  include Accountable
-end
--- a/app/models/transaction/category.rb
+++ b/app/models/transaction/category.rb
@@ -1,5 +1,5 @@
-class Transaction::Category < ApplicationRecord
-  has_many :transactions, dependent: :nullify
+class Category < ApplicationRecord
+  has_many :transactions, dependent: :nullify, class_name: "Account::Transaction"
  belongs_to :family

  validates :name, :color, :family, presence: true
@@ -24,7 +24,7 @@ class Transaction::Category < ApplicationRecord
  ]

  def self.create_default_categories(family)
-    if family.transaction_categories.size > 0
+    if family.categories.size > 0
      raise ArgumentError, "Family already has some categories"
    end

--- a/app/models/concerns/accountable.rb
+++ b/app/models/concerns/accountable.rb
@@ -1,28 +1,19 @@
 module Accountable
  extend ActiveSupport::Concern

-  ASSET_TYPES = %w[ Account::Depository Account::Investment Account::Crypto Account::OtherAsset Account::Property Account::Vehicle ]
-  LIABILITY_TYPES = %w[ Account::Credit Account::Loan Account::OtherLiability ]
+  ASSET_TYPES = %w[ Depository Investment Crypto Property Vehicle OtherAsset ]
+  LIABILITY_TYPES = %w[ CreditCard Loan OtherLiability ]
  TYPES = ASSET_TYPES + LIABILITY_TYPES

  def self.from_type(type)
-    return nil unless types.include?(type) || TYPES.include?(type)
-    "Account::#{type.demodulize}".constantize
+    return nil unless TYPES.include?(type)
+    type.constantize
  end

  def self.by_classification
    { assets: ASSET_TYPES, liabilities: LIABILITY_TYPES }
  end

-  def self.types(classification = nil)
-    types = classification ? (classification.to_sym == :asset ? ASSET_TYPES : LIABILITY_TYPES) : TYPES
-    types.map { |type| type.demodulize }
-  end
-
-  def self.classification(type)
-    ASSET_TYPES.include?(type) ? :asset : :liability
-  end
-
  included do
    has_one :account, as: :accountable, touch: true
  end
--- a/app/models/concerns/monetizable.rb
+++ b/app/models/concerns/monetizable.rb
@@ -6,7 +6,7 @@ module Monetizable
        fields.each do |field|
          define_method("#{field}_money") do
            value = self.send(field)
-            value.nil? ? nil : Money.new(value, currency)
+            value.nil? ? nil : Money.new(value, currency || Money.default_currency)
          end
        end
      end
--- a/app/models/concerns/providable.rb
+++ b/app/models/concerns/providable.rb
@@ -7,7 +7,13 @@ module Providable

  class_methods do
    def exchange_rates_provider
-      Provider::Synth.new
+      api_key = ENV["SYNTH_API_KEY"]
+
+      if api_key.present?
+        Provider::Synth.new api_key
+      else
+        nil
+      end
    end

    def git_repository_provider
--- a/app/models/credit_card.rb
+++ b/app/models/credit_card.rb
@@ -0,0 +1,3 @@
+class CreditCard < ApplicationRecord
+  include Accountable
+end
--- a/app/models/crypto.rb
+++ b/app/models/crypto.rb
@@ -0,0 +1,3 @@
+class Crypto < ApplicationRecord
+  include Accountable
+end
--- a/app/models/current.rb
+++ b/app/models/current.rb
@@ -1,5 +1,5 @@
 class Current < ActiveSupport::CurrentAttributes
  attribute :user

-  delegate :family, to: :user
+  delegate :family, to: :user, allow_nil: true
 end
--- a/app/models/demo/generator.rb
+++ b/app/models/demo/generator.rb
@@ -0,0 +1,347 @@
+class Demo::Generator
+  COLORS = %w[#e99537 #4da568 #6471eb #db5a54 #df4e92 #c44fe9 #eb5429 #61c9ea #805dee #6ad28a]
+
+  def initialize
+    @family = reset_family!
+  end
+
+  def reset_and_clear_data!
+    clear_data!
+    create_user!
+
+    puts "user reset"
+  end
+
+  def reset_data!
+    Family.transaction do
+      clear_data!
+      create_user!
+
+      puts "user reset"
+
+      create_tags!
+      create_categories!
+      create_merchants!
+
+      puts "tags, categories, merchants created"
+
+      create_credit_card_account!
+      create_checking_account!
+      create_savings_account!
+
+      create_investment_account!
+      create_house_and_mortgage!
+      create_car_and_loan!
+
+      puts "accounts created"
+
+      family.sync
+
+      puts "balances synced"
+      puts "Demo data loaded successfully!"
+    end
+  end
+
+  private
+
+    attr_reader :family
+
+    def reset_family!
+      family_id = "d99e3c6e-d513-4452-8f24-dc263f8528c0" # deterministic demo id
+
+      family = Family.find_by(id: family_id)
+      family.destroy! if family
+
+      Family.create!(id: family_id, name: "Demo Family").tap(&:reload)
+    end
+
+    def clear_data!
+      ExchangeRate.destroy_all
+      Security.destroy_all
+      Security::Price.destroy_all
+    end
+
+    def create_user!
+      family.users.create! \
+        email: "user@maybe.local",
+        first_name: "Demo",
+        last_name: "User",
+        password: "password"
+    end
+
+    def create_tags!
+      [ "Trips", "Emergency Fund", "Demo Tag" ].each do |tag|
+        family.tags.create!(name: tag)
+      end
+    end
+
+    def create_categories!
+      categories = [ "Income", "Food & Drink", "Entertainment", "Travel",
+                    "Personal Care", "General Services", "Auto & Transport",
+                    "Rent & Utilities", "Home Improvement", "Shopping" ]
+
+      categories.each do |category|
+        family.categories.create!(name: category, color: COLORS.sample)
+      end
+    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" ]
+
+      merchants.each do |merchant|
+        family.merchants.create!(name: merchant, color: COLORS.sample)
+      end
+    end
+
+    def create_credit_card_account!
+      cc = family.accounts.create! \
+        accountable: CreditCard.new,
+        name: "Chase Credit Card",
+        balance: 2300,
+        currency: "USD",
+        institution: family.institutions.find_or_create_by(name: "Chase")
+
+      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
+      end
+
+      5.times do
+        create_transaction! \
+          account: cc,
+          amount: Faker::Number.negative(from: -1000),
+          name: "CC Payment"
+      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")
+
+      10.times do
+        create_transaction! \
+          account: checking,
+          name: "Expense",
+          amount: Faker::Number.positive(from: 100, to: 1000)
+      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!
+      securities = [
+        { isin: "US0378331005", symbol: "AAPL", name: "Apple Inc.", reference_price: 210 },
+        { isin: "JP3633400001", symbol: "TM", name: "Toyota Motor Corporation", reference_price: 202 },
+        { isin: "US5949181045", symbol: "MSFT", name: "Microsoft Corporation", reference_price: 455 }
+      ]
+
+      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! \
+            isin: security.isin,
+            date: date,
+            price: Faker::Number.positive(from: low_price, to: high_price)
+        end
+      end
+    end
+
+    def create_investment_account!
+      load_securities!
+
+      account = family.accounts.create! \
+        accountable: Investment.new,
+        name: "Robinhood",
+        balance: 100000,
+        currency: "USD",
+        institution: family.institutions.find_or_create_by(name: "Robinhood")
+
+      aapl = Security.find_by(symbol: "AAPL")
+      tm = Security.find_by(symbol: "TM")
+      msft = Security.find_by(symbol: "MSFT")
+
+      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!(isin: security.isin, date: date).price
+        name_prefix = qty < 0 ? "Sell " : "Buy "
+
+        account.entries.create! \
+          date: date,
+          amount: qty * price,
+          currency: "USD",
+          name: name_prefix + "#{qty} shares of #{security.symbol}",
+          entryable: Account::Trade.new(qty: qty, price: price, security: security)
+      end
+    end
+
+    def create_house_and_mortgage!
+      house = family.accounts.create! \
+        accountable: Property.new,
+        name: "123 Maybe Way",
+        balance: 560000,
+        currency: "USD"
+
+      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)
+
+      family.accounts.create! \
+        accountable: Loan.new,
+        name: "Mortgage",
+        balance: 495000,
+        currency: "USD"
+    end
+
+    def create_car_and_loan!
+      family.accounts.create! \
+        accountable: Vehicle.new,
+        name: "Honda Accord",
+        balance: 18000,
+        currency: "USD"
+
+      family.accounts.create! \
+        accountable: Loan.new,
+        name: "Car Loan",
+        balance: 8000,
+        currency: "USD"
+    end
+
+    def create_transaction!(attributes = {})
+      entry_attributes = attributes.except(:category, :tags, :merchant)
+      transaction_attributes = attributes.slice(:category, :tags, :merchant)
+
+      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)
+    end
+
+    def create_valuation!(account, date, amount)
+      Account::Entry.create! \
+        account: account,
+        date: date,
+        amount: amount,
+        currency: "USD",
+        entryable: Account::Valuation.new
+    end
+
+    def random_family_record(model)
+      family_records = model.where(family_id: family.id)
+      model.offset(rand(family_records.count)).first
+    end
+
+    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"
+      }
+
+      categories.find { |c| c.name == mapping[merchant.name] }
+    end
+
+    def tag_for_merchant(merchant)
+      mapping = {
+        "Delta Airlines" => "Trips",
+        "Airbnb" => "Trips"
+      }
+
+      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" }
+    end
+end
--- a/app/models/depository.rb
+++ b/app/models/depository.rb
@@ -0,0 +1,3 @@
+class Depository < ApplicationRecord
+  include Accountable
+end
--- a/app/models/exchange_rate.rb
+++ b/app/models/exchange_rate.rb
@@ -1,29 +1,29 @@
 class ExchangeRate < ApplicationRecord
  include Provided

-  validates :base_currency, :converted_currency, presence: true
+  validates :from_currency, :to_currency, :date, :rate, presence: true

  class << self
-    def find_rate(from:, to:, date:)
-      find_by \
-        base_currency: Money::Currency.new(from).iso_code,
-        converted_currency: Money::Currency.new(to).iso_code,
+    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_rate_or_fetch(from:, to:, date:)
-      find_rate(from:, to:, date:) || fetch_rate_from_provider(from:, to:, date:)&.tap(&:save!)
-    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.to_set
+      existing_dates = rates.map(&:date).to_set
+      missing_dates = all_dates - existing_dates

-    def get_rates(from, to, dates)
-      where(base_currency: from, converted_currency: to, date: dates).order(:date)
-    end
+      if missing_dates.any?
+        rates += fetch_rates_from_provider(from:, to:, dates: missing_dates, cache:)
+      end

-    def convert(value:, from:, to:, date:)
-      rate = ExchangeRate.find_by(base_currency: from, converted_currency: to, date:)
-      raise "Conversion from: #{from} to: #{to} on: #{date} not found" unless rate
-
-      value * rate.rate
+      rates
    end
  end
 end
--- a/app/models/exchange_rate/provided.rb
+++ b/app/models/exchange_rate/provided.rb
@@ -1,25 +1,38 @@
 module ExchangeRate::Provided
  extend ActiveSupport::Concern
+
  include Providable

  class_methods do
    private
-      def fetch_rate_from_provider(from:, to:, date:)
-        return nil unless exchange_rates_provider.configured?
+
+      def fetch_rates_from_provider(from:, to:, dates:, cache: false)
+        return [] unless exchange_rates_provider.present?
+
+        dates.map do |date|
+          fetch_rate_from_provider from:, to:, date:, cache:
+        end.compact
+      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: Money::Currency.new(from).iso_code,
-          to: Money::Currency.new(to).iso_code,
+          from: from,
+          to: to,
          date: date

        if response.success?
-          ExchangeRate.new \
-            base_currency: from,
-            converted_currency: to,
+          rate = ExchangeRate.new \
+            from_currency: from,
+            to_currency: to,
            rate: response.rate,
            date: date
+
+          rate.save! if cache
+          rate
        else
-          raise response.error
+          nil
        end
      end
  end
--- a/app/models/family.rb
+++ b/app/models/family.rb
@@ -4,22 +4,23 @@ class Family < ApplicationRecord
  has_many :accounts, dependent: :destroy
  has_many :institutions, dependent: :destroy
  has_many :transactions, through: :accounts
+  has_many :entries, through: :accounts
  has_many :imports, through: :accounts
-  has_many :transaction_categories, dependent: :destroy, class_name: "Transaction::Category"
-  has_many :transaction_merchants, dependent: :destroy, class_name: "Transaction::Merchant"
+  has_many :categories, dependent: :destroy
+  has_many :merchants, dependent: :destroy

  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")
+              .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
@@ -34,16 +35,18 @@ class Family < ApplicationRecord

  def snapshot_account_transactions
    period = Period.last_30_days
-    results = accounts.active.joins(:transactions)
-      .select(
-        "accounts.*",
-        "COALESCE(SUM(amount) FILTER (WHERE amount > 0), 0) AS spending",
-        "COALESCE(SUM(-amount) FILTER (WHERE amount < 0), 0) AS income"
-      )
-      .where("transactions.date >= ?", period.date_range.begin)
-      .where("transactions.date <= ?", period.date_range.end)
-      .group("id")
-      .to_a
+    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("id")
+                      .to_a

    results.each do |r|
      r.define_singleton_method(:savings_rate) do
@@ -59,7 +62,8 @@ class Family < ApplicationRecord
  end

  def snapshot_transactions
-    rolling_totals = Transaction.daily_rolling_totals(transactions, period: Period.last_30_days, currency: self.currency)
+    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 = []
@@ -88,23 +92,19 @@ class Family < ApplicationRecord
    }
  end

-  def effective_start_date
-    accounts.active.joins(:balances).minimum("account_balances.date") || Date.current
-  end
-
  def net_worth
    assets - liabilities
  end

  def assets
-    Money.new(accounts.active.assets.map { |account| account.balance_money.exchange_to(currency) || 0 }.sum, currency)
+    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) || 0 }.sum, currency)
+    Money.new(accounts.active.liabilities.map { |account| account.balance_money.exchange_to(currency, fallback_rate: 0) }.sum, currency)
  end

-  def sync_accounts
-    accounts.each { |account| account.sync_later if account.can_sync? }
+  def sync(start_date: nil)
+    accounts.active.sync(start_date: start_date)
  end
 end
--- a/app/models/help/article.rb
+++ b/app/models/help/article.rb
@@ -0,0 +1,54 @@
+class Help::Article
+  attr_reader :frontmatter, :content
+
+  def initialize(frontmatter:, content:)
+    @frontmatter = frontmatter
+    @content = content
+  end
+
+  def title
+    frontmatter["title"]
+  end
+
+  def html
+    render_markdown(content)
+  end
+
+  class << self
+    def root_path
+      Rails.root.join("docs", "help")
+    end
+
+    def find(slug)
+      Dir.glob(File.join(root_path, "*.md")).each do |file_path|
+        file_content = File.read(file_path)
+        frontmatter, markdown_content = parse_frontmatter(file_content)
+
+        return new(frontmatter:, content: markdown_content) if frontmatter["slug"] == slug
+      end
+
+      nil
+    end
+
+    private
+
+      def parse_frontmatter(content)
+        if content =~ /\A---(.+?)---/m
+          frontmatter = YAML.safe_load($1)
+          markdown_content = content[($~.end(0))..-1].strip
+        else
+          frontmatter = {}
+          markdown_content = content
+        end
+
+        [ frontmatter, markdown_content ]
+      end
+  end
+
+  private
+
+    def render_markdown(content)
+      markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
+      markdown.render(content)
+    end
+end
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -38,7 +38,7 @@ class Import < ApplicationRecord
  end

  def get_selected_header_for_field(field)
-    column_mappings&.dig(field) || field.key
+    column_mappings&.dig(field.key) || field.key
  end

  def update_csv!(row_idx:, col_idx:, value:)
@@ -111,7 +111,7 @@ class Import < ApplicationRecord
    end

    def generate_transactions
-      transactions = []
+      transaction_entries = []
      category_cache = {}
      tag_cache = {}

@@ -124,20 +124,19 @@ class Import < ApplicationRecord
          tags << tag_cache[tag_string] ||= account.family.tags.find_or_initialize_by(name: tag_string)
        end

-        category = category_cache[category_name] ||= account.family.transaction_categories.find_or_initialize_by(name: category_name) if category_name.present?
+        category = category_cache[category_name] ||= account.family.categories.find_or_initialize_by(name: category_name) if category_name.present?

-        txn = account.transactions.build \
+        entry = account.entries.build \
          name: row["name"].presence || FALLBACK_TRANSACTION_NAME,
          date: Date.iso8601(row["date"]),
-          category: category,
-          tags: tags,
-          amount: BigDecimal(row["amount"]) * -1, # User inputs amounts with opposite signage of our internal representation
-          currency: account.currency
+          currency: account.currency,
+          amount: BigDecimal(row["amount"]) * -1,
+          entryable: Account::Transaction.new(category: category, tags: tags)

-        transactions << txn
+        transaction_entries << entry
      end

-      transactions
+      transaction_entries
    end

    def create_expected_fields
--- a/app/models/account/investment.rb
+++ b/app/models/account/investment.rb
@@ -1,4 +1,4 @@
-class Account::Investment < ApplicationRecord
+class Investment < ApplicationRecord
  include Accountable

  SUBTYPES = [
--- a/app/models/loan.rb
+++ b/app/models/loan.rb
@@ -0,0 +1,3 @@
+class Loan < ApplicationRecord
+  include Accountable
+end
--- a/app/models/transaction/merchant.rb
+++ b/app/models/transaction/merchant.rb
@@ -1,5 +1,5 @@
-class Transaction::Merchant < ApplicationRecord
-  has_many :transactions, dependent: :nullify
+class Merchant < ApplicationRecord
+  has_many :transactions, dependent: :nullify, class_name: "Account::Transaction"
  belongs_to :family

  validates :name, :color, :family, presence: true
--- a/app/models/other_asset.rb
+++ b/app/models/other_asset.rb
@@ -0,0 +1,3 @@
+class OtherAsset < ApplicationRecord
+  include Accountable
+end
--- a/app/models/other_liability.rb
+++ b/app/models/other_liability.rb
@@ -0,0 +1,3 @@
+class OtherLiability < ApplicationRecord
+  include Accountable
+end
--- a/app/models/property.rb
+++ b/app/models/property.rb
@@ -0,0 +1,3 @@
+class Property < ApplicationRecord
+  include Accountable
+end
--- a/app/models/provider/synth.rb
+++ b/app/models/provider/synth.rb
@@ -1,12 +1,8 @@
 class Provider::Synth
  include Retryable

-  def initialize(api_key = ENV["SYNTH_API_KEY"])
-    @api_key = api_key || ENV["SYNTH_API_KEY"]
-  end
-
-  def configured?
-    @api_key.present?
+  def initialize(api_key)
+    @api_key = api_key
  end

  def fetch_exchange_rate(from:, to:, date:)
--- a/app/models/security.rb
+++ b/app/models/security.rb
@@ -0,0 +1,14 @@
+class Security < ApplicationRecord
+  before_save :normalize_identifiers
+
+  has_many :trades, dependent: :nullify, class_name: "Account::Trade"
+
+  validates :isin, presence: true, uniqueness: { case_sensitive: false }
+
+  private
+
+    def normalize_identifiers
+      self.isin = isin.upcase
+      self.symbol = symbol.upcase
+    end
+end
--- a/app/models/security/price.rb
+++ b/app/models/security/price.rb
@@ -0,0 +1,2 @@
+class Security::Price < ApplicationRecord
+end
--- 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: "Transaction"
+  has_many :transactions, through: :taggings, source: :taggable, source_type: "Account::Transaction"

  validates :name, presence: true, uniqueness: { scope: :family }

--- a/app/models/time_series/trend.rb
+++ b/app/models/time_series/trend.rb
@@ -1,16 +1,15 @@
 class TimeSeries::Trend
  include ActiveModel::Validations

-  attr_reader :current, :previous
-
-  delegate :favorable_direction, to: :series
+  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)
+  def initialize(current:, previous:, series: nil, favorable_direction: nil)
    @current = current
    @previous = previous
    @series = series
+    @favorable_direction = get_favorable_direction(favorable_direction)

    validate!
  end
@@ -25,6 +24,17 @@ class TimeSeries::Trend
    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
@@ -56,8 +66,21 @@ class TimeSeries::Trend
  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"
@@ -90,4 +113,9 @@ class TimeSeries::Trend
        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
--- a/app/models/transaction.rb
+++ b/app/models/transaction.rb
@@ -1,107 +0,0 @@
-class Transaction < ApplicationRecord
-  include Monetizable
-
-  monetize :amount
-
-  belongs_to :account
-  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
-
-  validates :name, :date, :amount, :account, presence: true
-
-  scope :ordered, -> { order(date: :desc) }
-  scope :active, -> { where(excluded: false) }
-  scope :inflows, -> { where("amount <= 0") }
-  scope :outflows, -> { where("amount > 0") }
-  scope :by_name, ->(name) { where("transactions.name ILIKE ?", "%#{name}%") }
-  scope :with_categories, ->(categories) { joins(:category).where(transaction_categories: { name: categories }) }
-  scope :with_accounts, ->(accounts) { joins(:account).where(accounts: { name: accounts }) }
-  scope :with_account_ids, ->(account_ids) { joins(:account).where(accounts: { id: account_ids }) }
-  scope :with_merchants, ->(merchants) { joins(:merchant).where(transaction_merchants: { name: merchants }) }
-  scope :on_or_after_date, ->(date) { where("transactions.date >= ?", date) }
-  scope :on_or_before_date, ->(date) { where("transactions.date <= ?", date) }
-  scope :with_converted_amount, ->(currency = Current.family.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(
-      "transactions.*",
-      "transactions.amount * COALESCE(er.rate, 1) AS converted_amount"
-    )
-      .joins(sanitize_sql_array([ "LEFT JOIN exchange_rates er ON transactions.date = er.date AND transactions.currency = er.base_currency AND er.converted_currency = ?", currency ]))
-      .where("er.rate IS NOT NULL OR transactions.currency = ?", currency)
-  }
-
-  def inflow?
-    amount <= 0
-  end
-
-  def outflow?
-    amount > 0
-  end
-
-  def sync_account_later
-    if destroyed?
-      sync_start_date = previous_transaction_date
-    else
-      sync_start_date = [ date_previously_was, date ].compact.min
-    end
-
-    account.sync_later(sync_start_date)
-  end
-
-  class << self
-    def daily_totals(transactions, period: Period.last_30_days, currency: Current.family.currency)
-      # 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(transactions.with_converted_amount(currency), :t)
-        .joins(sanitize_sql([ "RIGHT JOIN generate_series(?, ?, interval '1 day') AS gs(date) ON t.date = gs.date", period.date_range.first, period.date_range.last ]))
-        .group("gs.date")
-    end
-
-    def daily_rolling_totals(transactions, period: Period.last_30_days, currency: Current.family.currency)
-      # 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(transactions, period: period_with_rolling, currency: currency))
-                         .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 search(params)
-      query = all
-      query = query.by_name(params[:search]) if params[:search].present?
-      query = query.with_categories(params[:categories]) if params[:categories].present?
-      query = query.with_accounts(params[:accounts]) if params[:accounts].present?
-      query = query.with_account_ids(params[:account_ids]) if params[:account_ids].present?
-      query = query.with_merchants(params[:merchants]) if params[:merchants].present?
-      query = query.on_or_after_date(params[:start_date]) if params[:start_date].present?
-      query = query.on_or_before_date(params[:end_date]) if params[:end_date].present?
-      query
-    end
-  end
-
-  private
-
-    def previous_transaction_date
-      self.account
-          .transactions
-          .where("date < ?", date)
-          .order(date: :desc)
-          .first&.date
-    end
-end
--- a/app/models/valuation.rb
+++ b/app/models/valuation.rb
@@ -1,13 +0,0 @@
-class Valuation < ApplicationRecord
-  include Monetizable
-
-  belongs_to :account
-  validates :account, :date, :value, presence: true
-  monetize :value
-
-  scope :in_period, ->(period) { period.date_range.nil? ? all : where(date: period.date_range) }
-
-  def self.to_series
-    TimeSeries.from_collection all, :value_money
-  end
-end
--- a/app/models/vehicle.rb
+++ b/app/models/vehicle.rb
@@ -0,0 +1,3 @@
+class Vehicle < ApplicationRecord
+  include Accountable
+end
--- a/app/views/account/entries/_empty.html.erb
+++ b/app/views/account/entries/_empty.html.erb
--- a/app/views/account/entries/_entry.html.erb
+++ b/app/views/account/entries/_entry.html.erb
@@ -0,0 +1,4 @@
+<%# locals: (entry:, **opts) %>
+<%= turbo_frame_tag dom_id(entry) do %>
+  <%= render permitted_entryable_partial_path(entry, entry.entryable_name_short), entry: entry, **opts %>
+<% end %>
--- a/app/views/account/entries/_entry_group.html.erb
+++ b/app/views/account/entries/_entry_group.html.erb
@@ -0,0 +1,21 @@
+<%# locals: (date:, entries:, selectable: true, **opts) %>
+<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 %>
+
+      <%= tag.span "#{date.strftime('%b %d, %Y')} · #{entries.size}" %>
+    </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">
+    <%= render entries.reject { |e| e.transfer_id.present? }, selectable:, **opts %>
+    <%= render transfer_entries(entries), selectable:, **opts %>
+  </div>
+</div>
--- a/app/views/account/entries/_loading.html.erb
+++ b/app/views/account/entries/_loading.html.erb
@@ -0,0 +1,5 @@
+<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>
--- a/Show More
+++ b/Show More