[WIP] - Adapt to pattern of textual and something

commits for #42