[WIP] refactoring/new extension

:+1: