Honestly I should just PR it instead of asking. Just promise to be gentle. My TS is almost non-existent