I was thinking of keeping Nao in the tower/professor group. I like the idea of splitting everyone up into fresh groups from what we've been running so far. It opens things up for new dynamics and relationships.