wip refactoring material system