My approach isn't working for me yet and I'm going to be offline most of today, so I'd suggest not letting this point block the pull request. We can try to simplify later if time allows.