Invite Command
Refactorings and Invite command fixes