(wip) older version / draft
[wip] refactoring, merging docs