[wip] plan, refactoring tiny,small,...