Sid/material refactor


covers #1