Middle of big refactor.