Committing current version of Materia

Don’t know what changed so I’m committing everything.