Merged taxcredit branch and cleaned up taxCredit class