Work on invite handling