model refinement and first try to unfold the context boundaries
initial version (unfinished draft) of context boundaries