New Invite model, plus minor changes elsewhere.