Seems odd to bundle this into the same module