Almost done so far, need to fix listBalance bug.
Merge remote-tracking branch 'origin/master'