Added material system, amoung other things