WIP: Refactoring...