CSMv2

part of https://github.com/opentechinstitute/commotion-service-manager/pull/16