Small progress on materials stuff. Committing early...