Wallet

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