Moving stuff around to refactor.