would it make sense to move this to a common module?