[WIP] sample of refactor for fluent interface

making all entities fluent