fixed some stuff
put material property in parent shape class instead of each subclass
redid a lot a lot a lot of code