Feature/team fights

[jeffyzxc]

All Submissions

• [ ] Can you post a screenshot of your changes (if applicable)?

New Feature Submissions

• [ ] Does this relate to an existing issue, or has it been talked about prior to being done (if a major change)?

Notes

Please note, your code must pass all tests and lint checks before it can be merged.

PR Description

closes #1933

Testing

Has the code been tested, or does it need double checking?