[WIP] Idea of refactoring