WiP: a little bit more encapsulation
WiP: some renaming