New Dorms!
Each unit has four individual bedrooms and a shared common space in... some configuration that I'm sure will wobble with people's narration.
I assigned people, trying to spread out the players and add some frictions and similarities (like Nika and Chisaki both being bodyguards or Tosh and Haley getting to share a suit which I'm sure will upset nobody).