@petebacondarwin I don't understand your comment. Can you expand?

(I'm blocked on this PR and would love to see it merged)