Refactored a bit and hopefully people are removed from squad when they sign off