This should move to be part of a JointModelGroup