Huge refactoring in WalletHandler (moar abstraction)