rough material refactor. More tests