We had also discussed somehow refactoring this out, although we didn't come to a consensus as to how.