reworking CM invokation
Reworking cm invocation, part 2
Refactoring cm invocation
Merge branch 'dev' of https://github.com/powercode/PSPlastic into dev