Primitive class added, convenience constructors added to material and shape classes for now