More refactoring of material handling

Refactored to completely remove global access to material model

Merge request reports

Loading