Working on #757 Buddy System Enhancements
Merge pull request #781 from PirataNervo/feature-757

Working on #757 Buddy System Enhancements