Working on #757 Buddy System Enhancements

#757