Is this something we really need or can it be moved out to a test utility?