Wallet

Wallet branch mostly complete, will add some testing changes to it later.
Incorrect indentation detected (column 6 instead of 4).