Merge back in work from Ledgerbuddy
New HasOne associations, with common ancestor