[WIP] refactoring/new extension