Will do. I'll also take the opportunity to write a few tests.