New sub-model convenience. Incomplete, tests to follow.