diff --git a/source/Gnomeshade.Avalonia.Core/AutoCompleteSelectors.cs b/source/Gnomeshade.Avalonia.Core/AutoCompleteSelectors.cs
index c0b731323..ca5b77707 100644
--- a/source/Gnomeshade.Avalonia.Core/AutoCompleteSelectors.cs
+++ b/source/Gnomeshade.Avalonia.Core/AutoCompleteSelectors.cs
@@ -7,6 +7,7 @@
 using Gnomeshade.Avalonia.Core.Reports.Aggregates;
 using Gnomeshade.Avalonia.Core.Reports.Calculations;
 using Gnomeshade.WebApi.Models.Accounts;
+using Gnomeshade.WebApi.Models.Loans;
 using Gnomeshade.WebApi.Models.Owners;
 using Gnomeshade.WebApi.Models.Products;
 
@@ -18,12 +19,15 @@ internal static class AutoCompleteSelectors
 
 	internal static AutoCompleteSelector<object> Account { get; } = (_, item) => ((Account)item).Name;
 
+	/// <summary>Gets a delegate for formatting a counterparty in an <see cref="AutoCompleteBox"/>.</summary>
 	internal static AutoCompleteSelector<object> Counterparty { get; } = (_, item) => ((Counterparty)item).Name;
 
 	internal static AutoCompleteSelector<object> Category { get; } = (_, item) => ((Category)item).Name;
 
+	/// <summary>Gets a delegate for formatting a currency in an <see cref="AutoCompleteBox"/>.</summary>
 	internal static AutoCompleteSelector<object> Currency { get; } = (_, item) => ((Currency)item).AlphabeticCode;
 
+	/// <summary>Gets a delegate for formatting a owner in an <see cref="AutoCompleteBox"/>.</summary>
 	internal static AutoCompleteSelector<object> Owner { get; } = (_, item) => ((Owner)item).Name;
 
 	internal static AutoCompleteSelector<object> Product { get; } = (_, item) => ((Product)item).Name;
@@ -33,4 +37,7 @@ internal static class AutoCompleteSelectors
 	internal static AutoCompleteSelector<object> Aggregate { get; } = (_, item) => ((IAggregateFunction)item).Name;
 
 	internal static AutoCompleteSelector<object> Calculation { get; } = (_, item) => ((ICalculationFunction)item).Name;
+
+	/// <summary>Gets a delegate for formatting a loan in an <see cref="AutoCompleteBox"/>.</summary>
+	internal static AutoCompleteSelector<object> Loan { get; } = (_, item) => ((Loan)item).Name;
 }
diff --git a/source/Gnomeshade.Avalonia.Core/DesignTime/DesignTimeData.cs b/source/Gnomeshade.Avalonia.Core/DesignTime/DesignTimeData.cs
index 8a60b421f..55a67993e 100644
--- a/source/Gnomeshade.Avalonia.Core/DesignTime/DesignTimeData.cs
+++ b/source/Gnomeshade.Avalonia.Core/DesignTime/DesignTimeData.cs
@@ -15,13 +15,14 @@
 using Gnomeshade.Avalonia.Core.Counterparties;
 using Gnomeshade.Avalonia.Core.Help;
 using Gnomeshade.Avalonia.Core.Imports;
+using Gnomeshade.Avalonia.Core.Loans;
+using Gnomeshade.Avalonia.Core.Loans.Migration;
 using Gnomeshade.Avalonia.Core.Products;
 using Gnomeshade.Avalonia.Core.Reports;
 using Gnomeshade.Avalonia.Core.Transactions;
 using Gnomeshade.Avalonia.Core.Transactions.Controls;
 using Gnomeshade.Avalonia.Core.Transactions.Links;
 using Gnomeshade.Avalonia.Core.Transactions.Loans;
-using Gnomeshade.Avalonia.Core.Transactions.Loans.Migration;
 using Gnomeshade.Avalonia.Core.Transactions.Purchases;
 using Gnomeshade.Avalonia.Core.Transactions.Transfers;
 using Gnomeshade.WebApi.Client;
@@ -150,12 +151,20 @@ public static class DesignTimeData
 		InitializeViewModel<LinkViewModel, LinkOverview, LinkUpsertionViewModel>(new(ActivityService, GnomeshadeClient, Guid.Empty));
 
 	/// <summary>Gets an instance of <see cref="LoanUpsertionViewModel"/> for use during design time.</summary>
+	public static LoanPaymentUpsertionViewModel LoanPaymentUpsertionViewModel { get; } =
+		InitializeViewModel(new LoanPaymentUpsertionViewModel(ActivityService, GnomeshadeClient, Guid.Empty, null));
+
+	/// <summary>Gets an instance of <see cref="LoanPaymentViewModel"/> for use during design time.</summary>
+	public static LoanPaymentViewModel LoanPaymentViewModel { get; } =
+		InitializeViewModel<LoanPaymentViewModel, LoanPaymentRow, LoanPaymentUpsertionViewModel>(new(ActivityService, GnomeshadeClient, Guid.Empty));
+
+	/// <summary>Gets an instance of <see cref="Loans.LoanUpsertionViewModel"/> for use during design time.</summary>
 	public static LoanUpsertionViewModel LoanUpsertionViewModel { get; } =
-		InitializeViewModel(new LoanUpsertionViewModel(ActivityService, GnomeshadeClient, Guid.Empty, null));
+		InitializeViewModel(new LoanUpsertionViewModel(ActivityService, GnomeshadeClient, null));
 
-	/// <summary>Gets an instance of <see cref="LoanViewModel"/> for use during design time.</summary>
+	/// <summary>Gets an instance of <see cref="Loans.LoanViewModel"/> for use during design time.</summary>
 	public static LoanViewModel LoanViewModel { get; } =
-		InitializeViewModel<LoanViewModel, LoanOverview, LoanUpsertionViewModel>(new(ActivityService, GnomeshadeClient, Guid.Empty));
+		InitializeViewModel<LoanViewModel, LoanRow, LoanUpsertionViewModel>(new(ActivityService, GnomeshadeClient));
 
 	/// <summary>Gets an instance of <see cref="CategoryReportViewModel"/> for use during design time.</summary>
 	public static CategoryReportViewModel CategoryReportViewModel { get; } =
diff --git a/source/Gnomeshade.Avalonia.Core/Loans/LoanPaymentRow.cs b/source/Gnomeshade.Avalonia.Core/Loans/LoanPaymentRow.cs
new file mode 100644
index 000000000..f6767133e
--- /dev/null
+++ b/source/Gnomeshade.Avalonia.Core/Loans/LoanPaymentRow.cs
@@ -0,0 +1,44 @@
+// Copyright 2021 Valters Melnalksnis
+// Licensed under the GNU Affero General Public License v3.0 or later.
+// See LICENSE.txt file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Gnomeshade.WebApi.Models.Accounts;
+using Gnomeshade.WebApi.Models.Loans;
+
+namespace Gnomeshade.Avalonia.Core.Loans;
+
+/// <summary>Overview of a single <see cref="LoanPayment"/>.</summary>
+public sealed class LoanPaymentRow : PropertyChangedBase
+{
+	/// <summary>Initializes a new instance of the <see cref="LoanPaymentRow"/> class.</summary>
+	/// <param name="payment">The payment which this row will represent.</param>
+	/// <param name="loans">All available loans.</param>
+	/// <param name="currencies">All available currencies.</param>
+	public LoanPaymentRow(LoanPayment payment, IEnumerable<Loan> loans, IEnumerable<Currency> currencies)
+	{
+		var loan = loans.Single(loan => loan.Id == payment.LoanId);
+		Loan = loan.Name;
+		Amount = payment.Amount;
+		Interest = payment.Interest;
+		Currency = currencies.Single(currency => currency.Id == loan.CurrencyId).AlphabeticCode;
+		Id = payment.Id;
+	}
+
+	/// <summary>Gets the name of the loan that this payment is a part of.</summary>
+	public string Loan { get; }
+
+	/// <summary>Gets the amount that was loaned or payed back.</summary>
+	public decimal Amount { get; }
+
+	/// <summary>Gets the interest amount of this loan payment.</summary>
+	public decimal Interest { get; }
+
+	/// <summary>Gets the alphabetic code of the currency of <see cref="Amount"/> and <see cref="Interest"/>.</summary>
+	public string Currency { get; }
+
+	internal Guid Id { get; }
+}
diff --git a/source/Gnomeshade.Avalonia.Core/Loans/LoanRow.cs b/source/Gnomeshade.Avalonia.Core/Loans/LoanRow.cs
new file mode 100644
index 000000000..ac969a327
--- /dev/null
+++ b/source/Gnomeshade.Avalonia.Core/Loans/LoanRow.cs
@@ -0,0 +1,66 @@
+// Copyright 2021 Valters Melnalksnis
+// Licensed under the GNU Affero General Public License v3.0 or later.
+// See LICENSE.txt file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Gnomeshade.WebApi.Models.Accounts;
+using Gnomeshade.WebApi.Models.Loans;
+
+namespace Gnomeshade.Avalonia.Core.Loans;
+
+/// <summary>Overview of a single <see cref="Loan"/>.</summary>
+public sealed class LoanRow : PropertyChangedBase
+{
+	/// <summary>Initializes a new instance of the <see cref="LoanRow"/> class.</summary>
+	/// <param name="loan">The loan which this row will represent.</param>
+	/// <param name="counterparties">All available counterparties.</param>
+	/// <param name="currencies">All available currencies.</param>
+	/// <param name="payments">All available loan payments.</param>
+	public LoanRow(
+		Loan loan,
+		IReadOnlyCollection<Counterparty> counterparties,
+		IEnumerable<Currency> currencies,
+		IEnumerable<LoanPayment> payments)
+	{
+		Id = loan.Id;
+		Name = loan.Name;
+		Issuer = counterparties.Single(counterparty => counterparty.Id == loan.IssuingCounterpartyId).Name;
+		Receiver = counterparties.Single(counterparty => counterparty.Id == loan.ReceivingCounterpartyId).Name;
+		Principal = loan.Principal;
+		Currency = currencies.Single(currency => currency.Id == loan.CurrencyId).AlphabeticCode;
+
+		var loanPayments = payments.Where(payment => payment.LoanId == Id).ToArray();
+		ActualPrincipal = loanPayments.Where(payment => payment.Amount > 0).Sum(payment => payment.Amount);
+		PaidPrincipal = loanPayments.Where(payment => payment.Amount < 0).Sum(payment => -payment.Amount);
+		PaidInterest = loanPayments.Where(payment => payment.Amount < 0).Sum(payment => -payment.Interest);
+	}
+
+	/// <summary>Gets the name of the loan.</summary>
+	public string Name { get; }
+
+	/// <summary>Gets the name of the issuing counterparty.</summary>
+	public string Issuer { get; }
+
+	/// <summary>Gets the name of the receiving counterparty.</summary>
+	public string Receiver { get; }
+
+	/// <summary>Gets the amount of capital originally borrowed or invested.</summary>
+	public decimal Principal { get; }
+
+	/// <summary>Gets the currency of  <see cref="Principal"/>.</summary>
+	public string Currency { get; }
+
+	/// <summary>Gets the actual amount borrow as indicated by loan payments.</summary>
+	public decimal ActualPrincipal { get; }
+
+	/// <summary>Gets the amount of <see cref="Principal"/> that has been paid back.</summary>
+	public decimal PaidPrincipal { get; }
+
+	/// <summary>Gets the amount of interest paid.</summary>
+	public decimal PaidInterest { get; }
+
+	internal Guid Id { get; }
+}
diff --git a/source/Gnomeshade.Avalonia.Core/Loans/LoanUpsertionViewModel.cs b/source/Gnomeshade.Avalonia.Core/Loans/LoanUpsertionViewModel.cs
new file mode 100644
index 000000000..30ae000ed
--- /dev/null
+++ b/source/Gnomeshade.Avalonia.Core/Loans/LoanUpsertionViewModel.cs
@@ -0,0 +1,126 @@
+// Copyright 2021 Valters Melnalksnis
+// Licensed under the GNU Affero General Public License v3.0 or later.
+// See LICENSE.txt file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+using Avalonia.Controls;
+
+using Gnomeshade.WebApi.Client;
+using Gnomeshade.WebApi.Models.Accounts;
+using Gnomeshade.WebApi.Models.Loans;
+using Gnomeshade.WebApi.Models.Owners;
+
+using PropertyChanged.SourceGenerator;
+
+namespace Gnomeshade.Avalonia.Core.Loans;
+
+/// <summary>Creates or updates a single loan.</summary>
+public sealed partial class LoanUpsertionViewModel : UpsertionViewModel
+{
+	/// <summary>Gets a collection of all owners.</summary>
+	[Notify(Setter.Private)]
+	private List<Owner> _owners = [];
+
+	/// <summary>Gets a collection of all counterparties.</summary>
+	[Notify(Setter.Private)]
+	private List<Counterparty> _counterparties = [];
+
+	/// <summary>Gets a collection of all currencies.</summary>
+	[Notify(Setter.Private)]
+	private List<Currency> _currencies = [];
+
+	/// <summary>Gets or sets the name of the loan.</summary>
+	[Notify]
+	private string? _name;
+
+	/// <summary>Gets or sets the owner of the loan.</summary>
+	[Notify]
+	private Owner? _owner;
+
+	/// <summary>Gets or sets the issuer of the loan.</summary>
+	[Notify]
+	private Counterparty? _issuer;
+
+	/// <summary>Gets or sets the receiver of the loan.</summary>
+	[Notify]
+	private Counterparty? _receiver;
+
+	/// <summary>Gets or sets the amount of capital originally borrowed or invested.</summary>
+	[Notify]
+	private decimal? _principal;
+
+	/// <summary>Gets or sets the currency of <see cref="Principal"/>.</summary>
+	[Notify]
+	private Currency? _currency;
+
+	/// <summary>Initializes a new instance of the <see cref="LoanUpsertionViewModel"/> class.</summary>
+	/// <param name="activityService">Service for indicating the activity of the application to the user.</param>
+	/// <param name="gnomeshadeClient">A strongly typed API client.</param>
+	/// <param name="id">The id of the loan to edit.</param>
+	public LoanUpsertionViewModel(IActivityService activityService, IGnomeshadeClient gnomeshadeClient, Guid? id)
+		: base(activityService, gnomeshadeClient)
+	{
+		Id = id;
+	}
+
+	/// <inheritdoc cref="AutoCompleteSelectors.Counterparty"/>
+	public AutoCompleteSelector<object> CounterpartySelector => AutoCompleteSelectors.Counterparty;
+
+	/// <inheritdoc cref="AutoCompleteSelectors.Currency"/>
+	public AutoCompleteSelector<object> CurrencySelector => AutoCompleteSelectors.Currency;
+
+	/// <inheritdoc cref="AutoCompleteSelectors.Owner"/>
+	public AutoCompleteSelector<object> OwnerSelector => AutoCompleteSelectors.Owner;
+
+	/// <inheritdoc />
+	public override bool CanSave =>
+		!string.IsNullOrWhiteSpace(Name) &&
+		Issuer is not null &&
+		Receiver is not null &&
+		Issuer.Id != Receiver.Id &&
+		Principal is not null &&
+		Currency is not null;
+
+	/// <inheritdoc />
+	protected override async Task<Guid> SaveValidatedAsync()
+	{
+		var id = Id ?? Guid.NewGuid();
+		var loan = new LoanCreation
+		{
+			OwnerId = Owner?.Id,
+			Name = Name!,
+			IssuingCounterpartyId = Issuer?.Id,
+			ReceivingCounterpartyId = Receiver?.Id,
+			Principal = Principal,
+			CurrencyId = Currency?.Id,
+		};
+
+		await GnomeshadeClient.PutLoanAsync(id, loan);
+		return id;
+	}
+
+	/// <inheritdoc />
+	protected override async Task Refresh()
+	{
+		Owners = await GnomeshadeClient.GetOwnersAsync();
+		Counterparties = await GnomeshadeClient.GetCounterpartiesAsync();
+		Currencies = await GnomeshadeClient.GetCurrenciesAsync();
+
+		if (Id is not { } id)
+		{
+			return;
+		}
+
+		var loan = await GnomeshadeClient.GetLoanAsync(id);
+		Owner = Owners.Single(owner => owner.Id == loan.OwnerId);
+		Name = loan.Name;
+		Issuer = Counterparties.Single(counterparty => counterparty.Id == loan.IssuingCounterpartyId);
+		Receiver = Counterparties.Single(counterparty => counterparty.Id == loan.ReceivingCounterpartyId);
+		Principal = loan.Principal;
+		Currency = Currencies.Single(currency => currency.Id == loan.CurrencyId);
+	}
+}
diff --git a/source/Gnomeshade.Avalonia.Core/Loans/LoanViewModel.cs b/source/Gnomeshade.Avalonia.Core/Loans/LoanViewModel.cs
new file mode 100644
index 000000000..0386db4a9
--- /dev/null
+++ b/source/Gnomeshade.Avalonia.Core/Loans/LoanViewModel.cs
@@ -0,0 +1,70 @@
+// Copyright 2021 Valters Melnalksnis
+// Licensed under the GNU Affero General Public License v3.0 or later.
+// See LICENSE.txt file in the project root for full license information.
+
+using System.Linq;
+using System.Threading.Tasks;
+
+using Gnomeshade.WebApi.Client;
+
+namespace Gnomeshade.Avalonia.Core.Loans;
+
+/// <summary>An overview of all loans.</summary>
+public sealed class LoanViewModel : OverviewViewModel<LoanRow, LoanUpsertionViewModel>
+{
+	private readonly IGnomeshadeClient _gnomeshadeClient;
+
+	private LoanUpsertionViewModel _details;
+
+	/// <summary>Initializes a new instance of the <see cref="LoanViewModel"/> class.</summary>
+	/// <param name="activityService">Service for indicating the activity of the application to the user.</param>
+	/// <param name="gnomeshadeClient">A strongly typed API client.</param>
+	public LoanViewModel(IActivityService activityService, IGnomeshadeClient gnomeshadeClient)
+		: base(activityService)
+	{
+		_gnomeshadeClient = gnomeshadeClient;
+
+		_details = new(activityService, _gnomeshadeClient, null);
+	}
+
+	/// <inheritdoc />
+	public override LoanUpsertionViewModel Details
+	{
+		get => _details;
+		set => SetAndNotify(ref _details, value);
+	}
+
+	/// <inheritdoc />
+	public override async Task UpdateSelection()
+	{
+		Details = new(ActivityService, _gnomeshadeClient, Selected?.Id);
+		await Details.RefreshAsync();
+	}
+
+	/// <inheritdoc />
+	protected override async Task DeleteAsync(LoanRow row)
+	{
+		await _gnomeshadeClient.DeleteLoanAsync(row.Id);
+		await RefreshAsync();
+	}
+
+	/// <inheritdoc />
+	protected override async Task Refresh()
+	{
+		var (loans, loanPayments, counterparties, currencies) = await (
+			_gnomeshadeClient.GetLoansAsync(),
+			_gnomeshadeClient.GetLoanPaymentsAsync(),
+			_gnomeshadeClient.GetCounterpartiesAsync(),
+			_gnomeshadeClient.GetCurrenciesAsync())
+			.WhenAll();
+
+		var loanOverviews = loans
+			.Select(loan => new LoanRow(loan, counterparties, currencies, loanPayments))
+			.ToArray();
+
+		Rows = new(loanOverviews);
+
+		Details = new(ActivityService, _gnomeshadeClient, Selected?.Id);
+		await Details.RefreshAsync();
+	}
+}
diff --git a/source/Gnomeshade.Avalonia.Core/Loans/Migration/LegacyLoanRow.cs b/source/Gnomeshade.Avalonia.Core/Loans/Migration/LegacyLoanRow.cs
new file mode 100644
index 000000000..7c02329c8
--- /dev/null
+++ b/source/Gnomeshade.Avalonia.Core/Loans/Migration/LegacyLoanRow.cs
@@ -0,0 +1,48 @@
+// Copyright 2021 Valters Melnalksnis
+// Licensed under the GNU Affero General Public License v3.0 or later.
+// See LICENSE.txt file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Gnomeshade.WebApi.Models.Accounts;
+using Gnomeshade.WebApi.Models.Transactions;
+
+namespace Gnomeshade.Avalonia.Core.Loans.Migration;
+
+/// <summary>Overview of a single <see cref="LegacyLoan"/>.</summary>
+public sealed class LegacyLoanRow : PropertyChangedBase
+{
+	/// <summary>Initializes a new instance of the <see cref="LegacyLoanRow"/> class.</summary>
+	/// <param name="loan">The loan which this row represents.</param>
+	/// <param name="counterparties">A collection of all available counterparties.</param>
+	/// <param name="currencies">A collection of all available currencies.</param>
+#pragma warning disable CS0612 // Type or member is obsolete
+	public LegacyLoanRow(
+		LegacyLoan loan,
+		IReadOnlyCollection<Counterparty> counterparties,
+		IEnumerable<Currency> currencies)
+#pragma warning restore CS0612 // Type or member is obsolete
+	{
+		Issuer = counterparties.Single(counterparty => counterparty.Id == loan.IssuingCounterpartyId).Name;
+		Receiver = counterparties.Single(counterparty => counterparty.Id == loan.ReceivingCounterpartyId).Name;
+		Amount = loan.Amount;
+		Currency = currencies.Single(currency => currency.Id == loan.CurrencyId).AlphabeticCode;
+		Id = loan.Id;
+	}
+
+	/// <summary>Gets the name of the issuing counterparty of the loan.</summary>
+	public string Issuer { get; }
+
+	/// <summary>Gets the name of the issuing counterparty of the loan.</summary>
+	public string Receiver { get; }
+
+	/// <summary>Gets the amount loaned or paid back.</summary>
+	public decimal Amount { get; }
+
+	/// <summary>Gets the currency of <see cref="Amount"/>.</summary>
+	public string Currency { get; }
+
+	internal Guid Id { get; }
+}
diff --git a/source/Gnomeshade.Avalonia.Core/Transactions/Loans/Migration/LoanCounterpartyComparer.cs b/source/Gnomeshade.Avalonia.Core/Loans/Migration/LoanCounterpartyComparer.cs
similarity index 83%
rename from source/Gnomeshade.Avalonia.Core/Transactions/Loans/Migration/LoanCounterpartyComparer.cs
rename to source/Gnomeshade.Avalonia.Core/Loans/Migration/LoanCounterpartyComparer.cs
index 37b0637e7..5e4a53b6a 100644
--- a/source/Gnomeshade.Avalonia.Core/Transactions/Loans/Migration/LoanCounterpartyComparer.cs
+++ b/source/Gnomeshade.Avalonia.Core/Loans/Migration/LoanCounterpartyComparer.cs
@@ -7,12 +7,13 @@
 
 using Gnomeshade.WebApi.Models.Transactions;
 
-namespace Gnomeshade.Avalonia.Core.Transactions.Loans.Migration;
+namespace Gnomeshade.Avalonia.Core.Loans.Migration;
 
 /// <inheritdoc />
-internal sealed class LoanCounterpartyComparer : IEqualityComparer<Loan?>
+[Obsolete]
+internal sealed class LoanCounterpartyComparer : IEqualityComparer<LegacyLoan?>
 {
-	public bool Equals(Loan? x, Loan? y)
+	public bool Equals(LegacyLoan? x, LegacyLoan? y)
 	{
 		if (ReferenceEquals(x, y))
 		{
@@ -29,7 +30,7 @@ public bool Equals(Loan? x, Loan? y)
 			(x.IssuingCounterpartyId == y.ReceivingCounterpartyId && x.ReceivingCounterpartyId == y.IssuingCounterpartyId);
 	}
 
-	public int GetHashCode(Loan obj)
+	public int GetHashCode(LegacyLoan obj)
 	{
 		return HashCode.Combine(obj.IssuingCounterpartyId, obj.ReceivingCounterpartyId);
 	}
diff --git a/source/Gnomeshade.Avalonia.Core/Transactions/Loans/Migration/LoanMigrationRow.cs b/source/Gnomeshade.Avalonia.Core/Loans/Migration/LoanMigrationRow.cs
similarity index 88%
rename from source/Gnomeshade.Avalonia.Core/Transactions/Loans/Migration/LoanMigrationRow.cs
rename to source/Gnomeshade.Avalonia.Core/Loans/Migration/LoanMigrationRow.cs
index 19553ea2d..ce581dd78 100644
--- a/source/Gnomeshade.Avalonia.Core/Transactions/Loans/Migration/LoanMigrationRow.cs
+++ b/source/Gnomeshade.Avalonia.Core/Loans/Migration/LoanMigrationRow.cs
@@ -3,8 +3,9 @@
 // See LICENSE.txt file in the project root for full license information.
 
 using System.Collections.Generic;
+using System.Linq;
 
-namespace Gnomeshade.Avalonia.Core.Transactions.Loans.Migration;
+namespace Gnomeshade.Avalonia.Core.Loans.Migration;
 
 /// <summary>Row for displaying how a loan will look after migrating.</summary>
 public sealed class LoanMigrationRow : PropertyChangedBase
@@ -20,6 +21,7 @@ public LoanMigrationRow(string name, string issuer, string receiver, List<decima
 		Name = name;
 		Issuer = issuer;
 		Receiver = receiver;
+		Total = amounts.Sum();
 		Amounts = amounts;
 		Currency = currency;
 	}
@@ -33,6 +35,9 @@ public LoanMigrationRow(string name, string issuer, string receiver, List<decima
 	/// <summary>Gets the receiver of the loan.</summary>
 	public string Receiver { get; }
 
+	/// <summary>Gets the current loaned total.</summary>
+	public decimal Total { get; }
+
 	/// <summary>Gets the loan payment amounts.</summary>
 	public List<decimal> Amounts { get; }
 
diff --git a/source/Gnomeshade.Avalonia.Core/Loans/Migration/LoanMigrationViewModel.cs b/source/Gnomeshade.Avalonia.Core/Loans/Migration/LoanMigrationViewModel.cs
new file mode 100644
index 000000000..8adfdafb2
--- /dev/null
+++ b/source/Gnomeshade.Avalonia.Core/Loans/Migration/LoanMigrationViewModel.cs
@@ -0,0 +1,175 @@
+// Copyright 2021 Valters Melnalksnis
+// Licensed under the GNU Affero General Public License v3.0 or later.
+// See LICENSE.txt file in the project root for full license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+using Gnomeshade.WebApi.Client;
+using Gnomeshade.WebApi.Models.Loans;
+
+using NodaTime;
+
+using PropertyChanged.SourceGenerator;
+
+namespace Gnomeshade.Avalonia.Core.Loans.Migration;
+
+/// <summary>Overview of loans to be migrated to named loans/loan payments.</summary>
+public sealed partial class LoanMigrationViewModel : ViewModelBase
+{
+	private readonly IGnomeshadeClient _gnomeshadeClient;
+
+	/// <summary>Gets a collection of all current loans.</summary>
+	[Notify(Setter.Private)]
+	private List<LegacyLoanRow> _loans = [];
+
+	/// <summary>Gets a collection of all loan payments that will be created.</summary>
+	[Notify(Setter.Private)]
+	private List<LoanMigrationRow> _migratedLoans = [];
+
+	/// <summary>Initializes a new instance of the <see cref="LoanMigrationViewModel"/> class.</summary>
+	/// <param name="activityService">Service for indicating the activity of the application to the user.</param>
+	/// <param name="gnomeshadeClient">A strongly typed API client.</param>
+	public LoanMigrationViewModel(IActivityService activityService, IGnomeshadeClient gnomeshadeClient)
+		: base(activityService)
+	{
+		_gnomeshadeClient = gnomeshadeClient;
+	}
+
+	/// <summary>Migrate legacy loans to loans/loan payments.</summary>
+	/// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+	public async Task MigrateLoans()
+	{
+		using var activity = BeginActivity("Migrating loans");
+
+#pragma warning disable CS0612 // Type or member is obsolete
+		var legacyLoans = await _gnomeshadeClient.GetLegacyLoans();
+#pragma warning restore CS0612 // Type or member is obsolete
+		var counterparties = await _gnomeshadeClient.GetCounterpartiesAsync();
+		var transactions = await _gnomeshadeClient.GetDetailedTransactionsAsync(new(Instant.MinValue, Instant.MaxValue));
+		var currencies = await _gnomeshadeClient.GetCurrenciesAsync();
+
+		var loansToCreate = legacyLoans
+			.OrderBy(loan =>
+			{
+				var transaction = transactions.Single(transaction => transaction.Id == loan.TransactionId);
+				return transaction.ValuedAt ?? transaction.BookedAt;
+			})
+#pragma warning disable CS0612 // Type or member is obsolete
+			.GroupBy(loan => loan, new LoanCounterpartyComparer())
+#pragma warning restore CS0612 // Type or member is obsolete
+			.Select(grouping =>
+			{
+				var counterparty1 =
+					counterparties.Single(counterparty => counterparty.Id == grouping.Key.IssuingCounterpartyId);
+				var counterparty2 =
+					counterparties.Single(counterparty => counterparty.Id == grouping.Key.ReceivingCounterpartyId);
+				return (counterparty1, counterparty2, grouping.ToArray());
+			})
+			.SelectMany(loanTuple =>
+			{
+				var issuer = loanTuple.Item3.First().IssuingCounterpartyId == loanTuple.counterparty1.Id
+					? loanTuple.counterparty1
+					: loanTuple.counterparty2;
+
+				var receiver = loanTuple.counterparty1 == issuer
+					? loanTuple.counterparty2
+					: loanTuple.counterparty1;
+
+				return loanTuple.Item3.GroupBy(loan => loan.CurrencyId).Select(grouping =>
+				{
+					var currency = currencies.Single(currency => currency.Id == grouping.Key);
+					var name = $"{issuer.Name} loan to {receiver.Name} ({currency.AlphabeticCode})";
+
+					var payments = grouping.Select(loan => new LoanPaymentCreation
+					{
+						TransactionId = loan.TransactionId,
+						Amount = loan.Amount,
+						Interest = 0,
+					}).ToArray();
+
+					var loanCreation = new LoanCreation
+					{
+						Name = name,
+						IssuingCounterpartyId = issuer.Id,
+						ReceivingCounterpartyId = receiver.Id,
+						Principal = payments.Sum(payment => payment.Amount),
+						CurrencyId = currency.Id,
+					};
+
+					return (loanCreation, payments);
+				});
+			});
+
+		foreach (var (loanCreation, paymentCreations) in loansToCreate)
+		{
+			var loanId = await _gnomeshadeClient.CreateLoanAsync(loanCreation);
+			foreach (var paymentCreation in paymentCreations)
+			{
+				await _gnomeshadeClient.CreateLoanPaymentAsync(paymentCreation with { LoanId = loanId });
+			}
+		}
+	}
+
+	/// <summary>Deletes all legacy loans.</summary>
+	/// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+	public async Task DeleteLegacyLoans()
+	{
+		using var activity = BeginActivity("Deleting legacy loans");
+
+		foreach (var legacyLoanRow in Loans)
+		{
+#pragma warning disable CS0612 // Type or member is obsolete
+			await _gnomeshadeClient.DeleteLegacyLoan(legacyLoanRow.Id);
+#pragma warning restore CS0612 // Type or member is obsolete
+		}
+	}
+
+	/// <inheritdoc />
+	protected override async Task Refresh()
+	{
+#pragma warning disable CS0612 // Type or member is obsolete
+		var loans = await _gnomeshadeClient.GetLegacyLoans();
+		var counterparties = await _gnomeshadeClient.GetCounterpartiesAsync();
+		var transactions = await _gnomeshadeClient.GetDetailedTransactionsAsync(new(Instant.MinValue, Instant.MaxValue));
+		var currencies = await _gnomeshadeClient.GetCurrenciesAsync();
+
+		MigratedLoans = loans
+			.OrderBy(loan =>
+			{
+				var transaction = transactions.Single(transaction => transaction.Id == loan.TransactionId);
+				return transaction.ValuedAt ?? transaction.BookedAt;
+			})
+			.GroupBy(loan => loan, new LoanCounterpartyComparer())
+			.Select(grouping =>
+			{
+				var counterparty1 = counterparties.Single(counterparty => counterparty.Id == grouping.Key.IssuingCounterpartyId);
+				var counterparty2 = counterparties.Single(counterparty => counterparty.Id == grouping.Key.ReceivingCounterpartyId);
+				return (counterparty1, counterparty2, grouping.ToArray());
+			})
+			.SelectMany(loanTuple =>
+			{
+				var issuer = loanTuple.Item3.First().IssuingCounterpartyId == loanTuple.counterparty1.Id
+					? loanTuple.counterparty1
+					: loanTuple.counterparty2;
+
+				var receiver = loanTuple.counterparty1 == issuer
+					? loanTuple.counterparty2
+					: loanTuple.counterparty1;
+
+				return loanTuple.Item3.GroupBy(loan => loan.CurrencyId).Select(grouping =>
+				{
+					var currency = currencies.Single(currency => currency.Id == grouping.Key);
+					var name = $"{issuer.Name} loan to {receiver.Name} ({currency.AlphabeticCode})";
+					return new LoanMigrationRow(name, issuer.Name, receiver.Name, grouping.Select(loan => loan.Amount).ToList(), currency.AlphabeticCode);
+				});
+			})
+			.ToList();
+#pragma warning restore CS0612 // Type or member is obsolete
+
+		Loans = loans
+			.Select(loan => new LegacyLoanRow(loan, counterparties, currencies))
+			.ToList();
+	}
+}
diff --git a/source/Gnomeshade.Avalonia.Core/MainWindowViewModel.cs b/source/Gnomeshade.Avalonia.Core/MainWindowViewModel.cs
index 4e282b7e9..2679706d8 100644
--- a/source/Gnomeshade.Avalonia.Core/MainWindowViewModel.cs
+++ b/source/Gnomeshade.Avalonia.Core/MainWindowViewModel.cs
@@ -21,13 +21,14 @@
 using Gnomeshade.Avalonia.Core.Products;
 using Gnomeshade.Avalonia.Core.Reports;
 using Gnomeshade.Avalonia.Core.Transactions;
-using Gnomeshade.Avalonia.Core.Transactions.Loans.Migration;
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 using PropertyChanged.SourceGenerator;
 
+using LoanMigrationViewModel = Gnomeshade.Avalonia.Core.Loans.Migration.LoanMigrationViewModel;
+
 namespace Gnomeshade.Avalonia.Core;
 
 /// <summary>A container view which manages navigation and the currently active view.</summary>
@@ -170,6 +171,10 @@ public void SwitchToSetup()
 	/// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
 	public Task SwitchToTransactionOverviewAsync() => SwitchTo<TransactionViewModel>();
 
+	/// <summary>Switches <see cref="ActiveView"/> to <see cref="Loans.LoanViewModel"/>.</summary>
+	/// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+	public Task SwitchToLoanOverviewAsync() => SwitchTo<Loans.LoanViewModel>();
+
 	/// <summary>Switches <see cref="ActiveView"/> to <see cref="LoanMigrationViewModel"/>.</summary>
 	/// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
 	public Task SwitchToLoanMigrationAsync() => SwitchTo<LoanMigrationViewModel>();
diff --git a/source/Gnomeshade.Avalonia.Core/ServiceCollectionExtensions.cs b/source/Gnomeshade.Avalonia.Core/ServiceCollectionExtensions.cs
index d74beaaee..329e4531b 100644
--- a/source/Gnomeshade.Avalonia.Core/ServiceCollectionExtensions.cs
+++ b/source/Gnomeshade.Avalonia.Core/ServiceCollectionExtensions.cs
@@ -9,13 +9,16 @@
 using Gnomeshade.Avalonia.Core.Counterparties;
 using Gnomeshade.Avalonia.Core.Help;
 using Gnomeshade.Avalonia.Core.Imports;
+using Gnomeshade.Avalonia.Core.Loans;
 using Gnomeshade.Avalonia.Core.Products;
 using Gnomeshade.Avalonia.Core.Reports;
 using Gnomeshade.Avalonia.Core.Transactions;
-using Gnomeshade.Avalonia.Core.Transactions.Loans.Migration;
+using Gnomeshade.Avalonia.Core.Transactions.Loans;
 
 using Microsoft.Extensions.DependencyInjection;
 
+using LoanMigrationViewModel = Gnomeshade.Avalonia.Core.Loans.Migration.LoanMigrationViewModel;
+
 namespace Gnomeshade.Avalonia.Core;
 
 /// <summary>Methods for configuring needed services in <see cref="IServiceCollection"/>.</summary>
@@ -48,5 +51,7 @@ public static IServiceCollection AddViewModels(this IServiceCollection serviceCo
 		.AddSingleton<OwnerUpsertionViewModel>()
 		.AddSingleton<AboutViewModel>()
 		.AddSingleton<LicensesViewModel>()
+		.AddSingleton<LoanViewModel>()
+		.AddSingleton<LoanPaymentViewModel>()
 		.AddSingleton<LoanMigrationViewModel>();
 }
diff --git a/source/Gnomeshade.Avalonia.Core/TaskExtensions.cs b/source/Gnomeshade.Avalonia.Core/TaskExtensions.cs
new file mode 100644
index 000000000..42499bbc8
--- /dev/null
+++ b/source/Gnomeshade.Avalonia.Core/TaskExtensions.cs
@@ -0,0 +1,34 @@
+// Copyright 2021 Valters Melnalksnis
+// Licensed under the GNU Affero General Public License v3.0 or later.
+// See LICENSE.txt file in the project root for full license information.
+
+using System.Threading.Tasks;
+
+namespace Gnomeshade.Avalonia.Core;
+
+internal static class TaskExtensions
+{
+	internal static async Task<(T1 Result1, T2 Result2)> WhenAll<T1, T2>(
+		this (Task<T1> Task1, Task<T2> Task2) tasks)
+	{
+		var (task1, task2) = tasks;
+		await Task.WhenAll(task1, task2);
+		return (task1.Result, task2.Result);
+	}
+
+	internal static async Task<(T1 Result1, T2 Result2, T3 Result3)> WhenAll<T1, T2, T3>(
+		this (Task<T1> Task1, Task<T2> Task2, Task<T3> Task3) tasks)
+	{
+		var (task1, task2, task3) = tasks;
+		await Task.WhenAll(task1, task2, task3);
+		return (task1.Result, task2.Result, task3.Result);
+	}
+
+	internal static async Task<(T1 Result1, T2 Result2, T3 Result3, T4 Result4)> WhenAll<T1, T2, T3, T4>(
+		this (Task<T1> Task1, Task<T2> Task2, Task<T3> Task3, Task<T4> Task4) tasks)
+	{
+		var (task1, task2, task3, task4) = tasks;
+		await Task.WhenAll(task1, task2, task3, task4);
+		return (task1.Result, task2.Result, task3.Result, task4.Result);
+	}
+}
diff --git a/source/Gnomeshade.Avalonia.Core/Transactions/Loans/LoanOverview.cs b/source/Gnomeshade.Avalonia.Core/Transactions/Loans/LoanOverview.cs
deleted file mode 100644
index 1583fed64..000000000
--- a/source/Gnomeshade.Avalonia.Core/Transactions/Loans/LoanOverview.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2021 Valters Melnalksnis
-// Licensed under the GNU Affero General Public License v3.0 or later.
-// See LICENSE.txt file in the project root for full license information.
-
-using System;
-
-using Gnomeshade.WebApi.Models.Transactions;
-
-namespace Gnomeshade.Avalonia.Core.Transactions.Loans;
-
-/// <summary>Overview of a single <see cref="Loan"/>.</summary>
-public sealed class LoanOverview : PropertyChangedBase
-{
-	/// <summary>Initializes a new instance of the <see cref="LoanOverview"/> class.</summary>
-	/// <param name="id">The id of the loan.</param>
-	/// <param name="issuingCounterparty">The name of the counterparty that issued the loan.</param>
-	/// <param name="receivingCounterparty">The name of the counterparty that received the loan.</param>
-	/// <param name="amount">The amount loaned.</param>
-	/// <param name="currency">The alphabetic code of the currency of <see cref="Amount"/>.</param>
-	public LoanOverview(
-		Guid id,
-		string issuingCounterparty,
-		string receivingCounterparty,
-		decimal amount,
-		string currency)
-	{
-		Id = id;
-		IssuingCounterparty = issuingCounterparty;
-		ReceivingCounterparty = receivingCounterparty;
-		Amount = amount;
-		Currency = currency;
-	}
-
-	/// <summary>Gets the id of the loan.</summary>
-	public Guid Id { get; }
-
-	/// <summary>Gets the name of the counterparty that issued the loan.</summary>
-	public string IssuingCounterparty { get; }
-
-	/// <summary>Gets the name of the counterparty that received the loan.</summary>
-	public string ReceivingCounterparty { get; }
-
-	/// <summary>Gets the amount loaned.</summary>
-	public decimal Amount { get; }
-
-	/// <summary>Gets the alphabetic code of the currency of <see cref="Amount"/>.</summary>
-	public string Currency { get; }
-}
diff --git a/source/Gnomeshade.Avalonia.Core/Transactions/Loans/LoanPaymentUpsertionViewModel.cs b/source/Gnomeshade.Avalonia.Core/Transactions/Loans/LoanPaymentUpsertionViewModel.cs
new file mode 100644
index 000000000..d5822852b
--- /dev/null
+++ b/source/Gnomeshade.Avalonia.Core/Transactions/Loans/LoanPaymentUpsertionViewModel.cs
@@ -0,0 +1,152 @@
+// Copyright 2021 Valters Melnalksnis
+// Licensed under the GNU Affero General Public License v3.0 or later.
+// See LICENSE.txt file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading.Tasks;
+
+using Avalonia.Controls;
+
+using Gnomeshade.WebApi.Client;
+using Gnomeshade.WebApi.Models.Accounts;
+using Gnomeshade.WebApi.Models.Loans;
+
+using PropertyChanged.SourceGenerator;
+
+namespace Gnomeshade.Avalonia.Core.Transactions.Loans;
+
+/// <summary>Creates or updates a single loan payment.</summary>
+public sealed partial class LoanPaymentUpsertionViewModel : UpsertionViewModel
+{
+	private readonly Guid _transactionId;
+
+	/// <summary>Gets all available loans.</summary>
+	[Notify(Setter.Private)]
+	private List<Loan> _loans = [];
+
+	/// <summary>Gets or sets the loan that this payment is a part of.</summary>
+	[Notify]
+	private Loan? _loan;
+
+	/// <summary>Gets or sets the amount of the loan payment.</summary>
+	/// <seealso cref="Currency"/>
+	[Notify]
+	private decimal? _amount;
+
+	/// <summary>Gets or sets the interest amount of this loan payment.</summary>
+	[Notify]
+	private decimal? _interest;
+
+	/// <summary>Initializes a new instance of the <see cref="LoanPaymentUpsertionViewModel"/> class.</summary>
+	/// <param name="activityService">Service for indicating the activity of the application to the user.</param>
+	/// <param name="gnomeshadeClient">A strongly typed API client.</param>
+	/// <param name="transactionId">The id of the transaction to which to add the loan.</param>
+	/// <param name="id">The id of the loan payment to edit.</param>
+	public LoanPaymentUpsertionViewModel(
+		IActivityService activityService,
+		IGnomeshadeClient gnomeshadeClient,
+		Guid transactionId,
+		Guid? id)
+		: base(activityService, gnomeshadeClient)
+	{
+		_transactionId = transactionId;
+		Id = id;
+
+		PropertyChanged += OnPropertyChanged;
+	}
+
+	/// <inheritdoc cref="AutoCompleteSelectors.Loan"/>
+	public AutoCompleteSelector<object> LoanSelector => AutoCompleteSelectors.Loan;
+
+	/// <inheritdoc />
+	public override bool CanSave =>
+		Loan is not null &&
+		Amount is not null &&
+		Interest is not null;
+
+	/// <inheritdoc />
+	protected override async Task Refresh()
+	{
+		Loans = await GnomeshadeClient.GetLoansAsync();
+
+		if (Id is not { } id)
+		{
+			return;
+		}
+
+		var payment = await GnomeshadeClient.GetLoanPaymentAsync(id);
+		Loan = Loans.Single(loan => loan.Id == payment.LoanId);
+		Amount = payment.Amount;
+		Interest = payment.Interest;
+	}
+
+	/// <inheritdoc />
+	protected override async Task<Guid> SaveValidatedAsync()
+	{
+		var creation = new LoanPaymentCreation
+		{
+			LoanId = Loan?.Id,
+			TransactionId = _transactionId,
+			Amount = Amount,
+			Interest = Interest,
+		};
+
+		var id = Id ?? Guid.NewGuid();
+		await GnomeshadeClient.PutLoanPaymentAsync(id, creation);
+		return id;
+	}
+
+	private async void OnPropertyChanged(object? sender, PropertyChangedEventArgs e)
+	{
+		if (e.PropertyName is not nameof(Loan) || Loan is not { } loan)
+		{
+			return;
+		}
+
+		var accounts = await GnomeshadeClient.GetAccountsAsync();
+		var transaction = await GnomeshadeClient.GetDetailedTransactionAsync(_transactionId);
+
+		var sourceCounterparties = transaction
+			.Transfers
+			.Select(transfer => accounts
+				.Single(account => account.Currencies.Any(currency => currency.Id == transfer.SourceAccountId)))
+			.Select(account => account.CounterpartyId)
+			.Distinct()
+			.ToArray();
+
+		var targetCounterparties = transaction
+			.Transfers
+			.Select(transfer => accounts
+				.Single(account => account.Currencies.Any(currency => currency.Id == transfer.TargetAccountId)))
+			.Select(account => account.CounterpartyId)
+			.Distinct()
+			.ToArray();
+
+		if (sourceCounterparties is not [var source] || targetCounterparties is not [var target])
+		{
+			return;
+		}
+
+		if (loan.IssuingCounterpartyId == source && loan.ReceivingCounterpartyId == target)
+		{
+			Amount = transaction.Transfers.Sum(transfer => transfer.SourceAmount);
+			Interest = 0;
+		}
+		else if (loan.IssuingCounterpartyId == target && loan.ReceivingCounterpartyId == source)
+		{
+			if (transaction.Transfers.OrderByDescending(transfer => transfer.SourceAmount).ToArray() is [var amount, var interest])
+			{
+				Amount = -amount.SourceAmount;
+				Interest = -interest.SourceAmount;
+			}
+			else if (transaction.Transfers is [var transfer])
+			{
+				Amount = -transfer.SourceAmount;
+				Interest = 0;
+			}
+		}
+	}
+}
diff --git a/source/Gnomeshade.Avalonia.Core/Transactions/Loans/LoanViewModel.cs b/source/Gnomeshade.Avalonia.Core/Transactions/Loans/LoanPaymentViewModel.cs
similarity index 69%
rename from source/Gnomeshade.Avalonia.Core/Transactions/Loans/LoanViewModel.cs
rename to source/Gnomeshade.Avalonia.Core/Transactions/Loans/LoanPaymentViewModel.cs
index 119d3f133..b0ac45ac3 100644
--- a/source/Gnomeshade.Avalonia.Core/Transactions/Loans/LoanViewModel.cs
+++ b/source/Gnomeshade.Avalonia.Core/Transactions/Loans/LoanPaymentViewModel.cs
@@ -7,28 +7,29 @@
 using System.Linq;
 using System.Threading.Tasks;
 
+using Gnomeshade.Avalonia.Core.Loans;
 using Gnomeshade.WebApi.Client;
 
 using PropertyChanged.SourceGenerator;
 
 namespace Gnomeshade.Avalonia.Core.Transactions.Loans;
 
-/// <summary>Overview of all loans for a single transaction.</summary>
-public sealed partial class LoanViewModel : OverviewViewModel<LoanOverview, LoanUpsertionViewModel>
+/// <summary>Overview of all loan payments for a single transaction.</summary>
+public sealed partial class LoanPaymentViewModel : OverviewViewModel<LoanPaymentRow, LoanPaymentUpsertionViewModel>
 {
 	private readonly IGnomeshadeClient _gnomeshadeClient;
 	private readonly Guid _transactionId;
-	private LoanUpsertionViewModel _details;
+	private LoanPaymentUpsertionViewModel _details;
 
 	/// <summary>Gets the total loaned amount.</summary>
 	[Notify(Setter.Private)]
 	private decimal _total;
 
-	/// <summary>Initializes a new instance of the <see cref="LoanViewModel"/> class.</summary>
+	/// <summary>Initializes a new instance of the <see cref="LoanPaymentViewModel"/> class.</summary>
 	/// <param name="activityService">Service for indicating the activity of the application to the user.</param>
 	/// <param name="gnomeshadeClient">A strongly typed API client.</param>
 	/// <param name="transactionId">The transaction for which to create a loan overview.</param>
-	public LoanViewModel(IActivityService activityService, IGnomeshadeClient gnomeshadeClient, Guid transactionId)
+	public LoanPaymentViewModel(IActivityService activityService, IGnomeshadeClient gnomeshadeClient, Guid transactionId)
 		: base(activityService)
 	{
 		_gnomeshadeClient = gnomeshadeClient;
@@ -40,7 +41,7 @@ public LoanViewModel(IActivityService activityService, IGnomeshadeClient gnomesh
 	}
 
 	/// <inheritdoc />
-	public override LoanUpsertionViewModel Details
+	public override LoanPaymentUpsertionViewModel Details
 	{
 		get => _details;
 		set
@@ -62,15 +63,12 @@ public override async Task UpdateSelection()
 	protected override async Task Refresh()
 	{
 		var transaction = await _gnomeshadeClient.GetDetailedTransactionAsync(_transactionId);
-		var counterparties = await _gnomeshadeClient.GetCounterpartiesAsync();
+		var payments = await _gnomeshadeClient.GetLoanPaymentsForTransactionAsync(_transactionId);
+		var loans = await _gnomeshadeClient.GetLoansAsync();
 		var currencies = await _gnomeshadeClient.GetCurrenciesAsync();
-		var overviews = transaction.Loans
-			.Select(loan => new LoanOverview(
-				loan.Id,
-				counterparties.Single(counterparty => counterparty.Id == loan.IssuingCounterpartyId).Name,
-				counterparties.Single(counterparty => counterparty.Id == loan.ReceivingCounterpartyId).Name,
-				loan.Amount,
-				currencies.Single(currency => currency.Id == loan.CurrencyId).AlphabeticCode))
+
+		var overviews = payments
+			.Select(payment => new LoanPaymentRow(payment, loans, currencies))
 			.ToList();
 
 		var selected = Selected;
@@ -86,9 +84,10 @@ protected override async Task Refresh()
 	}
 
 	/// <inheritdoc />
-	protected override async Task DeleteAsync(LoanOverview row)
+	protected override async Task DeleteAsync(LoanPaymentRow row)
 	{
-		await _gnomeshadeClient.DeleteLoanAsync(row.Id);
+		await _gnomeshadeClient.DeleteLoanPaymentAsync(row.Id);
+		await RefreshAsync();
 	}
 
 	private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e)
diff --git a/source/Gnomeshade.Avalonia.Core/Transactions/Loans/LoanUpsertionViewModel.cs b/source/Gnomeshade.Avalonia.Core/Transactions/Loans/LoanUpsertionViewModel.cs
deleted file mode 100644
index 23ac7558f..000000000
--- a/source/Gnomeshade.Avalonia.Core/Transactions/Loans/LoanUpsertionViewModel.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2021 Valters Melnalksnis
-// Licensed under the GNU Affero General Public License v3.0 or later.
-// See LICENSE.txt file in the project root for full license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-using Avalonia.Controls;
-
-using Gnomeshade.WebApi.Client;
-using Gnomeshade.WebApi.Models.Accounts;
-using Gnomeshade.WebApi.Models.Transactions;
-
-using PropertyChanged.SourceGenerator;
-
-namespace Gnomeshade.Avalonia.Core.Transactions.Loans;
-
-/// <summary>Creates or updates a single loan.</summary>
-public sealed partial class LoanUpsertionViewModel : UpsertionViewModel
-{
-	private readonly Guid _transactionId;
-
-	/// <summary>Gets all available counterparties.</summary>
-	[Notify(Setter.Private)]
-	private List<Counterparty> _counterparties;
-
-	/// <summary>Gets all available currencies.</summary>
-	[Notify(Setter.Private)]
-	private List<Currency> _currencies;
-
-	/// <summary>Gets or sets the counterparty issuing the loan.</summary>
-	/// <seealso cref="Counterparties"/>
-	/// <seealso cref="CounterpartySelector"/>
-	[Notify]
-	private Counterparty? _issuingCounterparty;
-
-	/// <summary>Gets or sets the counterparty receiving the loan.</summary>
-	/// <seealso cref="Counterparties"/>
-	/// <seealso cref="CounterpartySelector"/>
-	[Notify]
-	private Counterparty? _receivingCounterparty;
-
-	/// <summary>Gets or sets the amount of the loan.</summary>
-	/// <seealso cref="Currency"/>
-	[Notify]
-	private decimal? _amount;
-
-	/// <summary>Gets or sets the currency of the loan.</summary>
-	/// <seealso cref="Currencies"/>
-	/// <seealso cref="CurrencySelector"/>
-	[Notify]
-	private Currency? _currency;
-
-	/// <summary>Initializes a new instance of the <see cref="LoanUpsertionViewModel"/> class.</summary>
-	/// <param name="activityService">Service for indicating the activity of the application to the user.</param>
-	/// <param name="gnomeshadeClient">A strongly typed API client.</param>
-	/// <param name="transactionId">The id of the transaction to which to add the loan.</param>
-	/// <param name="id">The id of the loan to edit.</param>
-	public LoanUpsertionViewModel(
-		IActivityService activityService,
-		IGnomeshadeClient gnomeshadeClient,
-		Guid transactionId,
-		Guid? id)
-		: base(activityService, gnomeshadeClient)
-	{
-		_transactionId = transactionId;
-		Id = id;
-
-		_counterparties = new();
-		_currencies = new();
-	}
-
-	/// <summary>Gets a delegate for formatting a counterparty in an <see cref="AutoCompleteBox"/>.</summary>
-	public AutoCompleteSelector<object> CounterpartySelector => AutoCompleteSelectors.Counterparty;
-
-	/// <summary>Gets a delegate for formatting a currency in an <see cref="AutoCompleteBox"/>.</summary>
-	public AutoCompleteSelector<object> CurrencySelector => AutoCompleteSelectors.Currency;
-
-	/// <inheritdoc />
-	public override bool CanSave =>
-		IssuingCounterparty is not null &&
-		ReceivingCounterparty is not null &&
-		IssuingCounterparty.Id != ReceivingCounterparty.Id &&
-		Amount is not null &&
-		Currency is not null;
-
-	/// <inheritdoc />
-	protected override async Task Refresh()
-	{
-		Counterparties = await GnomeshadeClient.GetCounterpartiesAsync();
-		Currencies = await GnomeshadeClient.GetCurrenciesAsync();
-
-		if (Id is null)
-		{
-			return;
-		}
-
-		var loan = await GnomeshadeClient.GetTransactionLoanAsync(Id.Value);
-		IssuingCounterparty = Counterparties.Single(counterparty => counterparty.Id == loan.IssuingCounterpartyId);
-		ReceivingCounterparty = Counterparties.Single(counterparty => counterparty.Id == loan.ReceivingCounterpartyId);
-		Amount = loan.Amount;
-		Currency = Currencies.Single(currency => currency.Id == loan.CurrencyId);
-	}
-
-	/// <inheritdoc />
-	protected override async Task<Guid> SaveValidatedAsync()
-	{
-		var creation = new LoanCreation
-		{
-			TransactionId = _transactionId,
-			IssuingCounterpartyId = IssuingCounterparty?.Id,
-			ReceivingCounterpartyId = ReceivingCounterparty?.Id,
-			Amount = Amount,
-			CurrencyId = Currency?.Id,
-		};
-
-		var id = Id ?? Guid.NewGuid();
-		await GnomeshadeClient.PutLoanAsync(id, creation);
-		return id;
-	}
-}
diff --git a/source/Gnomeshade.Avalonia.Core/Transactions/Loans/Migration/LoanMigrationViewModel.cs b/source/Gnomeshade.Avalonia.Core/Transactions/Loans/Migration/LoanMigrationViewModel.cs
deleted file mode 100644
index 5b7a9041a..000000000
--- a/source/Gnomeshade.Avalonia.Core/Transactions/Loans/Migration/LoanMigrationViewModel.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2021 Valters Melnalksnis
-// Licensed under the GNU Affero General Public License v3.0 or later.
-// See LICENSE.txt file in the project root for full license information.
-
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-using Gnomeshade.WebApi.Client;
-
-using NodaTime;
-
-using PropertyChanged.SourceGenerator;
-
-namespace Gnomeshade.Avalonia.Core.Transactions.Loans.Migration;
-
-/// <summary>Overview of loans to be migrated to named loans/loan payments.</summary>
-public sealed partial class LoanMigrationViewModel : ViewModelBase
-{
-	private readonly IGnomeshadeClient _gnomeshadeClient;
-
-	/// <summary>Gets a collection of all current loans.</summary>
-	[Notify(Setter.Private)]
-	private List<LoanOverview> _loans = [];
-
-	/// <summary>Gets a collection of all loan payments that will be created.</summary>
-	[Notify(Setter.Private)]
-	private List<LoanMigrationRow> _migratedLoans = [];
-
-	/// <summary>Initializes a new instance of the <see cref="LoanMigrationViewModel"/> class.</summary>
-	/// <param name="activityService">Service for indicating the activity of the application to the user.</param>
-	/// <param name="gnomeshadeClient">A strongly typed API client.</param>
-	public LoanMigrationViewModel(IActivityService activityService, IGnomeshadeClient gnomeshadeClient)
-		: base(activityService)
-	{
-		_gnomeshadeClient = gnomeshadeClient;
-	}
-
-	/// <inheritdoc />
-	protected override async Task Refresh()
-	{
-		var loans = await _gnomeshadeClient.GetLoansAsync();
-		var counterparties = await _gnomeshadeClient.GetCounterpartiesAsync();
-		var transactions = await _gnomeshadeClient.GetDetailedTransactionsAsync(new(Instant.MinValue, Instant.MaxValue));
-		var currencies = await _gnomeshadeClient.GetCurrenciesAsync();
-
-		MigratedLoans = loans
-			.OrderBy(loan =>
-			{
-				var transaction = transactions.Single(transaction => transaction.Id == loan.TransactionId);
-				return transaction.ValuedAt ?? transaction.BookedAt;
-			})
-			.GroupBy(loan => loan, new LoanCounterpartyComparer())
-			.Select(grouping =>
-			{
-				var counterparty1 = counterparties.Single(counterparty => counterparty.Id == grouping.Key.IssuingCounterpartyId);
-				var counterparty2 = counterparties.Single(counterparty => counterparty.Id == grouping.Key.ReceivingCounterpartyId);
-				return (counterparty1, counterparty2, grouping.ToArray());
-			})
-			.SelectMany(loanTuple =>
-			{
-				var issuer = loanTuple.Item3.First().IssuingCounterpartyId == loanTuple.counterparty1.Id
-					? loanTuple.counterparty1
-					: loanTuple.counterparty2;
-
-				var receiver = loanTuple.counterparty1 == issuer
-					? loanTuple.counterparty2
-					: loanTuple.counterparty1;
-
-				return loanTuple.Item3.GroupBy(loan => loan.CurrencyId).Select(grouping =>
-				{
-					var currency = currencies.Single(currency => currency.Id == grouping.Key);
-					var name = $"{issuer.Name} loan to {receiver.Name} ({currency.AlphabeticCode})";
-					return new LoanMigrationRow(name, issuer.Name, receiver.Name, grouping.Select(loan => loan.Amount).ToList(), currency.AlphabeticCode);
-				});
-			})
-			.ToList();
-
-		Loans = transactions
-			.SelectMany(transaction => transaction.Loans)
-			.Select(loan => new LoanOverview(
-				loan.Id,
-				counterparties.Single(counterparty => counterparty.Id == loan.IssuingCounterpartyId).Name,
-				counterparties.Single(counterparty => counterparty.Id == loan.ReceivingCounterpartyId).Name,
-				loan.Amount,
-				currencies.Single(currency => currency.Id == loan.CurrencyId).AlphabeticCode))
-			.ToList();
-	}
-}
diff --git a/source/Gnomeshade.Avalonia.Core/Transactions/TransactionUpsertionViewModel.cs b/source/Gnomeshade.Avalonia.Core/Transactions/TransactionUpsertionViewModel.cs
index 937a21a0b..08d7ebf0a 100644
--- a/source/Gnomeshade.Avalonia.Core/Transactions/TransactionUpsertionViewModel.cs
+++ b/source/Gnomeshade.Avalonia.Core/Transactions/TransactionUpsertionViewModel.cs
@@ -44,7 +44,7 @@ public sealed partial class TransactionUpsertionViewModel : UpsertionViewModel
 
 	/// <summary>Gets view model of all loans of this transaction.</summary>
 	[Notify(Setter.Private)]
-	private LoanViewModel? _loans;
+	private LoanPaymentViewModel? _loans;
 
 	/// <summary>Initializes a new instance of the <see cref="TransactionUpsertionViewModel"/> class.</summary>
 	/// <param name="activityService">Service for indicating the activity of the application to the user.</param>
diff --git a/source/Gnomeshade.Desktop/App.axaml b/source/Gnomeshade.Desktop/App.axaml
index 0ff530fab..32b39e69b 100644
--- a/source/Gnomeshade.Desktop/App.axaml
+++ b/source/Gnomeshade.Desktop/App.axaml
@@ -6,6 +6,7 @@
 	xmlns:accounts="clr-namespace:Gnomeshade.WebApi.Models.Accounts;assembly=Gnomeshade.WebApi.Models"
 	xmlns:products="clr-namespace:Gnomeshade.WebApi.Models.Products;assembly=Gnomeshade.WebApi.Models"
 	xmlns:owners="clr-namespace:Gnomeshade.WebApi.Models.Owners;assembly=Gnomeshade.WebApi.Models"
+	xmlns:loans="clr-namespace:Gnomeshade.WebApi.Models.Loans;assembly=Gnomeshade.WebApi.Models"
 	x:Class="Gnomeshade.Desktop.App"
 	RequestedThemeVariant="Dark">
 
@@ -32,6 +33,10 @@
 			<TextBlock Text="{Binding Name}" />
 		</DataTemplate>
 
+		<DataTemplate x:DataType="loans:Loan">
+			<TextBlock Text="{Binding Name}" />
+		</DataTemplate>
+
 		<DataTemplate x:DataType="owners:Owner">
 			<TextBlock Text="{Binding Name}" />
 		</DataTemplate>
diff --git a/source/Gnomeshade.Desktop/Views/Loans/LoanUpsertionView.axaml b/source/Gnomeshade.Desktop/Views/Loans/LoanUpsertionView.axaml
new file mode 100644
index 000000000..0e81cd4c1
--- /dev/null
+++ b/source/Gnomeshade.Desktop/Views/Loans/LoanUpsertionView.axaml
@@ -0,0 +1,75 @@
+<UserControl
+	xmlns="https://github.com/avaloniaui"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:dd="clr-namespace:Gnomeshade.Avalonia.Core.DesignTime;assembly=Gnomeshade.Avalonia.Core"
+	xmlns:loans="clr-namespace:Gnomeshade.Avalonia.Core.Loans;assembly=Gnomeshade.Avalonia.Core"
+	mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+	d:DataContext="{x:Static dd:DesignTimeData.LoanUpsertionViewModel}"
+	x:Class="Gnomeshade.Desktop.Views.Loans.LoanUpsertionView"
+	x:DataType="loans:LoanUpsertionViewModel">
+
+	<StackPanel Orientation="Vertical">
+		<WrapPanel>
+			<TextBox MinWidth="300" Watermark="Name" Text="{Binding Name}" />
+
+			<AutoCompleteBox
+				MinWidth="300"
+				Watermark="Owner"
+				MinimumPrefixLength="1" FilterMode="ContainsOrdinal"
+				IsTextCompletionEnabled="True"
+				ItemSelector="{Binding OwnerSelector}"
+				ItemsSource="{Binding Owners}"
+				SelectedItem="{Binding Owner, Mode=TwoWay}" />
+		</WrapPanel>
+
+		<WrapPanel>
+			<AutoCompleteBox
+				MinWidth="300"
+				Watermark="Issuer"
+				MinimumPrefixLength="1" FilterMode="ContainsOrdinal"
+				IsTextCompletionEnabled="True"
+				ItemSelector="{Binding CounterpartySelector}"
+				ItemsSource="{Binding Counterparties}"
+				SelectedItem="{Binding Issuer, Mode=TwoWay}" />
+
+			<AutoCompleteBox
+				MinWidth="300"
+				Watermark="Receiver"
+				MinimumPrefixLength="1" FilterMode="ContainsOrdinal"
+				IsTextCompletionEnabled="True"
+				ItemSelector="{Binding CounterpartySelector}"
+				ItemsSource="{Binding Counterparties}"
+				SelectedItem="{Binding Receiver, Mode=TwoWay}" />
+		</WrapPanel>
+
+		<WrapPanel>
+			<TextBox MinWidth="150" Watermark="Principal" Text="{Binding Principal}" />
+
+			<AutoCompleteBox
+				MinWidth="150"
+				Watermark="Currency"
+				MinimumPrefixLength="1" FilterMode="ContainsOrdinal"
+				IsTextCompletionEnabled="True"
+				ItemSelector="{Binding CurrencySelector}"
+				ItemsSource="{Binding Currencies}"
+				SelectedItem="{Binding Currency, Mode=TwoWay}" />
+		</WrapPanel>
+
+		<Button
+			HorizontalContentAlignment="Center"
+			IsEnabled="{Binding CanSave}" Command="{Binding SaveAsync}">
+			Save
+		</Button>
+
+		<StackPanel.Styles>
+			<Style Selector="StackPanel > Button">
+				<Setter Property="Width" Value="140"/>
+				<Setter Property="Margin" Value="5 0"/>
+				<Setter Property="VerticalAlignment" Value="Top"/>
+			</Style>
+		</StackPanel.Styles>
+	</StackPanel>
+
+</UserControl>
diff --git a/source/Gnomeshade.Desktop/Views/Loans/LoanUpsertionView.axaml.cs b/source/Gnomeshade.Desktop/Views/Loans/LoanUpsertionView.axaml.cs
new file mode 100644
index 000000000..386212388
--- /dev/null
+++ b/source/Gnomeshade.Desktop/Views/Loans/LoanUpsertionView.axaml.cs
@@ -0,0 +1,17 @@
+// Copyright 2021 Valters Melnalksnis
+// Licensed under the GNU Affero General Public License v3.0 or later.
+// See LICENSE.txt file in the project root for full license information.
+
+using Avalonia.Controls;
+
+using Gnomeshade.Avalonia.Core;
+using Gnomeshade.Avalonia.Core.Loans;
+
+namespace Gnomeshade.Desktop.Views.Loans;
+
+/// <inheritdoc cref="LoanUpsertionViewModel" />
+public sealed partial class LoanUpsertionView : UserControl, IView<LoanUpsertionView, LoanUpsertionViewModel>
+{
+	/// <summary>Initializes a new instance of the <see cref="LoanUpsertionView"/> class.</summary>
+	public LoanUpsertionView() => InitializeComponent();
+}
diff --git a/source/Gnomeshade.Desktop/Views/Loans/LoanView.axaml b/source/Gnomeshade.Desktop/Views/Loans/LoanView.axaml
new file mode 100644
index 000000000..9e73becd0
--- /dev/null
+++ b/source/Gnomeshade.Desktop/Views/Loans/LoanView.axaml
@@ -0,0 +1,110 @@
+<UserControl
+	xmlns="https://github.com/avaloniaui"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:dd="clr-namespace:Gnomeshade.Avalonia.Core.DesignTime;assembly=Gnomeshade.Avalonia.Core"
+	xmlns:loans="clr-namespace:Gnomeshade.Avalonia.Core.Loans;assembly=Gnomeshade.Avalonia.Core"
+	mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+	d:DataContext="{x:Static dd:DesignTimeData.LoanViewModel}"
+	x:Class="Gnomeshade.Desktop.Views.Loans.LoanView"
+	x:DataType="loans:LoanViewModel">
+
+	<Grid RowDefinitions="*">
+
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="*" MinWidth="200" MaxWidth="300" />
+			<ColumnDefinition Width="4*" />
+			<ColumnDefinition Width="2*" MinWidth="300" MaxWidth="600" />
+		</Grid.ColumnDefinitions>
+
+
+		<StackPanel Grid.Column="0" Orientation="Vertical" Spacing="10">
+			<!-- <UserControl Content="{Binding Filter, Mode=OneWay}" /> -->
+
+			<Border Background="White" HorizontalAlignment="Stretch" Height="1" />
+
+			<Button
+				Width="140" Margin="5 0" HorizontalAlignment="Center" HorizontalContentAlignment="Center"
+				IsEnabled="{Binding CanDelete}" Command="{Binding DeleteSelectedAsync}">
+				Delete Selected
+			</Button>
+		</StackPanel>
+
+		<DataGrid
+			Grid.Column="1" Grid.Row="0"
+			VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible"
+			x:Name="DataGrid"
+			ItemsSource="{Binding DataGridView, Mode=TwoWay}"
+			SelectedItem="{Binding Selected, Mode=TwoWay}"
+			AutoGenerateColumns="False" IsReadOnly="False"
+			CanUserReorderColumns="True" CanUserResizeColumns="True" CanUserSortColumns="True">
+			<DataGrid.Columns>
+				<DataGridTemplateColumn Header="Name" IsReadOnly="True">
+					<DataTemplate x:DataType="loans:LoanRow">
+						<TextBlock
+							HorizontalAlignment="Right" VerticalAlignment="Top" Margin="5 0"
+							Text="{Binding Name, Mode=OneWay}" />
+					</DataTemplate>
+				</DataGridTemplateColumn>
+				<DataGridTemplateColumn Header="Issuer" IsReadOnly="True">
+					<DataTemplate x:DataType="loans:LoanRow">
+						<TextBlock
+							HorizontalAlignment="Right" VerticalAlignment="Top" Margin="5 0"
+							Text="{Binding Issuer, Mode=OneWay}" />
+					</DataTemplate>
+				</DataGridTemplateColumn>
+				<DataGridTemplateColumn Header="Receiver" IsReadOnly="True">
+					<DataTemplate x:DataType="loans:LoanRow">
+						<TextBlock
+							HorizontalAlignment="Right" VerticalAlignment="Top" Margin="5 0"
+							Text="{Binding Receiver, Mode=OneWay}" />
+					</DataTemplate>
+				</DataGridTemplateColumn>
+				<DataGridTemplateColumn Header="Currency" IsReadOnly="True">
+					<DataTemplate x:DataType="loans:LoanRow">
+						<TextBlock
+							HorizontalAlignment="Right" VerticalAlignment="Top" Margin="5 0"
+							Text="{Binding Currency, Mode=OneWay}" />
+					</DataTemplate>
+				</DataGridTemplateColumn>
+				<DataGridTemplateColumn Header="Principal" IsReadOnly="True">
+					<DataTemplate x:DataType="loans:LoanRow">
+						<TextBlock
+							HorizontalAlignment="Right" VerticalAlignment="Top" Margin="5 0"
+							Text="{Binding Principal, Mode=OneWay, StringFormat=\{0:N2\}}" />
+					</DataTemplate>
+				</DataGridTemplateColumn>
+				<DataGridTemplateColumn Header="Actual Principal" IsReadOnly="True">
+					<DataTemplate x:DataType="loans:LoanRow">
+						<TextBlock
+							HorizontalAlignment="Right" VerticalAlignment="Top" Margin="5 0"
+							Text="{Binding ActualPrincipal, Mode=OneWay, StringFormat=\{0:N2\}}" />
+					</DataTemplate>
+				</DataGridTemplateColumn>
+				<DataGridTemplateColumn Header="Paid Principal" IsReadOnly="True">
+					<DataTemplate x:DataType="loans:LoanRow">
+						<TextBlock
+							HorizontalAlignment="Right" VerticalAlignment="Top" Margin="5 0"
+							Text="{Binding PaidPrincipal, Mode=OneWay, StringFormat=\{0:N2\}}" />
+					</DataTemplate>
+				</DataGridTemplateColumn>
+				<DataGridTemplateColumn Header="Paid Interest" IsReadOnly="True">
+					<DataTemplate x:DataType="loans:LoanRow">
+						<TextBlock
+							HorizontalAlignment="Right" VerticalAlignment="Top" Margin="5 0"
+							Text="{Binding PaidInterest, Mode=OneWay, StringFormat=\{0:N2\}}" />
+					</DataTemplate>
+				</DataGridTemplateColumn>
+			</DataGrid.Columns>
+
+			<Interaction.Behaviors>
+				<EventTriggerBehavior EventName="SelectionChanged" SourceObject="{Binding #DataGrid}">
+					<InvokeCommandAction Command="{Binding UpdateSelection}" />
+				</EventTriggerBehavior>
+			</Interaction.Behaviors>
+		</DataGrid>
+
+		<UserControl Grid.Column="2" Content="{Binding Details}" />
+	</Grid>
+</UserControl>
diff --git a/source/Gnomeshade.Desktop/Views/Loans/LoanView.axaml.cs b/source/Gnomeshade.Desktop/Views/Loans/LoanView.axaml.cs
new file mode 100644
index 000000000..dd8849768
--- /dev/null
+++ b/source/Gnomeshade.Desktop/Views/Loans/LoanView.axaml.cs
@@ -0,0 +1,17 @@
+// Copyright 2021 Valters Melnalksnis
+// Licensed under the GNU Affero General Public License v3.0 or later.
+// See LICENSE.txt file in the project root for full license information.
+
+using Avalonia.Controls;
+
+using Gnomeshade.Avalonia.Core;
+using Gnomeshade.Avalonia.Core.Loans;
+
+namespace Gnomeshade.Desktop.Views.Loans;
+
+/// <inheritdoc cref="LoanViewModel" />
+public sealed partial class LoanView : UserControl, IView<LoanView, LoanViewModel>
+{
+	/// <summary>Initializes a new instance of the <see cref="LoanView"/> class.</summary>
+	public LoanView() => InitializeComponent();
+}
diff --git a/source/Gnomeshade.Desktop/Views/Transactions/Loans/Migration/LoanMigrationView.axaml b/source/Gnomeshade.Desktop/Views/Loans/Migration/LoanMigrationView.axaml
similarity index 76%
rename from source/Gnomeshade.Desktop/Views/Transactions/Loans/Migration/LoanMigrationView.axaml
rename to source/Gnomeshade.Desktop/Views/Loans/Migration/LoanMigrationView.axaml
index 323263fd8..c1095cb26 100644
--- a/source/Gnomeshade.Desktop/Views/Transactions/Loans/Migration/LoanMigrationView.axaml
+++ b/source/Gnomeshade.Desktop/Views/Loans/Migration/LoanMigrationView.axaml
@@ -4,12 +4,11 @@
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:dd="clr-namespace:Gnomeshade.Avalonia.Core.DesignTime;assembly=Gnomeshade.Avalonia.Core"
-	xmlns:migration="clr-namespace:Gnomeshade.Avalonia.Core.Transactions.Loans.Migration;assembly=Gnomeshade.Avalonia.Core"
-	xmlns:loans="clr-namespace:Gnomeshade.Avalonia.Core.Transactions.Loans;assembly=Gnomeshade.Avalonia.Core"
 	xmlns:system="clr-namespace:System;assembly=System.Runtime"
+	xmlns:migration="clr-namespace:Gnomeshade.Avalonia.Core.Loans.Migration;assembly=Gnomeshade.Avalonia.Core"
 	mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
 	d:DataContext="{x:Static dd:DesignTimeData.LoanMigrationViewModel}"
-	x:Class="Gnomeshade.Desktop.Views.Transactions.Loans.Migration.LoanMigrationView"
+	x:Class="Gnomeshade.Desktop.Views.Loans.Migration.LoanMigrationView"
 	x:DataType="migration:LoanMigrationViewModel">
 
 	<Grid ColumnDefinitions="Auto,Auto,Auto" RowDefinitions="Auto,*">
@@ -23,19 +22,19 @@
 			CanUserReorderColumns="True" CanUserResizeColumns="True" CanUserSortColumns="True">
 			<DataGrid.Columns>
 				<DataGridTextColumn
-					x:DataType="loans:LoanOverview"
+					x:DataType="migration:LegacyLoanRow"
 					Header="Issuer" IsReadOnly="True"
-					Binding="{Binding IssuingCounterparty, Mode=OneWay}" />
+					Binding="{Binding Issuer, Mode=OneWay}" />
 				<DataGridTextColumn
-					x:DataType="loans:LoanOverview"
+					x:DataType="migration:LegacyLoanRow"
 					Header="Receiver" IsReadOnly="True"
-					Binding="{Binding ReceivingCounterparty, Mode=OneWay}" />
+					Binding="{Binding Receiver, Mode=OneWay}" />
 				<DataGridTextColumn
-					x:DataType="loans:LoanOverview"
+					x:DataType="migration:LegacyLoanRow"
 					Header="Amount" IsReadOnly="True"
 					Binding="{Binding Amount, Mode=OneWay, StringFormat=\{0:N2\}}" />
 				<DataGridTextColumn
-					x:DataType="loans:LoanOverview"
+					x:DataType="migration:LegacyLoanRow"
 					Header="Currency" IsReadOnly="True"
 					Binding="{Binding Currency, Mode=OneWay}" />
 			</DataGrid.Columns>
@@ -77,6 +76,13 @@
 							Text="{Binding Currency, Mode=OneWay}" />
 					</DataTemplate>
 				</DataGridTemplateColumn>
+				<DataGridTemplateColumn Header="Total" IsReadOnly="True">
+					<DataTemplate x:DataType="migration:LoanMigrationRow">
+						<TextBlock
+							HorizontalAlignment="Right" VerticalAlignment="Top" Margin="5 0"
+							Text="{Binding Total, Mode=OneWay, StringFormat=\{0:N2\}}" />
+					</DataTemplate>
+				</DataGridTemplateColumn>
 				<DataGridTemplateColumn Header="Payments" IsReadOnly="True">
 					<DataTemplate x:DataType="migration:LoanMigrationRow">
 						<ItemsControl ItemsSource="{Binding Amounts}">
@@ -88,13 +94,24 @@
 								</DataTemplate>
 							</ItemsControl.ItemTemplate>
 						</ItemsControl>
-
 					</DataTemplate>
 				</DataGridTemplateColumn>
 			</DataGrid.Columns>
 		</DataGrid>
 
-		<!-- <UserControl Grid.Column="2" Content="{Binding Details}" /> -->
+		<StackPanel Grid.Column="2" Grid.Row="1" Orientation="Vertical">
+			<Button
+				MinWidth="150" HorizontalContentAlignment="Center"
+				Command="{Binding MigrateLoans}">
+				Migrate loans
+			</Button>
+
+			<Button
+				MinWidth="150" HorizontalContentAlignment="Center"
+				Command="{Binding DeleteLegacyLoans}">
+				Delete legacy loans
+			</Button>
+		</StackPanel>
 	</Grid>
 
 </UserControl>
diff --git a/source/Gnomeshade.Desktop/Views/Transactions/Loans/Migration/LoanMigrationView.axaml.cs b/source/Gnomeshade.Desktop/Views/Loans/Migration/LoanMigrationView.axaml.cs
similarity index 81%
rename from source/Gnomeshade.Desktop/Views/Transactions/Loans/Migration/LoanMigrationView.axaml.cs
rename to source/Gnomeshade.Desktop/Views/Loans/Migration/LoanMigrationView.axaml.cs
index 6e7c71781..3a093b545 100644
--- a/source/Gnomeshade.Desktop/Views/Transactions/Loans/Migration/LoanMigrationView.axaml.cs
+++ b/source/Gnomeshade.Desktop/Views/Loans/Migration/LoanMigrationView.axaml.cs
@@ -5,9 +5,9 @@
 using Avalonia.Controls;
 
 using Gnomeshade.Avalonia.Core;
-using Gnomeshade.Avalonia.Core.Transactions.Loans.Migration;
+using Gnomeshade.Avalonia.Core.Loans.Migration;
 
-namespace Gnomeshade.Desktop.Views.Transactions.Loans.Migration;
+namespace Gnomeshade.Desktop.Views.Loans.Migration;
 
 /// <inheritdoc cref="LoanMigrationViewModel" />
 public sealed partial class LoanMigrationView : UserControl, IView<LoanMigrationView, LoanMigrationViewModel>
diff --git a/source/Gnomeshade.Desktop/Views/MainWindow.axaml b/source/Gnomeshade.Desktop/Views/MainWindow.axaml
index a4939c38c..4bad0de7a 100644
--- a/source/Gnomeshade.Desktop/Views/MainWindow.axaml
+++ b/source/Gnomeshade.Desktop/Views/MainWindow.axaml
@@ -68,6 +68,9 @@
 					<MenuItem
 						x:Name="Transactions" Header="_Overview"
 						Command="{Binding SwitchToTransactionOverviewAsync}" />
+					<MenuItem
+						x:Name="Loans" Header="Loans"
+						Command="{Binding SwitchToLoanOverviewAsync}" />
 					<MenuItem
 						x:Name="LoanMigration" Header="Loan Migration"
 						Command="{Binding SwitchToLoanMigrationAsync}" />
diff --git a/source/Gnomeshade.Desktop/Views/Transactions/Loans/LoanUpsertionView.axaml b/source/Gnomeshade.Desktop/Views/Transactions/Loans/LoanUpsertionView.axaml
index 260542aeb..bd2c69ebe 100644
--- a/source/Gnomeshade.Desktop/Views/Transactions/Loans/LoanUpsertionView.axaml
+++ b/source/Gnomeshade.Desktop/Views/Transactions/Loans/LoanUpsertionView.axaml
@@ -5,38 +5,24 @@
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:design="clr-namespace:Gnomeshade.Avalonia.Core.DesignTime;assembly=Gnomeshade.Avalonia.Core"
 	xmlns:loans="clr-namespace:Gnomeshade.Avalonia.Core.Transactions.Loans;assembly=Gnomeshade.Avalonia.Core"
-	mc:Ignorable="d" d:DataContext="{x:Static design:DesignTimeData.LoanUpsertionViewModel}"
+	mc:Ignorable="d" d:DataContext="{x:Static design:DesignTimeData.LoanPaymentUpsertionViewModel}"
 	x:Class="Gnomeshade.Desktop.Views.Transactions.Loans.LoanUpsertionView"
-	x:DataType="loans:LoanUpsertionViewModel">
+	x:DataType="loans:LoanPaymentUpsertionViewModel">
 
 	<WrapPanel>
 		<WrapPanel>
 			<AutoCompleteBox
-				Watermark="Issuer"
+				Watermark="Loan"
 				MinimumPrefixLength="1" FilterMode="ContainsOrdinal"
 				IsTextCompletionEnabled="True"
-				ItemsSource="{Binding Counterparties}"
-				ItemSelector="{Binding CounterpartySelector}"
-				SelectedItem="{Binding IssuingCounterparty, Mode=TwoWay}" />
-
-			<AutoCompleteBox
-				Watermark="Receiver"
-				MinimumPrefixLength="1" FilterMode="ContainsOrdinal"
-				IsTextCompletionEnabled="True"
-				ItemsSource="{Binding Counterparties}"
-				ItemSelector="{Binding CounterpartySelector}"
-				SelectedItem="{Binding ReceivingCounterparty, Mode=TwoWay}" />
+				ItemsSource="{Binding Loans}"
+				ItemSelector="{Binding LoanSelector}"
+				SelectedItem="{Binding Loan, Mode=TwoWay}" />
 		</WrapPanel>
 
 		<WrapPanel>
 			<TextBox Watermark="Amount" Text="{Binding Amount}" />
-			<AutoCompleteBox
-				Watermark="Currency"
-				MinimumPrefixLength="1" FilterMode="ContainsOrdinal"
-				IsTextCompletionEnabled="True"
-				ItemsSource="{Binding Currencies}"
-				ItemSelector="{Binding CurrencySelector}"
-				SelectedItem="{Binding Currency, Mode=TwoWay}" />
+			<TextBox Watermark="Interest" Text="{Binding Interest}" />
 		</WrapPanel>
 	</WrapPanel>
 </UserControl>
diff --git a/source/Gnomeshade.Desktop/Views/Transactions/Loans/LoanUpsertionView.axaml.cs b/source/Gnomeshade.Desktop/Views/Transactions/Loans/LoanUpsertionView.axaml.cs
index 0252ae9d6..7be88ad6b 100644
--- a/source/Gnomeshade.Desktop/Views/Transactions/Loans/LoanUpsertionView.axaml.cs
+++ b/source/Gnomeshade.Desktop/Views/Transactions/Loans/LoanUpsertionView.axaml.cs
@@ -10,8 +10,8 @@
 
 namespace Gnomeshade.Desktop.Views.Transactions.Loans;
 
-/// <inheritdoc cref="LoanUpsertionViewModel"/>
-public sealed partial class LoanUpsertionView : UserControl, IView<LoanUpsertionView, LoanUpsertionViewModel>
+/// <inheritdoc cref="LoanPaymentUpsertionViewModel"/>
+public sealed partial class LoanUpsertionView : UserControl, IView<LoanUpsertionView, LoanPaymentUpsertionViewModel>
 {
 	/// <summary>Initializes a new instance of the <see cref="LoanUpsertionView"/> class.</summary>
 	public LoanUpsertionView()
diff --git a/source/Gnomeshade.Desktop/Views/Transactions/Loans/LoanView.axaml b/source/Gnomeshade.Desktop/Views/Transactions/Loans/LoanView.axaml
index f3e57a187..137e2eb47 100644
--- a/source/Gnomeshade.Desktop/Views/Transactions/Loans/LoanView.axaml
+++ b/source/Gnomeshade.Desktop/Views/Transactions/Loans/LoanView.axaml
@@ -4,12 +4,13 @@
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:design="clr-namespace:Gnomeshade.Avalonia.Core.DesignTime;assembly=Gnomeshade.Avalonia.Core"
-	xmlns:loans="clr-namespace:Gnomeshade.Avalonia.Core.Transactions.Loans;assembly=Gnomeshade.Avalonia.Core"
 	xmlns:core="clr-namespace:Gnomeshade.Avalonia.Core;assembly=Gnomeshade.Avalonia.Core"
+	xmlns:loans="clr-namespace:Gnomeshade.Avalonia.Core.Loans;assembly=Gnomeshade.Avalonia.Core"
+	xmlns:transactionLoans="clr-namespace:Gnomeshade.Avalonia.Core.Transactions.Loans;assembly=Gnomeshade.Avalonia.Core"
 	mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-	d:DataContext="{x:Static design:DesignTimeData.LoanViewModel}"
+	d:DataContext="{x:Static design:DesignTimeData.LoanPaymentViewModel}"
 	x:Class="Gnomeshade.Desktop.Views.Transactions.Loans.LoanView"
-	x:DataType="loans:LoanViewModel">
+	x:DataType="transactionLoans:LoanPaymentViewModel">
 
 	<StackPanel Orientation="Vertical">
 		<StackPanel
@@ -29,19 +30,19 @@
 			CanUserReorderColumns="True" CanUserResizeColumns="True" CanUserSortColumns="True">
 			<DataGrid.Columns>
 				<DataGridTextColumn
-					x:DataType="loans:LoanOverview"
-					Header="Issuer" IsReadOnly="True"
-					Binding="{Binding IssuingCounterparty, Mode=OneWay}" />
+					x:DataType="loans:LoanPaymentRow"
+					Header="Loan" IsReadOnly="True"
+					Binding="{Binding Loan, Mode=OneWay}" />
 				<DataGridTextColumn
-					x:DataType="loans:LoanOverview"
-					Header="Receiver" IsReadOnly="True"
-					Binding="{Binding ReceivingCounterparty, Mode=OneWay}" />
-				<DataGridTextColumn
-					x:DataType="loans:LoanOverview"
+					x:DataType="loans:LoanPaymentRow"
 					Header="Amount" IsReadOnly="True"
 					Binding="{Binding Amount, Mode=OneWay, StringFormat=\{0:N2\}}" />
 				<DataGridTextColumn
-					x:DataType="loans:LoanOverview"
+					x:DataType="loans:LoanPaymentRow"
+					Header="Interest" IsReadOnly="True"
+					Binding="{Binding Interest, Mode=OneWay, StringFormat=\{0:N2\}}" />
+				<DataGridTextColumn
+					x:DataType="loans:LoanPaymentRow"
 					Header="Currency" IsReadOnly="True"
 					Binding="{Binding Currency, Mode=OneWay}" />
 			</DataGrid.Columns>
diff --git a/source/Gnomeshade.Desktop/Views/Transactions/Loans/LoanView.axaml.cs b/source/Gnomeshade.Desktop/Views/Transactions/Loans/LoanView.axaml.cs
index caece1e18..98ae176f1 100644
--- a/source/Gnomeshade.Desktop/Views/Transactions/Loans/LoanView.axaml.cs
+++ b/source/Gnomeshade.Desktop/Views/Transactions/Loans/LoanView.axaml.cs
@@ -10,8 +10,8 @@
 
 namespace Gnomeshade.Desktop.Views.Transactions.Loans;
 
-/// <inheritdoc cref="LoanViewModel" />
-public sealed partial class LoanView : UserControl, IView<LoanView, LoanViewModel>
+/// <inheritdoc cref="LoanPaymentViewModel" />
+public sealed partial class LoanView : UserControl, IView<LoanView, LoanPaymentViewModel>
 {
 	/// <summary>Initializes a new instance of the <see cref="LoanView"/> class.</summary>
 	public LoanView()