Continue with huge refactor.