Feature/wallet integration2