Materials and todo updates