WIP Refactor.