Sounds good. I probably shouldn't have pushed this as a PR, I still have a little more work to do on it.