Add an McM service and unit test