Preparing for investments being taxed

Also made income tax calculation consistent with other similar
calculations, allowing them to be moved into a function in the future