Added invitations and some functionality
Some changes