I like that solution. If you update your branch and the tests are all still passing I'll merge it in.