handle multiple accounts with separation
Merge branch 'separate_wallets'