I’m working on a Second Edition that includes both of those elements (and more). The first draft should be ready in two or three weeks. I’ll share it here when it’s ready.
