[WIP] Refactoring again