dev/account-for-join diff

Addresses #278. Based on #258 (can be merged with it if wanted).