I agree with everything above, including Nadia and Rabia´s long‑overdue moving to Zaton´s house. The only thing I can't agree with is the double date between Zahra, Savanna, and Igor. But that's only because this (optional) partner swap isn't my cup of tea...
As for Shani and Mandisa, I must admit that I am a little concerned that the latter, being an extremely dominant personality, may try to make Shani her "slave" for the entire evening.
Yes, I also decided to let Shani go on a date with her, but we'll see where that leads..If Mandisa puts too much pressure on her, I won't let her do it, either by interrupting the date or, if that's not possible, by refusing the date. Shani herself is quite assertive by nature, and I don't want her to be broken, humiliated, or anything like that.