ADD: context/partial context definitions. Agree?