[WIP] refactoring/new extension

Youps ...