Reworking things to more easily transition to multiple wallets.