Finished almost all calculations, the only calculations that need to be finished is misc loans and savings (which more information is needed)
Merge remote-tracking branch 'origin/master'