This is an awful small class to get its own file.  Can we find another place for it?