refactoring.. currently broken (ContextGroup,Context)