Wallet

Wallet branch mostly complete, will add some testing changes to it later.
Redundant `self` detected.