Chris has some refactoring of this planned soon so I'm going to hold off on anything too drastic