Wip - Improving / Clarifying the encapsulation