Receive kits on first join with permissions.

I have updated the base repo from master and fixed all the changes that you have requested.