WIP: Refactoring, the last final one