@6a68 - should we move this into the new module as well since there is nothing else that calls it?