ToDo - Fix Balance Calculations