A couple days ago I created a pull request for part of this:


Anyone interested in reviewing?

— Darin