Sure, that would be cool. And since we've got the unit tests, we can easily refactor this willy-nilly without fear of breaking stuff.