Yeah, I was less than thrilled with this. I'll flatten it and fix the tests.