Donation/Income Refactor (WIP), part of Major Refactor (WIP)