Working WIP for refactor.