move to more of a service model, clarify messaging