WIP: Refactoring.