yeah. wallets is undergoing a big facelift shortly. That should be the next PR