updated Matreshka, started todo