it would be nice to have this one declared as a service