I think these eventually need to live in a more general module, but that doesn't need to happen now. Can you add a TODO to that effect?