wow -- there are a lot of good PRs people wrote over the last year. I am happy to code review for you if you can rebase against the current master and refactor for the new build.