Ongoing material refactor.