model yaml now fully working