I'll clean up what I have and put up a PR; hopefully I'm just doing something obviously wrong 🙂