Yeah it's starting to sound like it will need it's own issue. I'll remove this and open a new issue when this PR gets accepted.