WIP: fix refactor.