Oops + refactor.