Improve code, add wallet and currency