I actually pre-merged it, but it was so ugly I reverted before doing me new code.  So I punished myself twice by having to manually fix the formatting for the pull request.... lol.