Does this really need to be a separate module?