Command model

CBA command datamodel is complete, no reason to keep the branch seperate.