Why not make this another service?