Revert "Revert that last one"

This reverts commit cd2d519bcb50b010e77ff753f76f92b3aee0d098.
Revert "Simplify Income Tax and National Insurance"

This reverts commit 9f63d5b1dd59ccf826363cfef2a3f47a0bc2fa6d.